smooth_operator 1.9.2 → 1.10.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Y2IzODZkZGVmNjNlY2UwODZhZWM3MTMyMjU5ZGVhYWMxNzY4ZDI4Yw==
+    ZjJmMWRkYmQxMzdiOTM2MDJiYzViZTk5ZmY1MDI1OGUxYWM0MjAyZg==
   data.tar.gz: !binary |-
-    M2E5Zjk0YTQyY2RlZmQ5YTkwMzIxNmU2NTFjMmMyN2U2NGM1NmNkMA==
+    MGZiODc4YzY5OTAwY2EzYzRkNTE4NWJlOWNjMmM3YTliNTg0ZWM4Yg==
 SHA512:
   metadata.gz: !binary |-
-    Mzg5YmMxOTI1NWFiM2RhMjY3OWQ2YjZmZGJhNmY2OGY0YTViN2RmNDVmNDNm
-    MzA3ZDdkNGM5NGM4YmU4Y2FjNWM5MWE4OWFmZTRmMTkwMWU1YmE0ZTM3Y2Nl
-    MjA5YTk4ZjBjZDcxZjU4YWE4ZWFmMWRjMjY4MDRkY2IyYzAxNTk=
+    OGRhMjljNWE2MmI4YmRkZTkwN2FhYzIxMDdhYzhiMjA0Y2Y3NTJiYTk4NTAz
+    ZmQ2MmI2YWRkMzI4ODBjZGI2YTY3N2U4ZjY3NTRhZTk2MjUyNzhhNDdiMDU3
+    ZWNmZWY3NjExMjQyY2E1NjNjNDhiNTM5NjlhNDhiN2RlNGM2ZGY=
   data.tar.gz: !binary |-
-    YzRmYTk3ZWE3MTk3NTI2ZDM4NTUxMjFmNjMwNTQ2NWIzNzYzOGZkNWFhMGJm
-    N2U0NWIyYTFlNmEzMDQxZTZhOGJjZWI2NzE5NTU1MTY4YWRjZTBkNTRjYTFl
-    MWUyNmVmZWZmZGFlNmNiNGJiYWJjZGM5NjEzODRjM2U3YWM3ZDA=
+    MDRkZmQxNGMwODg4MmQ0NTdhYWU3NGYyYWQ4MDU3YzAxZGQyMmUxZmIzMWU1
+    ZjU5NGI0ZjhlZjMyOWIwNTExZTVlMjY2Y2RiOGZiOWYyZmMwZWM3ZTE2Mzc5
+    MGJhOGNhZDdkMDU1YTJmZGFmNDQzMWE3NDUxOGM5ZjAxZDdlMDI=

data/Gemfile

@@ -8,6 +8,7 @@ gem 'simplecov', :require => false, :group => :test
 group :development, :test do
   gem "pry"
   gem "sinatra"
+  gem "typhoeus"
   gem "sinatra-contrib"
   gem "rspec", "~> 3.0.0.beta1"
   gem "factory_girl", "~> 4.0"

data/console.rb

@@ -7,5 +7,14 @@ 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
+
 binding.pry
 

data/lib/smooth_operator/operator.rb

@@ -1,8 +1,7 @@
-require 'faraday'
-# require 'typhoeus'
-# require 'faraday_middleware'
-# require 'typhoeus/adapters/faraday'
 require "smooth_operator/remote_call/base"
+require "smooth_operator/operator_call/base"
+require "smooth_operator/operator_call/faraday"
+require "smooth_operator/operator_call/typhoeus"
 
 module SmoothOperator
 
@@ -19,10 +18,10 @@ module SmoothOperator
 
     HTTP_VERBS.each { |http_verb| define_method(http_verb) { |relative_path = '', params = {}, options = {}| make_the_call(http_verb, relative_path, params, options) } }
 
-
     def headers
       Helpers.get_instance_variable(self, :headers, {})
     end
+
     attr_writer :headers
 
     
@@ -35,84 +34,28 @@ module SmoothOperator
       options ||= {}
       url, timeout = (options[:endpoint] || self.endpoint), (options[:timeout] || self.timeout)
 
-      Faraday.new(url: url) do |builder|
-        # builder.options.params_encoder = Faraday::NestedParamsEncoder # to properly encode arrays
+      ::Faraday.new(url: url) do |builder|
         builder.options[:timeout] = timeout unless Helpers.blank?(timeout)
         builder.request :url_encoded
         builder.adapter adapter
       end
     end
 
-
-    protected ################ PROTECTED ################
-
-    # TODO: COMPLEX METHOD
     def make_the_call(http_verb, relative_path = '', data = {}, options = {})
-      params, body = strip_params(http_verb, data)
-
-      connection, operator_options, options = strip_options(options)
-
-      relative_path = build_relative_path(relative_path, options)
-
-      begin
-        set_basic_authentication(connection, operator_options)
-
-        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::ConnectionFailed
-      rescue Faraday::Error::ConnectionFailed
-        RemoteCall::Errors::ConnectionFailed.new(response)
-      rescue Faraday::Error::TimeoutError
-        RemoteCall::Errors::Timeout.new(response)
-      end
-    end
-
-    def query_string(options)
-      options
-    end
-
-
-    private ################# PRIVATE ###################
-
-    def build_relative_path(relative_path, options)
-      table_name = options[:table_name] || self.table_name
-
-      if Helpers.present?(table_name)
-        Helpers.present?(relative_path) ? "#{table_name}/#{relative_path}" : table_name
+      if Helpers.present?(options[:hydra])
+        operator_call = OperatorCall::Faraday.new(self, http_verb, relative_path, data, options)
       else
-        relative_path
+        operator_call = OperatorCall::Typhoeus.new(self, http_verb, relative_path, data, options)
       end
-    end
 
-    def strip_params(http_verb, data)
-      data ||= {}
-
-      ([:get, :head, :delete].include?(http_verb) ? [query_string(data), nil] : [query_string({}), data])
+      operator_call.make_the_call
     end
 
-    def strip_options(options)
-      options ||= {}
-
-      options[:headers] = self.headers.merge(options[:headers] || {})
-      operator_options = options.delete(:operator_options) || {}
-      connection = options.delete(:connection) || generate_connection(nil, operator_options)
 
-      [connection, operator_options, options]
-    end
-
-    def set_basic_authentication(connection, options)
-      endpoint_user = options[:endpoint_user] || self.endpoint_user
-      endpoint_pass = options[:endpoint_pass] || self.endpoint_pass
+    protected ################ PROTECTED ################
 
-      connection.basic_auth(endpoint_user, endpoint_pass) if Helpers.present?(endpoint_user)
+    def query_string(params)
+      params
     end
 
   end

data/lib/smooth_operator/operator_call/base.rb

@@ -0,0 +1,55 @@
+module SmoothOperator
+
+  module OperatorCall
+
+    class Base
+
+      attr_reader :operator_class, :http_verb, :params, :body, :connection, :operator_options, :options, :relative_path, :endpoint_user, :endpoint_pass
+
+      def initialize(operator_class, http_verb, relative_path, data, options)
+        @operator_class, @http_verb = operator_class, http_verb
+
+        @params, @body = strip_params(http_verb, data)
+
+        @connection, @operator_options, @options = strip_options(options)
+
+        @relative_path = build_relative_path(relative_path, options)
+
+        @endpoint_user = options[:endpoint_user] || @operator_class.endpoint_user
+        
+        @endpoint_pass = options[:endpoint_pass] || @operator_class.endpoint_pass
+      end
+
+
+      protected ################# PROTECTED ###################
+
+      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
+
+      def strip_options(options)
+        options ||= {}
+
+        options[:headers] = @operator_class.headers.merge(options[:headers] || {})
+        operator_options = options.delete(:operator_options) || {}
+        connection = options.delete(:connection) || @operator_class.generate_connection(nil, operator_options)
+
+        [connection, operator_options, options]
+      end
+
+      def build_relative_path(relative_path, options)
+        table_name = options[:table_name] || @operator_class.table_name
+
+        if Helpers.present?(table_name)
+          Helpers.present?(relative_path) ? "#{table_name}/#{relative_path}" : table_name
+        else
+          relative_path
+        end
+      end
+    
+    end
+
+  end
+end

data/lib/smooth_operator/operator_call/faraday.rb

@@ -0,0 +1,41 @@
+require 'faraday'
+require 'typhoeus/adapters/faraday'
+
+module SmoothOperator
+
+  module OperatorCall
+
+    class Faraday < 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/operator_call/typhoeus.rb

@@ -0,0 +1,40 @@
+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/version.rb

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

data/smooth_operator.gemspec

@@ -24,6 +24,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
   
   spec.add_dependency "json"
-  # spec.add_dependency 'faraday', '> 0.9.0.rc5'
+  spec.add_dependency 'typhoeus'
   spec.add_dependency 'faraday', '~> 0.8.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smooth_operator
 version: !ruby/object:Gem::Version
-  version: 1.9.2
+  version: 1.10.0
 platform: ruby
 authors:
 - João Gonçalves
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-05 00:00:00.000000000 Z
+date: 2014-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,6 +38,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: typhoeus
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -77,6 +91,9 @@ 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/persistence.rb
 - lib/smooth_operator/remote_call/base.rb
 - lib/smooth_operator/remote_call/errors/base.rb