clean_model 0.0.4 → 0.0.5

data/lib/clean_model/attribute.rb

@@ -34,7 +34,8 @@ module CleanModel
     end
 
     def assign_default(model)
-      model.send("#{@name}=", @options[:default]) if @options[:default] && model.respond_to?("#{@name}=")
+      default_value = @options[:default].is_a?(Proc) ? @options[:default].call : @options[:default]
+      model.send("#{@name}=", default_value) if default_value && model.respond_to?("#{@name}=")
     end
 
     private

data/lib/clean_model/remote.rb

@@ -19,7 +19,6 @@ module CleanModel
 
       def http_get(path, data=nil, headers={})
         begin
-          headers[:content_type] ||= 'application/json'
           response = http.get(path, data, headers)
           if response.is_a?(Net::HTTPSuccess)
             block_given? ? yield(response) : response

data/lib/clean_model/version.rb

@@ -1,3 +1,3 @@
 module CleanModel
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

data/spec/base_model_spec.rb

@@ -44,7 +44,7 @@ describe CleanModel::Base do
 
     it 'Get attributes hash' do
       person = Person.new first_name: 'John', last_name: 'Doe', nationality: :usa
-      person.attributes.keys.should eq [:first_name, :last_name, :nationality]
+      person.attributes.keys.should eq [:first_name, :last_name, :nationality, :age]
       person.attributes[:first_name].should eq 'John'
       person.attributes[:last_name].should eq 'Doe'
       person.attributes[:nationality].should eq :usa
@@ -81,6 +81,7 @@ describe CleanModel::Base do
       person.first_name.should be_nil
       person.last_name.should be_nil
       person.nationality.should eq :argentina
+      person.age.should eq Time.now.year - 1979
     end
 
   end

data/spec/support/models/base_models.rb

@@ -6,6 +6,7 @@ module BaseModels
     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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: clean_model
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-01 00:00:00.000000000 Z
+date: 2012-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &25155312 !ruby/object:Gem::Requirement
+  requirement: &2924916 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *25155312
+  version_requirements: *2924916
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &25065840 !ruby/object:Gem::Requirement
+  requirement: &2924028 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *25065840
+  version_requirements: *2924028
 - !ruby/object:Gem::Dependency
   name: web_client
-  requirement: &25068576 !ruby/object:Gem::Requirement
+  requirement: &2939556 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -43,10 +43,10 @@ dependencies:
         version: 0.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *25068576
+  version_requirements: *2939556
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &25069740 !ruby/object:Gem::Requirement
+  requirement: &2937996 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *25069740
+  version_requirements: *2937996
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &25044888 !ruby/object:Gem::Requirement
+  requirement: &2936856 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *25044888
+  version_requirements: *2936856
 description: Extensions for ActiveModel to implement multiple types of models
 email:
 - gabynaiman@gmail.com