ohm-contrib 0.0.4 → 0.0.5

data/LICENSE

@@ -17,4 +17,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.markdown

@@ -14,14 +14,14 @@ Example usage
 
     require 'ohm'
     require 'ohm/contrib'
-    
+
     class Post < Ohm::Model
       include Ohm::Timestamping
       include Ohm::ToHash
       include Ohm::Boundaries
       include Ohm::WebValidations
       include Ohm::NumberValidations
-        
+
       attribute :amount
       attribute :url
       attribute :poster_email
@@ -51,12 +51,12 @@ Example usage
     # Casting example
     class Product
       include Ohm::Typecast
-
-      attribute :price, :decimal
-      attribute :start_of_sale, :time
-      attribute :end_of_sale, :time
-      attribute :priority, :integer
-      attribute :rating, :float
+      
+      attribute :price, Decimal
+      attribute :start_of_sale, Time
+      attribute :end_of_sale, Time
+      attribute :priority, Integer
+      attribute :rating, Float
     end
 
 Credits
@@ -70,10 +70,10 @@ Note on Patches/Pull Requests
 * Add tests for it. This is important so I don't break it in a
   future version unintentionally.
 * Commit, do not mess with rakefile, version, or history.
-  (if you want to have your own version, that is fine but bump version in a 
+  (if you want to have your own version, that is fine but bump version in a
   commit by itself I can ignore when I pull)
 * Send me a pull request. Bonus points for topic branches.
 
 Copyright
 ---------
-Copyright (c) 2010 Cyril David. See LICENSE for details.
+Copyright (c) 2010 Cyril David. See LICENSE for details.

data/Rakefile

@@ -52,4 +52,4 @@ Rake::RDocTask.new do |rdoc|
   rdoc.title = "ohm-contrib #{version}"
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
-end
+end

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/lib/ohm/contrib.rb

@@ -1,6 +1,6 @@
 module Ohm
   module Contrib
-    VERSION = '0.0.4'
+    VERSION = '0.0.5'
   end
 
   autoload :Boundaries,        "ohm/contrib/boundaries"

data/lib/ohm/contrib/boundaries.rb

@@ -1,7 +1,7 @@
 module Ohm
   module Boundaries
     def self.included(base)
-      base.extend ClassMethods 
+      base.extend ClassMethods
     end
 
     module ClassMethods
@@ -14,4 +14,4 @@ module Ohm
       end
     end
   end
-end
+end

data/lib/ohm/contrib/number_validations.rb

@@ -6,4 +6,4 @@ module Ohm
       assert_format(att, /^(\d+)?(\.\d+)?$/, error)
     end
   end
-end
+end

data/lib/ohm/contrib/timestamping.rb

@@ -4,7 +4,7 @@ module Ohm
       base.attribute :created_at
       base.attribute :updated_at
     end
-    
+
     def create
       self.created_at ||= Time.now.utc
 
@@ -18,4 +18,4 @@ module Ohm
       super
     end
   end
-end
+end

data/lib/ohm/contrib/to_hash.rb

@@ -8,4 +8,4 @@ module Ohm
     end
     alias :to_h :to_hash
   end
-end
+end

data/lib/ohm/contrib/typecast.rb

@@ -22,7 +22,7 @@ module Ohm
     class Date < ::Date
       def self.[](value)
         return value if value.to_s.empty?
-        
+
         parse(value)
       rescue ArgumentError
         value
@@ -30,10 +30,16 @@ module Ohm
     end
 
     class Decimal
+      CANONICAL = /^(\d+)?(\.\d+)?(E[+\-]\d+)?$/
+
       def self.[](value)
         return value if value.to_s.empty?
 
-        BigDecimal(value)
+        if value.to_s =~ CANONICAL
+          BigDecimal(value)
+        else
+          value
+        end
       end
     end
 
@@ -64,7 +70,7 @@ module Ohm
     def self.included(base)
       base.extend Macros
     end
-    
+
     module Macros
       def attribute(name, type = String)
         define_method(name) do
@@ -79,4 +85,4 @@ module Ohm
       end
     end
   end
-end
+end

data/lib/ohm/contrib/web_validations.rb

@@ -32,4 +32,4 @@ module Ohm
         assert_ipv4(att, error)
     end
   end
-end
+end

data/ohm-contrib.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ohm-contrib}
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Cyril David"]

data/test/helper.rb

@@ -12,4 +12,4 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'ohm/contrib'
 
 class Test::Unit::TestCase
-end
+end

data/test/test_ohm_boundaries.rb

@@ -4,20 +4,20 @@ class TestOhmBoundaries < Test::Unit::TestCase
   setup do
     Ohm.flush
   end
-  
+
   class Person < Ohm::Model
     include Ohm::Boundaries
 
     attribute :name
   end
-  
+
   context "when there are no People" do
     should "have a nil Person.first" do
       assert_nil Person.first
     end
 
     should "have a nil Person.last" do
-      assert_nil Person.last 
+      assert_nil Person.last
     end
   end
 
@@ -31,7 +31,7 @@ class TestOhmBoundaries < Test::Unit::TestCase
     end
 
     should "have matz as the last person" do
-      assert_equal @matz, Person.last 
+      assert_equal @matz, Person.last
     end
   end
 
@@ -40,13 +40,13 @@ class TestOhmBoundaries < Test::Unit::TestCase
       @matz  = Person.create(:name => "matz")
       @linus = Person.create(:name => "linus")
     end
-    
+
     should "have matz as the first Person" do
       assert_equal @matz, Person.first
-    end    
+    end
 
     should "have linus as the last Person" do
       assert_equal @linus, Person.last
-    end    
+    end
   end
-end
+end

data/test/test_ohm_contrib.rb

@@ -30,10 +30,10 @@ class TestOhmContrib < Test::Unit::TestCase
       Ohm::NumberValidations
     end
   end
-  
+
   test "autoloading of Typecast" do
     assert_nothing_raised NameError, LoadError do
       Ohm::Typecast
     end
   end
-end
+end

data/test/test_ohm_number_validations.rb

@@ -12,7 +12,7 @@ class TestOhmNumberValidations < Test::Unit::TestCase
       assert_decimal :optional_price unless optional_price.to_s.empty?
     end
   end
-  
+
   context "given no price" do
     should "still validate as :not_decimal" do
       product = Product.new(:price => nil)
@@ -29,7 +29,7 @@ class TestOhmNumberValidations < Test::Unit::TestCase
       assert product.valid?
     end
   end
-  
+
   context "given 1 as a value" do
     should "validate as a decimal" do
       product = Product.new(:price => 1)
@@ -56,4 +56,4 @@ class TestOhmNumberValidations < Test::Unit::TestCase
       assert product.valid?
     end
   end
-end
+end

data/test/test_ohm_timestamping.rb

@@ -11,11 +11,11 @@ class TestOhmTimestamping < Test::Unit::TestCase
 
   context "a new? record" do
     should "have no created_at" do
-      assert_nil Person.new.created_at 
+      assert_nil Person.new.created_at
     end
 
     should "have no updated_at" do
-      assert_nil Person.new.updated_at 
+      assert_nil Person.new.updated_at
     end
   end
 
@@ -26,8 +26,8 @@ class TestOhmTimestamping < Test::Unit::TestCase
       @person = Person.create
       @person = Person[@person.id]
     end
-    
-    
+
+
     should "set the created_at equal to the current time" do
       assert_equal @now.to_s, @person.created_at
     end
@@ -48,13 +48,13 @@ class TestOhmTimestamping < Test::Unit::TestCase
       @person.save
       @person = Person[@person.id]
     end
-    
+
     should "leave created_at unchanged" do
       assert_equal @old_created_at, @person.created_at
     end
-    
+
     should "set updated_at to the current Time" do
       assert_equal @now.to_s, @person.updated_at
     end
   end
-end
+end

data/test/test_ohm_to_hash.rb

@@ -18,7 +18,7 @@ class TestOhmToHash < Test::Unit::TestCase
       @person = Person.create(:name => 'matz', :skills => 10)
       @person = Person[@person.id]
     end
-    
+
     should "have a to_hash of { id: 1, name: 'matz', age: nil, skills: 10 }" do
       assert_equal(
         { :id => '1', :name => "matz", :age => nil, :skills => '10' },
@@ -26,7 +26,7 @@ class TestOhmToHash < Test::Unit::TestCase
       )
     end
   end
-  
+
   context "when a Post has a votes counter" do
     class Post < Ohm::Model
       include Ohm::ToHash
@@ -48,7 +48,7 @@ class TestOhmToHash < Test::Unit::TestCase
 
   context "when a comment has a reference to a person" do
     Person = Class.new(Ohm::Model)
-    
+
     class Comment < Ohm::Model
       include Ohm::ToHash
 
@@ -64,4 +64,4 @@ class TestOhmToHash < Test::Unit::TestCase
       assert_equal({ :id => '1', :person_id => '1' }, @comment.to_hash)
     end
   end
-end
+end

data/test/test_ohm_typecast.rb

@@ -29,7 +29,7 @@ class TestOhmTypecast < Test::Unit::TestCase
       @time = Time.now.utc
       product = Product.create(:start_of_sale => @time)
       product = Product[product.id]
-      
+
       assert_equal @time, product.start_of_sale
     end
 
@@ -37,7 +37,7 @@ class TestOhmTypecast < Test::Unit::TestCase
       @time = Time.now.utc
       product = Product.create(:start_of_sale => @time)
       product = Product[product.id]
-       
+
       assert_kind_of Time, product.start_of_sale
     end
 
@@ -78,16 +78,16 @@ class TestOhmTypecast < Test::Unit::TestCase
       @date = Date.today
       product = Product.create(:date_bought => @date)
       product = Product[product.id]
-      
+
       assert_kind_of Date, product.date_bought
     end
 
     test "assigning a string which is not a valid date before persisting" do
       product = Product.create(:date_bought => "Bla Bla")
-      
+
       assert_equal "Bla Bla", product.date_bought
     end
-  
+
     test "when nil" do
       assert_nil Product.new.date_bought
     end
@@ -156,4 +156,25 @@ class TestOhmTypecast < Test::Unit::TestCase
       assert_equal 0.12, Product.new(:vat => ".12").vat
     end
   end
-end
+
+  context "trying to validate numericality of a decimal" do
+    class Item < Ohm::Model
+      include Ohm::Typecast
+
+      attribute :price, Decimal
+
+      def validate
+        assert_numeric :price
+      end
+    end
+
+    setup do
+      @item = Item.new(:price => "FooBar")
+    end
+
+    test "invalidation of price" do
+      assert ! @item.valid?
+      assert_equal [[:price, :not_numeric]], @item.errors
+    end
+  end
+end

data/test/test_ohm_web_validations.rb

@@ -26,7 +26,7 @@ class TestOhmWebValidations < Test::Unit::TestCase
       assert_email :email
     end
   end
-  
+
   context "The slug should be valid" do
     def setup
       @blog_post_01 = BlogPost.new
@@ -36,7 +36,7 @@ class TestOhmWebValidations < Test::Unit::TestCase
     should "fail if the slug is not valid" do
       @blog_post_01.slug = "This is a title, not a SLUG"
       @blog_post_01.create
-      
+
       assert @blog_post_01.new?
       assert_equal [[:slug, :not_slug]], @blog_post_01.errors
     end
@@ -108,6 +108,6 @@ class TestOhmWebValidations < Test::Unit::TestCase
       assert @comment.new?
       assert @comment.errors.include? [:homepage, :not_url]
     end
-    
+
   end
-end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Cyril David