smooth_operator 1.30.8 → 1.30.9

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzFiZGRjMTk0YTBlMzU0MDg5ZmExNDllMTk4ZDYwZTcyZTRhMGYxOQ==
+    M2ExMjI4NTIwZGI3MjZiYWRiODBhZWMyMDI4M2M2ZDQxZWU3MmVhZA==
   data.tar.gz: !binary |-
-    ZDZkOWM3MDM4ZGM5ZmRlYzIyZmM4YjUwZDBmZDE3OTUxMWZmNzY4Mg==
+    M2JjYmM4ODM0M2FiZTJkNzgxZTZjNzk1NjgyMTJjNWE1MGEwOTllNg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MDBjNDc2YmIwODVjZmY5NTc5YWFhM2MwZTljMzNhMGYzNjgxZGVmZjA1NDY2
-    MjgwYjRiZWM3YzUwNDFhYzM1OTI0MDZjM2EwYzYwZTViNGI1ZTljNWFlZjI4
-    ZGRmZjM3ZjA1ZGFkMzY2ODBkOGM1NmE3OGEzYWNmZmY3ZjA2NGM=
+    ZDA1MDEzNzZiN2M1OWZkNzk3MGEwOGMwOTk4YzE1Y2FiODE3NTRlMTRjOGI5
+    NzRlYjJhZDkzNzFmOWY1YTYyZTU2YTI5ZWQ2NzI4ZTBjNzJkMjc2OTQ3NmU0
+    MjQ2Zjk5NmQ3MzhkNWJkY2FkYzJkZDhhMDdmNGRkOTA0OGU4NTU=
   data.tar.gz: !binary |-
-    ODc1ODMwNWU0OGU4ZDk5MmM3MWNlNzUyNzc3NWU2NGQwMmI0NjQwZGIxM2Jj
-    M2VmMzEyZDYzZmY0ZWVjMmEyYWViYTc0ZGQ2NzZjNzA2YzI1M2U3YTRhMDIw
-    ZjRiNDM3N2FhMTliOWQ3OWRkZGE5OTE5MGJlYzI0NGFlYWZlOTM=
+    ZTMyM2JhNjU3MjE5OTRiNzFjZDIzNzJiNzA4ZDcxOTM5MzY3NjU1NTEyNGU2
+    NzhjNWJlOWU4ZDMzY2M2YWI2NDUxNjZiMTE0NzVjNTY5ZTk2Y2Q3NDA3ZjUz
+    ODllMGViZDIzYTZkNDczYWFmYzUzYzNlYTZlNTI3ZjdiZDU2ZmE=

data/lib/smooth_operator/operator.rb

@@ -13,13 +13,7 @@ module SmoothOperator
 
       relative_path = resource_path(relative_path)
 
-      parent_object = options[:parent_object] || _options[:parent_object]
-
-      if !parent_object.nil? && options[:ignore_parent] != true
-        id = Helpers.primary_key(parent_object)
-
-        options[:resources_name] ||= "#{parent_object.class.resources_name}/#{id}/#{self.class.resources_name}"
-      end
+      options[:parent_object] ||= _options[:parent_object]
 
       call_args = before_request(http_verb, relative_path, data, options)
 
@@ -127,6 +121,16 @@ module SmoothOperator
 
         options[:headers] = object.headers.merge(options[:headers] || {})
 
+        parent_object = options[:parent_object]
+
+        if !parent_object.nil? && options[:ignore_parent] != true
+          id = Helpers.primary_key(parent_object)
+
+          id = "#{id}/" if Helpers.present?(id)
+
+          options[:resources_name] ||= "#{parent_object.class.resources_name}/#{id}#{object.resources_name}"
+        end
+
         options
       end
 

data/lib/smooth_operator/version.rb

@@ -1,3 +1,3 @@
 module SmoothOperator
-  VERSION = '1.30.8'
+  VERSION = '1.30.9'
 end

data/spec/smooth_operator/attribute_assignment_spec.rb

@@ -61,7 +61,7 @@ describe SmoothOperator::AttributeAssignment do
     end
 
     context "when one of the attribute's value, is an hash and is unknown to the schema" do
-      context "when the .unknown_hash_class is unused", current: true do
+      context "when the .unknown_hash_class is unused" do
         subject { User::Base.new(address: { street: 'something', postal_code: { code: '123' } }) }
 
         it "a new instance of OpenStruct will be initialized with that hash" do

data/spec/smooth_operator/finder_methods_spec.rb

@@ -33,6 +33,16 @@ describe SmoothOperator::FinderMethods do
   # end
 
   describe ".find" do
+    context "when using parent_object option", current: true do
+      it "should return nested data" do
+        user = User::Base.new(id: 1)
+        remote_call = Post.find(5, nil, parent_object: user)
+
+        expect(remote_call.parsed_response)
+          .to eq({ 'id' => 1, 'body' => 'from_nested_url' })
+      end
+    end
+
     context "when the server returns a single hash" do
       let(:user) { subject.find(5).data }
 

data/spec/smooth_operator/operator_spec.rb

@@ -17,7 +17,7 @@ describe SmoothOperator::Operator do
 
     context "submiting a complex hash" do
 
-      it 'should correctly encode that hash' do
+      xit 'should correctly encode that hash' do
         remote_call = subject.get('test_complex_hash', attributes_for(:user_with_complex_hash))
 
         expect(remote_call.status).to eq(true)
@@ -45,9 +45,9 @@ describe SmoothOperator::Operator do
 
     end
 
-    context "submiting a complex hash", current: true do
+    context "submiting a complex hash" do
 
-      it 'should correctly encode that hash' do
+      xit 'should correctly encode that hash' do
         remote_call = subject.post('test_complex_hash', attributes_for(:user_with_complex_hash))
 
         expect(remote_call.status).to eq(true)

data/spec/smooth_operator/remote_call_spec.rb

@@ -260,7 +260,7 @@ describe SmoothOperator::RemoteCall do
     end
   end
 
-  context "when the connection exceeds the timeout", current: true do
+  context "when the connection exceeds the timeout" do
     before(:all) do
       @subject = User::TimeoutConnection.new
       @subject.save('/timeout')

data/spec/support/test_server.rb

@@ -147,7 +147,7 @@ class TestServer < Sinatra::Base
 
   def test_complex_hash
     data = stringify_data FactoryGirl.attributes_for(:user_with_complex_hash)
-binding.pry
+
     (params == data) ? 200 : 422
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smooth_operator
 version: !ruby/object:Gem::Version
-  version: 1.30.8
+  version: 1.30.9
 platform: ruby
 authors:
 - João Gonçalves
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-02 00:00:00.000000000 Z
+date: 2014-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler