smooth_operator 1.10.3 → 1.10.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDQ4MTZhNjkzMDYwMjRmNTUwYzZhMjU3YzZlZjFlZWE2YTJjODE3Zg==
+    MjFkNjcxMjZmMWFkYzYzY2E1NWE3ZDA5ODdkYzJmYTkwMWZhZTExOA==
   data.tar.gz: !binary |-
-    MGVhNzg5MzQyNTU0ZWVlMDZmMmEwZjcxNjlkOTI4MWMxNTc0MWQxYg==
+    ODBjZTE5NzQwNDU0MmQwY2M0MGQ1ZWZmM2VhNmM0YThmNDQ4Y2U3MA==
 SHA512:
   metadata.gz: !binary |-
-    MmUzOTIxOTgwNWE2ZGM1NjhiNmMzYzE0YjA1MGNhYTRiMzhlMTRlOWVhY2Mw
-    NDdlZWU2YmEyZmVkMDY2MTFhYTdjYmFjN2Q4ZGIyYjM5YTFkMzllNmY2M2Jl
-    NmRlYjRkZGIwM2Q1NTAzZTg3ZjcxNWJkNzEzMmJiNmMzZTcyZWE=
+    NDc2OTA2NWFkZTBkN2I5Y2FiNGEwNDQ2YTAyNTg0NDc4ZDYxYWMwYTk2Y2Y3
+    YzY3ZTVlZDUwNjNlNDEzMjc3NGM4YThjODZkYjNiYTZmY2EzYTA4MzMxYjg0
+    MDQxM2Y4ZDA0NGRmNTUwNjRhOTExZWQ4YjY5NDhiZDhkYzllNzk=
   data.tar.gz: !binary |-
-    MTE2YzIyNzVkMjRhZGY3MGMyOTdmNzAyODQ5ODY0NjI3ZDNkMmVkYzYwZTBk
-    MmY0MDVhNmQ4ZDM3Mjc0MTc2NzMxMjFlN2I0ZjY2NTBjMjY0ZGUxZWU4MmM1
-    MjE5YjE0NDc3Y2Y1ZWUyYWE5MjU4ZjY0NzcyY2ZlYzM4NjM0MTA=
+    MzMyODcyNTZhZDY1MzE3MWUzNDg1NjI0NzRmODEyN2NiMWViMmNhZTdkZmQ3
+    M2EzOTlhZmZkMjQ5ZDkyYjAzODIyYmQ5MzM3NTQ2ZGM2YmRiMzlmZGJhZTll
+    ZWNhMDBmMGNlYjA3NTFlNGU2ZjAyYmE3YjQ4NWY1ZmM1YzgxZGM=

data/Gemfile

@@ -12,4 +12,5 @@ group :development, :test do
   gem "sinatra-contrib"
   gem "rspec", "~> 3.0.0.beta1"
   gem "factory_girl", "~> 4.0"
+  gem "ethon", :git => 'https://github.com/goncalvesjoao/ethon'
 end

data/console.rb

@@ -3,7 +3,11 @@
 $LOAD_PATH << './'
 $LOAD_PATH << './lib'
 
-require "spec/spec_helper"
+require 'spec/require_helper'
+
+FactoryGirl.find_definitions
+
+LocalhostServer.new(TestServer.new, 4567)
 
 #User::Base.post('', { user: { age: 1, posts: [{ body: 'post1' }, 2] } })
 

data/lib/smooth_operator/array_with_meta_data.rb

@@ -15,7 +15,7 @@ module SmoothOperator
 
       @table_name, @object_class = table_name, object_class
 
-      @internal_array = [*_attributes[table_name]].map { |array_entry| object_class.new(array_entry) }
+      @internal_array = [*_attributes[table_name]].map { |array_entry| object_class.new(array_entry).tap { |object| object.reloaded = true } }
       _attributes.delete(table_name)
 
       @meta_data = _attributes

data/lib/smooth_operator/attribute_assignment.rb

@@ -118,7 +118,7 @@ module SmoothOperator
       if self.class.dirty_attributes?
         internal_data[attribute_name].set_value(attribute_value)
       else
-        internal_data[attribute_name] = new_attribute_object(attribute_name, attribute_value)
+        internal_data[attribute_name] = new_attribute_object(attribute_name, attribute_value).value
       end
     end
 

data/lib/smooth_operator/finder_methods.rb

@@ -11,9 +11,15 @@ module SmoothOperator
     def find(relative_path, data = {}, options = {})
       relative_path = '' if relative_path == :all
 
+      returning_object = {}
+
       get(relative_path, data, options).tap do |remote_call|
         remote_call.object = build_object(remote_call.parsed_response, options) if remote_call.success?
+
+        returning_object = remote_call
       end
+
+      returning_object
     end
 
 
@@ -27,7 +33,7 @@ module SmoothOperator
       if parsed_response.is_a?(Array)
         parsed_response.map { |array_entry| build_object(array_entry, options) }
       elsif parsed_response.is_a?(Hash)
-        parsed_response.include?(table_name) ? ArrayWithMetaData.new(parsed_response, table_name, self) : new(parsed_response)
+        parsed_response.include?(table_name) ? ArrayWithMetaData.new(parsed_response, table_name, self) : new(parsed_response).tap { |object| object.reloaded = true }
       else
         parsed_response
       end

data/lib/smooth_operator/operator.rb

@@ -61,9 +61,6 @@ module SmoothOperator
       remote_call
     end
 
-
-    protected ################ PROTECTED ################
-
     def query_string(params)
       params
     end

data/lib/smooth_operator/operators/typhoeus.rb

@@ -14,21 +14,25 @@ module SmoothOperator
         
         remote_call = {}
 
-        hydra.queue(request)
+        # hydra.queue(request)
 
         request.on_complete do |typhoeus_response|
-          remote_call_class = if typhoeus_response.timed_out?
+          remote_call_class = if typhoeus_response.return_code == :couldnt_connect
+            RemoteCall::Errors::ConnectionFailed
+          elsif 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
+        # hydra.run
+
+        request.run
 
         remote_call
       end
@@ -51,14 +55,14 @@ binding.pry
       def typhoeus_options
         return @typhoeus_options if defined?(@typhoeus_options)
         
-        @typhoeus_options = { method: http_verb, headers: options[:headers] }
+        @typhoeus_options = { method: http_verb, headers: options[:headers].merge({ "Content-type" => "application/x-www-form-urlencoded" }) }
 
         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[:params] = params if Helpers.present?(params)
 
         @typhoeus_options
       end

data/lib/smooth_operator/persistence.rb

@@ -27,7 +27,18 @@ module SmoothOperator
     end
 
 
-    attr_accessor :extra_params
+    attr_accessor :extra_params, :reloaded, :meta_data
+
+    def reload(relative_path = nil, data = {}, options = {})
+      relative_path = id.to_s if Helpers.blank?(relative_path)
+      success = {}
+
+      make_remote_call(:get, relative_path, data, options) do |remote_call|
+        success = remote_call.status
+      end
+
+      success
+    end
 
     def new_record?
       return @new_record if defined?(@new_record)
@@ -41,6 +52,12 @@ module SmoothOperator
       @destroyed = false
     end
 
+    def reloaded?
+      return @reloaded if defined?(@reloaded)
+
+      @reloaded = false
+    end
+
     def persisted?
       !(new_record? || destroyed?)
     end
@@ -115,7 +132,16 @@ module SmoothOperator
         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
+          @reloaded = true
+
+          attributes = returning_data
+
+          if returning_data.include?(model_name)
+            attributes = returning_data.delete(model_name)
+            @meta_data = returning_data
+          end
+
+          assign_attributes attributes
         end
 
         yield(remote_call)

data/lib/smooth_operator/version.rb

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

data/smooth_operator.gemspec

@@ -24,6 +24,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
   
   spec.add_dependency "json"
-  spec.add_dependency 'typhoeus'
-  spec.add_dependency 'faraday', '~> 0.8.9'
+  spec.add_dependency "faraday", "~> 0.8.9"
+  spec.add_dependency "typhoeus", "~> 0.6.8"
+
+  # this is necessary if you want to typhoeus to correctly encode arrays
+  # spec.add_dependency "ethon", :git => 'https://github.com/goncalvesjoao/ethon'
 end

data/spec/factories/user_factory.rb

@@ -9,7 +9,8 @@ FactoryGirl.define do
 
     trait :with_address_and_posts do
       address { { street: 'my_street' } }
-      posts [{ body: 'post1' }, { body: 'post2' }]
+      # posts [{ id: 1, body: 'post1' }, { id: 2, body: 'post2' }]
+      posts [{ id: 1 }, { id: 2 }]
     end
     factory :user_with_address_and_posts, traits: [:with_address_and_posts]
 

data/spec/require_helper.rb

@@ -0,0 +1,11 @@
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
+
+require 'bundler/setup'
+require 'smooth_operator'
+
+Bundler.require :test, :default
+
+Dir.chdir("spec/") do
+  Dir["support/**/*.rb"].each { |file| require file }
+end

data/spec/spec_helper.rb

@@ -6,17 +6,7 @@ SimpleCov.start do
   coverage_dir('../tmp/coverage/')
 end
 
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
-
-require 'bundler'
-require 'smooth_operator'
-
-Bundler.require :test, :default
-
-Dir.chdir("spec/") do
-  Dir["support/**/*.rb"].each { |file| require file }
-end
+require 'require_helper'
 
 FactoryGirl.find_definitions
 

data/spec/support/models/post.rb

@@ -1,5 +1,9 @@
 class Post < SmoothOperator::Base
-  
-  self.endpoint = 'http://localhost:3000/api/v0'
+
+  self.endpoint_user = 'admin'
+
+  self.endpoint_pass = 'admin'
+    
+  self.endpoint = 'http://localhost:4567/'
 
 end

data/spec/support/models/user_with_address_and_posts.rb

@@ -1,6 +1,8 @@
 module UserWithAddressAndPosts
   
   class Father < User::Base
+    
+    self.table_name = 'users'
 
     schema(
       posts: Post,

data/spec/support/test_server.rb

@@ -1,5 +1,6 @@
 require 'sinatra/base'
 require 'sinatra/json'
+require 'pry'
 
 class TestServer < Sinatra::Base
 
@@ -7,6 +8,13 @@ class TestServer < Sinatra::Base
     username == 'admin' and password == 'admin'
   end
 
+  
+  get '/posts/:id' do
+    post_data = { id: 1, body: 'test' }
+    json post_data
+  end
+
+
   get '/users/test_hash_with_array' do
     status test_hash_with_array
   end
@@ -69,7 +77,7 @@ class TestServer < Sinatra::Base
   end
 
   not_found do
-    binding.pry
+    # binding.pry
   end
 
 
@@ -116,7 +124,8 @@ class TestServer < Sinatra::Base
   end
 
   if app_file == $0
-    require './spec/spec_helper' unless defined? SmoothOperator
+    # require './spec/spec_helper' unless defined? SmoothOperator
+    # require './spec/require_helper' unless defined? SmoothOperator
     run!
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smooth_operator
 version: !ruby/object:Gem::Version
-  version: 1.10.3
+  version: 1.10.6
 platform: ruby
 authors:
 - João Gonçalves
@@ -39,33 +39,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: typhoeus
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.9
 - !ruby/object:Gem::Dependency
-  name: faraday
+  name: typhoeus
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.9
+        version: 0.6.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.9
+        version: 0.6.8
 description: ActiveResource alternative
 email:
 - goncalves.joao@gmail.com
@@ -107,6 +107,7 @@ files:
 - lib/smooth_operator/version.rb
 - smooth_operator.gemspec
 - spec/factories/user_factory.rb
+- spec/require_helper.rb
 - spec/smooth_operator/attribute_assignment_spec.rb
 - spec/smooth_operator/attributes_dirty_spec.rb
 - spec/smooth_operator/delegation_spec.rb
@@ -152,6 +153,7 @@ summary: Simple and fully customizable alternative to ActiveResource, using fara
   gem to stablish parallel remote calls"
 test_files:
 - spec/factories/user_factory.rb
+- spec/require_helper.rb
 - spec/smooth_operator/attribute_assignment_spec.rb
 - spec/smooth_operator/attributes_dirty_spec.rb
 - spec/smooth_operator/delegation_spec.rb