sohm 0.0.1 → 0.9.0

data/sohm.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "sohm"
-  s.version = "0.0.1"
+  s.version = "0.9.0"
   s.summary = %{Slim ohm for twemproxy-like system}
   s.description = %Q{Slim ohm is a forked ohm that works with twemproxy-like redis system, only a limited set of features in ohm is supported}
   s.authors = ["Xuejie Xiao"]

data/test/association.rb

@@ -1,10 +1,14 @@
 require_relative "helper"
 
-class User < Ohm::Model
+class User < Sohm::Model
+  include Sohm::AutoId
+
   collection :posts, :Post
 end
 
-class Post < Ohm::Model
+class Post < Sohm::Model
+  include Sohm::AutoId
+
   reference :user, :User
 end
 
@@ -21,13 +25,3 @@ test "basic shake and bake" do |u, p|
   p = Post[p.id]
   assert_equal u, p.user
 end
-
-test "memoization" do |u, p|
-  # This will read the user instance once.
-  p.user
-  assert_equal p.user, p.instance_variable_get(:@_memo)[:user]
-
-  # This will un-memoize the user instance
-  p.user = u
-  assert_equal nil, p.instance_variable_get(:@_memo)[:user]
-end

data/test/command.rb

@@ -22,11 +22,11 @@ scope do
   end
 
   test "special condition: single argument returns that arg" do
-    assert_equal "A", Ohm::Command[:sinterstore, "A"]
+    assert_equal "A", Sohm::Command[:sinterstore, "A"]
   end
 
   test "full stack test"  do |redis, nido|
-    cmd1 = Ohm::Command[:sinterstore, "A", "B"]
+    cmd1 = Sohm::Command[:sinterstore, "A", "B"]
 
     res = cmd1.call(nido, redis)
     assert_equal ["1"], redis.call("SMEMBERS", res)
@@ -34,8 +34,8 @@ scope do
     cmd1.clean
     assert_equal 0, redis.call("EXISTS", res)
 
-    cmd2 = Ohm::Command[:sinterstore, "C", "D", "E"]
-    cmd3 = Ohm::Command[:sunionstore, cmd1, cmd2]
+    cmd2 = Sohm::Command[:sinterstore, "C", "D", "E"]
+    cmd3 = Sohm::Command[:sunionstore, cmd1, cmd2]
 
     res = cmd3.call(nido, redis)
     assert_equal ["1", "12"], redis.call("SMEMBERS", res)
@@ -43,8 +43,8 @@ scope do
     cmd3.clean
     assert redis.call("KEYS", nido["*"]).empty?
 
-    cmd4 = Ohm::Command[:sinterstore, "F", "G", "H"]
-    cmd5 = Ohm::Command[:sdiffstore, cmd3, cmd4]
+    cmd4 = Sohm::Command[:sinterstore, "F", "G", "H"]
+    cmd5 = Sohm::Command[:sdiffstore, cmd3, cmd4]
 
     res = cmd5.call(nido, redis)
     assert_equal ["1"], redis.call("SMEMBERS", res)

data/test/connection.rb

@@ -1,16 +1,16 @@
 require_relative 'helper'
 
-test "model inherits Ohm.redis connection by default" do
-  class C < Ohm::Model
+test "model inherits Sohm.redis connection by default" do
+  class C < Sohm::Model
   end
 
-  assert_equal C.redis.url, Ohm.redis.url
+  assert_equal C.redis.url, Sohm.redis.url
 end
 
 test "model can define its own connection" do
-  class B < Ohm::Model
+  class B < Sohm::Model
     self.redis = Redic.new("redis://localhost:6379/1")
   end
 
-  assert B.redis.url != Ohm.redis.url
+  assert B.redis.url != Sohm.redis.url
 end

data/test/core.rb

@@ -1,6 +1,9 @@
+# coding: utf-8
 require_relative "helper"
 
-class Event < Ohm::Model
+class Event < Sohm::Model
+  include Sohm::AutoId
+
   attribute :name
   attribute :location
 end

data/test/counters.rb

@@ -2,7 +2,8 @@ require_relative "helper"
 
 $VERBOSE = false
 
-class Ad < Ohm::Model
+class Ad < Sohm::Model
+  include Sohm::AutoId
 end
 
 test "counters aren't overwritten by competing saves" do

data/test/enumerable.rb

@@ -1,7 +1,10 @@
 require_relative "helper"
 
 scope do
-  class Contact < Ohm::Model
+  class Contact < Sohm::Model
+    include Sohm::AutoId
+    include Sohm::IndexAll
+
     attribute :name
   end
 
@@ -37,10 +40,13 @@ scope do
 end
 
 scope do
-  class Comment < Ohm::Model
+  class Comment < Sohm::Model
+    include Sohm::AutoId
   end
 
-  class Post < Ohm::Model
+  class Post < Sohm::Model
+    include Sohm::AutoId
+
     list :comments, :Comment
   end
 

data/test/filtering.rb

@@ -1,6 +1,9 @@
 require_relative "helper"
 
-class User < Ohm::Model
+class User < Sohm::Model
+  include Sohm::AutoId
+  include Sohm::IndexAll
+
   attribute :fname
   attribute :lname
   attribute :status
@@ -35,16 +38,6 @@ test "sets aren't mutable" do |john, jane|
   end
 end
 
-test "#first" do |john, jane|
-  set = User.find(:lname => "Doe", :status => "active")
-
-  assert_equal jane, set.first(:by => "fname", :order => "ALPHA")
-  assert_equal john, set.first(:by => "fname", :order => "ALPHA DESC")
-
-  assert_equal "Jane", set.first(:by => "fname", :order => "ALPHA", :get => "fname")
-  assert_equal "John", set.first(:by => "fname", :order => "ALPHA DESC", :get => "fname")
-end
-
 test "#[]" do |john, jane|
   set = User.find(:lname => "Doe", :status => "active")
 
@@ -121,11 +114,15 @@ end
 
 # book author thing via @myobie
 scope do
-  class Book < Ohm::Model
+  class Book < Sohm::Model
+    include Sohm::AutoId
+
     collection :authors, :Author
   end
 
-  class Author < Ohm::Model
+  class Author < Sohm::Model
+    include Sohm::AutoId
+
     reference :book, :Book
 
     attribute :mood

data/test/hash_key.rb

@@ -1,6 +1,8 @@
 require_relative "helper"
 
-class Tag < Ohm::Model
+class Tag < Sohm::Model
+  include Sohm::AutoId
+
   attribute :name
 end
 

data/test/helper.rb

@@ -14,10 +14,12 @@ end unless defined?(silence_warnings)
 
 $VERBOSE = true
 
-require_relative "../lib/ohm"
+require_relative "../lib/sohm"
+require_relative "../lib/sohm/auto_id"
+require_relative "../lib/sohm/index_all"
 
-Ohm.redis = Redic.new("redis://127.0.0.1:6379")
+Sohm.redis = Redic.new("redis://127.0.0.1:6379")
 
 prepare do
-  Ohm.redis.call("FLUSHALL")
+  Sohm.redis.call("FLUSHALL")
 end

data/test/indices.rb

@@ -1,6 +1,8 @@
 require_relative "helper"
 
-class User < Ohm::Model
+class User < Sohm::Model
+  include Sohm::AutoId
+
   attribute :email
   attribute :update
   attribute :activation_code
@@ -35,7 +37,7 @@ test "be able to find by the given attribute" do
 end
 
 test "raise if the index doesn't exist" do
-  assert_raise Ohm::IndexNotFound do
+  assert_raise Sohm::IndexNotFound do
     User.find(:address => "foo")
   end
 end
@@ -51,13 +53,13 @@ test "raise an error if the parameter supplied is not a hash" do
 end
 
 test "avoid intersections with the all collection" do
-  assert_equal "User:indices:email:foo", User.find(:email => "foo").key
+  assert_equal "User:_indices:email:foo", User.find(:email => "foo").key
 end
 
 test "cleanup the temporary key after use" do
   assert User.find(:email => "foo", :activation_code => "bar").to_a
 
-  assert Ohm.redis.call("KEYS", "User:temp:*").empty?
+  assert Sohm.redis.call("KEYS", "User:temp:*").empty?
 end
 
 test "allow multiple chained finds" do
@@ -99,35 +101,3 @@ test "allow indexing by an arbitrary attribute" do
   assert [@user1, @user2] == gmail.sort_by { |u| u.id }
   assert [@user3] == User.find(:email_provider => "yahoo.com").to_a
 end
-
-scope do
-  # Just to give more context around this bug, basically it happens
-  # when you define a virtual unique or index.
-  #
-  # Previously it was unable to cleanup the indices mainly because
-  # it relied on the attributes being set.
-  class Node < Ohm::Model
-    index :available
-    attribute :capacity
-
-    unique :available
-
-    def available
-      capacity.to_i <= 90
-    end
-  end
-
-  test "index bug" do
-    n = Node.create
-    n.update(capacity: 91)
-
-    assert_equal 0, Node.find(available: true).size
-  end
-
-  test "uniques bug" do
-    n = Node.create
-    n.update(capacity: 91)
-
-    assert_equal nil, Node.with(:available, true)
-  end
-end

data/test/json.rb

@@ -1,12 +1,17 @@
 require_relative 'helper'
-require_relative "../lib/ohm/json"
+require_relative "../lib/sohm/json"
+
+class Venue < Sohm::Model
+  include Sohm::AutoId
 
-class Venue < Ohm::Model
   attribute :name
   list :programmers, :Programmer
 end
 
-class Programmer < Ohm::Model
+class Programmer < Sohm::Model
+  include Sohm::AutoId
+  include Sohm::IndexAll
+
   attribute :language
 
   index :language

data/test/list.rb

@@ -1,10 +1,13 @@
 require_relative "helper"
 
-class Post < Ohm::Model
+class Post < Sohm::Model
+  include Sohm::AutoId
+
   list :comments, :Comment
 end
 
-class Comment < Ohm::Model
+class Comment < Sohm::Model
+  include Sohm::AutoId
 end
 
 setup do
@@ -30,14 +33,6 @@ test "first / last / size / empty?" do |p, c1, c2, c3|
   assert ! p.comments.empty?
 end
 
-test "replace" do |p, c1, c2, c3|
-  c4 = Comment.create
-
-  p.comments.replace([c4])
-
-  assert_equal [c4], p.comments.to_a
-end
-
 test "push / unshift" do |p, c1, c2, c3|
   c4 = Comment.create
   c5 = Comment.create
@@ -65,7 +60,7 @@ end
 test "deleting main model cleans up the collection" do |p, _, _, _|
   p.delete
 
-  assert_equal 0, Ohm.redis.call("EXISTS", p.key[:comments])
+  assert_equal 0, Sohm.redis.call("EXISTS", p.key[:comments])
 end
 
 test "#ids returns an array with the ids" do |post, *comments|