simple_model 1.1.1 → 1.2.0

data/spec/extend_core_spec.rb

@@ -1,5 +1,4 @@
-
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'spec_helper'
 describe SimpleModel::ExtendCore, 'Float.rb' do
   before(:all) do
     include SimpleModel::ExtendCore
@@ -18,44 +17,40 @@ describe SimpleModel::ExtendCore, 'Float.rb' do
     it "should return a string" do
       0.333.to_currency_s.class.should eql(String)
     end
-#    it "should prefix string with currency symbol" do
-#      5.12.to_currency_s.include?("$").should be_true
-#    end
-#    it "should padd with zeros for cents" do
-#      5.0.to_currency_s.should eql("$5.00")
-#    end
-#    it "should round string to nearest tenth" do
-#      0.333.to_currency_s.should eql("$0.33")
-#    end
-#    it "should add commas to long numbers" do
-#      500000000000.0.to_currency_s.should eql("$500,000,000,000.00")
-#      50000000000.0.to_currency_s.should eql("$50,000,000,000.00")
-#      5000000000.0.to_currency_s.should eql("$5,000,000,000.00")
-#    end
+    it "should prefix string with currency symbol" do
+      5.12.to_currency_s.include?("$").should be_true
+    end
+    it "should padd with zeros for cents" do
+      5.0.to_currency_s.should eql("$5.00")
+    end
+    it "should round string to nearest tenth" do
+      0.333.to_currency_s.should eql("$0.33")
+    end
+    it "should add commas to long numbers" do
+      500000000000.0.to_currency_s.should eql("$500,000,000,000.00")
+      50000000000.0.to_currency_s.should eql("$50,000,000,000.00")
+      5000000000.0.to_currency_s.should eql("$5,000,000,000.00")
+    end
   end
-
 end
 
-
 describe SimpleModel::ExtendCore, 'String.rb' do
   before(:all) do
     include SimpleModel::ExtendCore
   end
-  describe SimpleModel::ExtendCore, 'safe_datetime_string' do
+  context '#safe_datetime_string' do
     it "should set US formated datetime string to international" do
       "12/31/2010".safe_datetime_string.should eql("2010-12-31")
       "12/31/2010T23:31:59".safe_datetime_string.should eql("2010-12-31T23:31:59")
       "12/31/2010 23:31:59".safe_datetime_string.should eql("2010-12-31 23:31:59")
-
     end
   end
   
-  describe SimpleModel::ExtendCore, 'to_b' do
+  context '#to_b' do
     it "should return a Boolean" do
       "1".to_b.class.should eql(TrueClass)
       "".to_b.class.should eql(FalseClass)
     end
-
     it "should return true if string is '1' or 't' or 'true'"do
       ['1','t','true'].each do |s|
         s.to_b.should be_true
@@ -63,41 +58,41 @@ describe SimpleModel::ExtendCore, 'String.rb' do
     end  
   end
 
-  describe SimpleModel::ExtendCore, 'to_date' do
-    it "return a Date object" do
+  context '#to_date' do 
+    it "should handel US formatted date strings" do
+      lambda {"12/31/2010".to_date}.should_not raise_error
       "12/31/2010".to_date.class.should eql(Date)
+      "12/31/2010".to_date.should eql(Date.parse("2010-12-31"))
+    end
+    it "should handle C# JSON datetime stamp" do
+      lambda {"\/Date(1310669017000)\/".to_date}.should_not raise_error
+      "\/Date(1310669017000)\/".to_date.should be_kind_of(Date)
+      "\/Date(1310669017000)\/".to_date.should eql(Date.parse("2011-07-14"))
     end
   end
-  describe SimpleModel::ExtendCore, 'to_date' do
-    it "return a Time object" do
-      "12/31/2010".to_time.class.should eql(Time)
+  
+  context '#to_time' do
+    it "should handel US formatted date strings" do
+      lambda {"12/31/2010 12:00:00".to_time}.should_not raise_error
+      "12/31/2010 12:00:00".to_time.should be_kind_of(Time)
+      "12/31/2010 12:00:00".to_time.should eql(Time.parse("2010-12-31 12:00:00"))
+    end
+    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
-  describe SimpleModel::ExtendCore, 'to_f' do
+  
+  context '#to_f' do
     it "return a Foat from a string that may contain non-numeric values" do
       "$5,000.006".to_f.should eql(5000.006)
     end
   end
-  describe SimpleModel::ExtendCore, 'to_currency' do
+  
+  context '#to_currency' do
     it "return a BigDecimal from a string that may contain non-numeric values" do
-      "$5,000.006".to_currency.should eql(BigDecimal("5000.01"))
-    end
-  end
-
-  describe SimpleModel::ExtendCore, 'parse_name' do
-    it "return return hash with name elements properly keyed" do
-      hash = "Doe, John C.".parse_name
-      hash[:first_name].should eql("John")
-      hash[:last_name].should eql("Doe")
-
-      hash = "John Doe".parse_name
-      hash[:first_name].should eql("John")
-      hash[:last_name].should eql("Doe")
-
-      hash = "Mr. John C. Doe Jr".parse_name
-      hash[:first_name].should eql("John")
-      hash[:last_name].should eql("Doe")
-
+      "$5,000.006".to_currency.should eql(BigDecimal("5000.006"))
     end
   end
 end

data/spec/simple_model_spec.rb

@@ -1,13 +1,16 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe SimpleModel do
+  
+  after(:each) do
+    Object.send(:remove_const,:TestStuff)
+  end
+  
   context 'action methods' do
-    describe "save" do
-    
+    describe "save" do  
       it "should perform the supplied methods" do
         class TestStuff < SimpleModel::Base
-          save :test
-        
+          save :test  
           attr_accessor :foo
         
           def test
@@ -40,7 +43,6 @@ describe SimpleModel do
     end
   
     describe "destroy" do
-    
       it "should not preform validation by default" do
         class TestStuff < SimpleModel::Base
           destroy :test
@@ -55,6 +57,40 @@ describe SimpleModel do
         t.destroy.should be_true
       end
     end
+    context "action methods that end with '!'" do
+      it 'should raise exception if validation fails' do
+        class TestStuff < SimpleModel::Base
+          save :my_save_method
+          has_attributes :foo
+      
+          def my_save_method
+            false
+          end
+        end
+    
+        t = TestStuff.new
+        lambda {t.save!}.should raise_error(SimpleModel::ActionError)
+      end
+      it 'should raise exception if validation fails' do
+        class TestStuff < SimpleModel::Base
+          save :my_save_method
+          has_attributes :foo
+          validate :validates_bar
+      
+          def my_save_method
+            self.errors.blank?
+          end
+      
+          def validates_bar
+            self.errors.add(:foo, "bar")
+          end
+        end
+    
+        t = TestStuff.new
+        lambda {t.save!}.should raise_error(SimpleModel::ValidationError)
+      end
+      
+    end
   end
   
   
@@ -164,20 +200,5 @@ describe SimpleModel do
     t.changed?.should be_true
     t.save
     t.changed?.should be_false
-  end
-  
+  end  
 end
-
-#describe SimpleModel::Errors do
-#  it 'Should add a error setter' do
-#    class TestError
-#      include SimpleModel::Errors
-#      attr_accessor :test_attr
-#    end
-#    a = TestError.new(self)
-#    a.errors.add(:test_attr, "test")
-#    a.errors?.should be_true
-#
-#    #a.test.should be_false
-#  end
-#end

data/spec/spec_helper.rb

@@ -1,4 +1,4 @@
-#$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 #$LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'simple_model'
 require 'rspec'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_model
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-16 00:00:00.000000000Z
+date: 2012-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70104505150660 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70104505150660
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70104505150160 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +37,15 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70104505150160
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70104505149780 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70104505149780
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: autotest
-  requirement: &70104505149320 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +69,28 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70104505149320
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !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:
@@ -66,7 +102,6 @@ files:
 - .gitignore
 - .rspec
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -74,6 +109,7 @@ files:
 - lib/simple_model/attributes.rb
 - lib/simple_model/base.rb
 - lib/simple_model/error_helpers.rb
+- lib/simple_model/exceptions.rb
 - lib/simple_model/extend_core.rb
 - lib/simple_model/simple_model_railtie.rb
 - lib/simple_model/validation.rb
@@ -103,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: simple_model
-rubygems_version: 1.8.6
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Simpifies building tableless models or models backed by webservices

data/Gemfile.lock

@@ -1,39 +0,0 @@
-PATH
-  remote: .
-  specs:
-    simple_model (1.1.0)
-      activemodel (~> 3.0)
-      activesupport (~> 3.0)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    ZenTest (4.6.2)
-    activemodel (3.1.1)
-      activesupport (= 3.1.1)
-      builder (~> 3.0.0)
-      i18n (~> 0.6)
-    activesupport (3.1.1)
-      multi_json (~> 1.0)
-    autotest (4.4.6)
-      ZenTest (>= 4.4.1)
-    builder (3.0.0)
-    diff-lcs (1.1.3)
-    i18n (0.6.0)
-    multi_json (1.0.3)
-    rspec (2.7.0)
-      rspec-core (~> 2.7.0)
-      rspec-expectations (~> 2.7.0)
-      rspec-mocks (~> 2.7.0)
-    rspec-core (2.7.1)
-    rspec-expectations (2.7.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.7.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  autotest
-  rspec
-  simple_model!