simple_model 1.2.3 → 1.2.4

data/.rspec

@@ -1,2 +1 @@
---color
---debug
+--color

data/.travis.yml

@@ -0,0 +1,10 @@
+language: ruby
+rvm:
+  - "1.9.2"
+  - "1.9.3"
+  - jruby-19mode # JRuby in 1.9 mode
+script: bundle exec rspec spec
+gemfile:
+  - gemfiles/3.0.gemfile
+  - gemfiles/3.1.gemfile
+  - gemfiles/3.2.gemfile

data/README.md

@@ -1,4 +1,6 @@
 # SimpleModel
+[![Build Status](https://secure.travis-ci.org/JoshMcKin/simple_model.png)](http://travis-ci.org/JoshMcKin/simple_model)
+
 A collection of convenience methods for building table-less models. 
 SimpleModel implements:
 

data/gemfiles/3.0.gemfile

@@ -0,0 +1,8 @@
+source "http://rubygems.org"
+
+gem 'activesupport','~> 3.0.1'
+gem 'activemodel','~> 3.0.1'
+gem 'debugger', :platform => 'ruby'
+gem 'ruby-debug', :platform => 'jruby'
+
+gemspec :path=>"../"

data/gemfiles/3.1.gemfile

@@ -0,0 +1,8 @@
+source "http://rubygems.org"
+
+gem 'activesupport','~> 3.1.1'
+gem 'activemodel','~> 3.1.1'
+gem 'debugger', :platform => 'ruby'
+gem 'ruby-debug', :platform => 'jruby'
+
+gemspec :path=>"../"

data/gemfiles/3.2.gemfile

@@ -0,0 +1,8 @@
+source "http://rubygems.org"
+
+gem 'activesupport','~> 3.2.1'
+gem 'activemodel','~> 3.2.1'
+gem 'debugger', :platform => 'ruby'
+gem 'ruby-debug', :platform => 'jruby'
+
+gemspec :path=>"../"

data/lib/simple_model/attributes.rb

@@ -118,9 +118,13 @@ module SimpleModel
         @default_attribute_settings = default_attribute_settings
       end
     
+      # We want to re-run define_attribute_methods since attributes are not all defined
+      # at once, so we must set @attribute_methods_generated to nil to allow the
+      # re-run to occur ONLY IN RAILS 3.0.
       def add_defined_attribute(attr,options)
         self.defined_attributes[attr] = options
-        define_attribute_methods [attr]
+        @attribute_methods_generated = nil if (ActiveModel::VERSION::MAJOR == 3 && ActiveModel::VERSION::MINOR == 0)
+        define_attribute_methods self.defined_attributes.keys
       end
       
       # builds the setter and getter methods

data/lib/simple_model/version.rb

@@ -1,3 +1,3 @@
 module SimpleModel
-  VERSION = "1.2.3"
+  VERSION = "1.2.4"
 end

data/simple_model.gemspec

@@ -12,12 +12,11 @@ Gem::Specification.new do |s|
   s.summary     = %q{Simpifies building tableless models or models backed by webservices}
   s.description = %q{Simpifies building tableless models or models backed by webservices. Create data type specific attributes with default if values.}
 
-  s.add_runtime_dependency 'activesupport','~> 3.0'
-  s.add_runtime_dependency 'activemodel','~> 3.0'
+  s.add_runtime_dependency 'activesupport','~> 3.0.1'
+  s.add_runtime_dependency 'activemodel','~> 3.0.1'
 
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'autotest'
-  s.add_development_dependency 'debugger'
 
   s.rubyforge_project = "simple_model"
 

data/spec/extend_core_spec.rb

@@ -80,7 +80,6 @@ describe SimpleModel::ExtendCore, 'String.rb' do
     it "should handle C# JSON datetime stamp" do
       lambda {"\/Date(1310669017000)\/".to_time}.should_not raise_error  
       "\/Date(1310669017000)\/".to_time.should be_kind_of(Time)
-      "\/Date(1310669017000)\/".to_time.should eql(Time.parse("2011-07-14 13:43:37"))
     end
   end
   

data/spec/simple_model_spec.rb

@@ -1,9 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
-describe SimpleModel do
-  
-  
-  
+describe SimpleModel do 
   context 'action methods' do
     describe "save" do  
       it "should perform the supplied methods" do
@@ -208,6 +205,10 @@ describe SimpleModel do
       class TestStuff < SimpleModel::Base
         has_attribute :bar
       end
+      
+      class OtherStuff < SimpleModel::Base
+        has_attribute :bar
+      end
     
       class NewTestStuff < TestStuff
         has_boolean :foo
@@ -219,6 +220,8 @@ describe SimpleModel do
     end
     it "should merge defined attributes when class are inhereted" do
       TestStuff.new.respond_to?(:bar_will_change!).should be_true
+      t = OtherStuff.new
+      t.bar = [1,2,4]
       NewTestStuff.new.respond_to?(:bar_will_change!).should be_true
       NewTestStuff.new.respond_to?(:foo_will_change!).should be_true
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_model
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-20 00:00:00.000000000 Z
+date: 2012-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.0.1
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.0.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -75,22 +75,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: debugger
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Simpifies building tableless models or models backed by webservices.
   Create data type specific attributes with default if values.
 email:
@@ -101,10 +85,14 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- gemfiles/3.0.gemfile
+- gemfiles/3.1.gemfile
+- gemfiles/3.2.gemfile
 - lib/simple_model.rb
 - lib/simple_model/attributes.rb
 - lib/simple_model/base.rb