From 1c2e2f560d6eecccbe0c5a56ff2e0611e847a9ea Mon Sep 17 00:00:00 2001
From: Benjamin Neff <benjamin@coding4coffee.ch>
Date: Sat, 6 Feb 2016 21:19:09 +0100
Subject: [PATCH] Request: rename sender_id to diaspora_id

See #29
---
 lib/diaspora_federation/entities/request.rb                   | 4 ++--
 lib/diaspora_federation/test/factories.rb                     | 2 +-
 lib/diaspora_federation/validators/request_validator.rb       | 2 +-
 spec/lib/diaspora_federation/entities/request_spec.rb         | 2 +-
 .../diaspora_federation/validators/request_validator_spec.rb  | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/diaspora_federation/entities/request.rb b/lib/diaspora_federation/entities/request.rb
index 08f67b6..e1fa7c2 100644
--- a/lib/diaspora_federation/entities/request.rb
+++ b/lib/diaspora_federation/entities/request.rb
@@ -5,11 +5,11 @@ module DiasporaFederation
     #
     # @see Validators::RequestValidator
     class Request < Entity
-      # @!attribute [r] sender_id
+      # @!attribute [r] diaspora_id
       #   The diaspora ID of the person who shares his profile
       #   @see Person#diaspora_id
       #   @return [String] sender ID
-      property :sender_id, xml_name: :sender_handle
+      property :diaspora_id, xml_name: :sender_handle
 
       # @!attribute [r] recipient_id
       #   The diaspora ID of the person who will be shared with
diff --git a/lib/diaspora_federation/test/factories.rb b/lib/diaspora_federation/test/factories.rb
index 3248b46..3f902a3 100644
--- a/lib/diaspora_federation/test/factories.rb
+++ b/lib/diaspora_federation/test/factories.rb
@@ -105,7 +105,7 @@ module DiasporaFederation
           end
 
           factory :request_entity, class: DiasporaFederation::Entities::Request do
-            sender_id { generate(:diaspora_id) }
+            diaspora_id
             recipient_id { generate(:diaspora_id) }
           end
 
diff --git a/lib/diaspora_federation/validators/request_validator.rb b/lib/diaspora_federation/validators/request_validator.rb
index a7a95dd..2f691b5 100644
--- a/lib/diaspora_federation/validators/request_validator.rb
+++ b/lib/diaspora_federation/validators/request_validator.rb
@@ -4,7 +4,7 @@ module DiasporaFederation
     class RequestValidator < Validation::Validator
       include Validation
 
-      rule :sender_id, %i(not_empty diaspora_id)
+      rule :diaspora_id, %i(not_empty diaspora_id)
       rule :recipient_id, %i(not_empty diaspora_id)
     end
   end
diff --git a/spec/lib/diaspora_federation/entities/request_spec.rb b/spec/lib/diaspora_federation/entities/request_spec.rb
index 36968ad..a2de555 100644
--- a/spec/lib/diaspora_federation/entities/request_spec.rb
+++ b/spec/lib/diaspora_federation/entities/request_spec.rb
@@ -5,7 +5,7 @@ module DiasporaFederation
     let(:xml) {
       <<-XML
 <request>
-  <sender_handle>#{data[:sender_id]}</sender_handle>
+  <sender_handle>#{data[:diaspora_id]}</sender_handle>
   <recipient_handle>#{data[:recipient_id]}</recipient_handle>
 </request>
 XML
diff --git a/spec/lib/diaspora_federation/validators/request_validator_spec.rb b/spec/lib/diaspora_federation/validators/request_validator_spec.rb
index d8e0dcc..5e3376a 100644
--- a/spec/lib/diaspora_federation/validators/request_validator_spec.rb
+++ b/spec/lib/diaspora_federation/validators/request_validator_spec.rb
@@ -4,7 +4,7 @@ module DiasporaFederation
 
     it_behaves_like "a common validator"
 
-    %i(sender_id recipient_id).each do |prop|
+    %i(diaspora_id recipient_id).each do |prop|
       describe "##{prop}" do
         it_behaves_like "a diaspora id validator" do
           let(:property) { prop }