ohm-contrib 0.0.26 → 0.0.27

data/.gitignore

@@ -22,3 +22,4 @@ pkg
 /.rvmrc
 /.yardoc
 /doc
+/tests

data/VERSION

@@ -1 +1 @@
-0.0.26
+0.0.27

data/lib/ohm/contrib/timestamping.rb

@@ -29,9 +29,9 @@ module Ohm
 
   protected
     def write
-      self.updated_at ||= Time.now.utc
+      self.updated_at = Time.now.utc
 
       super
     end
   end
-end
+end

data/lib/ohm/contrib.rb

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

data/ohm-contrib.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ohm-contrib}
-  s.version = "0.0.26"
+  s.version = "0.0.27"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Cyril David"]
-  s.date = %q{2010-06-19}
+  s.date = %q{2010-06-29}
   s.description = %q{Highly decoupled drop-in functionality for Ohm models}
   s.email = %q{cyx.ucron@gmail.com}
   s.extra_rdoc_files = [
@@ -50,7 +50,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",
@@ -70,7 +70,7 @@ 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"])

data/test/test_ohm_boundaries.rb

@@ -51,21 +51,15 @@ class TestOhmBoundaries < Test::Unit::TestCase
     end
 
     context "when searching name => matz" do
-      should "have matz as the first Person" do
+      test "matz is the first and last" do
         assert_equal @matz, Person.first(:name => "matz")
-      end
-
-      should "have matz as the last Person" do
         assert_equal @matz, Person.last(:name => "matz")
       end
     end
 
     context "when searching name => linus" do
-      should "have matz as the first Person" do
+      test "linus is first and last" do
         assert_equal @linus, Person.first(:name => "linus")
-      end
-
-      should "have matz as the last Person" do
         assert_equal @linus, Person.last(:name => "linus")
       end
     end
@@ -76,6 +70,5 @@ class TestOhmBoundaries < Test::Unit::TestCase
         assert_nil Person.last(:name => "quentin")
       end
     end
-
   end
 end

data/test/test_ohm_timestamping.rb

@@ -39,8 +39,11 @@ class TestOhmTimestamping < Test::Unit::TestCase
 
   context "on update" do
     setup do
+      Timecop.freeze(Time.utc(2010, 10, 30))
+
       @person = Person.create
       @old_created_at = @person.created_at.to_s
+      @old_updated_at = @person.updated_at.to_s
 
       @now = Time.utc(2010, 10, 31)
       Timecop.freeze(@now)
@@ -54,7 +57,8 @@ class TestOhmTimestamping < Test::Unit::TestCase
     end
 
     should "set updated_at to the current Time" do
+      assert_not_equal @old_updated_at, @person.updated_at
       assert_equal @now.to_s, @person.updated_at
     end
   end
-end
+end

data/test/test_ohm_to_hash.rb

@@ -47,7 +47,7 @@ class TestOhmToHash < Test::Unit::TestCase
   end
 
   context "when a comment has a reference to a person" do
-    Person = Class.new(Ohm::Model)
+    self::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

@@ -38,29 +38,29 @@ class TestOhmTypecast < Test::Unit::TestCase
   end
 
   context "when using a decimal" do
-    class Post < Ohm::Model
+    class PostDecimal < Ohm::Model
       include Ohm::Typecast
 
       attribute :price, Decimal
     end
 
     test "handles nil case correctly" do
-      post = Post.create(:price => nil)
-      post = Post[post.id]
+      post = PostDecimal.create(:price => nil)
+      post = PostDecimal[post.id]
 
       assert_nil post.price
     end
 
     test "handles empty string case correctly" do
-      post = Post.create(:price => "")
-      post = Post[post.id]
+      post = PostDecimal.create(:price => "")
+      post = PostDecimal[post.id]
 
       assert_equal "", post.price.to_s
     end
 
     test "allows for real arithmetic" do
-      post = Post.create(:price => "0.01")
-      post = Post[post.id]
+      post = PostDecimal.create(:price => "0.01")
+      post = PostDecimal[post.id]
 
       assert_equal 0.02,   post.price + post.price
       assert_equal 0.0,    post.price - post.price
@@ -69,8 +69,8 @@ class TestOhmTypecast < Test::Unit::TestCase
     end
 
     test "is accurate accdg to the decimal spec" do
-      post = Post.create(:price => "0.0001")
-      post = Post[post.id]
+      post = PostDecimal.create(:price => "0.0001")
+      post = PostDecimal[post.id]
 
       sum = 0
       1_000.times { sum += post.price }
@@ -78,22 +78,22 @@ class TestOhmTypecast < Test::Unit::TestCase
     end
 
     test "using += with price" do
-      post = Post.create(:price => "0.0001")
-      post = Post[post.id]
+      post = PostDecimal.create(:price => "0.0001")
+      post = PostDecimal[post.id]
 
       post.price += 1
       assert_equal 1.0001, post.price.to_f
     end
 
     test "assigning a raw BigDecimal" do
-      post = Post.create(:price => BigDecimal("399.50"))
-      post = Post[post.id]
+      post = PostDecimal.create(:price => BigDecimal("399.50"))
+      post = PostDecimal[post.id]
 
       assert_kind_of String, post.price.to_s
     end
 
     test "equality and comparable matching" do
-      post = Post.create(:price => "399.50")
+      post = PostDecimal.create(:price => "399.50")
       assert (post.price == "399.50")
       assert (post.price < 399.51)
       assert (post.price > 399.49)
@@ -104,7 +104,7 @@ class TestOhmTypecast < Test::Unit::TestCase
     end
 
     test "inspecting a Decimal" do
-      post = Post.new(:price => 399.50)
+      post = PostDecimal.new(:price => 399.50)
       assert_equal '"399.5"', post.price.inspect
 
       post.price = 'FooBar'
@@ -544,15 +544,15 @@ class TestOhmTypecast < Test::Unit::TestCase
       assert_equal addresses, post.addresses
     end
 
-    class Address < Struct.new(:city, :country)
-      def to_json
-        [city, country].to_json
+    class AddressArr < Class.new(Struct.new(:city, :country))
+      def to_json(*args)
+        [city, country].to_json(*args)
       end
     end
 
     test "handles an arbitrary class as an element of the array" do
-      addresses = [Address.new("Singapore", "SG"),
-                   Address.new("Philippines", "PH")]
+      addresses = [AddressArr.new("Singapore", "SG"),
+                   AddressArr.new("Philippines", "PH")]
 
       post = Post.create(:addresses => addresses)
       assert_equal [['Singapore', 'SG'], ['Philippines', 'PH']], post.addresses
@@ -612,7 +612,7 @@ class TestOhmTypecast < Test::Unit::TestCase
       end
 
       assert_raise TypeError do
-        Post.new(:addresses => Address.new)
+        Post.new(:addresses => AddressArr.new)
       end
     end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 26
-  version: 0.0.26
+  - 27
+  version: 0.0.27
 platform: ruby
 authors: 
 - Cyril David
@@ -14,13 +14,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-19 00:00:00 +08:00
+date: 2010-06-29 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 
@@ -45,6 +47,7 @@ dependencies:
   name: ohm
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -57,6 +60,7 @@ dependencies:
   name: timecop
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -69,6 +73,7 @@ dependencies:
   name: mocha
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -126,6 +131,7 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -133,6 +139,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 
@@ -142,7 +149,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