smooth_operator 1.30.7 → 1.30.8

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDNhMzVmMTUyOWZjZmNlNDQxNmM2ZWE3Y2YyNmIxNDM3MzllZDYzNg==
+    MzFiZGRjMTk0YTBlMzU0MDg5ZmExNDllMTk4ZDYwZTcyZTRhMGYxOQ==
   data.tar.gz: !binary |-
-    M2MxMzc4MDJmMWE2NmFlYmNlMDE3NjVmODg0Y2VjMTI1MWIzNTQ1Yw==
-SHA512:
+    ZDZkOWM3MDM4ZGM5ZmRlYzIyZmM4YjUwZDBmZDE3OTUxMWZmNzY4Mg==
+!binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZDZjNjM3ODFjZWY1ZDJiM2ExMDg1ZWNkZTRlMmVkYTVjYWE0YWY3MzlmNTBk
-    MWM2ZGNjODg0MmZjYTlkMWExMmIyNzNiYTBiNDE2MjJhOWVlYjBjYTlhYjU2
-    YzI5MWVjNWZhYmNkZDQxNjg3YjFkNTM2M2FkZmE5ZDkyOGNhYjc=
+    MDBjNDc2YmIwODVjZmY5NTc5YWFhM2MwZTljMzNhMGYzNjgxZGVmZjA1NDY2
+    MjgwYjRiZWM3YzUwNDFhYzM1OTI0MDZjM2EwYzYwZTViNGI1ZTljNWFlZjI4
+    ZGRmZjM3ZjA1ZGFkMzY2ODBkOGM1NmE3OGEzYWNmZmY3ZjA2NGM=
   data.tar.gz: !binary |-
-    NTZjMGZhMjJhNTBhOTMxYWIxYWNmYjM1N2E0N2RkYzQ5NmZmMzNkNGZkZWVk
-    ZDVkOWE5Nzc0MGFjYjUzMzQ3ZGIzZDYzNWM2ZGQ5MGU5MjJiOGRlOWZhOWNh
-    NGE3Y2VjMWZmZDEyZTRkMGQ1ZDFkYzIyZTNiODU2YWY3YWQ0MzM=
+    ODc1ODMwNWU0OGU4ZDk5MmM3MWNlNzUyNzc3NWU2NGQwMmI0NjQwZGIxM2Jj
+    M2VmMzEyZDYzZmY0ZWVjMmEyYWViYTc0ZGQ2NzZjNzA2YzI1M2U3YTRhMDIw
+    ZjRiNDM3N2FhMTliOWQ3OWRkZGE5OTE5MGJlYzI0NGFlYWZlOTM=

data/lib/smooth_operator/associations/has_many_relation.rb

@@ -32,6 +32,10 @@ module SmoothOperator
         attributes.is_a?(Array) ? new_entries : new_entries.first
       end
 
+      def attributes
+        get_array.map(&:attributes)
+      end
+
       undef :is_a?
 
       protected ############### PROTECTED ###############

data/lib/smooth_operator/operators/faraday.rb

@@ -1,6 +1,7 @@
 require 'faraday'
 require 'typhoeus/adapters/faraday'
 require "smooth_operator/remote_call/faraday"
+require "smooth_operator/operators/faraday_encoder"
 
 module SmoothOperator
 
@@ -8,6 +9,8 @@ module SmoothOperator
 
     module Faraday
 
+      # ::Faraday::Utils.default_params_encoder = FaradayEncoder
+
       extend self
 
       # def generate_parallel_connection

data/lib/smooth_operator/operators/faraday_encoder.rb

@@ -0,0 +1,116 @@
+module SmoothOperator
+  module Operators
+
+    module FaradayEncoder
+
+      class << self
+        extend Forwardable
+        def_delegators :'Faraday::Utils', :escape, :unescape
+      end
+
+      def self.encode(params)
+        return nil if params == nil
+
+        if !params.is_a?(Array)
+          if !params.respond_to?(:to_hash)
+            raise TypeError,
+              "Can't convert #{params.class} into Hash."
+          end
+          params = params.to_hash
+          params = params.map do |key, value|
+            key = key.to_s if key.kind_of?(Symbol)
+            [key, value]
+          end
+          # Useful default for OAuth and caching.
+          # Only to be used for non-Array inputs. Arrays should preserve order.
+          params.sort!
+        end
+
+        # Helper lambda
+        to_query = lambda do |parent, value|
+          if value.is_a?(Hash)
+            value = value.map do |key, val|
+              key = escape(key)
+              [key, val]
+            end
+            value.sort!
+            buffer = ""
+            value.each do |key, val|
+              new_parent = "#{parent}%5B#{key}%5D"
+              buffer << "#{to_query.call(new_parent, val)}&"
+            end
+            return buffer.chop
+          elsif value.is_a?(Array)
+            buffer = ""
+            value.each_with_index do |val, i|
+              new_parent = "#{parent}%5B%5D"
+              buffer << "#{to_query.call(new_parent, val)}&"
+            end
+            return buffer.chop
+          else
+            encoded_value = escape(value)
+            return "#{parent}=#{encoded_value}"
+          end
+        end
+
+        # The params have form [['key1', 'value1'], ['key2', 'value2']].
+        buffer = ''
+        params.each do |parent, value|
+          encoded_parent = escape(parent)
+          buffer << "#{to_query.call(encoded_parent, value)}&"
+        end
+        return buffer.chop
+      end
+
+      def self.decode(query)
+        return nil if query == nil
+        # Recursive helper lambda
+        dehash = lambda do |hash|
+          hash.each do |(key, value)|
+            if value.kind_of?(Hash)
+              hash[key] = dehash.call(value)
+            end
+          end
+          # Numeric keys implies an array
+          if hash != {} && hash.keys.all? { |key| key =~ /^\d+$/ }
+            hash.sort.inject([]) do |accu, (_, value)|
+              accu << value; accu
+            end
+          else
+            hash
+          end
+        end
+
+        empty_accumulator = {}
+        return ((query.split('&').map do |pair|
+          pair.split('=', 2) if pair && !pair.empty?
+        end).compact.inject(empty_accumulator.dup) do |accu, (key, value)|
+          key = unescape(key)
+          if value.kind_of?(String)
+            value = unescape(value.gsub(/\+/, ' '))
+          end
+
+          array_notation = !!(key =~ /\[\]$/)
+          subkeys = key.split(/[\[\]]+/)
+          current_hash = accu
+          for i in 0...(subkeys.size - 1)
+            subkey = subkeys[i]
+            current_hash[subkey] = {} unless current_hash[subkey]
+            current_hash = current_hash[subkey]
+          end
+          if array_notation
+            current_hash[subkeys.last] = [] unless current_hash[subkeys.last]
+            current_hash[subkeys.last] << value
+          else
+            current_hash[subkeys.last] = value
+          end
+          accu
+        end).inject(empty_accumulator.dup) do |accu, (key, value)|
+          accu[key] = value.kind_of?(Hash) ? dehash.call(value) : value
+          accu
+        end
+      end
+    end
+
+  end
+end

data/lib/smooth_operator/version.rb

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

data/spec/factories/user_factory.rb

@@ -1,7 +1,7 @@
 FactoryGirl.define do
-  
+
   factory :user, class: User::Base do
-    
+
     id 1
     admin true
     last_name 'Doe'
@@ -19,13 +19,27 @@ FactoryGirl.define do
     end
     factory :user_with_my_method, traits: [:with_address_and_posts, :has_my_method]
 
+    trait :with_complex_hash do
+      alarms [{
+        :action=>"AMQP",
+        :attach=>"amqp:bus/routing_key",
+        :description=>{"alarm_id"=>"542d2cd24a756e6006000000", "alarm_type"=>"MedicationAlarm", "medicine_id"=>"25", "medicine_type"=>"medicine", "body"=>""},
+        :trigger=>{:positive=>false, :relative=>"START", :value=>"RELATIVE"}
+      }]
+      recurrence_rules [
+        {:by_hour=>[0], :by_minute=>[30], :by_weekday=>[], :cycle=>nil, :frequency=>"DAILY", :interval=>1, :repeat_until=>nil},
+        {:by_hour=>[1], :by_minute=>[0], :by_weekday=>[], :cycle=>nil, :frequency=>"DAILY", :interval=>1, :repeat_until=>nil}
+      ]
+    end
+    factory :user_with_complex_hash, traits: [:with_complex_hash]
+
   end
 
   factory :white_list, class: User::Base do
     id 1
     first_name 'John'
   end
-  
+
   factory :black_list, class: User::Base do
     admin true
     last_name 'Doe'

data/spec/smooth_operator/operator_spec.rb

@@ -9,7 +9,17 @@ describe SmoothOperator::Operator do
 
       it 'should correctly encode that hash' do
         remote_call = subject.get('test_hash_with_array', attributes_for(:user_with_address_and_posts))
-        
+
+        expect(remote_call.status).to eq(true)
+      end
+
+    end
+
+    context "submiting a complex hash" do
+
+      it '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)
       end
 
@@ -35,6 +45,16 @@ describe SmoothOperator::Operator do
 
     end
 
+    context "submiting a complex hash", current: true do
+
+      it '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)
+      end
+
+    end
+
     it "should send the extra params set by .query_string method" do
       remote_call = subject.post('test_query_string', { normal_param: true })
 

data/spec/support/test_server.rb

@@ -23,10 +23,18 @@ class TestServer < Sinatra::Base
     status test_hash_with_array
   end
 
+  get '/users/test_complex_hash' do
+    status test_complex_hash
+  end
+
   post '/users/test_hash_with_array' do
     status test_hash_with_array
   end
 
+  post '/users/test_complex_hash' do
+    status test_complex_hash
+  end
+
   get '/users/test_query_string' do
     status test_query_string
   end
@@ -137,6 +145,12 @@ class TestServer < Sinatra::Base
     (params == data) ? 200 : 422
   end
 
+  def test_complex_hash
+    data = stringify_data FactoryGirl.attributes_for(:user_with_complex_hash)
+binding.pry
+    (params == data) ? 200 : 422
+  end
+
   def test_query_string
     params[:normal_param] == 'true' && params[:query_string_param] == 'true' ? 200 : 422
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smooth_operator
 version: !ruby/object:Gem::Version
-  version: 1.30.7
+  version: 1.30.8
 platform: ruby
 authors:
 - João Gonçalves
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-09 00:00:00.000000000 Z
+date: 2014-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -97,6 +97,7 @@ files:
 - lib/smooth_operator/operator.rb
 - lib/smooth_operator/operators/connection_wrapper.rb
 - lib/smooth_operator/operators/faraday.rb
+- lib/smooth_operator/operators/faraday_encoder.rb
 - lib/smooth_operator/operators/typhoeus.rb
 - lib/smooth_operator/options.rb
 - lib/smooth_operator/persistence.rb
@@ -153,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.7
 signing_key: 
 specification_version: 4
 summary: Simple and fully customizable alternative to ActiveResource, using faraday
@@ -179,3 +180,4 @@ test_files:
 - spec/support/models/user.rb
 - spec/support/models/user_with_address_and_posts.rb
 - spec/support/test_server.rb
+has_rdoc: