ohm-zset 0.3 → 0.4

data/.gitignore

@@ -1,2 +1,4 @@
+*.gem
+
 ## MAC OS
 .DS_Store

data/README.md

@@ -59,6 +59,35 @@ b.zsmalls.to_a.map(&:name)
 # => ['S5', 'S4', 'S3', 'S6', 'S2', 'S1']
 ```
 
+You can also add an element with a custom score.
+
+```ruby
+class Big < Ohm::Model
+  include Ohm::ZScores
+  
+  zset :zcustom, :Bool, nil, ZScore::DateTime
+end
+
+class Bool < Ohm::Model
+  attribute :name
+  attribute :is_valid
+end
+
+b = Big.create
+b1 = Bool.create(name: 'B1', is_valid: "false")
+b2 = Bool.create(name: 'B2', is_valid: "true")
+b3 = Bool.create(name: 'B3', is_valid: "false")
+b4 = Bool.create(name: 'B4', is_valid: "true")
+
+b.zcustom.add(b1, "2012-07-29 06:24:20 +0800")
+b.zcustom.add(b2, "2012-07-25 06:24:20 +0800")
+b.zcustom.add(b3, "2012-07-30 06:24:20 +0800")
+b.zcustom.add(b4, "2012-07-27 06:24:20 +0800")
+
+b.zcustom.to_a.map(&:name)
+# => ['B2', 'B4', 'B1', 'B3']
+```
+
 You can update the score of an element by using *update*. There is also a *count* function that returns the number of elements with scores inside a specified range.
 
 ## Deleting Elements

data/lib/ohm-zset/version.rb

@@ -1,5 +1,5 @@
 module Ohm
   module Zset
-    VERSION = "0.3"
+    VERSION = "0.4"
   end
 end

data/lib/ohm-zset.rb

@@ -234,18 +234,22 @@ module Ohm
       size == 0
     end
 
-    def add(model)
+    def add(model, custom_score = nil)
       score_value = model
 
       lambda_function = score_field.each do |field|
         break field if field.is_a? Proc
 
-        score_value = model.send(field)
+        score_value = model.send(field) if custom_score.nil?
 
         break lambda{ |x| x.to_i } if field == score_field.last
       end
 
-      db.zadd(key, lambda_function.call(score_value), model.id)
+      if custom_score.nil?
+        db.zadd(key, lambda_function.call(score_value), model.id)
+      else
+        db.zadd(key, lambda_function.call(custom_score), model.id)
+      end
     end
 
     def add_list(*models)

data/test/unit/ohm-zset.rb

@@ -14,6 +14,7 @@ class Big < Ohm::Model
   zset :zbools2, :Bool, :name, ZScore::String
   zset :zbools3, :Bool, :name, ZScore::StringInsensitive
   zset :zbools4, :Bool, :name, ZScore::StringInsensitiveHigh
+  zset :zcustom, :Bool, nil, ZScore::DateTime
 end
 
 class Bool < Ohm::Model
@@ -660,4 +661,20 @@ describe Ohm do
 
     assert_equal sorted_set_2.to_a.map(&:name), sorted_set.to_a.map(&:name)
   end
+
+  it "can add element with custom score" do
+    b = Big.create
+    b1 = Bool.create(name: 'B1', is_valid: "false")
+    b2 = Bool.create(name: 'B2', is_valid: "true")
+    b3 = Bool.create(name: 'B3', is_valid: "false")
+    b4 = Bool.create(name: 'B4', is_valid: "true")
+
+    b.zcustom.add(b1, "2012-07-29 06:24:20 +0800")
+    b.zcustom.add(b2, "2012-07-25 06:24:20 +0800")
+    b.zcustom.add(b3, "2012-07-30 06:24:20 +0800")
+    b.zcustom.add(b4, "2012-07-27 06:24:20 +0800")
+
+    sorted_set = b.zcustom
+    assert_equal ['B2', 'B4', 'B1', 'B3'], sorted_set.to_a.map(&:name)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ohm-zset
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: '0.4'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-04 00:00:00.000000000 Z
+date: 2012-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ohm