clean_model 0.0.5 → 0.0.6

data/spec/remote_models_spec.rb

@@ -1,148 +1,148 @@
-require 'spec_helper'
-
-include RemoteModels
-
-describe CleanModel::Persistent do
-
-  context 'Successful operations' do
-
-    it 'Create' do
-      user = User.new first_name: 'John', last_name: 'Doe', email: 'john.doe@mail.com'
-
-      user.stub(:create) { user.http.post('/users/create.json', user.wrapped_attributes) }
-      user.should_receive :create
-
-      stub_request(:post, 'http://localhost:9999/users/create.json').
-          with(body: {user: {first_name: 'John', last_name: 'Doe', email: 'john.doe@mail.com'}}).
-          to_return(body: {id: 1}.to_json)
-
-      user.save.should be_true
-      user.should be_persisted
-    end
-
-    it 'Update' do
-      user = User.new id: 1, first_name: 'John', last_name: 'Doe', email: 'john.doe@mail.com'
-
-      user.stub(:update) { user.http.put("/users/#{user.id}.json", user.wrapped_attributes(except: :id)) }
-      user.should_receive :update
-
-      stub_request(:put, 'http://localhost:9999/users/1.json').
-          with(body: {user: {first_name: 'Jorge', last_name: 'Doe', email: 'john.doe@mail.com'}})
-
-      user.update_attributes(first_name: 'Jorge').should be_true
-      user.first_name.should eq 'Jorge'
-    end
-
-    it 'Destroy' do
-      user = User.new id: 1, first_name: 'John', last_name: 'Doe', email: 'john.doe@mail.com'
-
-      user.stub(:delete) { user.http.delete("/users/#{user.id}.json") }
-      user.should_receive :delete
-
-      stub_request(:delete, 'http://localhost:9999/users/1.json')
-
-      user.destroy.should be_true
-    end
-
-  end
-
-  context 'Failed operations' do
-
-    it 'Save validation errors' do
-      user = User.new first_name: 'John', last_name: 'Doe'
-
-      user.stub(:create) { user.http.post('/users/create.json', user.wrapped_attributes) }
-
-      stub_request(:post, 'http://localhost:9999/users/create.json').
-          to_return(status: 422, body: {email: ["can't be blank"]}.to_json)
-
-      user.save.should_not be_true
-      user.errors[:email].should have(1).items
-    end
-
-    it 'Save with unexpected error' do
-      user = User.new first_name: 'John', last_name: 'Doe', email: 'john.doe@mail.com'
-
-      user.stub(:create) { user.http.post('/users/create.json', user.wrapped_attributes) }
-
-      stub_request(:post, 'http://localhost:9999/users/create.json').
-          to_return(status: 500, body: 'Internal Server Error')
-
-      user.save.should_not be_true
-      user.errors[:base].should have(1).items
-    end
-
-    it 'Save with timeout error' do
-      user = User.new first_name: 'John', last_name: 'Doe', email: 'john.doe@mail.com'
-
-      user.stub(:create) { user.http.post('/users/create.json', user.wrapped_attributes) }
-
-      stub_request(:post, 'http://localhost:9999/users/create.json').to_timeout
-
-      user.save.should_not be_true
-      user.errors[:base].should have(1).items
-    end
-
-    it 'Destroy with unexpected error' do
-      user = User.new id: 1, first_name: 'John', last_name: 'Doe', email: 'john.doe@mail.com'
-
-      user.stub(:delete) { user.http.delete("/users/#{user.id}.json") }
-
-      stub_request(:delete, 'http://localhost:9999/users/1.json').
-          to_return(status: 500, body: 'Internal Server Error')
-
-      user.destroy.should_not be_true
-      user.errors[:base].should have(1).items
-    end
-
-    it 'Destroy with timeout error' do
-      user = User.new id: 1, first_name: 'John', last_name: 'Doe', email: 'john.doe@mail.com'
-
-      user.stub(:delete) { user.http.delete("/users/#{user.id}.json") }
-
-      stub_request(:delete, 'http://localhost:9999/users/1.json').to_timeout
-
-      user.destroy.should_not be_true
-      user.errors[:base].should have(1).items
-    end
-
-  end
-
-  context 'Http get safe' do
-
-    before :each do
-      User.stub(:find) do
-        User.http_get '/users/1.json' do |response|
-          User.new JSON.parse(response.body)
-        end
-      end
-    end
-
-    it 'Successful' do
-      stub_request(:get, 'http://localhost:9999/users/1.json').
-          to_return(body: {id: 1, first_name: 'John', last_name: 'Doe', email: 'john.doe@mail.com'}.to_json)
-
-      user = User.find(1)
-
-      user.id.should eq 1
-      user.first_name.should eq 'John'
-      user.last_name.should eq 'Doe'
-      user.email.should eq 'john.doe@mail.com'
-    end
-
-    it 'Invalid response' do
-      stub_request(:get, 'http://localhost:9999/users/1.json').
-          to_return(status: 500, body: 'Internal Server Error')
-
-      expect{User.find(1)}.to raise_error CleanModel::InvalidResponse
-    end
-
-    it 'Connection fail' do
-      stub_request(:get, 'http://localhost:9999/users/1.json').to_timeout
-
-      expect{User.find(1)}.to raise_error CleanModel::ConnectionFail
-    end
-
-  end
-
+require 'spec_helper'
+
+include RemoteModels
+
+describe CleanModel::Remote do
+
+  context 'Successful operations' do
+
+    it 'Create' do
+      user = User.new first_name: 'John', last_name: 'Doe', email: 'john.doe@mail.com'
+
+      user.stub(:create) { User.connection.post('/users/create.json', body: user.send(:wrapped_attributes)) }
+      user.should_receive :create
+
+      stub_request(:post, 'http://localhost:9999/users/create.json').
+          with(body: {user: {first_name: 'John', last_name: 'Doe', email: 'john.doe@mail.com'}}).
+          to_return(body: {id: 1}.to_json)
+
+      user.save.should be_true
+      user.should be_persisted
+    end
+
+    it 'Update' do
+      user = User.new id: 1, first_name: 'John', last_name: 'Doe', email: 'john.doe@mail.com'
+
+      user.stub(:update) { User.connection.put("/users/#{user.id}.json", body: user.send(:wrapped_attributes, except: :id)) }
+      user.should_receive :update
+
+      stub_request(:put, 'http://localhost:9999/users/1.json').
+          with(body: {user: {first_name: 'Jorge', last_name: 'Doe', email: 'john.doe@mail.com'}})
+
+      user.update_attributes(first_name: 'Jorge').should be_true
+      user.first_name.should eq 'Jorge'
+    end
+
+    it 'Destroy' do
+      user = User.new id: 1, first_name: 'John', last_name: 'Doe', email: 'john.doe@mail.com'
+
+      user.stub(:delete) { User.connection.delete("/users/#{user.id}.json") }
+      user.should_receive :delete
+
+      stub_request(:delete, 'http://localhost:9999/users/1.json')
+
+      user.destroy.should be_true
+    end
+
+  end
+
+  context 'Failed operations' do
+
+    it 'Save validation errors' do
+      user = User.new first_name: 'John', last_name: 'Doe'
+
+      user.stub(:create) { User.connection.post!('/users/create.json', user.send(:wrapped_attributes)) }
+
+      stub_request(:post, 'http://localhost:9999/users/create.json').
+          to_return(status: 422, body: {email: ["can't be blank"]}.to_json)
+
+      user.save.should_not be_true
+      user.errors[:email].should have(1).items
+    end
+
+    it 'Save with unexpected error' do
+      user = User.new first_name: 'John', last_name: 'Doe', email: 'john.doe@mail.com'
+
+      user.stub(:create) { User.connection.post!('/users/create.json', body: user.send(:wrapped_attributes)) }
+
+      stub_request(:post, 'http://localhost:9999/users/create.json').
+          to_return(status: 500, body: 'Internal Server Error')
+
+      user.save.should_not be_true
+      user.errors[:base].should have(1).items
+    end
+
+    it 'Save with timeout error' do
+      user = User.new first_name: 'John', last_name: 'Doe', email: 'john.doe@mail.com'
+
+      user.stub(:create) { User.connection.post!('/users/create.json', body: user.send(:wrapped_attributes)) }
+
+      stub_request(:post, 'http://localhost:9999/users/create.json').to_timeout
+
+      user.save.should_not be_true
+      user.errors[:base].should have(1).items
+    end
+
+    it 'Destroy with unexpected error' do
+      user = User.new id: 1, first_name: 'John', last_name: 'Doe', email: 'john.doe@mail.com'
+
+      user.stub(:delete) { User.connection.delete!("/users/#{user.id}.json") }
+
+      stub_request(:delete, 'http://localhost:9999/users/1.json').
+          to_return(status: 500, body: 'Internal Server Error')
+
+      user.destroy.should_not be_true
+      user.errors[:base].should have(1).items
+    end
+
+    it 'Destroy with timeout error' do
+      user = User.new id: 1, first_name: 'John', last_name: 'Doe', email: 'john.doe@mail.com'
+
+      user.stub(:delete) { User.connection.delete!("/users/#{user.id}.json") }
+
+      stub_request(:delete, 'http://localhost:9999/users/1.json').to_timeout
+
+      user.destroy.should_not be_true
+      user.errors[:base].should have(1).items
+    end
+
+  end
+
+  context 'Safe requests' do
+
+    before :each do
+      User.stub(:find) do
+        User.connection.get '/users/1.json' do |response|
+          User.new JSON.parse(response.body)
+        end
+      end
+    end
+
+    it 'Successful' do
+      stub_request(:get, 'http://localhost:9999/users/1.json').
+          to_return(body: {id: 1, first_name: 'John', last_name: 'Doe', email: 'john.doe@mail.com'}.to_json)
+
+      user = User.find(1)
+
+      user.id.should eq 1
+      user.first_name.should eq 'John'
+      user.last_name.should eq 'Doe'
+      user.email.should eq 'john.doe@mail.com'
+    end
+
+    it 'Invalid response' do
+      stub_request(:get, 'http://localhost:9999/users/1.json').
+          to_return(status: 500, body: 'Internal Server Error')
+
+      User.find(1).should be_nil
+    end
+
+    it 'Connection fail' do
+      stub_request(:get, 'http://localhost:9999/users/1.json').to_timeout
+
+      User.find(1).should be_nil
+    end
+
+  end
+
 end

data/spec/spec_helper.rb

@@ -1,8 +1,8 @@
-require 'webmock/rspec'
-require 'clean_model'
-
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
-
-RSpec.configure do |config|
-
+require 'webmock/rspec'
+require 'clean_model'
+
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
+
+RSpec.configure do |config|
+
 end

data/spec/support/models/base_models.rb

@@ -1,37 +1,37 @@
-module BaseModels
-
-  class Person
-    include CleanModel::Base
-
-    attribute :first_name
-    attribute :last_name
-    attribute :nationality, default: :argentina
-    attribute :age, default: -> { Time.now.year - 1979 }
-
-    validates_presence_of :first_name, :last_name
-  end
-
-  class Engine
-    include CleanModel::Base
-
-    attribute :power, class_name: :numeric
-    attribute :cylinders, class_name: :integer
-    attribute :valves, class_name: 'Integer'
-  end
-
-  class Car
-    include CleanModel::Base
-
-    attribute :brand
-    attribute :model
-    attribute :engine, class_name: 'BaseModels::Engine'
-    attribute :comfort, transformation: lambda { |v| v.is_a?(String) ? v.split(',').map(&:strip) : v }
-  end
-
-  class Factory
-    include CleanModel::Base
-
-    attribute :cars, collection: 'BaseModels::Car'
-  end
-
+module BaseModels
+
+  class Person
+    include CleanModel::Base
+
+    attribute :first_name
+    attribute :last_name
+    attribute :nationality, default: :argentina
+    attribute :age, default: -> { Time.now.year - 1979 }
+
+    validates_presence_of :first_name, :last_name
+  end
+
+  class Engine
+    include CleanModel::Base
+
+    attribute :power, class_name: :numeric
+    attribute :cylinders, class_name: :integer
+    attribute :valves, class_name: 'Integer'
+  end
+
+  class Car
+    include CleanModel::Base
+
+    attribute :brand
+    attribute :model
+    attribute :engine, class_name: 'BaseModels::Engine'
+    attribute :comfort, transformation: lambda { |v| v.is_a?(String) ? v.split(',').map(&:strip) : v }
+  end
+
+  class Factory
+    include CleanModel::Base
+
+    attribute :cars, collection: 'BaseModels::Car'
+  end
+
 end

data/spec/support/models/persistent_models.rb

@@ -1,10 +1,10 @@
-module PersistentModels
-
-  class Post
-    include CleanModel::Persistent
-
-    attribute :subject
-    attribute :content
-  end
-
+module PersistentModels
+
+  class Post
+    include CleanModel::Persistent
+
+    attribute :subject
+    attribute :content
+  end
+
 end

data/spec/support/models/remote_models.rb

@@ -1,13 +1,13 @@
-module RemoteModels
-
-  class User
-    include CleanModel::Remote
-
-    connection host: 'localhost', port: 9999
-
-    attribute :first_name
-    attribute :last_name
-    attribute :email
-  end
-
+module RemoteModels
+
+  class User
+    include CleanModel::Remote
+
+    connection host: 'localhost', port: 9999
+
+    attribute :first_name
+    attribute :last_name
+    attribute :email
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: clean_model
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-09 00:00:00.000000000 Z
+date: 2012-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: &2924916 !ruby/object:Gem::Requirement
+  name: activemodel
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,32 +21,31 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2924916
-- !ruby/object:Gem::Dependency
-  name: activemodel
-  requirement: &2924028 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: *2924028
 - !ruby/object:Gem::Dependency
   name: web_client
-  requirement: &2939556 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *2939556
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.0.4
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2937996 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +53,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2937996
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &2936856 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +69,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2936856
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Extensions for ActiveModel to implement multiple types of models
 email:
 - gabynaiman@gmail.com
@@ -112,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.16
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Extensions for ActiveModel to implement multiple types of models