ohm 1.0.0.rc1 → 1.0.0.rc2

data/test/model.rb

@@ -61,7 +61,7 @@ test "customized ID" do
   inv = Invoice.create
   assert_equal "_custom_id", inv.id
 
-  i = Invoice.create(id: "_diff_id")
+  i = Invoice.create(:id => "_diff_id")
   assert_equal "_diff_id", i.id
   assert_equal i, Invoice["_diff_id"]
 end
@@ -74,7 +74,7 @@ test "empty model is ok" do
 end
 
 test "counters are cleaned up during deletion" do
-  e = Event.create(name: "Foo")
+  e = Event.create(:name => "Foo")
   e.incr :votes, 10
 
   assert_equal 10, e.votes
@@ -93,7 +93,7 @@ test "return false if the validation fails" do
 end
 
 test "get" do
-  m = Meetup.create(name: "Foo")
+  m = Meetup.create(:name => "Foo")
   m.name = "Bar"
 
   assert_equal "Foo", m.get(:name)
@@ -101,7 +101,7 @@ test "get" do
 end
 
 test "set" do
-  m = Meetup.create(name: "Foo")
+  m = Meetup.create(:name => "Foo")
 
   m.set :name, "Bar"
   assert_equal "Bar", m.name
@@ -411,7 +411,7 @@ test "work on lists" do
   post.related.key.rpush(Post.create(:body => "B").id)
   post.related.key.rpush(Post.create(:body => "A").id)
 
-  res = post.related.sort_by(:body, order: "ALPHA ASC").map { |r| r.body }
+  res = post.related.sort_by(:body, :order => "ALPHA ASC").map { |r| r.body }
   assert_equal ["A", "B", "C"], res
 end
 
@@ -439,19 +439,19 @@ class Entry < Ohm::Model
 end
 
 setup do
-  Entry.create(tags: "foo bar baz")
+  Entry.create(:tags => "foo bar baz")
 end
 
 test "finding by one entry in the enumerable" do |entry|
-  assert Entry.find(tag: "foo").include?(entry)
-  assert Entry.find(tag: "bar").include?(entry)
-  assert Entry.find(tag: "baz").include?(entry)
+  assert Entry.find(:tag => "foo").include?(entry)
+  assert Entry.find(:tag => "bar").include?(entry)
+  assert Entry.find(:tag => "baz").include?(entry)
 end
 
 test "finding by multiple entries in the enumerable" do |entry|
-  assert Entry.find(tag: ["foo", "bar"]).include?(entry)
-  assert Entry.find(tag: ["bar", "baz"]).include?(entry)
-  assert Entry.find(tag: ["baz", "oof"]).empty?
+  assert Entry.find(:tag => ["foo", "bar"]).include?(entry)
+  assert Entry.find(:tag => ["bar", "baz"]).include?(entry)
+  assert Entry.find(:tag => ["baz", "oof"]).empty?
 end
 
 # Attributes of type Set
@@ -562,12 +562,12 @@ test "sort the model instances by the values provided" do
 end
 
 test "accept a number in the limit parameter" do
-  people = @event.attendees.sort_by(:name, limit: [0, 2], order: "ALPHA")
+  people = @event.attendees.sort_by(:name, :limit => [0, 2], :order => "ALPHA")
   assert %w[A B] == people.map { |person| person.name }
 end
 
 test "use the start parameter as an offset if the limit is provided" do
-  people = @event.attendees.sort_by(:name, limit: [1, 2], order: "ALPHA")
+  people = @event.attendees.sort_by(:name, :limit => [1, 2], :order => "ALPHA")
   assert %w[B C] == people.map { |person| person.name }
 end
 
@@ -742,7 +742,7 @@ test "typecast attributes" do
   end
 
   option = Option.create :votes => 20
-  option.update(votes: option.votes + 1)
+  option.update(:votes => option.votes + 1)
 
   assert_equal 21, option.votes
 end
@@ -758,7 +758,7 @@ test "poster-example for overriding writers" do
     end
   end
 
-  a = Advertiser.new(email: " FOO@BAR.COM ")
+  a = Advertiser.new(:email => " FOO@BAR.COM ")
   assert_equal "foo@bar.com", a.email
 end
 

data/test/pipeline-performance.rb

@@ -1,4 +1,6 @@
-require_relative "helper"
+# encoding: UTF-8
+
+require File.expand_path("./helper", File.dirname(__FILE__))
 
 Ohm.flush
 
@@ -14,14 +16,14 @@ class User < Ohm::Model
 end
 
 create = lambda do |i|
-  User.new(fname: "John#{i}",
-           lname: "Doe#{i}",
-           bday: Time.now.to_s,
-           gender: "Male",
-           city: "Los Angeles",
-           state: "CA",
-           country: "US",
-           zip: "90210").save
+  User.new(:fname => "John#{i}",
+           :lname => "Doe#{i}",
+           :bday => Time.now.to_s,
+           :gender => "Male",
+           :city => "Los Angeles",
+           :state => "CA",
+           :country => "US",
+           :zip => "90210").save
 end
 
 10.times(&create)
@@ -29,7 +31,7 @@ end
 require "benchmark"
 
 t1 = Benchmark.realtime do
-  User.all.sort_by(:fname, order: "DESC ALPHA").each do |user|
+  User.all.sort_by(:fname, :order => "DESC ALPHA").each do |user|
   end
 end
 
@@ -48,7 +50,7 @@ end
 90.times(&create)
 
 t1 = Benchmark.realtime do
-  User.all.sort_by(:fname, order: "DESC ALPHA").each do |user|
+  User.all.sort_by(:fname, :order => "DESC ALPHA").each do |user|
   end
 end
 

data/test/transactions.rb

@@ -45,11 +45,11 @@ end
 test "transaction local storage" do |db|
   t1 = Ohm::Transaction.new do |t|
     t.read do |s|
-      s.foo = db.type("foo")
+      s[:foo] = db.type("foo")
     end
 
     t.write do |s|
-      db.set("foo", s.foo.reverse)
+      db.set("foo", s[:foo].reverse)
     end
   end
 
@@ -62,7 +62,7 @@ test "composed transaction" do |db|
   t1 = Ohm::Transaction.new do |t|
     t.watch("foo")
 
-    t.write do |s|
+    t.write do
       db.set("foo", "bar")
     end
   end
@@ -70,7 +70,7 @@ test "composed transaction" do |db|
   t2 = Ohm::Transaction.new do |t|
     t.watch("foo")
 
-    t.write do |s|
+    t.write do
       db.set("foo", "baz")
     end
   end
@@ -158,13 +158,13 @@ end
 test "storage in composed transactions" do |db|
   t1 = Ohm::Transaction.new do |t|
     t.read do |s|
-      s.foo = db.type("foo")
+      s[:foo] = db.type("foo")
     end
   end
 
   t2 = Ohm::Transaction.new do |t|
     t.write do |s|
-      db.set("foo", s.foo.reverse)
+      db.set("foo", s[:foo].reverse)
     end
   end
 
@@ -176,11 +176,11 @@ end
 test "reading an storage entries that doesn't exist raises" do |db|
   t1 = Ohm::Transaction.new do |t|
     t.read do |s|
-      s.foo
+      s[:foo]
     end
   end
 
-  assert_raise NoMethodError do
+  assert_raise Ohm::Transaction::Store::NoEntryError do
     t1.commit(db)
   end
 end
@@ -188,13 +188,13 @@ end
 test "storage entries can't be overriden" do |db|
   t1 = Ohm::Transaction.new do |t|
     t.read do |s|
-      s.foo = db.type("foo")
+      s[:foo] = db.type("foo")
     end
   end
 
   t2 = Ohm::Transaction.new do |t|
     t.read do |s|
-      s.foo = db.exists("foo")
+      s[:foo] = db.exists("foo")
     end
   end
 
@@ -203,51 +203,38 @@ test "storage entries can't be overriden" do |db|
   end
 end
 
-__END__
-# We leave this here to indicate what the past behavior was with
-# model transactions.
-
-class Post < Ohm::Model
-  attribute :body
-  attribute :state
-  index :state
-
-  def before_save
-    self.body = body.to_s.strip
+test "banking transaction" do |db|
+  class A < Ohm::Model
+    attribute :amount
   end
 
-  def before_create
-    self.state = "draft"
+  class B < Ohm::Model
+    attribute :amount
   end
-end
-
-test "transactions in models" do |db|
-  p = Post.new(body: " foo ")
 
-  db.set "csv:foo", "A,B"
+  def transfer(amount, account1, account2)
+    Ohm.transaction do |t|
 
-  t1 = Ohm::Transaction.define do |t|
-    t.watch("csv:foo")
+      t.watch(account1.key, account2.key)
 
-    t.read do |s|
-      s.csv = db.get("csv:foo")
-    end
+      t.read do |s|
+        s[:available] = account1.get(:amount).to_i
+      end
 
-    t.write do |s|
-      db.set("csv:foo", s.csv + "," + "C")
+      t.write do |s|
+        if s[:available] >= amount
+          account1.key.hincrby(:amount, - amount)
+          account2.key.hincrby(:amount,   amount)
+        end
+      end
     end
   end
 
-  main = Ohm::Transaction.new(p.transaction_for_create, t1)
-  main.commit(db)
-
-  # Verify the Post transaction proceeded without a hitch
-  p = Post[p.id]
+  a = A.create :amount => 100
+  b = B.create :amount => 0
 
-  assert_equal "draft", p.state
-  assert_equal "foo", p.body
-  assert Post.find(state: "draft").include?(p)
+  transfer(100, a, b).commit(db)
 
-  # Verify that the second transaction happened
-  assert_equal "A,B,C", db.get("csv:foo")
+  assert_equal a.get(:amount), "0"
+  assert_equal b.get(:amount), "100"
 end

data/test/uniques.rb

@@ -17,7 +17,7 @@ class User < Ohm::Model
 end
 
 setup do
-  User.create(email: "a@a.com")
+  User.create(:email => "a@a.com")
 end
 
 test "findability" do |u|
@@ -26,12 +26,12 @@ end
 
 test "raises when it already exists during create" do
   assert_raise Ohm::UniqueIndexViolation do
-    User.create(email: "a@a.com")
+    User.create(:email => "a@a.com")
   end
 end
 
 test "raises when it already exists during save" do
-  u = User.create(email: "b@b.com")
+  u = User.create(:email => "b@b.com")
   u.email = "a@a.com"
 
   assert_raise Ohm::UniqueIndexViolation do
@@ -52,8 +52,8 @@ test "doesn't raise when saving again and again" do |u|
 end
 
 test "removes the previous index when changing" do
-  u = User.create(email: "c@c.com")
-  u.update(email: "d@d.com")
+  u = User.create(:email => "c@c.com")
+  u.update(:email => "d@d.com")
 
   assert_equal nil, User.with(:email, "c@c.com")
   assert_equal nil, User.key[:unique][:email].hget("c@c.com")
@@ -68,20 +68,20 @@ test "removes the previous index when deleting" do |u|
 end
 
 test "unique virtual attribute" do
-  u = User.create(email: "foo@yahoo.com")
+  u = User.create(:email => "foo@yahoo.com")
 
   assert_equal u, User.with(:provider, "yahoo")
 
   # Yahoo should be allowed because this user is the one reserved for it.
-  u.update(email: "bar@yahoo.com")
+  u.update(:email => "bar@yahoo.com")
 
   # `a` is not allowed though.
   assert_raise Ohm::UniqueIndexViolation do
-    u.update(email: "bar@a.com")
+    u.update(:email => "bar@a.com")
   end
 
   # And so is yahoo if we try creating a different user.
   assert_raise Ohm::UniqueIndexViolation do
-    User.create(email: "baz@yahoo.com")
+    User.create(:email => "baz@yahoo.com")
   end
 end

data/test/validations.rb

@@ -68,7 +68,7 @@ scope do
       event.save
 
       assert event.new?
-      assert_equal({capacity: [:not_numeric]}, event.errors)
+      assert_equal({:capacity => [:not_numeric]}, event.errors)
     end
 
     test "fail when the value is not numeric" do |event|
@@ -82,7 +82,7 @@ scope do
       event.save
 
       assert event.new?
-      assert_equal({capacity: [:not_numeric]}, event.errors)
+      assert_equal({:capacity => [:not_numeric]}, event.errors)
     end
 
     test "succeed when the value is numeric" do |event|
@@ -182,14 +182,14 @@ scope do
     test "fail when the attribute is nil" do |target|
       target.validate
 
-      assert_equal({ name: [:not_present] }, target.errors)
+      assert_equal({ :name => [:not_present] }, target.errors)
     end
 
     test "fail when the attribute is empty" do |target|
       target.name = ""
       target.validate
 
-      assert_equal({ name: [:not_present] }, target.errors)
+      assert_equal({ :name => [:not_present] }, target.errors)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ohm
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc1
+  version: 1.0.0.rc2
   prerelease: 6
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-03 00:00:00.000000000 Z
+date: 2012-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nest
-  requirement: &2155966540 !ruby/object:Gem::Requirement
+  requirement: &2151942880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2155966540
+  version_requirements: *2151942880
 - !ruby/object:Gem::Dependency
   name: scrivener
-  requirement: &2155963980 !ruby/object:Gem::Requirement
+  requirement: &2151941460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 0.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *2155963980
+  version_requirements: *2151941460
 - !ruby/object:Gem::Dependency
   name: cutest
-  requirement: &2155978980 !ruby/object:Gem::Requirement
+  requirement: &2151940600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: '0.1'
   type: :development
   prerelease: false
-  version_requirements: *2155978980
+  version_requirements: *2151940600
 - !ruby/object:Gem::Dependency
   name: batch
-  requirement: &2155978440 !ruby/object:Gem::Requirement
+  requirement: &2151936780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,7 +55,7 @@ dependencies:
         version: 0.0.1
   type: :development
   prerelease: false
-  version_requirements: *2155978440
+  version_requirements: *2151936780
 description: Ohm is a library that allows to store an object in Redis, a persistent
   key-value database. It includes an extensible list of validations and has very good
   performance.