smooth_operator 1.10.9 → 1.10.11

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTYxNDdmNGJiNTIzZWU5YTc2MzlmYTkzYTJjOTZjOTcyZWU5YjMwMg==
+    MjkwOGZiOWM3NGYzODQ5MzY0ZGI4OTEwZWNhNWI5MzgyZmE4Y2E4Zg==
   data.tar.gz: !binary |-
-    YjlhYzNiNWUwNDdiYjUyOTMyNDY2YjhmYmM3YmE0YzNlM2I2MTBjZQ==
+    NzFiOWZiZWY4N2QwZWFmNzU5ODRhYTcyMjk0NGMwNjg0ODgzNDgxOA==
 SHA512:
   metadata.gz: !binary |-
-    NTQwNzAxYTExZDA0ZjE3YWMwNDJhMDljZjRkMWU3OTFlNzgzNWU4ODliN2Ez
-    MzI2NjUyZDMyYjdlYjJmYThkOGUzN2NlYjkxMTc1ODNiMGUyNmJiNzdkMjdl
-    OTVhYjAwNDlhZTliNDA4ODE1ODM1NWY5NzIwYTExN2MyOWZjNTQ=
+    YTNiMjUwODdkN2NhMDljMjUxNGZkZTlkMzExMzM1ZTg5NzUyN2ExMzZlYTBk
+    MzE5OGIyZGYyMWZmNWYwOWY4OTU5YjBiNjNjMTE4MzdmMmE1M2Y2MWI3ZTFh
+    Y2I1YmY2YTUxMTZmMmNlOTRlMGU1N2FlNzVjNWVmMmEzYjdiODQ=
   data.tar.gz: !binary |-
-    YTc1ODM3MmZlNmFjOGM0ZjYzNjc3ZTA0MmE1NGRlNzkyOWQzM2NiNmM5MTc2
-    YjE0ZDg5YjcxNWY1ODk4ODE5ZjNkZWMyOWVmNWZlNzE5MTRiMTdmOTY1MmYz
-    MTVlMDBhZGQyNjg1ZDNjMGJjM2I1YmE4MmY5OWFkZGNiNDg2Zjk=
+    MmExYzVkNDQ0YmEyZGJjZGMxYzljOWMwMjJmMjBiMGI3MDE1ZDU5ZjVlOTI0
+    ZDQ4ODA5NWIwZjcxYTY4M2Y0OGI2MzU2OTk5OWUxYzI4NzQ4MDI1YTY4ODNm
+    N2IzMmMzMTU2ODgwNmRiOGYwMjNkNTI3MDlmNDZiY2VkYWM0ZDA=

data/lib/smooth_operator/operators/base.rb

@@ -13,7 +13,7 @@ module SmoothOperator
 
         @connection, @operator_options, @options = strip_options(options)
 
-        @relative_path = build_relative_path(relative_path, options)
+        @relative_path = resource_path(relative_path, options)
 
         @endpoint_user = options[:endpoint_user] || @operator_class.endpoint_user
         
@@ -39,7 +39,7 @@ module SmoothOperator
         [connection, operator_options, options]
       end
 
-      def build_relative_path(relative_path, options)
+      def resource_path(relative_path, options)
         table_name = options[:table_name] || @operator_class.table_name
 
         if Helpers.present?(table_name)

data/lib/smooth_operator/persistence.rb

@@ -32,7 +32,7 @@ module SmoothOperator
     def reload(relative_path = nil, data = {}, options = {})
       raise 'UnknownPath' if !respond_to?(:id) || Helpers.blank?(id)
 
-      relative_path, options = build_relative_path(relative_path, options)
+      relative_path, options = resource_path(relative_path, options)
 
       success = {}
 
@@ -70,7 +70,7 @@ module SmoothOperator
     def destroy(relative_path = nil, data = {}, options = {})
       return false unless persisted?
 
-      relative_path, options = build_relative_path(relative_path, options)
+      relative_path, options = resource_path(relative_path, options)
 
       success = {}
 
@@ -103,7 +103,7 @@ module SmoothOperator
     end
 
     def update(relative_path, data, options)
-      relative_path, options = build_relative_path(relative_path, options)
+      relative_path, options = resource_path(relative_path, options)
       
       success = {}
 
@@ -117,24 +117,20 @@ module SmoothOperator
 
     private ##################### PRIVATE ####################
 
-    def build_relative_path(relative_path, options)
+    def resource_path(relative_path, options)
       if Helpers.blank?(relative_path)
-        if parent_object.nil?
+        if parent_object.nil? || options[:ignore_parent] == true
           relative_path = id.to_s
         else
           options ||= {}
           options[:table_name] = ''
-          relative_path = "#{parent_object.send(:rest_relative_path)}/#{table_name}/#{id}"
+          relative_path = "#{parent_object.table_name}/#{parent_object.id}/#{table_name}/#{id}"
         end
       end
 
       [relative_path, options]
     end
 
-    def rest_relative_path
-      "#{table_name}/#{id}"
-    end
-
     def make_remote_call(http_verb, relative_path, data, options)
       data ||= {}
       data.merge!(extra_params || {})

data/lib/smooth_operator/remote_call/base.rb

@@ -16,19 +16,43 @@ module SmoothOperator
 
 
       def success?
-        http_status.between?(200, 299)
+        http_status.between?(200, 299) || http_status == 304
       end
 
       alias :ok? :success?
 
+      def not_success?
+        !success?
+      end
+
+      alias :not_ok? :not_success?
+
       def failure?
         http_status.between?(400, 499)
       end
 
+      alias :failed? :failure?
+
       def error?
         http_status.between?(500, 599) || http_status == 0
       end
 
+      def not_found?
+        http_status == 404
+      end
+
+      def not_processed?
+        http_status == 422
+      end
+
+      def timeout?
+        false
+      end
+
+      def connection_failed?
+        false
+      end
+
       def parsed_response
         return nil if body.nil?
         
@@ -42,7 +66,11 @@ module SmoothOperator
       end
 
       def status
-        error? ? nil : success?
+        return nil if error?
+        
+        return true if success?
+
+        not_processed? ? false : nil
       end
 
       def objects

data/lib/smooth_operator/remote_call/errors/connection_failed.rb

@@ -5,10 +5,14 @@ module SmoothOperator
       class ConnectionFailed < Base
 
         def initialize(response)
-          @response = response
+          super
           @http_status = 0
         end
 
+        def connection_failed?
+          true
+        end
+
       end
 
     end

data/lib/smooth_operator/remote_call/errors/timeout.rb

@@ -5,10 +5,14 @@ module SmoothOperator
       class Timeout < Base
 
         def initialize(response)
-          @response = response
+          super
           @http_status = 0
         end
 
+        def timeout?
+          true
+        end
+
       end
 
     end

data/lib/smooth_operator/version.rb

@@ -1,3 +1,3 @@
 module SmoothOperator
-  VERSION = "1.10.9"
+  VERSION = "1.10.11"
 end

data/spec/smooth_operator/persistence_spec.rb

@@ -123,16 +123,31 @@ describe SmoothOperator::Persistence, helpers: :persistence do
     end
 
     context "when calling #reload on a nested object" do
-      before do
-        subject.id = 1
-        subject.reload
-        subject.posts.first.reload
+
+      context "without the option 'ignore_parent: true'" do
+        before do
+          subject.id = 1
+          subject.reload
+          subject.posts.first.reload
+        end
+
+        it "it should fetch server data, with NESTED REST url" do
+          expect(subject.posts.first.attributes).to eq({ id: 1, body: 'from_nested_url' })
+        end
       end
 
-      it "it should fetch server data, with the correct nested REST url" do
-        # binding.pry
-        expect(subject.posts.first.attributes).to eq({ id: 1, body: 'from_server' })
+      context "with the option 'ignore_parent: true'" do
+        before do
+          subject.id = 1
+          subject.reload
+          subject.posts.first.reload(nil, nil, { ignore_parent: true })
+        end
+
+        it "it should fetch server data, with REST url" do
+          expect(subject.posts.first.attributes).to eq({ id: 1, body: 'from_resource_url' })
+        end
       end
+
     end
   end
 

data/spec/smooth_operator/remote_call_spec.rb

@@ -1,96 +1,290 @@
 require "spec_helper"
 
-describe SmoothOperator::RemoteCall do
-  subject { User }
+describe SmoothOperator::RemoteCall, current: true do
+  subject { UserWithAddressAndPosts::Son.new(attributes_for(:user_with_address_and_posts)) }
 
-  describe "#success?" do
-    context "when the server response has a http code in the 200 range" do
-      it "should return true" do
-      end
+  context "when the server response has a http code in the 200 range" do
+    before { subject.save(nil, { status: 200 }) }
+
+    it "#success? should return true" do
+      expect(subject.last_remote_call.success?).to be true
     end
 
-    context "when the server response has a http code NOT in the 200 range" do
-      it "should return false" do
-      end
+    it "#failure? should return false" do
+      expect(subject.last_remote_call.failure?).to be false
     end
 
-    context "when the server response connection fails" do
-      it "should return false" do
-      end
+    it "#error? should return false" do
+      expect(subject.last_remote_call.error?).to be false
+    end
+
+    it "#not_found? should return false" do
+      expect(subject.last_remote_call.not_found?).to be false
+    end
+
+    it "#not_processed? should return false" do
+      expect(subject.last_remote_call.not_processed?).to be false
+    end
+
+    it "#timeout? should return false" do
+      expect(subject.last_remote_call.timeout?).to be false
+    end
+
+    it "#connection_failed? should return false" do
+      expect(subject.last_remote_call.connection_failed?).to be false
+    end
+
+    it "#status should return true" do
+      expect(subject.last_remote_call.status).to be true
     end
   end
 
-  describe "#failure?" do
-    context "when the server response has a http code in the 400 range" do
-      it "should return true" do
-      end
+  context "when the server response has a http code in the 400 range" do
+    before { subject.save(nil, { status: 400 }) }
+
+    it "#success? should return false" do
+      expect(subject.last_remote_call.success?).to be false
     end
 
-    context "when the server response has a http code NOT in the 400 range" do
-      it "should return false" do
-      end
+    it "#failure? should return true" do
+      expect(subject.last_remote_call.failure?).to be true
     end
 
-    context "when the server response connection fails" do
-      it "should return false" do
-      end
+    it "#error? should return false" do
+      expect(subject.last_remote_call.error?).to be false
+    end
+
+    it "#not_found? should return false" do
+      expect(subject.last_remote_call.not_found?).to be false
+    end
+
+    it "#not_processed? should return false" do
+      expect(subject.last_remote_call.not_processed?).to be false
+    end
+
+    it "#timeout? should return false" do
+      expect(subject.last_remote_call.timeout?).to be false
+    end
+
+    it "#connection_failed? should return false" do
+      expect(subject.last_remote_call.connection_failed?).to be false
+    end
+
+    it "#status should return nil" do
+      expect(subject.last_remote_call.status).to be nil
     end
   end
 
-  describe "#error?" do
-    context "when the server response has a http code in the 500 range" do
-      it "should return true" do
-      end
+  context "when the server response has a http is 404" do
+    before { subject.save(nil, { status: 404 }) }
+
+    it "#success? should return false" do
+      expect(subject.last_remote_call.success?).to be false
     end
 
-    context "when the server response has a http code NOT in the 500 range" do
-      it "should return false" do
-      end
+    it "#failure? should return true" do
+      expect(subject.last_remote_call.failure?).to be true
     end
 
-    context "when the server response connection fails" do
-      it "should return true" do
-      end
+    it "#error? should return false" do
+      expect(subject.last_remote_call.error?).to be false
+    end
+
+    it "#not_found? should return true" do
+      expect(subject.last_remote_call.not_found?).to be true
+    end
+
+    it "#not_processed? should return false" do
+      expect(subject.last_remote_call.not_processed?).to be false
+    end
+
+    it "#timeout? should return false" do
+      expect(subject.last_remote_call.timeout?).to be false
+    end
+
+    it "#connection_failed? should return false" do
+      expect(subject.last_remote_call.connection_failed?).to be false
+    end
+
+    it "#status should return nil" do
+      expect(subject.last_remote_call.status).to be nil
     end
   end
 
-  describe "#parsed_response" do
-    context "when the server response's body contains valid json data" do
-      it "should return the parsed result of that data" do
-      end
+  context "when the server response has a http is 422" do
+    before { subject.save(nil, { status: 422 }) }
+
+    it "#success? should return false" do
+      expect(subject.last_remote_call.success?).to be false
     end
 
-    context "when the server response's body does not contains valid json data" do
-      it "should return nil" do
-      end
+    it "#failure? should return true" do
+      expect(subject.last_remote_call.failure?).to be true
+    end
+
+    it "#error? should return false" do
+      expect(subject.last_remote_call.error?).to be false
+    end
+
+    it "#not_found? should return false" do
+      expect(subject.last_remote_call.not_found?).to be false
+    end
+
+    it "#not_processed? should return true" do
+      expect(subject.last_remote_call.not_processed?).to be true
+    end
+
+    it "#timeout? should return false" do
+      expect(subject.last_remote_call.timeout?).to be false
+    end
+
+    it "#connection_failed? should return false" do
+      expect(subject.last_remote_call.connection_failed?).to be false
+    end
+
+    it "#status should return false" do
+      expect(subject.last_remote_call.status).to be false
     end
   end
 
-  describe "#status" do
-    context "when the #error? returns true" do
-      it "should return nil" do
-      end
+  context "when the server response has a http code in the 500 range" do
+    before { subject.save(nil, { status: 500 }) }
+
+    it "#success? should return false" do
+      expect(subject.last_remote_call.success?).to be false
     end
 
-    context "when the #error? returns false and #success? returns true" do
-      it "should return true" do
-      end
+    it "#failure? should return false" do
+      expect(subject.last_remote_call.failure?).to be false
+    end
+
+    it "#error? should return true" do
+      expect(subject.last_remote_call.error?).to be true
+    end
+
+    it "#not_found? should return false" do
+      expect(subject.last_remote_call.not_found?).to be false
+    end
+
+    it "#not_processed? should return false" do
+      expect(subject.last_remote_call.not_processed?).to be false
+    end
+
+    it "#timeout? should return false" do
+      expect(subject.last_remote_call.timeout?).to be false
+    end
+
+    it "#connection_failed? should return false" do
+      expect(subject.last_remote_call.connection_failed?).to be false
+    end
+
+    it "#status should return nil" do
+      expect(subject.last_remote_call.status).to be nil
+    end
+  end
+
+  context "when the connection is broken" do
+    subject { User::BrokenConnection.new }
+
+    before { subject.save }
+
+    it "#success? should return false" do
+      expect(subject.last_remote_call.success?).to be false
+    end
+
+    it "#failure? should return false" do
+      expect(subject.last_remote_call.failure?).to be false
+    end
+
+    it "#error? should return true" do
+      expect(subject.last_remote_call.error?).to be true
+    end
+
+    it "#not_found? should return false" do
+      expect(subject.last_remote_call.not_found?).to be false
+    end
+
+    it "#not_processed? should return false" do
+      expect(subject.last_remote_call.not_processed?).to be false
+    end
+
+    it "#timeout? should return false" do
+      expect(subject.last_remote_call.timeout?).to be false
+    end
+
+    it "#connection_failed? should return true" do
+      expect(subject.last_remote_call.connection_failed?).to be true
+    end
+
+    it "#status should return nil" do
+      expect(subject.last_remote_call.status).to be nil
+    end
+  end
+
+  context "when the connection exceeds the timeout" do
+    subject { User::TimeoutConnection.new }
+    
+    before { subject.save('timeout') }
+
+    it "#success? should return false" do
+      expect(subject.last_remote_call.success?).to be false
+    end
+
+    it "#failure? should return false" do
+      expect(subject.last_remote_call.failure?).to be false
+    end
+
+    it "#error? should return true" do
+      expect(subject.last_remote_call.error?).to be true
+    end
+
+    it "#not_found? should return false" do
+      expect(subject.last_remote_call.not_found?).to be false
     end
 
-    context "when the #error? returns false and #success? returns false" do
-      it "should return false" do
+    it "#not_processed? should return false" do
+      expect(subject.last_remote_call.not_processed?).to be false
+    end
+
+    it "#timeout? should return true" do
+      expect(subject.last_remote_call.timeout?).to be true
+    end
+
+    it "#connection_failed? should return false" do
+      expect(subject.last_remote_call.connection_failed?).to be false
+    end
+
+    it "#status should return nil" do
+      expect(subject.last_remote_call.status).to be nil
+    end
+  end
+
+  describe "#parsed_response" do
+    context "when the server response's body does not contains valid json data" do
+      let(:remote_call) { User::Base.find('bad_json') }
+
+      it "should return nil" do
+        expect(remote_call.data).to be nil
       end
     end
   end
 
   describe "#http_status" do
     context "when a server connection is established" do
-      it "should return the server's http response code" do
+      before { subject.save(nil, { status: 422 }) }
+
+      it "it should return the server's http response code" do
+        expect(subject.last_remote_call.http_status).to be 422
       end
     end
 
     context "when a server connection fails" do
+      subject { User::TimeoutConnection.new }
+    
+      before { subject.save('timeout') }
+
       it "should return 0" do
+        expect(subject.last_remote_call.http_status).to be 0
       end
     end
   end

data/spec/support/models/user.rb

@@ -2,8 +2,6 @@ module User
   
   class Base < SmoothOperator::Base
 
-    # self.timeout = 2
-    
     self.model_name = 'user'
 
     self.endpoint_user = 'admin'
@@ -32,4 +30,13 @@ module User
 
   end
 
+  class BrokenConnection < SmoothOperator::Base
+    self.endpoint = 'http://localhost:1234/'
+  end
+
+  class TimeoutConnection < Base
+    self.timeout = 0
+    self.model_name = 'user'
+  end
+
 end

data/spec/support/test_server.rb

@@ -8,9 +8,13 @@ class TestServer < Sinatra::Base
     username == 'admin' and password == 'admin'
   end
 
-  
+  get '/posts/:id' do
+    post_data = { id: 1, body: 'from_resource_url' }
+    json post_data
+  end
+
   get '/users/:id/posts/:id' do
-    post_data = { id: 1, body: 'from_server' }
+    post_data = { id: 1, body: 'from_nested_url' }
     json post_data
   end
 
@@ -50,6 +54,10 @@ class TestServer < Sinatra::Base
     json data
   end
   
+  get '/users/bad_json' do
+    'ok'
+  end
+
   get '/users/:id' do
     json FactoryGirl.attributes_for(:user_with_address_and_posts)
   end
@@ -69,6 +77,11 @@ class TestServer < Sinatra::Base
   post '/users' do
     common_response
   end
+  
+  post '/users/timeout' do
+    sleep 1
+    json 'ok'
+  end
 
   put '/users/:id' do
     common_response

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smooth_operator
 version: !ruby/object:Gem::Version
-  version: 1.10.9
+  version: 1.10.11
 platform: ruby
 authors:
 - João Gonçalves
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-08 00:00:00.000000000 Z
+date: 2014-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler