ohm-sorted 0.3.1 → 0.3.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTQwNzhmZDJmMjY0ZDBiNDg1MzdlZDExZTI1ZjE2NjFhMGY3ZDc0NQ==
+    NzM0ZTQ4YmIwNjYzYjUzNTlhOTQwYjgxNGVkNWRlYzhjMzJiNTFlMQ==
   data.tar.gz: !binary |-
-    N2YyOGE2NzQwMmM4ZjZjYjAzYjA4NzU4MzlkMjBiNWI1ODhkYTg3Yg==
-!binary "U0hBNTEy":
+    YWU4MmQ1MTU2ZjAwOGU4MTY2YTgwNmEwYmM3MDk5YmQxOTVjNmU2ZQ==
+SHA512:
   metadata.gz: !binary |-
-    YzY1NTEzOTM3NGM4N2I2MjA1ZTBhNjFlMjZhNTRiYmYxNjNhNmYwMjkwMGVm
-    Y2Q2NjE3NTUxZDg1Y2YwNWExOGE1ODc3MjBiZjU0NWViZmU5YjUxZDA3MDYy
-    NGU3OWQwODc0ZjMxOGJiMzU2ODJhZjJmOTkzMzczYzFmYzNhNGY=
+    ZTNmZDhhMzlkNGMzOWZlMmE2ZTA4M2MxYWIwNDlhOWY4YzBhYWVlMzliYzlj
+    ZjMwMGZiNTdjZDQ0ZjViYmQxOWQ4YmI1OWZiYmI5OTc2MTE4NGVlMzU2NzMx
+    Y2JmMzNmYmJkMzY0MzBlNmQ2MDgxMjU5YjJkZjFlODdmOTQ2MGM=
   data.tar.gz: !binary |-
-    YjVjMTljNzBlMjMzNGQyYzI0ODBhNWIyMTQ5NDU0ZmQ3ZjgxNDM1M2FjYzBi
-    M2I2NTQ1ZDE5YzE0YTUxYWU4YjI4NTVjYWU4NzczMzk5YmFjMDdlMjdjMzU2
-    OGQ4MDFjNGE0OWM3NTk2MzA1ODA0ZjZmYjFjNWQwZjgzNTEyODg=
+    MjM5NTYxMGQ0MjRmMjNkOGZlZjA2ODdlMWJiMzk2MTcyMjRhYmI0NDZlZThj
+    NTI2MjY2YThjZThkMzdmNjQyNmM1MjEzOGMzMjIyZTQ4OTIzMzgzZDkwMGFm
+    NDk4MDAzZjE3MmMwOTFlNzNjNDBhOWZlYzVhNDFkYzliYWZiNWM=

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+### 0.3.2
+
+ - You can now use `SortedSet#reverse` to query in reverse order.
+
+   For instance:
+
+   ```
+   Post.sorted_find(:created_at).reverse.between(Time.now - 10, Time.now)
+   ```
+
+ - `SortedSet#each` now returns an Enumerator when called without a block
+
 ### 0.3.1
 
  - Return correct set size for ranged sets

data/Gemfile

@@ -1,5 +1,2 @@
 source "https://rubygems.org"
-
-gem "appraisal"
-gem "ohm"
-gem "ohm-contrib"
+gemspec

data/Rakefile

@@ -1,6 +1,5 @@
 require "rake/testtask"
 require "appraisal"
-require "bundler/setup"
 
 REDIS_DIR = File.expand_path(File.join("..", "test"), __FILE__)
 REDIS_CNF = File.join(REDIS_DIR, "test.conf")

data/lib/ohm/sorted.rb

@@ -1,5 +1,10 @@
 require 'ohm'
-require 'ohm/contrib'
+
+begin
+  require 'ohm/callbacks'
+rescue LoadError
+  require 'ohm/contrib/callbacks'
+end
 
 module Ohm
 
@@ -13,6 +18,7 @@ module Ohm
       @namespace = namespace
       @model = model
       @options = options
+      @range = options.fetch(:range, ["-inf", "inf"])
     end
 
     def offset
@@ -28,11 +34,23 @@ module Ohm
     end
 
     def between(first, last)
-      range = first.to_f..last.to_f
+      range = [first.to_f, last.to_f]
+      range.reverse! if reversed?
+
       opts = @options.merge(range: range)
       RangedSortedSet.new(key, namespace, model, opts)
     end
 
+    def reversed?
+      @options.fetch(:reverse, false)
+    end
+
+    def reverse
+      opts = @options.merge(reverse: !reversed?, range: @range.reverse)
+
+      self.class.new(key, namespace, model, opts)
+    end
+
     def slice(*args)
       if args.count == 1
         self[args.first]
@@ -50,7 +68,11 @@ module Ohm
     end
 
     def ids
-      execute { |key| db.zrangebyscore(key, "-inf", "inf", limit: [offset, count]) }
+      if reversed?
+        execute { |key| db.zrevrangebyscore(key, @range.first, @range.last, limit: [offset, count]) }
+      else
+        execute { |key| db.zrangebyscore(key, @range.first, @range.last, limit: [offset, count]) }
+      end
     end
 
     def inspect
@@ -83,8 +105,12 @@ module Ohm
         model.db
       end
 
-      def each(&block)
-        ids.each { |id| block.call(model.to_proc[id]) }
+      def each
+        if block_given?
+          ids.each { |id| block.call(model.to_proc[id]) }
+        else
+          to_enum(:each)
+        end
       end
 
       def [](id)
@@ -111,16 +137,8 @@ module Ohm
   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) }
+      execute { |key| db.zcount(key, @range.first, @range.last) }
     end
   end
 
@@ -153,9 +171,8 @@ module Ohm
 
       def sorted_index_key(attribute, dict={})
         index_key = [key, "sorted", attribute]
-        if dict.keys.size == 1
-          index_key << dict.keys.first
-          index_key << dict.values.first
+        if dict.size == 1
+          index_key.concat(dict.first)
         elsif dict.keys.size > 1
           raise ArgumentError
         end
@@ -228,9 +245,7 @@ module Ohm
     end
 
     def update_sorted_indices
-      self.class.sorted_indices.each do |args|
-        attribute, options = *args
-
+      self.class.sorted_indices.each do |attribute, options|
         opts = {}
         if options.include?(:group_by)
           group_by = options[:group_by]

data/ohm-sorted.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'ohm-sorted'
-  s.version     = '0.3.1'
+  s.version     = '0.3.2'
   s.summary     = "Sorted indices for Ohm."
   s.description = "An plugin for Ohm that lets you create sorted indices."
   s.author      = "Federico Bond"
@@ -8,4 +8,8 @@ Gem::Specification.new do |s|
   s.files       = `git ls-files`.split("\n")
   s.homepage    = 'https://github.com/educabilia/ohm-sorted'
   s.license     = 'UNLICENSE'
+
+  s.add_development_dependency "appraisal"
+  s.add_development_dependency "ohm"
+  s.add_development_dependency "ohm-contrib"
 end

data/test/sorted_test.rb

@@ -1,5 +1,5 @@
 require 'test/unit'
-require 'ohm/sorted'
+require_relative '../lib/ohm/sorted'
 
 class Post < Ohm::Model
   include Ohm::Callbacks
@@ -158,4 +158,47 @@ class SortedTest < Test::Unit::TestCase
     sorted_set = Post.sorted_find(:order)
     assert !sorted_set.empty?
   end
+
+  def test_sorted_find_reverse
+    posts = []
+
+    posts << Post.create(order: 3)
+    posts << Post.create(order: 2)
+    posts << Post.create(order: 1)
+
+    assert_equal posts, Post.sorted_find(:order).reverse.to_a
+
+    assert_equal posts[0..1], Post.sorted_find(:order).reverse.slice(0, 2).to_a
+    assert_equal posts[1..2], Post.sorted_find(:order).reverse.slice(1, 2).to_a
+
+    assert_equal posts.reverse, Post.sorted_find(:order).reverse.reverse.to_a
+  end
+
+  def test_sorted_find_reverse_range
+    posts = []
+
+    posts << Post.create(order: 3)
+    posts << Post.create(order: 2)
+    posts << Post.create(order: 1)
+
+    assert_equal posts, Post.sorted_find(:order).reverse.between(1, 3).to_a
+
+    assert_equal posts[0..1], Post.sorted_find(:order).reverse.between(2, 3).to_a
+  end
+
+  def test_sorted_find_reverse_range_conmutative
+    posts = []
+
+    posts << Post.create(order: 3)
+    posts << Post.create(order: 2)
+    posts << Post.create(order: 1)
+
+    assert_equal posts, Post.sorted_find(:order).between(1, 3).reverse.to_a
+
+    assert_equal posts[0..1], Post.sorted_find(:order).between(2, 3).reverse.to_a
+  end
+
+  def test_each_without_block_returns_enumerable
+    assert Post.sorted_find(:order).each.kind_of?(Enumerator)
+  end
 end

metadata

@@ -1,15 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: ohm-sorted
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Federico Bond
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-10 00:00:00.000000000 Z
-dependencies: []
+date: 2013-10-07 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: ohm
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: ohm-contrib
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: An plugin for Ohm that lets you create sorted indices.
 email: federico@educabilia.com
 executables: []
@@ -48,7 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 2.1.5
 signing_key: 
 specification_version: 4
 summary: Sorted indices for Ohm.