ohm-sorted 0.3.0 → 0.3.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmEwYzFiOTIwOGU3OWZhMGM2OTMzY2M4OTM1NTdmZTQ5Yzc4ZmUxMQ==
+    YTQwNzhmZDJmMjY0ZDBiNDg1MzdlZDExZTI1ZjE2NjFhMGY3ZDc0NQ==
   data.tar.gz: !binary |-
-    MGQ3YzdhZjUwYTQwNzJkZjJjOWEyOTQzYzQxNmJmYjFhNWI3YTc5Ng==
+    N2YyOGE2NzQwMmM4ZjZjYjAzYjA4NzU4MzlkMjBiNWI1ODhkYTg3Yg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MzE1Y2VjYzZiYjFkZjU2ZDExZWI5ZDYxMTllZmYyYWQ1ZWUzNDVmYTk5YmVi
-    NGFmMDExNmU4OTc0ZThjNzE3ZDRiZGZmNDBjYzk3NWQxZGY1MDRhZjNmYWEx
-    M2Y1YTJjNzBhYjc4Mjk3ZjgxMTVjOWY1ODg1Y2I0ZDkxZDdhN2Y=
+    YzY1NTEzOTM3NGM4N2I2MjA1ZTBhNjFlMjZhNTRiYmYxNjNhNmYwMjkwMGVm
+    Y2Q2NjE3NTUxZDg1Y2YwNWExOGE1ODc3MjBiZjU0NWViZmU5YjUxZDA3MDYy
+    NGU3OWQwODc0ZjMxOGJiMzU2ODJhZjJmOTkzMzczYzFmYzNhNGY=
   data.tar.gz: !binary |-
-    NjEzNTQ1M2JkYzk4MmQ3YmVjZmNkZjE0ZTc5NWQwYThiZDUzMDJjNjdmZTI3
-    Nzg1NDVmNzc2YTRhZGEwMjE0NTM0YjM5ZTEzZGEzMmZiN2FkOWY0ZjczYjZm
-    YjQ1MDM5ZTVmOWU1ZTQwMjg5MzEzMjY1ZjNlZGIzOTZjZDE4ZTc=
+    YjVjMTljNzBlMjMzNGQyYzI0ODBhNWIyMTQ5NDU0ZmQ3ZjgxNDM1M2FjYzBi
+    M2I2NTQ1ZDE5YzE0YTUxYWU4YjI4NTVjYWU4NzczMzk5YmFjMDdlMjdjMzU2
+    OGQ4MDFjNGE0OWM3NTk2MzA1ODA0ZjZmYjFjNWQwZjgzNTEyODg=

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+### 0.3.1
+
+ - Return correct set size for ranged sets
+
+### 0.3.0
+
+ - Simplify query API
+
 ### 0.2.1
 
  - Fix empty? method for SortedSet in Ohm legacy

data/lib/ohm/sorted.rb

@@ -15,10 +15,6 @@ module Ohm
       @options = options
     end
 
-    def range
-      @options.fetch(:range, "-inf".."inf")
-    end
-
     def offset
       @options.fetch(:offset, 0)
     end
@@ -27,10 +23,14 @@ module Ohm
       @options.fetch(:count, -1)
     end
 
+    def size
+      execute { |key| db.zcard(key) }
+    end
+
     def between(first, last)
       range = first.to_f..last.to_f
       opts = @options.merge(range: range)
-      SortedSet.new(key, namespace, model, opts)
+      RangedSortedSet.new(key, namespace, model, opts)
     end
 
     def slice(*args)
@@ -39,17 +39,22 @@ module Ohm
       elsif args.count == 2
         offset, count = *args
         opts = @options.merge(offset: offset, count: count)
-        SortedSet.new(key, namespace, model, opts)
+        self.class.new(key, namespace, model, opts)
       else
         raise ArgumentError
       end
     end
 
+    def first
+      slice(0, 1).to_a.first
+    end
+
     def ids
-      execute do |key|
-        db.zrangebyscore(key, range.begin, range.end,
-          limit: [offset, count])
-      end
+      execute { |key| db.zrangebyscore(key, "-inf", "inf", limit: [offset, count]) }
+    end
+
+    def inspect
+      "#<SortedSet (#{model}): #{ids}>"
     end
   end
 
@@ -57,14 +62,6 @@ module Ohm
     class SortedSet < BasicSet
       include SortedMethods
 
-      def size
-        execute { |key| db.zcard(key) }
-      end
-
-      def first
-        fetch(execute { |key| db.zrange(key, 0, 1) }).first
-      end
-
     private
       def exists?(id)
         execute { |key| !!db.zscore(key, id) }
@@ -82,17 +79,6 @@ module Ohm
     class SortedSet < Model::Collection
       include Ohm::SortedMethods
 
-      attr :key
-      attr :namespace
-      attr :model
-
-      def initialize(key, namespace, model, options={})
-        @key = key
-        @model = model
-        @namespace = namespace
-        @options = options
-      end
-
       def db
         model.db
       end
@@ -105,10 +91,6 @@ module Ohm
         model[id] if !!db.zrank(key, id)
       end
 
-      def size
-        db.zcard(key)
-      end
-
       def empty?
         size == 0
       end
@@ -117,19 +99,10 @@ module Ohm
         ids.map(&model)
       end
 
-      def first
-        id = db.zrange(key, 0, 1).first
-        model[id] unless id.empty?
-      end
-
       def include?(model)
         !!db.zrank(key, model.id)
       end
 
-      def inspect
-        "#<SortedSet (#{model}): #{db.zrange(key, 0, -1).inspect}>"
-      end
-
     private
       def execute
         yield key
@@ -137,6 +110,20 @@ module Ohm
     end
   end
 
+  class RangedSortedSet < SortedSet
+    def range
+      @options.fetch(:range)
+    end
+
+    def ids
+      execute { |key| db.zrangebyscore(key, range.begin, range.end, limit: [offset, count]) }
+    end
+
+    def size
+      execute { |key| db.zcount(key, range.begin, range.end) }
+    end
+  end
+
   module Sorted
     def self.included(model)
       model.extend(ClassMethods)

data/ohm-sorted.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'ohm-sorted'
-  s.version     = '0.3.0'
+  s.version     = '0.3.1'
   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

@@ -140,6 +140,15 @@ class SortedTest < Test::Unit::TestCase
     assert_equal 1, sorted_set.size
   end
 
+  def test_sorted_set_between_size
+    4.times do |i|
+      Post.create(order: i)
+    end
+
+    sorted_set = Post.sorted_find(:order).between(2, 3)
+    assert_equal 2, sorted_set.size
+  end
+
   def test_sorted_set_empty
     sorted_set = Post.sorted_find(:order)
     assert sorted_set.empty?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ohm-sorted
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Federico Bond