ohm-contrib 0.0.28 → 0.0.29

data/Rakefile

@@ -12,7 +12,7 @@ begin
     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 "ohm", ">= 0"
     gem.add_development_dependency "timecop", ">= 0"
     gem.add_development_dependency "mocha", ">= 0"
     gem.add_development_dependency "lunar", ">= 0"

data/VERSION

@@ -1 +1 @@
-0.0.28
+0.0.29

data/lib/ohm/contrib/boundaries.rb

@@ -21,11 +21,19 @@ module Ohm
 
     module ClassMethods
       def first(opts = {})
-        find(opts).sort(:start => 0, :limit => 1).first
+        if opts.any?
+          find(opts).first
+        else
+          all.first(opts)
+        end
       end
 
       def last(opts = {})
-        find(opts).sort(:start => 0, :limit => 1, :order => "DESC").first
+        if opts.any?
+          find(opts).first(:order => "DESC")
+        else
+          all.first(:order => "DESC")
+        end
       end
     end
   end

data/lib/ohm/contrib/extra_validations.rb

@@ -23,6 +23,8 @@ module Ohm
   #       assert_url     :url
   #       assert_email   :author_email
   #       assert_date    :birthday
+  #       assert_min_length :slug, 10
+  #       assert_max_length :slug, 25
   #     end
   #   end
   #
@@ -30,11 +32,12 @@ module Ohm
   #   post.valid?
   #   post.errors
   #   # [[:price, :not_decimal], [:state, :not_member], [:ipaddr, :not_ipaddr],
-  #   #  [:url, :not_url], [:author_email, :not_email]]
+  #   #  [:url, :not_url], [:author_email, :not_email],[:slug, :too_short]]
   module ExtraValidations
     include NumberValidations
     include WebValidations
     include DateValidations
+    include LengthValidations
 
   protected
     def assert_member(att, set, error = [att, :not_member])

data/lib/ohm/contrib/length_validations.rb

@@ -0,0 +1,31 @@
+module Ohm
+  module LengthValidations
+
+    def assert_min_length(att, length, error = [att, :too_short])
+      if assert_present(att, error)
+        m = send(att).to_s
+        assert is_long_enough?(m, length), error
+      end
+    end
+
+    def assert_max_length(att, length, error = [att, :too_long])
+      if assert_present(att, error)
+        m = send(att).to_s
+        assert is_too_long?(m, length), error
+      end
+    end
+
+    private
+    def is_too_long?(string, length)
+      string.size <= length
+    rescue ArgumentError
+      return false
+    end
+
+    def is_long_enough?(string, length)
+      string.size >= length
+    rescue ArgumentError
+      return false
+    end
+  end
+end

data/lib/ohm/contrib/locking.rb

@@ -29,11 +29,11 @@ module Ohm
     #
     # @see Model#mutex
     def lock!(wait = 0.1)
-      until db.setnx(key(:_lock), lock_timeout)
-        next unless lock = db.get(key(:_lock))
+      until key[:_lock].setnx(lock_timeout)
+        next unless lock = key[:_lock].get
         sleep(wait) and next unless lock_expired?(lock)
 
-        break unless lock = db.getset(key(:_lock), lock_timeout)
+        break unless lock = key[:_lock].getset(lock_timeout)
         break if lock_expired?(lock)
       end
     end
@@ -41,7 +41,7 @@ module Ohm
     # Release the lock.
     # @see Model#mutex
     def unlock!
-      db.del(key(:_lock))
+      key[:_lock].del
     end
 
     def lock_timeout

data/lib/ohm/contrib/lunar_macros.rb

@@ -39,7 +39,11 @@ module Ohm
           self.class.lunar_fields(type).each do |field|
             value = send(field)
             
-            i.send type, field, value  unless value.to_s.empty?
+            if type == :text and value.kind_of?(Enumerable)
+              i.text field, value.join(' ')  unless value.empty?
+            else
+              i.send type, field, value  unless value.to_s.empty?
+            end
           end
         end
       end

data/lib/ohm/contrib/typecast.rb

@@ -111,8 +111,17 @@ module Ohm
     class Time < Primitive
       delegate_to ::Time
 
+      YYYY_MM_DD = /\A([0-9]{4})-([01]?[0-9])-([0123]?[0-9])\z/
+      YYYY_MM_DD_HH_MM_SS = /\A([0-9]{4})-([01]?[0-9])-([0123]?[0-9]) ([\d]{1,2}):([\d]{1,2})(:([\d]{1,2}))?\z/
+
       def object
-        ::Time.parse(@raw)
+        if @raw =~ YYYY_MM_DD
+          ::Time.utc($1, $2, $3)
+        elsif @raw =~ YYYY_MM_DD_HH_MM_SS
+          ::Time.utc($1, $2, $3, $4, $5, $7)
+        else
+          ::Time.parse(@raw)
+        end
       end
     end
 

data/lib/ohm/contrib.rb

@@ -1,11 +1,12 @@
 module Ohm
   module Contrib
-    VERSION = '0.0.28'
+    VERSION = '0.0.29'
   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"
   autoload :DateValidations,   "ohm/contrib/date_validations"

data/ohm-contrib.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ohm-contrib}
-  s.version = "0.0.28"
+  s.version = "0.0.29"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Cyril David"]
-  s.date = %q{2010-07-02}
+  s.date = %q{2010-07-27}
   s.description = %q{Highly decoupled drop-in functionality for Ohm models}
   s.email = %q{cyx.ucron@gmail.com}
   s.extra_rdoc_files = [
@@ -28,6 +28,7 @@ Gem::Specification.new do |s|
      "lib/ohm/contrib/callbacks.rb",
      "lib/ohm/contrib/date_validations.rb",
      "lib/ohm/contrib/extra_validations.rb",
+     "lib/ohm/contrib/length_validations.rb",
      "lib/ohm/contrib/locking.rb",
      "lib/ohm/contrib/lunar_macros.rb",
      "lib/ohm/contrib/number_validations.rb",
@@ -43,6 +44,7 @@ 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_length_validations.rb",
      "test/test_ohm_lunar_macros.rb",
      "test/test_ohm_number_validations.rb",
      "test/test_ohm_slug.rb",
@@ -54,7 +56,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.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{A collection of ohm related modules}
   s.test_files = [
     "test/helper.rb",
@@ -63,6 +65,7 @@ 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_length_validations.rb",
      "test/test_ohm_lunar_macros.rb",
      "test/test_ohm_number_validations.rb",
      "test/test_ohm_slug.rb",
@@ -76,17 +79,15 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= 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"])
@@ -94,7 +95,6 @@ Gem::Specification.new do |s|
   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"])

data/test/test_ohm_boundaries.rb

@@ -60,14 +60,14 @@ class TestOhmBoundaries < Test::Unit::TestCase
     context "when searching name => linus" do
       test "linus is first and last" do
         assert_equal @linus, Person.first(:name => "linus")
-        assert_equal @linus, Person.last(:name => "linus")
+        assert_equal @linus, Person.last(:name => "linus") 
       end
     end
 
     context "when searching name => quentin" do
       should "have nil as first and last" do
         assert_nil Person.first(:name => "quentin")
-        assert_nil Person.last(:name => "quentin")
+        assert_nil Person.last(:name => "quentin")       
       end
     end
   end

data/test/test_ohm_length_validations.rb

@@ -0,0 +1,32 @@
+require "helper"
+
+class LengthValidationsTest < Test::Unit::TestCase
+  describe "length validation with a normal string column" do
+    class Person < Ohm::Model
+      include Ohm::LengthValidations
+
+      attribute :name
+      
+      def validate
+        assert_min_length :name, 5
+        assert_max_length :name, 10
+      end
+    end
+
+    test "valid length name" do
+      assert Person.new(:name => "bob smith").valid?
+    end
+
+    test "also catches short strings" do
+      assert ! Person.new(:name => "bob").valid?
+    end
+
+    test "also catches long strings" do
+      assert ! Person.new(:name => "robert smithson").valid?
+    end
+
+    test "invalid when empty" do
+      assert ! Person.new(:name => "").valid?
+    end
+  end
+end

data/test/test_ohm_typecast.rb

@@ -289,6 +289,50 @@ class TestOhmTypecast < Test::Unit::TestCase
     end
   end
 
+  context "timezones and the Time type" do
+    class Post < Ohm::Model
+      include Ohm::Typecast
+      
+      attribute :printed_at, Time
+    end
+
+    test "2010-08-07 is parsed as 2010-08-07 00:00:00 UTC" do
+      post = Post.new(:printed_at => "2010-08-07")
+      assert_equal Time.utc(2010, 8, 7).to_s, post.printed_at.utc.to_s
+
+      post.save
+      post = Post[post.id]
+      assert_equal Time.utc(2010, 8, 7).to_s, post.printed_at.utc.to_s
+    end
+
+    test "2010-08-07 00:00 is parsed as 2010-08-07 00:00:00 UTC" do
+      post = Post.new(:printed_at => "2010-08-07 00:00")
+      assert_equal Time.utc(2010, 8, 7).to_s, post.printed_at.utc.to_s
+
+      post.save
+      post = Post[post.id]
+      assert_equal Time.utc(2010, 8, 7).to_s, post.printed_at.utc.to_s
+    end
+
+    test "2010-08-07 18:29 is parsed as 2010-08-07 18:29:00 UTC" do
+      post = Post.new(:printed_at => "2010-08-07 18:29")
+      assert_equal Time.utc(2010, 8, 7, 18, 29).to_s, post.printed_at.utc.to_s
+
+      post.save
+      post = Post[post.id]
+      assert_equal Time.utc(2010, 8, 7, 18, 29).to_s, post.printed_at.utc.to_s
+    end
+
+    test "2010-08-07 18:29:31 is parsed as 2010-08-07 18:29:31 UTC" do
+      post = Post.new(:printed_at => "2010-08-07 18:29:31")
+      assert_equal Time.utc(2010, 8, 7, 18, 29, 31).to_s, post.printed_at.utc.to_s
+
+      post.save
+      post = Post[post.id]
+      assert_equal Time.utc(2010, 8, 7, 18, 29, 31).to_s, post.printed_at.utc.to_s
+    end
+  end
+  
   context "when using a date" do
     class Post < Ohm::Model
       include Ohm::Typecast

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 28
-  version: 0.0.28
+  - 29
+  version: 0.0.29
 platform: ruby
 authors: 
 - Cyril David
@@ -14,13 +14,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-02 00:00:00 +08:00
+date: 2010-07-27 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 
@@ -33,6 +34,7 @@ dependencies:
   name: redis
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -42,9 +44,10 @@ dependencies:
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: ohm
+  name: timecop
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -54,9 +57,10 @@ dependencies:
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: timecop
+  name: mocha
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -66,9 +70,10 @@ dependencies:
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: mocha
+  name: lunar
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -77,18 +82,6 @@ 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: []
@@ -110,6 +103,7 @@ files:
 - lib/ohm/contrib/callbacks.rb
 - lib/ohm/contrib/date_validations.rb
 - lib/ohm/contrib/extra_validations.rb
+- lib/ohm/contrib/length_validations.rb
 - lib/ohm/contrib/locking.rb
 - lib/ohm/contrib/lunar_macros.rb
 - lib/ohm/contrib/number_validations.rb
@@ -125,6 +119,7 @@ files:
 - test/test_ohm_contrib_callbacks.rb
 - test/test_ohm_date_validations.rb
 - test/test_ohm_extra_validations.rb
+- test/test_ohm_length_validations.rb
 - test/test_ohm_lunar_macros.rb
 - test/test_ohm_number_validations.rb
 - test/test_ohm_slug.rb
@@ -142,6 +137,7 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -149,6 +145,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -158,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A collection of ohm related modules
@@ -169,6 +166,7 @@ test_files:
 - test/test_ohm_contrib_callbacks.rb
 - test/test_ohm_date_validations.rb
 - test/test_ohm_extra_validations.rb
+- test/test_ohm_length_validations.rb
 - test/test_ohm_lunar_macros.rb
 - test/test_ohm_number_validations.rb
 - test/test_ohm_slug.rb