smooth_operator 1.10.14 → 1.10.15

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZGUwNjgxZDAyZTJmMDg3ZTRhZWMwZjFhY2UxYjhjYTIyOTBlZWNlOQ==
+    NjZkODA4OWRkN2I5MTEwZjQ2ZThiZjU5NjViMTg0OWRkY2ZkOTIzMg==
   data.tar.gz: !binary |-
-    YWRiNzFhZjlmYTI2MTRjYzM0MTU2NGMzZjJkNTgwZGI5NzdmOTJjZg==
+    ZDE1NmUwMWUxOWFlOGRlYmY1ZjM1ZWFlMTIxY2RiNzQ3NzU1ZDIxMw==
 SHA512:
   metadata.gz: !binary |-
-    MjI2ZTFjNjUyZTMwMWE0MWIyNDk2MTU1ZDEwZmU1OTBlNjAxMjRhZDhhNzZi
-    ZDljMmI5OTQyZDIzNDQ4ZDFkNjFhYWVlNTE0Y2YzMDAyZDdjYzA0ZWE3MTc0
-    MDY5YjM0NjcyOGIzNzNkMDdkYmY4MzA4MTEzNTE5MmYxNTUyMDQ=
+    NjE0NDA4NDNlNzFiN2EyNjUxZTY4NWNlZDg5YmM5NjgyMjhmMWNmNWYyMDdk
+    NDA0MDljOGI1YzczMTlhNTE0MzYxYjIxOWJjMmJiNTFhZDAzYzMyZGM1OGYx
+    NjZhYTU5Y2FlNjZkZmUzNGUxYjhlZGE2NTAzYWUwYjg4YzQwODQ=
   data.tar.gz: !binary |-
-    NDc2NWQ4Mzk2ZDk3YWFkMjZjZDI0MGYzZThkNmY4NzE0MDUyN2Y1NmQ2M2Rh
-    OGUyMWQ2MmU2ZTQxMzM2ODk4Mjk3YmE3MWRlODBkMmEwMjQzOTAyYTMxZjEx
-    YjQ4MmViM2VhYTViMzU2MTZjMzI0MTU3ODc2NTVkMTc0YjUzYjA=
+    MWExOWNjNzZlYjhlZWRjN2UyZDFmODNlZTAyMGE0MWM5M2EyYTBjNmZjYzBj
+    Yzg3MDI5ZDU1MDJjMjhmNDg2NzQxYzQ3YWM0ZDgwZjdmYTQ3N2ExNTMyMTY3
+    ZDM3OTY3YWU3Yjg3ZGRjYjY1ZTI0Y2EwNGU4NjI4ZjVjYzlhODg=

data/console.rb

@@ -7,7 +7,18 @@ require 'spec/require_helper'
 
 FactoryGirl.find_definitions
 
-# LocalhostServer.new(TestServer.new, 4567)
+LocalhostServer.new(TestServer.new, 4567)
+
+# user = nil
+
+# hydra = Typhoeus::Hydra::hydra
+
+# user = User::Base.new(id: 1)
+# user.reload(nil, nil, { hydra: hydra })
+
+# User::Base.find(1, nil, { hydra: hydra }) do |remote_call|
+#   user = remote_call.data
+# end
 
 #User::Base.post('', { user: { age: 1, posts: [{ body: 'post1' }, 2] } })
 

data/lib/smooth_operator/finder_methods.rb

@@ -11,15 +11,11 @@ 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|
+      get(relative_path, data, options) do |remote_call|
         remote_call.object = build_object(remote_call.parsed_response, options) if remote_call.ok?
 
-        returning_object = remote_call
+        block_given? ? yield(remote_call) : remote_call
       end
-
-      returning_object
     end
 
 

data/lib/smooth_operator/operator.rb

@@ -15,13 +15,18 @@ module SmoothOperator
     end
 
     attr_writer *OPTIONS
-
-    HTTP_VERBS = [:get, :post, :put, :patch, :delete]
-
-    HTTP_VERBS.each do |http_verb|
-      define_method(http_verb) { |relative_path = '', params = {}, options = {}| make_the_call(http_verb, relative_path, params, options) }
+    
+    %w[get post put patch delete].each do |method|
+      class_eval <<-RUBY, __FILE__, __LINE__ + 1
+        def #{method}(relative_path = '', params = {}, options = {})
+          make_the_call(:#{method}, relative_path, params, options) do |remote_call|
+            block_given? ? yield(remote_call) : remote_call
+          end
+        end
+      RUBY
     end
 
+
     def headers
       Helpers.get_instance_variable(self, :headers, {})
     end
@@ -38,15 +43,9 @@ module SmoothOperator
         operator_call = Operators::Faraday
       end
       
-      remote_call = {}
-
-      operator_call.make_the_call(*operator_args) do |_remote_call|
-        remote_call = _remote_call
-
-        yield(remote_call) if block_given?
+      operator_call.make_the_call(*operator_args) do |remote_call|
+        block_given? ? yield(remote_call) : remote_call
       end
-
-      remote_call
     end
 
     def query_string(params)

data/lib/smooth_operator/operators/faraday.rb

@@ -41,9 +41,7 @@ module SmoothOperator
           RemoteCall::Errors::Timeout.new(response)
         end
 
-        yield(remote_call) if block_given?
-
-        remote_call
+        block_given? ? yield(remote_call) : remote_call
       end
 
 

data/lib/smooth_operator/operators/typhoeus.rb

@@ -14,7 +14,7 @@ module SmoothOperator
         
         hydra = options[:hydra] || ::Typhoeus::Hydra::hydra
 
-        _remote_call = {}
+        _remote_call = nil
 
         hydra.queue(request)
 
@@ -24,9 +24,7 @@ module SmoothOperator
           yield(_remote_call) if block_given?
         end
 
-        hydra.run
-
-        # request.run
+        hydra.run if Helpers.blank?(options[:hydra])
 
         _remote_call
       end

data/lib/smooth_operator/persistence.rb

@@ -26,13 +26,9 @@ module SmoothOperator
     def reload(relative_path = nil, data = {}, options = {})
       raise 'UnknownPath' if Helpers.blank?(relative_path) && (!respond_to?(:id) || Helpers.blank?(id))
 
-      success = {}
-
       make_the_call(*persistent_method_args(:reload, relative_path, data, options)) do |remote_call|
-        success = remote_call.status
+        block_given? ? yield(remote_call) : remote_call.status
       end
-
-      success
     end
 
     def new_record?
@@ -52,56 +48,46 @@ module SmoothOperator
     end
 
     def save(relative_path = nil, data = {}, options = {})
-      create_or_update(relative_path, data, options)
+      data = data_with_object_attributes(data, options)
+
+      if new_record?
+        create(relative_path, data, options) { |remote_call| block_given? ? yield(remote_call) : remote_call.status }
+      else
+        update(relative_path, data, options) { |remote_call| block_given? ? yield(remote_call) : remote_call.status }
+      end
     end
 
     def save!(relative_path = nil, data = {}, options = {})
-      create_or_update(relative_path, data, options) || raise('RecordNotSaved')
+      save(relative_path, data, options) do |remote_call|
+        block_given? ? yield(remote_call) : remote_call.status
+      end || raise('RecordNotSaved')
     end
 
     def destroy(relative_path = nil, data = {}, options = {})
       return false unless persisted?
 
-      success = {}
-
       make_the_call(*persistent_method_args(:destroy, relative_path, data, options)) do |remote_call|
-        success = remote_call.status
+        @destroyed = true if remote_call.status
 
-        @destroyed = true if success
+        block_given? ? yield(remote_call) : remote_call.status
       end
-
-      success
     end
 
 
     protected ######################### PROTECTED ##################
 
-    def create_or_update(relative_path, data, options)
-      data = data_with_object_attributes(data, options)
-
-      new_record? ? create(relative_path, data, options) : update(relative_path, data, options)
-    end
-
     def create(relative_path, data, options)
-      success = {}
-      
       make_the_call(http_verb_for(:create, options), relative_path, data, options) do |remote_call|
-        success = remote_call.status
+        @new_record = false if remote_call.status
 
-        @new_record = false if success
+        block_given? ? yield(remote_call) : remote_call
       end
-
-      success
     end
 
     def update(relative_path, data, options)
-      success = {}
-
       make_the_call(*persistent_method_args(:update, relative_path, data, options)) do |remote_call|
-        success = remote_call.status
+        block_given? ? yield(remote_call) : remote_call
       end
-
-      success
     end
 
     def make_the_call(http_verb, relative_path, data, options)

data/lib/smooth_operator/version.rb

@@ -1,3 +1,3 @@
 module SmoothOperator
-  VERSION = "1.10.14"
+  VERSION = "1.10.15"
 end

metadata

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