ohm-contrib 0.0.27 → 0.0.28

data/Rakefile

@@ -15,6 +15,7 @@ begin
     gem.add_development_dependency "ohm", ">= 0"
     gem.add_development_dependency "timecop", ">= 0"
     gem.add_development_dependency "mocha", ">= 0"
+    gem.add_development_dependency "lunar", ">= 0"
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError
@@ -53,4 +54,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.27
+0.0.28

data/lib/ohm/contrib/callbacks.rb

@@ -1,6 +1,20 @@
 module Ohm
   # Minimalistic callback support for Ohm::Model.
   #
+  # You can implement callbacks by overriding any of the following
+  # methods:
+  #
+  #    - before_validate
+  #    - after_validate
+  #    - before_create
+  #    - after_create
+  #    - before_save
+  #    - after_save
+  #    - before_delete
+  #    - after_delete
+  # 
+  # If you prefer to do a class level declaration that is also possible.
+  #
   # @example
   #
   #   class Post < Ohm::Model
@@ -35,7 +49,7 @@ module Ohm
   #       # do something with the ids
   #     end
   #   end
-  #
+ 
   module Callbacks
     def self.included(base)
       base.extend Macros
@@ -171,16 +185,29 @@ module Ohm
 
     def delete
       execute_callback(:before, :delete)
+
       super.tap do |is_deleted|
         execute_callback(:after, :delete)  if is_deleted
       end
     end
+  
+  protected
+    def before_validate() end
+    def after_validate()  end
+    def before_save()     end
+    def after_save()      end
+    def before_create()   end
+    def after_create()    end
+    def before_delete()   end
+    def after_delete()    end
 
   private
     def execute_callback(position, method)
       self.class.callbacks[position][method].each do |callback|
         __send__(callback)
       end
+
+      __send__("#{ position }_#{ method }")
     end
   end
 end

data/lib/ohm/contrib/date_validations.rb

@@ -2,11 +2,11 @@ require 'date'
 
 module Ohm
   module DateValidations
-    DATE = /\A([0-9]{4})-([01]?[0-9])-([0123]?[0-9])\z/
+    DATE_REGEX = /\A([0-9]{4})-([01]?[0-9])-([0123]?[0-9])\z/
     
     def assert_date(att, error = [att, :not_date])
-      if assert_format att, DATE, error
-        m = send(att).to_s.match(DATE)
+      if assert_format att, DATE_REGEX, error
+        m = send(att).to_s.match(DATE_REGEX)
         assert is_date_parseable?(m[1], m[2], m[3]), error
       end
     end

data/lib/ohm/contrib/lunar_macros.rb

@@ -0,0 +1,53 @@
+begin
+  require 'lunar'
+rescue LoadError
+  raise "You have to install Lunar in order to use Ohm::LunarMacros."
+end
+
+module Ohm
+  module LunarMacros
+    def self.included(base)
+      base.send  :include, Ohm::Callbacks
+      base.after :save,   :update_lunar_index
+      base.after :delete, :delete_lunar_index
+
+      base.extend ClassMethods
+    end
+
+    module ClassMethods
+      def fuzzy(*atts)    lunar_fields(:fuzzy,    *atts) end
+      def text(*atts)     lunar_fields(:text,     *atts) end
+      def number(*atts)   lunar_fields(:number,   *atts) end
+      def sortable(*atts) lunar_fields(:sortable, *atts) end
+    
+      def lunar_fields(type, *atts)
+        @lunar_fields ||= Hash.new { |h, k| h[k] = [] }
+
+        atts.each { |att| 
+          @lunar_fields[type] << att  unless @lunar_fields[type].include?(att)
+        }
+
+        @lunar_fields[type]
+      end
+    end
+
+    def update_lunar_index
+      Lunar.index self.class do |i|
+        i.id id
+        
+        [:fuzzy, :text, :number, :sortable].each do |type|
+          self.class.lunar_fields(type).each do |field|
+            value = send(field)
+            
+            i.send type, field, value  unless value.to_s.empty?
+          end
+        end
+      end
+    end
+
+  protected
+    def delete_lunar_index
+      Lunar.delete self.class, id
+    end
+  end
+end

data/lib/ohm/contrib/number_validations.rb

@@ -1,12 +1,13 @@
 module Ohm
   # This module will include all numeric validation needs.
-  # As of VERSION 0.0.15, Ohm::NumberValidations#assert_decimal
+  # As of VERSION 0.0.27, Ohm::NumberValidations#assert_decimal
   # is the only method provided.
   module NumberValidations
+    DECIMAL_REGEX = /^(\d+)?(\.\d+)?$/
 
   protected
     def assert_decimal(att, error = [att, :not_decimal])
-      assert_format(att, /^(\d+)?(\.\d+)?$/, error)
+      assert_format att, DECIMAL_REGEX, error
     end
   end
-end
+end

data/lib/ohm/contrib/slug.rb

@@ -0,0 +1,22 @@
+module Ohm
+  module Slug
+    def self.included(base)
+      base.extend FinderOverride
+    end
+
+    module FinderOverride
+      def [](id)
+        super(id.to_i)
+      end
+    end
+
+    def slug(str = to_s)
+      str.gsub("'", "").gsub(/\p{^Alnum}/u, " ").strip.gsub(/\s+/, "-").downcase
+    end
+    module_function :slug
+
+    def to_param
+      "#{ id }-#{ slug }"
+    end
+  end
+end

data/lib/ohm/contrib/to_hash.rb

@@ -25,6 +25,8 @@ module Ohm
   #
   #   Post.create(:body => "Body").to_hash == { :id => 1, :body => "Body" }
   #   # => true
+  #
+  # @todo use super when Ohm has finally release their #to_hash impl.
   module ToHash
     def to_hash
       atts = attributes + counters
@@ -34,4 +36,4 @@ module Ohm
     end
     alias :to_h :to_hash
   end
-end
+end

data/lib/ohm/contrib/typecast.rb

@@ -75,7 +75,6 @@ module Ohm
         @raw.respond_to?(method)
       end
 
-    protected
       def object
         @raw
       end
@@ -88,7 +87,6 @@ module Ohm
     class Decimal < Primitive
       delegate_to ::BigDecimal
 
-    protected
       def object
         ::Kernel::BigDecimal(@raw)
       end
@@ -97,7 +95,6 @@ module Ohm
     class Integer < Primitive
       delegate_to ::Fixnum
 
-    protected
       def object
         ::Kernel::Integer(@raw)
       end
@@ -106,7 +103,6 @@ module Ohm
     class Float < Primitive
       delegate_to ::Float
 
-    protected
       def object
         ::Kernel::Float(@raw)
       end
@@ -115,7 +111,6 @@ module Ohm
     class Time < Primitive
       delegate_to ::Time
 
-    protected
       def object
         ::Time.parse(@raw)
       end
@@ -124,7 +119,6 @@ module Ohm
     class Date < Primitive
       delegate_to ::Date
 
-    protected
       def object
         ::Date.parse(@raw)
       end
@@ -175,7 +169,7 @@ module Ohm
     end
 
     class Hash < Serialized
-      RAW   = ::Hash
+      RAW = ::Hash
 
       delegate_to ::Hash
 
@@ -187,7 +181,7 @@ module Ohm
     end
 
     class Array < Serialized
-      RAW   = ::Array
+      RAW = ::Array
 
       delegate_to ::Array
 

data/lib/ohm/contrib.rb

@@ -1,6 +1,6 @@
 module Ohm
   module Contrib
-    VERSION = '0.0.27'
+    VERSION = '0.0.28'
   end
 
   autoload :Boundaries,        "ohm/contrib/boundaries"
@@ -13,4 +13,6 @@ module Ohm
   autoload :Typecast,          "ohm/contrib/typecast"
   autoload :Locking,           "ohm/contrib/locking"
   autoload :Callbacks,         "ohm/contrib/callbacks"
+  autoload :LunarMacros,       "ohm/contrib/lunar_macros"
+  autoload :Slug,              "ohm/contrib/slug"
 end

data/ohm-contrib.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ohm-contrib}
-  s.version = "0.0.27"
+  s.version = "0.0.28"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Cyril David"]
-  s.date = %q{2010-06-29}
+  s.date = %q{2010-07-02}
   s.description = %q{Highly decoupled drop-in functionality for Ohm models}
   s.email = %q{cyx.ucron@gmail.com}
   s.extra_rdoc_files = [
@@ -29,7 +29,9 @@ Gem::Specification.new do |s|
      "lib/ohm/contrib/date_validations.rb",
      "lib/ohm/contrib/extra_validations.rb",
      "lib/ohm/contrib/locking.rb",
+     "lib/ohm/contrib/lunar_macros.rb",
      "lib/ohm/contrib/number_validations.rb",
+     "lib/ohm/contrib/slug.rb",
      "lib/ohm/contrib/timestamping.rb",
      "lib/ohm/contrib/to_hash.rb",
      "lib/ohm/contrib/typecast.rb",
@@ -41,7 +43,9 @@ Gem::Specification.new do |s|
      "test/test_ohm_contrib_callbacks.rb",
      "test/test_ohm_date_validations.rb",
      "test/test_ohm_extra_validations.rb",
+     "test/test_ohm_lunar_macros.rb",
      "test/test_ohm_number_validations.rb",
+     "test/test_ohm_slug.rb",
      "test/test_ohm_timestamping.rb",
      "test/test_ohm_to_hash.rb",
      "test/test_ohm_typecast.rb",
@@ -50,7 +54,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://labs.sinefunc.com/ohm-contrib}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{A collection of ohm related modules}
   s.test_files = [
     "test/helper.rb",
@@ -59,7 +63,9 @@ Gem::Specification.new do |s|
      "test/test_ohm_contrib_callbacks.rb",
      "test/test_ohm_date_validations.rb",
      "test/test_ohm_extra_validations.rb",
+     "test/test_ohm_lunar_macros.rb",
      "test/test_ohm_number_validations.rb",
+     "test/test_ohm_slug.rb",
      "test/test_ohm_timestamping.rb",
      "test/test_ohm_to_hash.rb",
      "test/test_ohm_typecast.rb",
@@ -70,18 +76,20 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<contest>, [">= 0"])
       s.add_development_dependency(%q<redis>, [">= 0"])
       s.add_development_dependency(%q<ohm>, [">= 0"])
       s.add_development_dependency(%q<timecop>, [">= 0"])
       s.add_development_dependency(%q<mocha>, [">= 0"])
+      s.add_development_dependency(%q<lunar>, [">= 0"])
     else
       s.add_dependency(%q<contest>, [">= 0"])
       s.add_dependency(%q<redis>, [">= 0"])
       s.add_dependency(%q<ohm>, [">= 0"])
       s.add_dependency(%q<timecop>, [">= 0"])
       s.add_dependency(%q<mocha>, [">= 0"])
+      s.add_dependency(%q<lunar>, [">= 0"])
     end
   else
     s.add_dependency(%q<contest>, [">= 0"])
@@ -89,6 +97,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<ohm>, [">= 0"])
     s.add_dependency(%q<timecop>, [">= 0"])
     s.add_dependency(%q<mocha>, [">= 0"])
+    s.add_dependency(%q<lunar>, [">= 0"])
   end
 end
 

data/test/test_ohm_contrib.rb

@@ -54,4 +54,17 @@ class TestOhmContrib < Test::Unit::TestCase
       Ohm::DateValidations
     end
   end
+
+  test "autoloading of LunarMacros" do
+    require 'lunar'
+    assert_nothing_raised NameError, LoadError do
+      Ohm::LunarMacros
+    end
+  end
+
+  test "autoloading of Slug" do
+    assert_nothing_raised NameError, LoadError do
+      Ohm::Slug
+    end
+  end
 end

data/test/test_ohm_contrib_callbacks.rb

@@ -1,193 +1,375 @@
 require "helper"
 
 class OhmContribCallbacksTest < Test::Unit::TestCase
-  class Post < Ohm::Model
-    include Ohm::Callbacks
+  describe "instance level validation callbacks" do
+    class InstanceTypePost < Ohm::Model
+      include Ohm::Callbacks
 
-    attribute :body
+      attribute :body
 
-    before :validate, :do_before_validate
-    after  :validate, :do_after_validate
+      def validate
+        super
 
-    before :create,   :do_before_create
-    after  :create,   :do_after_create
+        assert_present :body
+      end
 
-    before :save,     :do_before_save
-    after  :save,     :do_after_save
+      def did?(action)
+        instance_variable_get("@#{ action }")
+      end
 
-    before :delete,   :do_before_delete
-    after  :delete,   :do_after_delete
+      def count(action)
+        instance_variable_get("@#{ action }")
+      end
 
-    def validate
-      super
+    protected
+      def before_validate() incr(:do_before_validate) end
+      def after_validate()  incr(:do_after_validate)  end
+      def before_create()   incr(:do_before_create)   end
+      def after_create()    incr(:do_after_create)    end
+      def before_save()     incr(:do_before_save)     end
+      def after_save()      incr(:do_after_save)      end
+      def before_delete()   incr(:do_before_delete)   end
+      def after_delete()    incr(:do_after_delete)    end
 
-      assert_present :body
+
+      def incr(action)
+        val = instance_variable_get("@#{ action }")
+        val ||= 0
+        val += 1
+
+        instance_variable_set("@#{ action }", val)
+      end
     end
 
-    def did?(action)
-      instance_variable_get("@#{ action }")
+    context "on save when invalid state" do
+      setup do
+        @post = InstanceTypePost.new
+        @post.save
+      end
+
+      should "still call before / after validate" do
+        assert @post.did?(:do_before_validate)
+        assert @post.did?(:do_after_validate)
+      end
+
+      should "not call all other callbacks" do
+        assert ! @post.did?(:do_before_create)
+        assert ! @post.did?(:do_after_create)
+        assert ! @post.did?(:do_before_save)
+        assert ! @post.did?(:do_after_save)
+      end
     end
 
-    def count(action)
-      instance_variable_get("@#{ action }")
+    context "on save when valid state" do
+      setup do
+        @post = InstanceTypePost.new(:body => "The Body")
+        @post.save
+      end
+
+      should "call all callbacks" do
+        assert @post.did?(:do_before_validate)
+        assert @post.did?(:do_after_validate)
+        assert @post.did?(:do_before_create)
+        assert @post.did?(:do_after_create)
+        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
 
-  protected
-    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 do_before_delete()   incr(:do_before_delete)   end
-    def do_after_delete()    incr(:do_after_delete)    end
+    context "on create when valid state" do
+      setup do
+        @post = InstanceTypePost.create(:body => "The Body")
+      end
+
+      should "call all callbacks" do
+        assert @post.did?(:do_before_validate)
+        assert @post.did?(:do_after_validate)
+        assert @post.did?(:do_before_create)
+        assert @post.did?(:do_after_create)
+        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
 
 
-    def incr(action)
-      val = instance_variable_get("@#{ action }")
-      val ||= 0
-      val += 1
+    context "on save of an existing object" do
+      setup do
+        @post = InstanceTypePost.create(:body => "The Body")
+        @post = InstanceTypePost[@post.id]
 
-      instance_variable_set("@#{ action }", val)
-    end
-  end
+        @post.save
+      end
+
+      should "not call create related callbacks" do
+        assert ! @post.did?(:do_before_create)
+        assert ! @post.did?(:do_after_create)
+      end
+
+      should "call the rest of the callbacks" do
+        assert @post.did?(:do_before_validate)
+        assert @post.did?(:do_after_validate)
+        assert @post.did?(:do_before_save)
+        assert @post.did?(:do_after_save)
+      end
 
-  context "on save when invalid state" do
-    setup do
-      @post = Post.new
-      @post.save
+      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
 
-    should "still call before / after validate" do
-      assert @post.did?(:do_before_validate)
-      assert @post.did?(:do_after_validate)
+    context "on save of an existing invalid object" do
+      setup do
+        @post = InstanceTypePost.create(:body => "The Body")
+        @post = InstanceTypePost[@post.id]
+
+        @post.body = nil
+        @post.save
+      end
+
+      should "call validation related callbacks" do
+        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)
+      end
+
+      should "also not call save related callbacks" do
+        assert ! @post.did?(:do_before_save)
+        assert ! @post.did?(:do_after_save)
+      end
     end
 
-    should "not call all other callbacks" do
-      assert ! @post.did?(:do_before_create)
-      assert ! @post.did?(:do_after_create)
-      assert ! @post.did?(:do_before_save)
-      assert ! @post.did?(:do_after_save)
+    context "on delete" do
+      setup do
+        @post = InstanceTypePost.create(:body => "The Body")
+        @post = InstanceTypePost[@post.id]
+        @post.delete
+      end
+
+
+      should "call delete related callbacks once" do
+        assert_equal 1, @post.count(:do_before_delete)
+        assert_equal 1, @post.count(:do_after_delete)
+      end
+
+      should "not call all other callbacks" do
+        assert ! @post.did?(:do_before_validate)
+        assert ! @post.did?(:do_after_validate)
+        assert ! @post.did?(:do_before_create)
+        assert ! @post.did?(:do_after_create)
+        assert ! @post.did?(:do_before_save)
+        assert ! @post.did?(:do_after_save)
+      end
     end
   end
 
-  context "on save when valid state" do
-    setup do
-      @post = Post.new(:body => "The Body")
-      @post.save
-    end
+  describe "macro level validation callbacks" do
+    class Post < Ohm::Model
+      include Ohm::Callbacks
 
-    should "call all callbacks" do
-      assert @post.did?(:do_before_validate)
-      assert @post.did?(:do_after_validate)
-      assert @post.did?(:do_before_create)
-      assert @post.did?(:do_after_create)
-      assert @post.did?(:do_before_save)
-      assert @post.did?(:do_after_save)
-    end
+      attribute :body
 
-    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
+      before :validate, :do_before_validate
+      after  :validate, :do_after_validate
 
-  context "on create when valid state" do
-    setup do
-      @post = Post.create(:body => "The Body")
-    end
+      before :create,   :do_before_create
+      after  :create,   :do_after_create
 
-    should "call all callbacks" do
-      assert @post.did?(:do_before_validate)
-      assert @post.did?(:do_after_validate)
-      assert @post.did?(:do_before_create)
-      assert @post.did?(:do_after_create)
-      assert @post.did?(:do_before_save)
-      assert @post.did?(:do_after_save)
-    end
+      before :save,     :do_before_save
+      after  :save,     :do_after_save
 
-    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
+      before :delete,   :do_before_delete
+      after  :delete,   :do_after_delete
 
+      def validate
+        super
 
-  context "on save of an existing object" do
-    setup do
-      @post = Post.create(:body => "The Body")
-      @post = Post[@post.id]
+        assert_present :body
+      end
 
-      @post.save
-    end
+      def did?(action)
+        instance_variable_get("@#{ action }")
+      end
 
-    should "not call create related callbacks" do
-      assert ! @post.did?(:do_before_create)
-      assert ! @post.did?(:do_after_create)
-    end
+      def count(action)
+        instance_variable_get("@#{ action }")
+      end
 
-    should "call the rest of the callbacks" do
-      assert @post.did?(:do_before_validate)
-      assert @post.did?(:do_after_validate)
-      assert @post.did?(:do_before_save)
-      assert @post.did?(:do_after_save)
-    end
+    protected
+      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 do_before_delete()   incr(:do_before_delete)   end
+      def do_after_delete()    incr(:do_after_delete)    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
-    setup do
-      @post = Post.create(:body => "The Body")
-      @post = Post[@post.id]
+      def incr(action)
+        val = instance_variable_get("@#{ action }")
+        val ||= 0
+        val += 1
 
-      @post.body = nil
-      @post.save
+        instance_variable_set("@#{ action }", val)
+      end
     end
 
-    should "call validation related callbacks" do
-      assert @post.did?(:do_before_validate)
-      assert @post.did?(:do_after_validate)
+    context "on save when invalid state" do
+      setup do
+        @post = Post.new
+        @post.save
+      end
+
+      should "still call before / after validate" do
+        assert @post.did?(:do_before_validate)
+        assert @post.did?(:do_after_validate)
+      end
+
+      should "not call all other callbacks" do
+        assert ! @post.did?(:do_before_create)
+        assert ! @post.did?(:do_after_create)
+        assert ! @post.did?(:do_before_save)
+        assert ! @post.did?(:do_after_save)
+      end
     end
 
-    should "not call create related callbacks" do
-      assert ! @post.did?(:do_before_create)
-      assert ! @post.did?(:do_after_create)
+    context "on save when valid state" do
+      setup do
+        @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)
+        assert @post.did?(:do_before_create)
+        assert @post.did?(:do_after_create)
+        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
 
-    should "also not call save related callbacks" do
-      assert ! @post.did?(:do_before_save)
-      assert ! @post.did?(:do_after_save)
+    context "on create when valid state" do
+      setup do
+        @post = Post.create(:body => "The Body")
+      end
+
+      should "call all callbacks" do
+        assert @post.did?(:do_before_validate)
+        assert @post.did?(:do_after_validate)
+        assert @post.did?(:do_before_create)
+        assert @post.did?(:do_after_create)
+        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
-  end
 
-  context "on delete" do
-    setup do
-      @post = Post.create(:body => "The Body")
-      @post = Post[@post.id]
-      @post.delete
-    end
 
+    context "on save of an existing object" do
+      setup do
+        @post = Post.create(:body => "The Body")
+        @post = Post[@post.id]
+
+        @post.save
+      end
+
+      should "not call create related callbacks" do
+        assert ! @post.did?(:do_before_create)
+        assert ! @post.did?(:do_after_create)
+      end
+
+      should "call the rest of the callbacks" do
+        assert @post.did?(:do_before_validate)
+        assert @post.did?(:do_after_validate)
+        assert @post.did?(:do_before_save)
+        assert @post.did?(:do_after_save)
+      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
 
-    should "call delete related callbacks once" do
-      assert_equal 1, @post.count(:do_before_delete)
-      assert_equal 1, @post.count(:do_after_delete)
+    context "on save of an existing invalid object" do
+      setup do
+        @post = Post.create(:body => "The Body")
+        @post = Post[@post.id]
+
+        @post.body = nil
+        @post.save
+      end
+
+      should "call validation related callbacks" do
+        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)
+      end
+
+      should "also not call save related callbacks" do
+        assert ! @post.did?(:do_before_save)
+        assert ! @post.did?(:do_after_save)
+      end
     end
 
-    should "not call all other callbacks" do
-      assert ! @post.did?(:do_before_validate)
-      assert ! @post.did?(:do_after_validate)
-      assert ! @post.did?(:do_before_create)
-      assert ! @post.did?(:do_after_create)
-      assert ! @post.did?(:do_before_save)
-      assert ! @post.did?(:do_after_save)
+    context "on delete" do
+      setup do
+        @post = Post.create(:body => "The Body")
+        @post = Post[@post.id]
+        @post.delete
+      end
+
+
+      should "call delete related callbacks once" do
+        assert_equal 1, @post.count(:do_before_delete)
+        assert_equal 1, @post.count(:do_after_delete)
+      end
+
+      should "not call all other callbacks" do
+        assert ! @post.did?(:do_before_validate)
+        assert ! @post.did?(:do_after_validate)
+        assert ! @post.did?(:do_before_create)
+        assert ! @post.did?(:do_after_create)
+        assert ! @post.did?(:do_before_save)
+        assert ! @post.did?(:do_after_save)
+      end
     end
   end
 end

data/test/test_ohm_lunar_macros.rb

@@ -0,0 +1,165 @@
+require "helper"
+
+class LunarMacrosTest < Test::Unit::TestCase
+  setup do
+    Ohm.flush
+  end
+
+  class Post < Ohm::Model
+    include Ohm::LunarMacros
+  end
+
+  test "fuzzy / text / number / sortable" do
+    Post.fuzzy :name
+    assert_equal [:name], Post.fuzzy
+
+    Post.text :name
+    assert_equal [:name], Post.text
+
+    Post.number :name
+    assert_equal [:name], Post.number
+
+    Post.sortable :name
+    assert_equal [:name], Post.sortable
+  end
+
+  test "fuzzy / text / number / sortable done twice" do
+    Post.fuzzy :name
+    Post.fuzzy :name
+    assert_equal [:name], Post.fuzzy
+
+    Post.text :name
+    Post.text :name
+    assert_equal [:name], Post.text
+
+    Post.number :name
+    Post.number :name
+    assert_equal [:name], Post.number
+
+    Post.sortable :name
+    Post.sortable :name
+    assert_equal [:name], Post.sortable
+  end
+  
+  context "on create" do
+    class Document < Ohm::Model
+      include Ohm::LunarMacros
+      
+      fuzzy    :filename
+      text     :content
+      number   :author_id
+      sortable :views
+
+      def filename()  "Filename" end
+      def content()   "Content"  end
+      def author_id() 100        end
+      def views()     15         end
+    end
+  
+    test "indexes filename" do
+      doc = stub("Doc", fuzzy: nil, text: nil, number: nil, sortable: nil)
+      Lunar.expects(:index).with(Document).yields(doc)
+
+      doc.expects(:id).with('1')
+      doc.expects(:fuzzy).with(:filename, 'Filename')
+      doc = Document.create
+    end
+
+    test "indexes content" do
+      doc = stub("Doc", fuzzy: nil, text: nil, number: nil, sortable: nil)
+      Lunar.expects(:index).with(Document).yields(doc)
+
+      doc.expects(:id).with('1')
+      doc.expects(:text).with(:content, 'Content')
+      doc = Document.create
+    end
+
+    test "indexes number" do
+      doc = stub("Doc", fuzzy: nil, text: nil, number: nil, sortable: nil)
+      Lunar.expects(:index).with(Document).yields(doc)
+
+      doc.expects(:id).with('1')
+      doc.expects(:number).with(:author_id, 100)
+      doc = Document.create
+    end
+
+    test "indexes sortable" do
+      doc = stub("Doc", fuzzy: nil, text: nil, number: nil, sortable: nil)
+      Lunar.expects(:index).with(Document).yields(doc)
+
+      doc.expects(:id).with('1')
+      doc.expects(:sortable).with(:views, 15)
+      doc = Document.create
+    end
+  end
+
+  context "on update" do
+    class Document < Ohm::Model
+      include Ohm::LunarMacros
+      
+      fuzzy    :filename
+      text     :content
+      number   :author_id
+      sortable :views
+
+      def filename()  "Filename" end
+      def content()   "Content"  end
+      def author_id() 100        end
+      def views()     15         end
+    end
+  
+    test "indexes filename" do
+      doc = stub("Doc", fuzzy: nil, text: nil, number: nil, sortable: nil)
+      Lunar.expects(:index).times(2).with(Document).yields(doc)
+
+      doc.expects(:id).times(2).with('1')
+      doc.expects(:fuzzy).times(2).with(:filename, 'Filename')
+      doc = Document.create
+      doc.save
+    end
+
+    test "indexes content" do
+      doc = stub("Doc", fuzzy: nil, text: nil, number: nil, sortable: nil)
+      Lunar.expects(:index).times(2).with(Document).yields(doc)
+
+      doc.expects(:id).times(2).with('1')
+      doc.expects(:text).times(2).with(:content, 'Content')
+      doc = Document.create
+      doc.save
+    end
+
+    test "indexes number" do
+      doc = stub("Doc", fuzzy: nil, text: nil, number: nil, sortable: nil)
+      Lunar.expects(:index).times(2).with(Document).yields(doc)
+
+      doc.expects(:id).times(2).with('1')
+      doc.expects(:number).times(2).with(:author_id, 100)
+      doc = Document.create
+      doc.save
+    end
+
+    test "indexes sortable" do
+      doc = stub("Doc", fuzzy: nil, text: nil, number: nil, sortable: nil)
+      Lunar.expects(:index).times(2).with(Document).yields(doc)
+
+      doc.expects(:id).times(2).with('1')
+      doc.expects(:sortable).times(2).with(:views, 15)
+      doc = Document.create
+      doc.save
+    end
+  end
+
+  context "on delete" do
+    test "executes Lunar.delete" do
+      doc = stub("Doc", id: nil, fuzzy: nil, text: nil, number: nil, 
+                        sortable: nil)
+
+      Lunar.expects(:index).with(Document).yields(doc)
+
+      doc = Document.create
+
+      Lunar.expects(:delete).with(Document, '1')
+      doc.delete
+    end
+  end
+end

data/test/test_ohm_slug.rb

@@ -0,0 +1,29 @@
+require "helper"
+
+class OhmSlugTest < Test::Unit::TestCase
+  module Finder
+    def [](id)
+      new(id)
+    end
+  end
+
+  class BaseWithoutToParam < Struct.new(:id)
+    extend Finder
+
+    include Ohm::Slug
+
+    def to_s
+      "A very Unique and Interesting String?'"
+    end
+  end
+
+  test "to_param" do
+    obj = BaseWithoutToParam.new(1)
+
+    assert_equal '1-a-very-unique-and-interesting-string', obj.to_param
+  end
+
+  test "finding" do
+    assert_equal 1, BaseWithoutToParam['1-a-very-unique'].id
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 27
-  version: 0.0.27
+  - 28
+  version: 0.0.28
 platform: ruby
 authors: 
 - Cyril David
@@ -14,14 +14,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-29 00:00:00 +08:00
+date: 2010-07-02 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: contest
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -34,7 +33,6 @@ dependencies:
   name: redis
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -47,7 +45,6 @@ dependencies:
   name: ohm
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -60,7 +57,6 @@ dependencies:
   name: timecop
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -73,7 +69,6 @@ dependencies:
   name: mocha
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -82,6 +77,18 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: lunar
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id006
 description: Highly decoupled drop-in functionality for Ohm models
 email: cyx.ucron@gmail.com
 executables: []
@@ -104,7 +111,9 @@ files:
 - lib/ohm/contrib/date_validations.rb
 - lib/ohm/contrib/extra_validations.rb
 - lib/ohm/contrib/locking.rb
+- lib/ohm/contrib/lunar_macros.rb
 - lib/ohm/contrib/number_validations.rb
+- lib/ohm/contrib/slug.rb
 - lib/ohm/contrib/timestamping.rb
 - lib/ohm/contrib/to_hash.rb
 - lib/ohm/contrib/typecast.rb
@@ -116,7 +125,9 @@ files:
 - test/test_ohm_contrib_callbacks.rb
 - test/test_ohm_date_validations.rb
 - test/test_ohm_extra_validations.rb
+- test/test_ohm_lunar_macros.rb
 - test/test_ohm_number_validations.rb
+- test/test_ohm_slug.rb
 - test/test_ohm_timestamping.rb
 - test/test_ohm_to_hash.rb
 - test/test_ohm_typecast.rb
@@ -131,7 +142,6 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -139,7 +149,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -149,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: A collection of ohm related modules
@@ -160,7 +169,9 @@ test_files:
 - test/test_ohm_contrib_callbacks.rb
 - test/test_ohm_date_validations.rb
 - test/test_ohm_extra_validations.rb
+- test/test_ohm_lunar_macros.rb
 - test/test_ohm_number_validations.rb
+- test/test_ohm_slug.rb
 - test/test_ohm_timestamping.rb
 - test/test_ohm_to_hash.rb
 - test/test_ohm_typecast.rb