mock_redis 0.5.5 → 0.6.0

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+### 0.6.0
+* Support for `#sort` (ascending and descending only)
+
 ### 0.5.5
 * Support exclusive ranges in `zcount`
 * List methods (`lindex`, `lrange`, `lset`, and `ltrim`) can take string indexes

data/README.md

@@ -51,6 +51,9 @@ necessary exceptions.
 
 * `#info` just returns canned values; they don't update over time.
 
+* `#sort` supports ascending and descending sort. `ALPHA` sort is not yet
+  supported.
+
 ## Unsupported Commands
 
 Some stuff, we just can't do with a single Ruby object in a single
@@ -79,10 +82,6 @@ please submit a pull request with your (tested!) implementation.
 * `#config(:get|:set|:resetstat)` isn't done. They can just return
   canned values.
 
-* `#sort` isn't done. We just haven't gotten to it yet. The input
-  validation will be a pain in the butt, but other than that, it
-  shouldn't be too bad.
-
 ## Running the Tests
 
 If you want to work on this, you'll probably want to run the

data/lib/mock_redis/database.rb

@@ -5,6 +5,7 @@ require 'mock_redis/list_methods'
 require 'mock_redis/set_methods'
 require 'mock_redis/string_methods'
 require 'mock_redis/zset_methods'
+require 'mock_redis/sort_method'
 
 class MockRedis
   class Database
@@ -13,6 +14,7 @@ class MockRedis
     include SetMethods
     include StringMethods
     include ZsetMethods
+    include SortMethod
 
     attr_reader :data, :expire_times
 

data/lib/mock_redis/sort_method.rb

@@ -0,0 +1,82 @@
+require 'mock_redis/assertions'
+
+class MockRedis
+  module SortMethod
+    include Assertions
+
+    def sort(key, options={})
+      return [] if key.nil?
+
+      enumerable = data[key]
+
+      return [] if enumerable.nil?
+
+      by           = options[:by]
+      limit        = options[:limit] || []
+      store        = options[:store]
+      get_patterns = Array(options[:get])
+      order        = options[:order] || "ASC"
+      direction    = order.split.first
+
+      projected = project(enumerable, by, get_patterns)
+      sorted    = sort_by(projected, direction)
+      sliced    = slice(sorted, limit)
+
+      store ? rpush(store, sliced) : sliced
+    end
+
+    private
+
+    ASCENDING_SORT  = Proc.new { |a, b| a.first <=> b.first }
+    DESCENDING_SORT = Proc.new { |a, b| b.first <=> a.first }
+
+    def project(enumerable, by, get_patterns)
+      enumerable.map do |*elements|
+        element = elements.last
+        weight  = by ? lookup_from_pattern(by, element) : element
+        value   = element
+
+        if get_patterns.length > 0
+          value = get_patterns.map do |pattern|
+            pattern == "#" ? element : lookup_from_pattern(pattern, element)
+          end
+          value = value.first if value.length == 1
+        end
+
+        [weight, value]
+      end
+    end
+
+    def sort_by(projected, direction)
+      sorter =
+        case direction.upcase
+          when "DESC"
+            DESCENDING_SORT
+          when "ASC", "ALPHA"
+            ASCENDING_SORT
+          else
+            raise "Invalid direction '#{direction}'"
+        end
+
+      projected.sort(&sorter).map(&:last)
+    end
+
+    def slice(sorted, limit)
+      skip = limit.first || 0
+      take = limit.last || sorted.length
+
+      sorted[skip...(skip + take)] || sorted
+    end
+
+    def lookup_from_pattern(pattern, element)
+      key = pattern.sub('*', element)
+
+      if (hash_parts = key.split('->')).length > 1
+        hget hash_parts.first, hash_parts.last
+      else
+        get key
+      end
+    end
+
+  end
+end

data/lib/mock_redis/version.rb

@@ -1,3 +1,3 @@
 class MockRedis
-  VERSION = '0.5.5'
+  VERSION = '0.6.0'
 end

data/spec/commands/setbit_spec.rb

@@ -21,7 +21,7 @@ describe "#setbit(key, offset)" do
 
   it "does the right thing with multibyte characters" do
     @redises.set(@key, "€99.94")   # the euro sign is 3 bytes wide in UTF-8
-    # @redises.setbit(@key, 63, 1).should == 0
+    @redises.setbit(@key, 63, 1).should == 0
     @redises.get(@key).should == "€99.95"
   end
 
@@ -43,4 +43,4 @@ describe "#setbit(key, offset)" do
 
   it_should_behave_like "a string-only command"
 end
-
+ 

data/spec/commands/sort_list_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+describe '#sort(key, options)' do
+  before do
+    @key = "mock-redis-test:list_sort"
+
+    @redises.rpush(@key, '1')
+    @redises.rpush(@key, '2')
+
+    @redises.set('mock-redis-test:values_1', 'a')
+    @redises.set('mock-redis-test:values_2', 'b')
+
+    @redises.set('mock-redis-test:weight_1', '2')
+    @redises.set('mock-redis-test:weight_2', '1')
+
+    @redises.hset('mock-redis-test:hash_1', 'key', 'x')
+    @redises.hset('mock-redis-test:hash_2', 'key', 'y')
+  end
+
+  it_should_behave_like "a sortable"
+end

data/spec/commands/sort_set_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+describe '#sort(key, options)' do
+  before do
+    @key = "mock-redis-test:set_sort"
+
+    @redises.sadd(@key, '1')
+    @redises.sadd(@key, '2')
+
+    @redises.set('mock-redis-test:values_1', 'a')
+    @redises.set('mock-redis-test:values_2', 'b')
+
+    @redises.set('mock-redis-test:weight_1', '2')
+    @redises.set('mock-redis-test:weight_2', '1')
+
+    @redises.hset('mock-redis-test:hash_1', 'key', 'x')
+    @redises.hset('mock-redis-test:hash_2', 'key', 'y')
+  end
+
+  it_should_behave_like "a sortable"
+end

data/spec/commands/sort_zset_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+describe '#sort(key, options)' do
+  before do
+    @key = "mock-redis-test:zset_sort"
+
+    @redises.zadd(@key, 100, '1')
+    @redises.zadd(@key, 99, '2')
+
+    @redises.set('mock-redis-test:values_1', 'a')
+    @redises.set('mock-redis-test:values_2', 'b')
+
+    @redises.set('mock-redis-test:weight_1', '2')
+    @redises.set('mock-redis-test:weight_2', '1')
+
+    @redises.hset('mock-redis-test:hash_1', 'key', 'x')
+    @redises.hset('mock-redis-test:hash_2', 'key', 'y')
+  end
+
+  it_should_behave_like "a sortable"
+end

data/spec/support/shared_examples/sorts_enumerables.rb

@@ -0,0 +1,56 @@
+shared_examples_for "a sortable" do
+  it 'returns empty array on nil' do
+    @redises.sort(nil).should == []
+  end
+
+  context 'ordering' do
+    it 'orders ascending by default' do
+      @redises.sort(@key).should == ['1', '2']
+    end
+
+    it 'orders by descending when specified' do
+      @redises.sort(@key, :order => "DESC").should == ['2', '1']
+    end
+  end
+
+  context 'projections' do
+    it 'projects element when :get is "#"' do
+      @redises.sort(@key, :get => '#').should == ['1', '2']
+    end
+
+    it 'projects through a key pattern' do
+      @redises.sort(@key, :get => 'mock-redis-test:values_*').should == ['a', 'b']
+    end
+
+    it 'projects through a key pattern and reflects element' do
+      @redises.sort(@key, :get => ['#', 'mock-redis-test:values_*']).should == [['1', 'a'], ['2', 'b']]
+    end
+
+    it 'projects through a hash key pattern' do
+      @redises.sort(@key, :get => 'mock-redis-test:hash_*->key').should == ['x', 'y']
+    end
+  end
+
+  context 'weights' do
+    it 'weights by projecting through a key pattern' do
+      @redises.sort(@key, :by => "mock-redis-test:weight_*").should == ['2', '1']
+    end
+
+    it 'weights by projecting through a key pattern and a specific order' do
+      @redises.sort(@key, :order => "DESC", :by => "mock-redis-test:weight_*").should == ['1', '2']
+    end
+  end
+
+  context 'limit' do
+    it 'only returns requested window in the enumerable' do
+      @redises.sort(@key, :limit => [0, 1]).should == ['1']
+    end
+  end
+
+  context 'store' do
+    it 'stores into another key' do
+      @redises.sort(@key, :store => "mock-redis-test:some_bucket").should == 2
+      @redises.lrange("mock-redis-test:some_bucket", 0, -1).should == ['1', '2']
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mock_redis
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-28 00:00:00.000000000 Z
+date: 2012-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -86,6 +86,7 @@ files:
 - lib/mock_redis/multi_db_wrapper.rb
 - lib/mock_redis/pipelined_wrapper.rb
 - lib/mock_redis/set_methods.rb
+- lib/mock_redis/sort_method.rb
 - lib/mock_redis/string_methods.rb
 - lib/mock_redis/transaction_wrapper.rb
 - lib/mock_redis/undef_redis_methods.rb
@@ -178,6 +179,9 @@ files:
 - spec/commands/sismember_spec.rb
 - spec/commands/smembers_spec.rb
 - spec/commands/smove_spec.rb
+- spec/commands/sort_list_spec.rb
+- spec/commands/sort_set_spec.rb
+- spec/commands/sort_zset_spec.rb
 - spec/commands/spop_spec.rb
 - spec/commands/srandmember_spec.rb
 - spec/commands/srem_spec.rb
@@ -212,6 +216,7 @@ files:
 - spec/support/shared_examples/only_operates_on_sets.rb
 - spec/support/shared_examples/only_operates_on_strings.rb
 - spec/support/shared_examples/only_operates_on_zsets.rb
+- spec/support/shared_examples/sorts_enumerables.rb
 - spec/transactions_spec.rb
 homepage: https://github.com/causes/mock_redis
 licenses: []
@@ -322,6 +327,9 @@ test_files:
 - spec/commands/sismember_spec.rb
 - spec/commands/smembers_spec.rb
 - spec/commands/smove_spec.rb
+- spec/commands/sort_list_spec.rb
+- spec/commands/sort_set_spec.rb
+- spec/commands/sort_zset_spec.rb
 - spec/commands/spop_spec.rb
 - spec/commands/srandmember_spec.rb
 - spec/commands/srem_spec.rb
@@ -356,5 +364,6 @@ test_files:
 - spec/support/shared_examples/only_operates_on_sets.rb
 - spec/support/shared_examples/only_operates_on_strings.rb
 - spec/support/shared_examples/only_operates_on_zsets.rb
+- spec/support/shared_examples/sorts_enumerables.rb
 - spec/transactions_spec.rb
 has_rdoc: