smooth_operator 1.10.0 → 1.10.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZjJmMWRkYmQxMzdiOTM2MDJiYzViZTk5ZmY1MDI1OGUxYWM0MjAyZg==
+    ZDQ4MTZhNjkzMDYwMjRmNTUwYzZhMjU3YzZlZjFlZWE2YTJjODE3Zg==
   data.tar.gz: !binary |-
-    MGZiODc4YzY5OTAwY2EzYzRkNTE4NWJlOWNjMmM3YTliNTg0ZWM4Yg==
+    MGVhNzg5MzQyNTU0ZWVlMDZmMmEwZjcxNjlkOTI4MWMxNTc0MWQxYg==
 SHA512:
   metadata.gz: !binary |-
-    OGRhMjljNWE2MmI4YmRkZTkwN2FhYzIxMDdhYzhiMjA0Y2Y3NTJiYTk4NTAz
-    ZmQ2MmI2YWRkMzI4ODBjZGI2YTY3N2U4ZjY3NTRhZTk2MjUyNzhhNDdiMDU3
-    ZWNmZWY3NjExMjQyY2E1NjNjNDhiNTM5NjlhNDhiN2RlNGM2ZGY=
+    MmUzOTIxOTgwNWE2ZGM1NjhiNmMzYzE0YjA1MGNhYTRiMzhlMTRlOWVhY2Mw
+    NDdlZWU2YmEyZmVkMDY2MTFhYTdjYmFjN2Q4ZGIyYjM5YTFkMzllNmY2M2Jl
+    NmRlYjRkZGIwM2Q1NTAzZTg3ZjcxNWJkNzEzMmJiNmMzZTcyZWE=
   data.tar.gz: !binary |-
-    MDRkZmQxNGMwODg4MmQ0NTdhYWU3NGYyYWQ4MDU3YzAxZGQyMmUxZmIzMWU1
-    ZjU5NGI0ZjhlZjMyOWIwNTExZTVlMjY2Y2RiOGZiOWYyZmMwZWM3ZTE2Mzc5
-    MGJhOGNhZDdkMDU1YTJmZGFmNDQzMWE3NDUxOGM5ZjAxZDdlMDI=
+    MTE2YzIyNzVkMjRhZGY3MGMyOTdmNzAyODQ5ODY0NjI3ZDNkMmVkYzYwZTBk
+    MmY0MDVhNmQ4ZDM3Mjc0MTc2NzMxMjFlN2I0ZjY2NTBjMjY0ZGUxZWU4MmM1
+    MjE5YjE0NDc3Y2Y1ZWUyYWE5MjU4ZjY0NzcyY2ZlYzM4NjM0MTA=

data/console.rb

@@ -7,14 +7,8 @@ require "spec/spec_helper"
 
 #User::Base.post('', { user: { age: 1, posts: [{ body: 'post1' }, 2] } })
 
-
-conn = SmoothOperator::Base.generate_parallel_connection
-
-conn.in_parallel do
-  remote_call = User::Base.find('http://localhost:4567/users', nil, { connection: conn })
-end
-
-remote_call
+#user = UserWithAddressAndPosts::Son.new(FactoryGirl.attributes_for(:user_with_address_and_posts))
+#user.save('', { status: 200 })
 
 binding.pry
 

data/lib/smooth_operator/helpers.rb

@@ -43,6 +43,8 @@ module SmoothOperator
       case object
       when String
         object.to_s == ''
+      when Array
+        object.empty?
       else
         object.nil?
       end

data/lib/smooth_operator/operator.rb

@@ -1,7 +1,9 @@
+require "smooth_operator/operators/base"
 require "smooth_operator/remote_call/base"
-require "smooth_operator/operator_call/base"
-require "smooth_operator/operator_call/faraday"
-require "smooth_operator/operator_call/typhoeus"
+require "smooth_operator/operators/faraday"
+require "smooth_operator/operators/typhoeus"
+require "smooth_operator/remote_call/errors/timeout"
+require "smooth_operator/remote_call/errors/connection_failed"
 
 module SmoothOperator
 
@@ -43,12 +45,20 @@ module SmoothOperator
 
     def make_the_call(http_verb, relative_path = '', data = {}, options = {})
       if Helpers.present?(options[:hydra])
-        operator_call = OperatorCall::Faraday.new(self, http_verb, relative_path, data, options)
+        operator_call = Operators::Typhoeus.new(self, http_verb, relative_path, data, options)
       else
-        operator_call = OperatorCall::Typhoeus.new(self, http_verb, relative_path, data, options)
+        operator_call = Operators::Faraday.new(self, http_verb, relative_path, data, options)
       end
 
-      operator_call.make_the_call
+      remote_call = {}
+
+      operator_call.make_the_call do |_remote_call|
+        remote_call = _remote_call
+
+        yield(remote_call) if block_given?
+      end
+
+      remote_call
     end
 
 

data/lib/smooth_operator/{operator_call → operators}/base.rb

@@ -1,6 +1,6 @@
 module SmoothOperator
 
-  module OperatorCall
+  module Operators
 
     class Base
 
@@ -25,7 +25,7 @@ module SmoothOperator
 
       def strip_params(http_verb, data)
         data ||= {}
-
+        
         ([:get, :head, :delete].include?(http_verb) ? [@operator_class.query_string(data), nil] : [@operator_class.query_string({}), data])
       end
 

data/lib/smooth_operator/{operator_call → operators}/faraday.rb

@@ -1,14 +1,15 @@
 require 'faraday'
 require 'typhoeus/adapters/faraday'
+require "smooth_operator/remote_call/faraday"
 
 module SmoothOperator
 
-  module OperatorCall
+  module Operators
 
     class Faraday < Base
 
       def make_the_call
-        begin
+        remote_call = begin
           set_basic_authentication
 
           response = connection.send(http_verb) do |request|
@@ -20,12 +21,16 @@ module SmoothOperator
             request.body = body
           end
 
-          RemoteCall::Base.new(response)
+          RemoteCall::Faraday.new(response)
         rescue ::Faraday::Error::ConnectionFailed
           RemoteCall::Errors::ConnectionFailed.new(response)
         rescue ::Faraday::Error::TimeoutError
           RemoteCall::Errors::Timeout.new(response)
         end
+
+        yield(remote_call) if block_given?
+
+        remote_call
       end
 
 

data/lib/smooth_operator/operators/typhoeus.rb

@@ -0,0 +1,73 @@
+require 'typhoeus'
+require "smooth_operator/remote_call/typhoeus"
+
+module SmoothOperator
+
+  module Operators
+
+    class Typhoeus < Base
+
+      def make_the_call
+        set_basic_authentication
+
+        request = ::Typhoeus::Request.new(url, typhoeus_options)
+        
+        remote_call = {}
+
+        hydra.queue(request)
+
+        request.on_complete do |typhoeus_response|
+          remote_call_class = if typhoeus_response.timed_out?
+            RemoteCall::Errors::Timeout
+          else
+            RemoteCall::Typhoeus
+          end
+binding.pry
+          remote_call = remote_call_class.new(typhoeus_response)
+
+          yield(remote_call) if block_given?
+        end
+
+        hydra.run
+
+        remote_call
+      end
+
+
+      protected ################ PROTECTED ################
+
+      def set_basic_authentication
+        typhoeus_options[:userpwd] = "#{endpoint_user}:#{endpoint_pass}" if Helpers.present?(endpoint_user)
+      end
+
+      def url
+        url = (options[:endpoint] || operator_class.endpoint)
+        
+        slice = url[-1] != '/' ? '/' : ''
+
+        url = "#{url}#{slice}#{relative_path}" if Helpers.present?(relative_path)
+      end
+
+      def typhoeus_options
+        return @typhoeus_options if defined?(@typhoeus_options)
+        
+        @typhoeus_options = { method: http_verb, headers: options[:headers] }
+
+        timeout = (options[:timeout] || operator_class.timeout)
+
+        @typhoeus_options[:timeout] = timeout if Helpers.present?(timeout)
+
+        @typhoeus_options[:body] = body if Helpers.present?(body)
+        @typhoeus_options[:params] = params if Helpers.present?(params)
+
+        @typhoeus_options
+      end
+
+      def hydra
+        @hydra ||= operator_options[:hydra] || ::Typhoeus::Hydra::hydra
+      end
+
+    end
+
+  end
+end

data/lib/smooth_operator/persistence.rb

@@ -27,6 +27,8 @@ module SmoothOperator
     end
 
 
+    attr_accessor :extra_params
+
     def new_record?
       return @new_record if defined?(@new_record)
 
@@ -56,9 +58,13 @@ module SmoothOperator
 
       relative_path = id.to_s if Helpers.blank?(relative_path)
 
-      success = make_remote_call(self.class.methods_http_verbs[:destroy], relative_path, data, options)
+      success = {}
+
+      success = make_remote_call(self.class.methods_http_verbs[:destroy], relative_path, data, options) do |remote_call|
+        success = remote_call.status
 
-      @destroyed = true if success
+        @destroyed = true if success
+      end
 
       success
     end
@@ -71,34 +77,49 @@ module SmoothOperator
     end
 
     def create(relative_path, data, options)
-      success = make_remote_call(self.class.methods_http_verbs[:create], relative_path, data, options)
+      success = {}
+      
+      make_remote_call(self.class.methods_http_verbs[:create], relative_path, data, options) do |remote_call|
+        success = remote_call.status
 
-      @new_record = false if success
+        @new_record = false if success
+      end
 
       success
     end
 
     def update(relative_path, data, options)
       relative_path = id.to_s if Helpers.blank?(relative_path)
+      
+      success = {}
+
+      make_remote_call(self.class.methods_http_verbs[:save], relative_path, data, options) do |remote_call|
+        success = remote_call.status
+      end
 
-      make_remote_call(self.class.methods_http_verbs[:save], relative_path, data, options)
+      success
     end
 
 
     private ##################### PRIVATE ####################
 
     def make_remote_call(http_verb, relative_path, data, options)
+      data ||= {}
+      data.merge!(extra_params || {})
+
       data, options = build_remote_call_args(http_verb, data, options)
 
-      @last_remote_call = self.class.send(http_verb, relative_path, data, options)
+      self.class.make_the_call(http_verb, relative_path, data, options) do |remote_call|
+        @last_remote_call = remote_call
 
-      returning_data = @last_remote_call.parsed_response
+        returning_data = @last_remote_call.parsed_response
 
-      if !@last_remote_call.error? && returning_data.is_a?(Hash)
-        assign_attributes returning_data.include?(model_name) ? returning_data[model_name] : returning_data
-      end
+        if !@last_remote_call.error? && returning_data.is_a?(Hash)
+          assign_attributes returning_data.include?(model_name) ? returning_data[model_name] : returning_data
+        end
 
-      @last_remote_call.status
+        yield(remote_call)
+      end
     end
 
     def build_remote_call_args(http_verb, data, options)

data/lib/smooth_operator/remote_call/base.rb

@@ -1,7 +1,3 @@
-require "smooth_operator/remote_call/errors/base"
-require "smooth_operator/remote_call/errors/timeout"
-require "smooth_operator/remote_call/errors/connection_failed"
-
 module SmoothOperator
 
   module RemoteCall
@@ -10,30 +6,32 @@ module SmoothOperator
 
       extend Forwardable
 
-      attr_reader :response
+      attr_reader :response, :http_status, :body, :headers
 
       attr_accessor :object
 
-      def_delegator :response, :status, :http_status
-
-      def_delegators :response, :success?, :headers, :body
-
-      alias :ok? :success?
-
       def initialize(response)
         @response = response
       end
 
 
+      def success?
+        http_status.between?(200, 299)
+      end
+
+      alias :ok? :success?
+
       def failure?
         http_status.between?(400, 499)
       end
 
       def error?
-        http_status.between?(500, 599)
+        http_status.between?(500, 599) || http_status == 0
       end
 
       def parsed_response
+        return nil if body.nil?
+        
         require 'json' unless defined? JSON
         
         begin

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

@@ -3,6 +3,12 @@ module SmoothOperator
     module Errors
 
       class ConnectionFailed < Base
+
+        def initialize(response)
+          @response = response
+          @http_status = 0
+        end
+
       end
 
     end

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

@@ -3,6 +3,12 @@ module SmoothOperator
     module Errors
 
       class Timeout < Base
+
+        def initialize(response)
+          @response = response
+          @http_status = 0
+        end
+
       end
 
     end

data/lib/smooth_operator/remote_call/faraday.rb

@@ -0,0 +1,19 @@
+module SmoothOperator
+
+  module RemoteCall
+
+    class Faraday < Base
+
+      def initialize(response)
+        @response = response
+
+        @body = response.body
+        @headers = response.headers
+        @http_status = response.status
+      end
+
+    end
+
+  end
+
+end

data/lib/smooth_operator/remote_call/typhoeus.rb

@@ -0,0 +1,19 @@
+module SmoothOperator
+
+  module RemoteCall
+
+    class Typhoeus < Base
+
+      def initialize(response)
+        @response = response
+
+        @body = response.body
+        @http_status = response.code
+        @headers = response.headers_hash
+      end
+
+    end
+
+  end
+
+end

data/lib/smooth_operator/version.rb

@@ -1,3 +1,3 @@
 module SmoothOperator
-  VERSION = "1.10.0"
+  VERSION = "1.10.3"
 end

data/smooth_operator.gemspec

@@ -25,5 +25,5 @@ Gem::Specification.new do |spec|
   
   spec.add_dependency "json"
   spec.add_dependency 'typhoeus'
-  spec.add_dependency 'faraday', '~> 0.8.1'
+  spec.add_dependency 'faraday', '~> 0.8.9'
 end

data/spec/smooth_operator/persistence_spec.rb

@@ -9,7 +9,7 @@ shared_examples_for "successful persistent remote call" do
   it "it should populate 'last_remote_call' with the remote_call used on this transaction" do
     expect(subject.last_remote_call).to be_nil unless method_to_execute.to_s =~ /create/
     execute_method
-    expect(subject.last_remote_call).to be_instance_of(SmoothOperator::RemoteCall::Base)
+    expect(subject.last_remote_call).to be_a_kind_of(SmoothOperator::RemoteCall::Base)
   end
 end
 
@@ -70,7 +70,7 @@ shared_examples_for "persistent remote call" do
     it "it should populate 'last_remote_call' with the remote_call used on this transaction" do
       expect(subject.last_remote_call).to be_nil unless method_to_execute.to_s =~ /create/
       execute_method
-      expect(subject.last_remote_call).to be_instance_of(SmoothOperator::RemoteCall::Base)
+      expect(subject.last_remote_call).to be_a_kind_of(SmoothOperator::RemoteCall::Base)
     end
 
     it "it should assert the subject's persistence" do

data/spec/support/models/user.rb

@@ -2,6 +2,8 @@ module User
   
   class Base < SmoothOperator::Base
 
+    # self.timeout = 2
+    
     self.model_name = 'user'
 
     self.endpoint_user = 'admin'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smooth_operator
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.10.3
 platform: ruby
 authors:
 - João Gonçalves
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-06 00:00:00.000000000 Z
+date: 2014-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.8.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.8.9
 description: ActiveResource alternative
 email:
 - goncalves.joao@gmail.com
@@ -91,14 +91,15 @@ files:
 - lib/smooth_operator/model_schema.rb
 - lib/smooth_operator/open_struct.rb
 - lib/smooth_operator/operator.rb
-- lib/smooth_operator/operator_call/base.rb
-- lib/smooth_operator/operator_call/faraday.rb
-- lib/smooth_operator/operator_call/typhoeus.rb
+- lib/smooth_operator/operators/base.rb
+- lib/smooth_operator/operators/faraday.rb
+- lib/smooth_operator/operators/typhoeus.rb
 - lib/smooth_operator/persistence.rb
 - lib/smooth_operator/remote_call/base.rb
-- lib/smooth_operator/remote_call/errors/base.rb
 - lib/smooth_operator/remote_call/errors/connection_failed.rb
 - lib/smooth_operator/remote_call/errors/timeout.rb
+- lib/smooth_operator/remote_call/faraday.rb
+- lib/smooth_operator/remote_call/typhoeus.rb
 - lib/smooth_operator/serialization.rb
 - lib/smooth_operator/translation.rb
 - lib/smooth_operator/type_converter.rb

data/lib/smooth_operator/operator_call/typhoeus.rb

@@ -1,40 +0,0 @@
-require 'typhoeus'
-
-module SmoothOperator
-
-  module OperatorCall
-
-    class Typhoeus < Base
-
-      def make_the_call
-        begin
-          set_basic_authentication
-
-          response = connection.send(http_verb) do |request|
-            operator_options.each { |key, value| request.options.send("#{key}=", value) }
-            options[:headers].each { |key, value| request.headers[key] = value }
-            params.each { |key, value| request.params[key] = value }
-
-            request.url relative_path
-            request.body = body
-          end
-
-          RemoteCall::Base.new(response)
-        rescue ::Faraday::Error::ConnectionFailed
-          RemoteCall::Errors::ConnectionFailed.new(response)
-        rescue ::Faraday::Error::TimeoutError
-          RemoteCall::Errors::Timeout.new(response)
-        end
-      end
-
-
-      protected ################ PROTECTED ################
-
-      def set_basic_authentication
-        connection.basic_auth(endpoint_user, endpoint_pass) if Helpers.present?(endpoint_user)
-      end
-
-    end
-
-  end
-end

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

@@ -1,27 +0,0 @@
-module SmoothOperator
-  module RemoteCall
-    module Errors
-
-      class Base
-
-        attr_reader :response, :data, :object, :objects, :parsed_response, :status, :headers, :body
-        
-        def initialize(response)
-          @response = response
-        end
-
-        def http_status; 0; end
-
-        def error?; true; end
-
-        def success?; false; end
-
-        def failure?; false; end
-
-        alias :ok? :success?
-
-      end
-
-    end
-  end
-end