ohm-sorted 0.3.3 → 0.3.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    N2ViM2QyN2RiM2MxZjlkMmQzZmNiYjU5NTg3MDZiMDdiYmI2YWQyOA==
+    ODM0YjY5ZGI2ZjdiNjk4Mjc0OGZkNTEwNjZlOTQ3NzcwYTRkNWI3NQ==
   data.tar.gz: !binary |-
-    MDQ3NTcwYTIwYmQzN2I4NDNiYjg4ODRjNmY3Y2NiNGQzMDI0NGU3MA==
+    MDNmZTcwMWNmNjBkNmExODdkMDc0MWFlM2M1NjAyZGZmZWI5YWRlMg==
 SHA512:
   metadata.gz: !binary |-
-    YWQ5N2FkODJhMjU2MGRlZDRhMGQxNWJiZmJjYmZmMmU1NjU1NWU4YmVkZWIw
-    OTkxMjU1NDZjMThkZWU1NTIwYjE1YzVlYzBkNmJiYWE5M2JjMTM2YzRlNTAz
-    MGI0ZjVlYjY5NzM4NjMyYjJiNjg4YjM4ZTg4YjNjMDlkZGNlN2E=
+    NDRiYzFhMzQ0N2YzODI5N2JkMDczOWNlN2QxNGQxNDRiMDgwYWRhYTY5YTFj
+    OWI3NmU2MzljYzFlNzZkYWVhYmZlOTYzN2I1ODQ2Y2I3NTE2YWViZmEzMmIy
+    YWRhYzliYzZmMTVmZjQyYmVmMGM2OWE5ZWU0NGVkMmIwODNmZDc=
   data.tar.gz: !binary |-
-    NDUyMzI2YmZiYmUwYTZmNmNjYTJjNjliZTlmYTBhYzhlODY3YWYxOTM2MmEw
-    MDUyN2ViMjE1MTZkNmNkOThlNjQwZDJjYmI3Y2MzOGEzMGQzMWI5YjZiMTE4
-    YTI2ZDZkZmQ0MDgxMGE2NzI5NjVhYjkzNWM4ZmEyOGFjZDY4NmM=
+    YzA4ZWNmOTM3OGU1OGUxOTY4NTcxYjZlNmU2ODI5NGZiMmJlOTRmZDI1ZDBj
+    YzM3MjViZWIyZDA4ZDc3MTQ3MDVjOTcwNTZkMjNhYTUzODIwYzkwYWJlNTcy
+    MjJhYTFlMWUzMjBiOGU3OTgxMjY1ODdkN2E1ZTQzMzEyNmRlZjM=

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+### 0.3.4
+
+ - Fix `SortedSet#size` when using slicing
+
 ### 0.3.3
 
  - Fix broken `SortedSet#each` behavior

data/lib/ohm/sorted.rb

@@ -30,7 +30,7 @@ module Ohm
     end
 
     def size
-      execute { |key| db.zcard(key) }
+      execute { |key| fix_size(db.zcard(key)) }
     end
 
     def between(first, last)
@@ -78,6 +78,11 @@ module Ohm
     def inspect
       "#<SortedSet (#{model}): #{ids}>"
     end
+
+  private
+    def fix_size(value)
+      [[value - offset, 0].max, count >= 0 ? count : Float::INFINITY].min
+    end
   end
 
   if defined?(BasicSet)
@@ -135,7 +140,7 @@ module Ohm
 
   class RangedSortedSet < SortedSet
     def size
-      execute { |key| db.zcount(key, @range.first, @range.last) }
+      execute { |key| fix_size(db.zcount(key, @range.first, @range.last)) }
     end
   end
 

data/ohm-sorted.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'ohm-sorted'
-  s.version     = '0.3.3'
+  s.version     = '0.3.4'
   s.summary     = "Sorted indices for Ohm."
   s.description = "An plugin for Ohm that lets you create sorted indices."
   s.author      = "Federico Bond"

data/test/sorted_test.rb

@@ -149,6 +149,21 @@ class SortedTest < Test::Unit::TestCase
     assert_equal 2, sorted_set.size
   end
 
+  def test_sorted_set_sliced_size
+    4.times do |i|
+      Post.create(order: i)
+    end
+
+    sorted_set = Post.sorted_find(:order).slice(2, 10)
+    assert_equal 2, sorted_set.size
+
+    sorted_set = Post.sorted_find(:order).slice(4, 1)
+    assert_equal 0, sorted_set.size
+
+    sorted_set = Post.sorted_find(:order).slice(1, 1)
+    assert_equal 1, sorted_set.size
+  end
+
   def test_sorted_set_empty
     sorted_set = Post.sorted_find(:order)
     assert sorted_set.empty?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ohm-sorted
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Federico Bond
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-08 00:00:00.000000000 Z
+date: 2014-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appraisal
@@ -90,7 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.5
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Sorted indices for Ohm.