smooth_operator 1.2.9 → 1.3.0

data/spec/smooth_operator/remote_call_spec.rb

@@ -1,289 +1,305 @@
 require "spec_helper"
 
 describe SmoothOperator::RemoteCall do
-  subject { UserWithAddressAndPosts::Son.new(attributes_for(:user_with_address_and_posts)) }
 
   context "when the server response has a http code in the 200 range" do
-    before { subject.save(nil, { status: 200 }) }
+    before(:all) do
+      @subject = UserWithAddressAndPosts::Son.new(attributes_for(:user_with_address_and_posts))
+      @subject.save(nil, { status: 200 })
+    end
 
     it "#ok? should return true" do
-      expect(subject.last_remote_call.ok?).to be true
+      expect(@subject.last_remote_call.ok?).to be true
     end
 
     it "#not_processed? should return false" do
-      expect(subject.last_remote_call.not_processed?).to be false
+      expect(@subject.last_remote_call.not_processed?).to be false
     end
 
     it "#client_error? should return false" do
-      expect(subject.last_remote_call.client_error?).to be false
+      expect(@subject.last_remote_call.client_error?).to be false
     end
 
     it "#server_error? should return false" do
-      expect(subject.last_remote_call.server_error?).to be false
+      expect(@subject.last_remote_call.server_error?).to be false
     end
 
     it "#error? should return false" do
-      expect(subject.last_remote_call.error?).to be false
+      expect(@subject.last_remote_call.error?).to be false
     end
 
     it "#not_found? should return false" do
-      expect(subject.last_remote_call.not_found?).to be false
+      expect(@subject.last_remote_call.not_found?).to be false
     end
 
     it "#timeout? should return false" do
-      expect(subject.last_remote_call.timeout?).to be false
+      expect(@subject.last_remote_call.timeout?).to be false
     end
 
     it "#connection_failed? should return false" do
-      expect(subject.last_remote_call.connection_failed?).to be false
+      expect(@subject.last_remote_call.connection_failed?).to be false
     end
 
     it "#status should return true" do
-      expect(subject.last_remote_call.status).to be true
+      expect(@subject.last_remote_call.status).to be true
     end
   end
 
   context "when the server response has a http code in the 400 range (not 422, 404)" do
-    before { subject.save(nil, { status: 400 }) }
+    before(:all) do
+      @subject = UserWithAddressAndPosts::Son.new(attributes_for(:user_with_address_and_posts))
+      @subject.save(nil, { status: 400 })
+    end
 
     it "#ok? should return false" do
-      expect(subject.last_remote_call.ok?).to be false
+      expect(@subject.last_remote_call.ok?).to be false
     end
 
     it "#not_processed? should return false" do
-      expect(subject.last_remote_call.not_processed?).to be false
+      expect(@subject.last_remote_call.not_processed?).to be false
     end
 
     it "#client_error? should return true" do
-      expect(subject.last_remote_call.client_error?).to be true
+      expect(@subject.last_remote_call.client_error?).to be true
     end
 
     it "#server_error? should return false" do
-      expect(subject.last_remote_call.server_error?).to be false
+      expect(@subject.last_remote_call.server_error?).to be false
     end
 
     it "#error? should return true" do
-      expect(subject.last_remote_call.error?).to be true
+      expect(@subject.last_remote_call.error?).to be true
     end
 
     it "#not_found? should return false" do
-      expect(subject.last_remote_call.not_found?).to be false
+      expect(@subject.last_remote_call.not_found?).to be false
     end
 
     it "#timeout? should return false" do
-      expect(subject.last_remote_call.timeout?).to be false
+      expect(@subject.last_remote_call.timeout?).to be false
     end
 
     it "#connection_failed? should return false" do
-      expect(subject.last_remote_call.connection_failed?).to be false
+      expect(@subject.last_remote_call.connection_failed?).to be false
     end
 
     it "#status should return nil" do
-      expect(subject.last_remote_call.status).to be nil
+      expect(@subject.last_remote_call.status).to be nil
     end
   end
 
   context "when the server response has a http is 404" do
-    before { subject.save(nil, { status: 404 }) }
+    before(:all) do
+      @subject = UserWithAddressAndPosts::Son.new(attributes_for(:user_with_address_and_posts))
+      @subject.save(nil, { status: 404 })
+    end
 
     it "#ok? should return false" do
-      expect(subject.last_remote_call.ok?).to be false
+      expect(@subject.last_remote_call.ok?).to be false
     end
 
     it "#not_processed? should return false" do
-      expect(subject.last_remote_call.not_processed?).to be false
+      expect(@subject.last_remote_call.not_processed?).to be false
     end
 
     it "#client_error? should return true" do
-      expect(subject.last_remote_call.client_error?).to be true
+      expect(@subject.last_remote_call.client_error?).to be true
     end
 
     it "#server_error? should return false" do
-      expect(subject.last_remote_call.server_error?).to be false
+      expect(@subject.last_remote_call.server_error?).to be false
     end
 
     it "#error? should return true" do
-      expect(subject.last_remote_call.error?).to be true
+      expect(@subject.last_remote_call.error?).to be true
     end
 
     it "#not_found? should return true" do
-      expect(subject.last_remote_call.not_found?).to be true
+      expect(@subject.last_remote_call.not_found?).to be true
     end
 
     it "#timeout? should return false" do
-      expect(subject.last_remote_call.timeout?).to be false
+      expect(@subject.last_remote_call.timeout?).to be false
     end
 
     it "#connection_failed? should return false" do
-      expect(subject.last_remote_call.connection_failed?).to be false
+      expect(@subject.last_remote_call.connection_failed?).to be false
     end
 
     it "#status should return nil" do
-      expect(subject.last_remote_call.status).to be nil
+      expect(@subject.last_remote_call.status).to be nil
     end
   end
 
   context "when the server response has a http is 422" do
-    before { subject.save(nil, { status: 422 }) }
+    before(:all) do
+      @subject = UserWithAddressAndPosts::Son.new(attributes_for(:user_with_address_and_posts))
+      @subject.save(nil, { status: 422 })
+    end
 
     it "#ok? should return false" do
-      expect(subject.last_remote_call.ok?).to be false
+      expect(@subject.last_remote_call.ok?).to be false
     end
 
     it "#not_processed? should return true" do
-      expect(subject.last_remote_call.not_processed?).to be true
+      expect(@subject.last_remote_call.not_processed?).to be true
     end
 
     it "#client_error? should return true" do
-      expect(subject.last_remote_call.client_error?).to be true
+      expect(@subject.last_remote_call.client_error?).to be true
     end
 
     it "#server_error? should return false" do
-      expect(subject.last_remote_call.server_error?).to be false
+      expect(@subject.last_remote_call.server_error?).to be false
     end
 
     it "#error? should return false" do
-      expect(subject.last_remote_call.error?).to be false
+      expect(@subject.last_remote_call.error?).to be false
     end
 
     it "#not_found? should return false" do
-      expect(subject.last_remote_call.not_found?).to be false
+      expect(@subject.last_remote_call.not_found?).to be false
     end
 
     it "#timeout? should return false" do
-      expect(subject.last_remote_call.timeout?).to be false
+      expect(@subject.last_remote_call.timeout?).to be false
     end
 
     it "#connection_failed? should return false" do
-      expect(subject.last_remote_call.connection_failed?).to be false
+      expect(@subject.last_remote_call.connection_failed?).to be false
     end
 
     it "#status should return false" do
-      expect(subject.last_remote_call.status).to be false
+      expect(@subject.last_remote_call.status).to be false
     end
   end
 
   context "when the server response has a http code in the 500 range" do
-    before { subject.save(nil, { status: 500 }) }
+    before(:all) do
+      @subject = UserWithAddressAndPosts::Son.new(attributes_for(:user_with_address_and_posts))
+      @subject.save(nil, { status: 500 })
+    end
 
     it "#ok? should return false" do
-      expect(subject.last_remote_call.ok?).to be false
+      expect(@subject.last_remote_call.ok?).to be false
     end
 
     it "#not_processed? should return false" do
-      expect(subject.last_remote_call.not_processed?).to be false
+      expect(@subject.last_remote_call.not_processed?).to be false
     end
 
     it "#client_error? should return false" do
-      expect(subject.last_remote_call.client_error?).to be false
+      expect(@subject.last_remote_call.client_error?).to be false
     end
 
     it "#server_error? should return true" do
-      expect(subject.last_remote_call.server_error?).to be true
+      expect(@subject.last_remote_call.server_error?).to be true
     end
 
     it "#error? should return true" do
-      expect(subject.last_remote_call.error?).to be true
+      expect(@subject.last_remote_call.error?).to be true
     end
 
     it "#not_found? should return false" do
-      expect(subject.last_remote_call.not_found?).to be false
+      expect(@subject.last_remote_call.not_found?).to be false
     end
 
     it "#timeout? should return false" do
-      expect(subject.last_remote_call.timeout?).to be false
+      expect(@subject.last_remote_call.timeout?).to be false
     end
 
     it "#connection_failed? should return false" do
-      expect(subject.last_remote_call.connection_failed?).to be false
+      expect(@subject.last_remote_call.connection_failed?).to be false
     end
 
     it "#status should return nil" do
-      expect(subject.last_remote_call.status).to be nil
+      expect(@subject.last_remote_call.status).to be nil
     end
   end
 
   context "when the connection is broken" do
-    subject { User::BrokenConnection.new }
-
-    before { subject.save }
+    before(:all) do
+      @subject = User::BrokenConnection.new
+      @subject.save
+    end
 
     it "#ok? should return false" do
-      expect(subject.last_remote_call.ok?).to be false
+      expect(@subject.last_remote_call.ok?).to be false
     end
 
     it "#not_processed? should return false" do
-      expect(subject.last_remote_call.not_processed?).to be false
+      expect(@subject.last_remote_call.not_processed?).to be false
     end
 
     it "#client_error? should return false" do
-      expect(subject.last_remote_call.client_error?).to be false
+      expect(@subject.last_remote_call.client_error?).to be false
     end
 
     it "#server_error? should return true" do
-      expect(subject.last_remote_call.server_error?).to be true
+      expect(@subject.last_remote_call.server_error?).to be true
     end
 
     it "#error? should return true" do
-      expect(subject.last_remote_call.error?).to be true
+      expect(@subject.last_remote_call.error?).to be true
     end
 
     it "#not_found? should return false" do
-      expect(subject.last_remote_call.not_found?).to be false
+      expect(@subject.last_remote_call.not_found?).to be false
     end
 
     it "#timeout? should return false" do
-      expect(subject.last_remote_call.timeout?).to be false
+      expect(@subject.last_remote_call.timeout?).to be false
     end
 
     it "#connection_failed? should return true" do
-      expect(subject.last_remote_call.connection_failed?).to be true
+      expect(@subject.last_remote_call.connection_failed?).to be true
     end
 
     it "#status should return nil" do
-      expect(subject.last_remote_call.status).to be nil
+      expect(@subject.last_remote_call.status).to be nil
     end
   end
 
-  context "when the connection exceeds the timeout" do
-    subject { User::TimeoutConnection.new }
-    
-    before { subject.save('/timeout') }
+  context "when the connection exceeds the timeout", current: true do
+    before(:all) do
+      @subject = User::TimeoutConnection.new
+      @subject.save('/timeout')
+    end
 
     it "#ok? should return false" do
-      expect(subject.last_remote_call.ok?).to be false
+      expect(@subject.last_remote_call.ok?).to be false
     end
 
     it "#not_processed? should return false" do
-      expect(subject.last_remote_call.not_processed?).to be false
+      expect(@subject.last_remote_call.not_processed?).to be false
     end
 
     it "#client_error? should return false" do
-      expect(subject.last_remote_call.client_error?).to be false
+      expect(@subject.last_remote_call.client_error?).to be false
     end
 
     it "#server_error? should return true" do
-      expect(subject.last_remote_call.server_error?).to be true
+      expect(@subject.last_remote_call.server_error?).to be true
     end
 
     it "#error? should return true" do
-      expect(subject.last_remote_call.error?).to be true
+      expect(@subject.last_remote_call.error?).to be true
     end
 
     it "#not_found? should return false" do
-      expect(subject.last_remote_call.not_found?).to be false
+      expect(@subject.last_remote_call.not_found?).to be false
     end
 
     it "#timeout? should return true" do
-      expect(subject.last_remote_call.timeout?).to be true
+      expect(@subject.last_remote_call.timeout?).to be true
     end
 
     it "#connection_failed? should return false" do
-      expect(subject.last_remote_call.connection_failed?).to be false
+      expect(@subject.last_remote_call.connection_failed?).to be false
     end
 
     it "#status should return nil" do
-      expect(subject.last_remote_call.status).to be nil
+      expect(@subject.last_remote_call.status).to be nil
     end
   end
 
@@ -291,28 +307,32 @@ describe SmoothOperator::RemoteCall do
     context "when the server response's body does not contains valid json data" do
       let(:remote_call) { User::Base.find('bad_json') }
 
-      it "should return nil" do
-        expect(remote_call.data).to be nil
+      it "it should return what the server has returned" do
+        expect(remote_call.data).to eq('ok')
       end
     end
   end
 
   describe "#http_status" do
     context "when a server connection is established" do
-      before { subject.save(nil, { status: 422 }) }
+      before do
+        @subject = UserWithAddressAndPosts::Son.new(attributes_for(:user_with_address_and_posts))
+        @subject.save(nil, { status: 422 })
+      end
 
       it "it should return the server's http response code" do
-        expect(subject.last_remote_call.http_status).to be 422
+        expect(@subject.last_remote_call.http_status).to be 422
       end
     end
 
     context "when a server connection fails" do
-      subject { User::TimeoutConnection.new }
-    
-      before { subject.save('/timeout') }
+      before do
+        @subject = User::TimeoutConnection.new
+        @subject.save('/timeout')
+      end
 
       it "should return 0" do
-        expect(subject.last_remote_call.http_status).to be 0
+        expect(@subject.last_remote_call.http_status).to be 0
       end
     end
   end

data/spec/smooth_operator/{model_schema_spec.rb → resource_name_spec.rb}

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe SmoothOperator::ModelSchema do
+describe SmoothOperator::ResourceName do
 
   describe "#known_attributes" do
     let(:initial_attributes_keys) { attributes_for(:user).keys.map(&:to_s) }

data/spec/support/models/address.rb

@@ -1,14 +1,12 @@
 class Address < SmoothOperator::Base
 
-  self.dirty_attributes
-
-  self.resource_name = ''
-
-  self.endpoint_user = 'admin'
-  self.endpoint_pass = 'admin'
-
-  self.endpoint = 'http://localhost:4567/'
-
-  self.headers = { "X-APPTOKEN" => "joaquim_app_token", "X-LAYERTOKEN" => "joaquim_layer_token" }
+  options resource_name: '',
+          endpoint_user: 'admin',
+          endpoint_pass: 'admin',
+          endpoint: 'http://localhost:4567/',
+          headers: {
+            "X-APPTOKEN" => "app_token",
+            "X-LAYERTOKEN" => "layer_token"
+          }
 
 end

data/spec/support/models/comment.rb

@@ -1,3 +1,5 @@
 class Comment < SmoothOperator::Base
 
+  options unknown_hash_class: SmoothOperator::OpenStruct
+
 end

data/spec/support/models/post.rb

@@ -1,13 +1,13 @@
 class Post < SmoothOperator::Base
 
-  self.endpoint_user = 'admin'
+  options endpoint_user: 'admin',
+          endpoint_pass: 'admin',
+          rails_serialization: true,
+          endpoint: 'http://localhost:4567/',
+          unknown_hash_class: SmoothOperator::OpenStruct
 
-  self.endpoint_pass = 'admin'
+  has_many :comments#, rails_serialization: true
 
-  self.endpoint = 'http://localhost:4567/'
-
-  has_many :comments
-
-  belongs_to :address
+  belongs_to :address#, rails_serialization: true
 
 end

data/spec/support/models/user.rb

@@ -1,14 +1,11 @@
 module User
-  
-  class Base < SmoothOperator::Base
-
-    self.resource_name = 'user'
-
-    self.endpoint_user = 'admin'
 
-    self.endpoint_pass = 'admin'
+  class Base < SmoothOperator::Base
 
-    self.endpoint = 'http://localhost:4567/'
+    options resource_name: 'user',
+            endpoint_user: 'admin',
+            endpoint_pass: 'admin',
+            endpoint: 'http://localhost:4567/'
 
     def self.query_string(params)
       params['query_string_param'] = true
@@ -19,23 +16,23 @@ module User
   end
 
   module UnknownHashClass
-    
+
     class OpenStructBase < User::Base
-      self.unknown_hash_class = SmoothOperator::OpenStruct::Base
+      options unknown_hash_class: SmoothOperator::OpenStruct
     end
 
     class None < User::Base
-      self.unknown_hash_class = :none
+      options unknown_hash_class: nil
     end
 
   end
 
   class BrokenConnection < SmoothOperator::Base
-    self.endpoint = 'http://localhost:1234/'
+    options endpoint: 'http://localhost:1234/'
   end
 
   class TimeoutConnection < Base
-    self.timeout = 1
+    options timeout: 1
   end
 
 end

data/spec/support/models/user_with_address_and_posts.rb

@@ -1,8 +1,8 @@
 module UserWithAddressAndPosts
-  
+
   class Father < User::Base
-    
-    self.resource_name = 'user'
+
+    options resource_name: 'user'
 
     schema(
       posts: Post,
@@ -27,19 +27,19 @@ module UserWithAddressAndPosts
 
   class SoftBehaviour < Son
 
-    self.strict_behaviour = false
+    options strict_behaviour: false
 
   end
 
   class WithPatch < Son
 
-    self.update_http_verb = :patch
+    options update_http_verb: 'patch'
 
   end
-  
+
 
   module UserBlackListed
-    
+
     class Father < ::UserWithAddressAndPosts::Son
 
       attributes_black_list_add "last_name"
@@ -55,7 +55,7 @@ module UserWithAddressAndPosts
   end
 
   module UserWhiteListed
-    
+
     class Father < ::UserWithAddressAndPosts::Son
 
       attributes_white_list_add "id"
@@ -69,7 +69,7 @@ module UserWithAddressAndPosts
     end
 
   end
-  
+
   class UserWithMyMethod < UserWithAddressAndPosts::Son
 
     def my_method
@@ -78,12 +78,4 @@ module UserWithAddressAndPosts
 
   end
 
-  class DirtyAttributes < UserWithAddressAndPosts::Son
-
-    self.dirty_attributes
-
-    self.unknown_hash_class = SmoothOperator::OpenStruct::Dirty
-
-  end
-
 end

data/spec/support/test_server.rb

@@ -38,7 +38,7 @@ class TestServer < Sinatra::Base
 
   get '/users' do
     users = [FactoryGirl.attributes_for(:user_with_address_and_posts), FactoryGirl.attributes_for(:user_with_address_and_posts)]
-    
+
     users[0][:id] = 1
     users[1][:id] = 2
 
@@ -63,10 +63,10 @@ class TestServer < Sinatra::Base
     users = [{ id: 1, users: nested_users}, { id: 2, users: nested_users}]
 
     data = { page: 1, total: 6, users: users }
-    
+
     json data
   end
-  
+
   get '/users/bad_json' do
     'ok'
   end
@@ -79,7 +79,7 @@ class TestServer < Sinatra::Base
     user_data = { user: FactoryGirl.attributes_for(:user_with_address_and_posts), status: 1 }
     json user_data
   end
-  
+
 
   put '/users/:id/send_error' do
     data_with_error = { id: 1, errors: [{ first_name: ["can't be blank"] }] }
@@ -90,7 +90,7 @@ class TestServer < Sinatra::Base
   post '/users' do
     common_response
   end
-  
+
   post '/users/timeout' do
     # sleep 2 # for typhoeus tests
     sleep 1
@@ -100,7 +100,7 @@ class TestServer < Sinatra::Base
   put '/users/:id' do
     common_response
   end
-  
+
   patch '/users/:id' do
     common_response
   end
@@ -123,7 +123,7 @@ class TestServer < Sinatra::Base
     data.delete('id')
 
     query_params = (params[:query_string_param] == 'true')
-    
+
     internal_data_match = params[:user] ? (params[:user] == data) : true
 
     json({ user: { server_response: true }, http_verb: env["REQUEST_METHOD"].downcase, internal_data_match: internal_data_match, query_params: query_params })