ohm-contrib 0.0.31 → 0.0.33

data/LICENSE

@@ -17,4 +17,5 @@ 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

@@ -198,4 +198,5 @@ 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

@@ -1,57 +1,8 @@
-require 'rubygems'
-require 'rake'
+require 'cutest'
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "ohm-contrib"
-    gem.summary = %Q{A collection of ohm related modules}
-    gem.description = %Q{Highly decoupled drop-in functionality for Ohm models}
-    gem.email = "cyx.ucron@gmail.com"
-    gem.homepage = "http://labs.sinefunc.com/ohm-contrib"
-    gem.authors = ["Cyril David"]
-    gem.add_development_dependency "contest", ">= 0"
-    gem.add_development_dependency "redis", ">= 0"
-    # 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
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
-
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
+task :test do
+  $:.unshift('./lib', './test')
 
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |test|
-    test.libs << 'test'
-    test.pattern = 'test/**/test_*.rb'
-    test.verbose = true
-  end
-rescue LoadError
-  task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
-  end
+  Cutest.run(Dir['./test/*_test.rb'])
 end
 
-task :test => :check_dependencies
-
-task :default => :test
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "ohm-contrib #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

data/lib/ohm/contrib.rb

@@ -1,11 +1,10 @@
 module Ohm
   module Contrib
-    VERSION = '0.0.31'
+    VERSION = '0.0.33'
   end
 
   autoload :Boundaries,        "ohm/contrib/boundaries"
   autoload :Timestamping,      "ohm/contrib/timestamping"
-  autoload :ToHash,            "ohm/contrib/to_hash"
   autoload :LengthValidations, "ohm/contrib/length_validations"
   autoload :WebValidations,    "ohm/contrib/web_validations"
   autoload :NumberValidations, "ohm/contrib/number_validations"
@@ -17,3 +16,4 @@ module Ohm
   autoload :LunarMacros,       "ohm/contrib/lunar_macros"
   autoload :Slug,              "ohm/contrib/slug"
 end
+

data/lib/ohm/contrib/boundaries.rb

@@ -38,3 +38,4 @@ module Ohm
     end
   end
 end
+

data/lib/ohm/contrib/callbacks.rb

@@ -12,7 +12,7 @@ module Ohm
   #    - after_save
   #    - before_delete
   #    - after_delete
-  # 
+  #
   # If you prefer to do a class level declaration that is also possible.
   #
   # @example
@@ -49,7 +49,7 @@ module Ohm
   #       # do something with the ids
   #     end
   #   end
- 
+
   module Callbacks
     def self.included(base)
       base.extend Macros
@@ -124,7 +124,7 @@ module Ohm
         @callbacks ||= Hash.new { |h, k| h[k] = Hash.new { |h, k| h[k] = [] }}
       end
     end
-  
+
     # This module is for class method overrides. As of now
     # it only overrides Ohm::Model::create to force calling save
     # instead of calling create so that Model.create will call
@@ -190,7 +190,7 @@ module Ohm
         execute_callback(:after, :delete)  if is_deleted
       end
     end
-  
+
   protected
     def before_validate() end
     def after_validate()  end
@@ -211,3 +211,4 @@ module Ohm
     end
   end
 end
+

data/lib/ohm/contrib/date_validations.rb

@@ -3,7 +3,7 @@ require 'date'
 module Ohm
   module DateValidations
     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_REGEX, error
         m = send(att).to_s.match(DATE_REGEX)
@@ -21,3 +21,4 @@ module Ohm
     end
   end
 end
+

data/lib/ohm/contrib/extra_validations.rb

@@ -45,3 +45,4 @@ module Ohm
     end
   end
 end
+

data/lib/ohm/contrib/length_validations.rb

@@ -29,3 +29,4 @@ module Ohm
     end
   end
 end
+

data/lib/ohm/contrib/locking.rb

@@ -52,4 +52,5 @@ module Ohm
       lock.to_f < Time.now.to_f
     end
   end
-end
+end
+

data/lib/ohm/contrib/lunar_macros.rb

@@ -19,11 +19,11 @@ module Ohm
       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| 
+        atts.each { |att|
           @lunar_fields[type] << att  unless @lunar_fields[type].include?(att)
         }
 
@@ -34,11 +34,11 @@ module Ohm
     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)
-            
+
             if type == :text and value.kind_of?(Enumerable)
               i.text field, value.join(' ')  unless value.empty?
             else
@@ -55,3 +55,4 @@ module Ohm
     end
   end
 end
+

data/lib/ohm/contrib/number_validations.rb

@@ -11,3 +11,4 @@ module Ohm
     end
   end
 end
+

data/lib/ohm/contrib/slug.rb

@@ -20,3 +20,4 @@ module Ohm
     end
   end
 end
+

data/lib/ohm/contrib/timestamping.rb

@@ -35,3 +35,4 @@ module Ohm
     end
   end
 end
+

data/lib/ohm/contrib/typecast.rb

@@ -316,3 +316,4 @@ module Ohm
     end
   end
 end
+

data/lib/ohm/contrib/web_validations.rb

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

data/test/autoload_test.rb

@@ -0,0 +1,19 @@
+# encoding: UTF-8
+
+require File.expand_path("./helper", File.dirname(__FILE__))
+
+test "autoloading of all libraries" do
+  assert_nothing_raised NameError, LoadError do
+    Ohm::Boundaries
+    Ohm::Timestamping
+    Ohm::WebValidations
+    Ohm::NumberValidations
+    Ohm::Typecast
+    Ohm::Locking
+    Ohm::ExtraValidations
+    Ohm::DateValidations
+    Ohm::LunarMacros
+    Ohm::Slug
+  end
+end
+

data/test/boundaries_test.rb

@@ -0,0 +1,45 @@
+# encoding: UTF-8
+
+require File.expand_path("./helper", File.dirname(__FILE__))
+
+class Person < Ohm::Model
+  include Ohm::Boundaries
+
+  attribute :name
+  index :name
+end
+
+test "first / last are nil when no records" do
+  assert nil == Person.first
+  assert nil == Person.last
+end
+
+test "first / last returns the only record when just 1 record" do
+  matz = Person.create(:name => "matz")
+
+  assert matz == Person.first
+  assert matz == Person.last
+end
+
+test "has chronological order by default" do
+  matz  = Person.create(:name => "matz")
+  linus = Person.create(:name => "linus")
+
+  assert matz == Person.first
+  assert linus == Person.last
+end
+
+test "respects filters passed in" do
+  matz  = Person.create(:name => "matz")
+  linus = Person.create(:name => "linus")
+
+  assert matz == Person.first(:name => "matz")
+  assert matz == Person.last(:name => "matz")
+
+  assert linus == Person.first(:name => "linus")
+  assert linus == Person.last(:name => "linus")
+
+  assert nil == Person.first(:name => "quentin")
+  assert nil == Person.last(:name => "quentin")
+end
+

data/test/callbacks_lint.rb

@@ -0,0 +1,105 @@
+test "save on invalid" do
+  post = Post.new
+  post.save
+
+  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
+
+test "saving a valid model" do
+  post = Post.new(:body => "The Body")
+  post.save
+
+  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
+
+test "ensure create / save callbacks are only called once" do
+  post = Post.new(:body => "The Body")
+  post.save
+
+  assert 1 == post.count(:do_before_create)
+  assert 1 == post.count(:do_after_create)
+  assert 1 == post.count(:do_before_save)
+  assert 1 == post.count(:do_after_create)
+end
+
+test "using Post::create on a valid model invokes all callbacks" do
+  post = Post.create(:body => "The Body")
+
+  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
+
+test "ensure Post::create only invokes save / create once" do
+  post = Post.create(:body => "The Body")
+
+  assert 1 == post.count(:do_before_create)
+  assert 1 == post.count(:do_after_create)
+  assert 1 == post.count(:do_before_save)
+  assert 1 == post.count(:do_after_create)
+end
+
+test "on successful save of existing record" do
+  post = Post.create(:body => "The Body")
+  post = Post[post.id]
+  post.save
+
+  assert ! post.did?(:do_before_create)
+  assert ! post.did?(:do_after_create)
+
+  assert post.did?(:do_before_validate)
+  assert post.did?(:do_after_validate)
+  assert post.did?(:do_before_save)
+  assert post.did?(:do_after_save)
+
+  assert 1 == post.count(:do_before_save)
+  assert 1 == post.count(:do_after_save)
+end
+
+test "on failed save of existing record" do
+  post = Post.create(:body => "The Body")
+  post = Post[post.id]
+
+  post.body = nil
+  post.save
+
+  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
+
+test "on delete" do
+  post = Post.create(:body => "The Body")
+  post = Post[post.id]
+  post.delete
+
+  assert 1 == post.count(:do_before_delete)
+  assert 1 == post.count(:do_after_delete)
+
+  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
+

data/test/date_validations_test.rb

@@ -0,0 +1,29 @@
+# encoding: UTF-8
+
+require File.expand_path("./helper", File.dirname(__FILE__))
+
+class Person < Ohm::Model
+  include Ohm::DateValidations
+
+  attribute :birthday
+
+  def validate
+    assert_date :birthday
+  end
+end
+
+test "accepts all canonical dates" do
+  assert Person.new(:birthday => "2010-05-05").valid?
+  assert Person.new(:birthday => "2010-5-5").valid?
+  assert Person.new(:birthday => "2010-05-5").valid?
+  assert Person.new(:birthday => "2010-5-05").valid?
+end
+
+test "also catches invalid dates" do
+  assert ! Person.new(:birthday => "2010-02-29").valid?
+end
+
+test "invalid when empty" do
+  assert ! Person.new(:birthday => "").valid?
+end
+