ohm-contrib 0.0.16 → 0.0.17

data/README.markdown

@@ -106,4 +106,4 @@ Note on Patches/Pull Requests
 
 Copyright
 ---------
-Copyright (c) 2010 Cyril David. See LICENSE for details.
+Copyright (c) 2010 Cyril David. See LICENSE for details.

data/Rakefile

@@ -53,4 +53,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.16
+0.0.17

data/lib/ohm/contrib/boundaries.rb

@@ -23,11 +23,11 @@ module Ohm
       def first
         all.first
       end
-  
+
       # @todo Add support for passing in conditions
       def last
         self[db.get(key(:id))]
       end
     end
   end
-end
+end

data/lib/ohm/contrib/callbacks.rb

@@ -36,7 +36,7 @@ module Ohm
   #     end
   #   end
   #
- 
+
   module Callbacks
     def self.included(base)
       base.extend Macros
@@ -66,7 +66,7 @@ module Ohm
       #
       # @param [Symbol] method the method type, `:validate`, `:create`, or `:save`
       # @param [Symbol] callback the name of the method to execute
-      # @return [Array<callback>, nil] the callback wrapped in an array or nil 
+      # @return [Array<callback>, nil] the callback wrapped in an array or nil
       #   if the callback exists
       def before(method, callback)
         unless callbacks[:before][method].include? callback
@@ -97,18 +97,20 @@ module Ohm
       #
       # @param [Symbol] method the method type, `:validate`, `:create`, or `:save`
       # @param [Symbol] callback the name of the method to execute
-      # @return [Array<callback>, nil] the callback in an array or nil if the 
+      # @return [Array<callback>, nil] the callback in an array or nil if the
       #   callback exists
       def after(method, callback)
-        callbacks[:after][method] << callback
+        unless callbacks[:after][method].include? callback
+          callbacks[:after][method] << callback
+        end
       end
-      
+
       # @private internally used to maintain the state of callbacks
       def callbacks
         @callbacks ||= Hash.new { |h, k| h[k] = Hash.new { |h, k| h[k] = [] }}
       end
     end
-  
+
     # Overrides the validate method of Ohm::Model. This is a bit tricky,
     # since typically you override this. Make sure you do something like:
     #
@@ -128,7 +130,7 @@ module Ohm
       super
       execute_callback(:after, :validate)
     end
-    
+
     # The overriden create of Ohm::Model. It checks if the
     # model is valid, and executes all before :create callbacks.
     #
@@ -141,7 +143,7 @@ module Ohm
         execute_callback(:after, :create)  if is_created
       end
     end
-  
+
     # The overridden save of Ohm::Model. It checks if the model
     # is valid, and executes all before :save callbacks.
     #

data/lib/ohm/contrib/extra_validations.rb

@@ -5,7 +5,7 @@ module Ohm
   #
   #   class Post < Ohm::Model
   #     include Ohm::ExtraValidations
-  #     
+  #
   #     attribute :price
   #     attribute :state
   #     attribute :slug
@@ -36,6 +36,6 @@ module Ohm
   protected
     def assert_member(att, set, error = [att, :not_member])
       assert set.include?(send(att)), error
-    end    
+    end
   end
-end
+end

data/lib/ohm/contrib/locking.rb

@@ -5,9 +5,9 @@ module Ohm
   # In addition, since future ohm versions might drop mutexes, I thought it
   # might be a good idea to preseve this feature as a drop-in module.
   module Locking
-    # Lock the object before executing the block, and release it once the block 
+    # Lock the object before executing the block, and release it once the block
     # is done.
-    # 
+    #
     # @example
     #
     #   post = Order.create(:customer => Customer.create)
@@ -52,4 +52,4 @@ module Ohm
       lock.to_f < Time.now.to_f
     end
   end
-end
+end

data/lib/ohm/contrib/number_validations.rb

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

data/lib/ohm/contrib/timestamping.rb

@@ -34,4 +34,4 @@ module Ohm
       super
     end
   end
-end
+end

data/lib/ohm/contrib/to_hash.rb

@@ -3,7 +3,7 @@ module Ohm
   # is that it chose the albeit better whitelisted approach.
   #
   # @example
-  #   
+  #
   #   # this is the core Ohm#to_hash implementation
   #   class Post < Ohm::Model
   #     attribute :body
@@ -34,4 +34,4 @@ module Ohm
     end
     alias :to_h :to_hash
   end
-end
+end

data/lib/ohm/contrib/typecast.rb

@@ -71,10 +71,10 @@ module Ohm
     class Time < Primitive
       class << self
         extend Forwardable
-        def_delegators :Time, 
-          :_load, :apply_offset, :at, :gm, :httpdate, :json_create, :local, 
-          :make_time, :mktime, :month_days, :now, :parse, :rfc2822, 
-          :strptime, :utc, :w3cdtf, :xmlschema, :yaml_new, :zone_offset, 
+        def_delegators :Time,
+          :_load, :apply_offset, :at, :gm, :httpdate, :json_create, :local,
+          :make_time, :mktime, :month_days, :now, :parse, :rfc2822,
+          :strptime, :utc, :w3cdtf, :xmlschema, :yaml_new, :zone_offset,
           :zone_utc?
       end
 
@@ -87,10 +87,10 @@ module Ohm
     class Date < Primitive
       class << self
         extend Forwardable
-        def_delegators :Date, 
-          :_parse, :_strptime, :civil, :commercial, :gregorian_leap?, :jd, 
-          :json_create, :julian_leap?, :now, :nth_kday, :ordinal, :parse, :s3e, 
-          :strptime, :today, :valid_civil?, :valid_commercial?, :valid_jd?, 
+        def_delegators :Date,
+          :_parse, :_strptime, :civil, :commercial, :gregorian_leap?, :jd,
+          :json_create, :julian_leap?, :now, :nth_kday, :ordinal, :parse, :s3e,
+          :strptime, :today, :valid_civil?, :valid_commercial?, :valid_jd?,
           :valid_ordinal?, :weeknum
       end
 
@@ -100,14 +100,14 @@ module Ohm
       end
     end
   end
-  
-  # Provides unobtrusive, non-explosive typecasting.Instead of exploding on set 
-  # of an invalid value, this module takes the approach of just taking in 
-  # parameters and letting you do validation yourself. The only thing this 
+
+  # Provides unobtrusive, non-explosive typecasting.Instead of exploding on set
+  # of an invalid value, this module takes the approach of just taking in
+  # parameters and letting you do validation yourself. The only thing this
   # module does for you is the boilerplate casting you might need to do.
   #
   # @example
-  #   
+  #
   #   # without typecasting
   #   class Item < Ohm::Model
   #     attribute :price
@@ -122,7 +122,7 @@ module Ohm
   #   # => true
   #
   #   # you can opt to manually cast everytime, or do it in the model, i.e.
-  #   
+  #
   #   class Item
   #     def price
   #       BigDecimal(read_local(:price))
@@ -174,4 +174,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/lib/ohm/contrib.rb

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

data/ohm-contrib.gemspec

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

data/test/test_ohm_contrib.rb

@@ -48,4 +48,4 @@ class TestOhmContrib < Test::Unit::TestCase
       Ohm::ExtraValidations
     end
   end
-end
+end

data/test/test_ohm_contrib_callbacks.rb

@@ -5,7 +5,7 @@ class OhmContribCallbacksTest < Test::Unit::TestCase
     include Ohm::Callbacks
 
     attribute :body
-    
+
     before :validate, :do_before_validate
     after  :validate, :do_after_validate
 
@@ -25,13 +25,25 @@ class OhmContribCallbacksTest < Test::Unit::TestCase
       instance_variable_get("@#{ action }")
     end
 
+    def count(action)
+      instance_variable_get("@#{ action }")
+    end
+
   protected
-    def do_before_validate() @do_before_validate = true  end
-    def do_after_validate()  @do_after_validate = true   end
-    def do_before_create()   @do_before_create = true    end
-    def do_after_create()    @do_after_create = true     end
-    def do_before_save()     @do_before_save = true      end
-    def do_after_save()      @do_after_save = true       end
+    def do_before_validate() incr(:do_before_validate) end
+    def do_after_validate()  incr(:do_after_validate)  end
+    def do_before_create()   incr(:do_before_create)   end
+    def do_after_create()    incr(:do_after_create)    end
+    def do_before_save()     incr(:do_before_save)     end
+    def do_after_save()      incr(:do_after_save)      end
+
+    def incr(action)
+      val = instance_variable_get("@#{ action }")
+      val ||= 0
+      val += 1
+
+      instance_variable_set("@#{ action }", val)
+    end
   end
 
   context "on save when invalid state" do
@@ -39,9 +51,9 @@ class OhmContribCallbacksTest < Test::Unit::TestCase
       @post = Post.new
       @post.save
     end
-    
+
     should "still call before / after validate" do
-      assert @post.did?(:do_before_validate)      
+      assert @post.did?(:do_before_validate)
       assert @post.did?(:do_after_validate)
     end
 
@@ -58,7 +70,7 @@ class OhmContribCallbacksTest < Test::Unit::TestCase
       @post = Post.new(:body => "The Body")
       @post.save
     end
-    
+
     should "call all callbacks" do
       assert @post.did?(:do_before_validate)
       assert @post.did?(:do_after_validate)
@@ -67,6 +79,13 @@ class OhmContribCallbacksTest < Test::Unit::TestCase
       assert @post.did?(:do_before_save)
       assert @post.did?(:do_after_save)
     end
+
+    should "call create / save callbacks only once" do
+      assert_equal 1, @post.count(:do_before_create)
+      assert_equal 1, @post.count(:do_after_create)
+      assert_equal 1, @post.count(:do_before_save)
+      assert_equal 1, @post.count(:do_after_create)
+    end
   end
 
   context "on save of an existing object" do
@@ -76,7 +95,7 @@ class OhmContribCallbacksTest < Test::Unit::TestCase
 
       @post.save
     end
-    
+
     should "not call create related callbacks" do
       assert ! @post.did?(:do_before_create)
       assert ! @post.did?(:do_after_create)
@@ -87,7 +106,12 @@ class OhmContribCallbacksTest < Test::Unit::TestCase
       assert @post.did?(:do_after_validate)
       assert @post.did?(:do_before_save)
       assert @post.did?(:do_after_save)
-    end    
+    end
+
+    should "call save callbacks only once" do
+      assert_equal 1, @post.count(:do_before_save)
+      assert_equal 1, @post.count(:do_after_save)
+    end
   end
 
   context "on save of an existing invalid object" do
@@ -103,7 +127,7 @@ class OhmContribCallbacksTest < Test::Unit::TestCase
       assert @post.did?(:do_before_validate)
       assert @post.did?(:do_after_validate)
     end
-   
+
     should "not call create related callbacks" do
       assert ! @post.did?(:do_before_create)
       assert ! @post.did?(:do_after_create)
@@ -114,4 +138,4 @@ class OhmContribCallbacksTest < Test::Unit::TestCase
       assert ! @post.did?(:do_after_save)
     end
   end
-end
+end

data/test/test_ohm_extra_validations.rb

@@ -29,4 +29,4 @@ class OhmExtraValidationsTest < Test::Unit::TestCase
       assert_equal [[:state, :not_member]], order.errors
     end
   end
-end
+end

data/test/test_ohm_typecast.rb

@@ -209,7 +209,7 @@ class TestOhmTypecast < Test::Unit::TestCase
         Time
       end
     end
-    
+
     test "still able to access top level Time" do
       post = Post.new
       assert_equal post.now.to_s, Time.now.to_s
@@ -219,11 +219,11 @@ class TestOhmTypecast < Test::Unit::TestCase
       post = Post.new
       methods = [
         :_load, :apply_offset, :at, :gm, :httpdate, :json_create, :local,
-        :make_time, :mktime, :month_days, :new, :now, :parse, :rfc2822, 
-        :strptime, :utc, :w3cdtf, :xmlschema, :yaml_new, :zone_offset, 
+        :make_time, :mktime, :month_days, :new, :now, :parse, :rfc2822,
+        :strptime, :utc, :w3cdtf, :xmlschema, :yaml_new, :zone_offset,
         :zone_utc?
       ]
-      
+
       methods.each do |m|
         assert_respond_to post.time, m
       end
@@ -281,7 +281,7 @@ class TestOhmTypecast < Test::Unit::TestCase
         Date.today
       end
     end
-    
+
     test "still able to get top level methods" do
       assert_equal Date.today, Post.new.base_today
     end
@@ -290,9 +290,9 @@ class TestOhmTypecast < Test::Unit::TestCase
       post = Post.new
 
       methods = [
-        :_parse, :_strptime, :civil, :commercial, :gregorian_leap?, :jd, 
-        :json_create, :julian_leap?, :now, :nth_kday, :ordinal, :parse, :s3e, 
-        :strptime, :today, :valid_civil?, :valid_commercial?, :valid_jd?, 
+        :_parse, :_strptime, :civil, :commercial, :gregorian_leap?, :jd,
+        :json_create, :julian_leap?, :now, :nth_kday, :ordinal, :parse, :s3e,
+        :strptime, :today, :valid_civil?, :valid_commercial?, :valid_jd?,
         :valid_ordinal?, :weeknum
       ]
       methods.each do |m|
@@ -335,4 +335,4 @@ class TestOhmTypecast < Test::Unit::TestCase
       assert_equal Date.today, Post.new.today
     end
   end
-end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 16
-  version: 0.0.16
+  - 17
+  version: 0.0.17
 platform: ruby
 authors: 
 - Cyril David