acts_as_hashish 0.4.2 → 0.4.3

data/lib/acts_as_hashish/hashish.rb

@@ -1,9 +1,12 @@
 module Hashish
 
   def acts_as_hashish(options = {})
-    raise "Cannot act as hashish without a redis connection!" unless Hashish.redis_connection
+    unless options.keys.all?{|k| k.is_a?(Symbol)} and options.values.all?{|v| v.is_a?(String) or v.is_a?(Hash)}
+      raise "Keys can only be Symbol, values can only be String or Hash" 
+    end
+    raise "Cannot act as hashish without a redis connection" unless Hashish.redis_connection
     options[:key_prefix] ||= Hashish.redis_namespace + ':' + self.to_s
-    raise "Please specify a primary index via the :key option!" unless options[:key]
+    raise "Please specify a primary index via the :key option" unless options[:key]
     options[:indexes] ||= {}
     options[:sorters] ||= {}
     

data/lib/acts_as_hashish/private_class_methods.rb

@@ -50,8 +50,8 @@ module Hashish
         data = o.to_json
         prefix = @options[:key_prefix]
         key = hashish_get_key(o)
-        hashish_delete(key)
         raise "Error: Computed data key as '#{key}'. Only alphanumeric characters and underscore allowed!" unless key.to_s =~ /^[\w_]+$/
+        hashish_delete(key)
         Hashish.redis_connection.multi do 
           Hashish.redis_connection.zadd("#{prefix}*", t , "#{prefix}@#{key}")
           # Hashish.redis_connection.zremrangebyrank("#{prefix}:", 0, -(@options[:max_size] + 1)) if @options[:max_size]

data/lib/acts_as_hashish/version.rb

@@ -1,3 +1,3 @@
 module Hashish
-  VERSION = '0.4.2'
+  VERSION = '0.4.3'
 end

data/spec/hashish_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'set'
 
 describe Hashish do
 
@@ -8,6 +7,7 @@ describe Hashish do
     @sample_data_2 = {'id' => 3, 'name' => 'Doe', 'location' => 'London'}
     @sample_data_3 = {'id' => 2, 'name' => 'Moe', 'location' => 'Mumbai'}
     @sample_data_4 = {'id' => 4, 'name' => 'Loe', 'location' => 'Goa'}
+    @sample_data_5 = {'id' => 5, 'name' => ['Zoe', 'Foe'], 'location' => 'Stockholm'}
 
     @primary_key = 'id'
 
@@ -41,16 +41,31 @@ describe Hashish do
       Hashish.redis_connection.zscore("#{@options[:key_prefix]}*", "#{@options[:key_prefix]}@#{SampleClass.send(:hashish_get_key, @sample_data_1)}").should_not be_nil
     end
 
+    it "should validate against hash or array only" do
+      expect { SampleClass.hashish_insert("")}.to raise_exception
+    end
+    
     it "should overwrite data and indexes if an existing key is being re-inserted with new values" do
       SampleClass.hashish_insert(@sample_data_1)
       SampleClass.hashish_insert(@sample_data_1.merge('name' => 'Doe'))
       SampleClass.hashish_list(:filters => {'_name' => 'Joe'}).should == []
     end
     
-    it "should create appropriate indexes" do
-      SampleClass.hashish_insert(@sample_data_1)
-      Hashish.redis_connection.zscore("#{@options[:key_prefix]}!#{@index_name}=#{@sample_data_1[@index_value]}", "#{@options[:key_prefix]}@#{SampleClass.send(:hashish_get_key, @sample_data_1)}").should_not be_nil
-      Hashish.redis_connection.zscore("#{@options[:key_prefix]}!#{@proc_index_name}=#{@proc_index_value.call(@sample_data_1)}", "#{@options[:key_prefix]}@#{SampleClass.send(:hashish_get_key, @sample_data_1)}").should_not be_nil
+    context "when indexes with multiple values are passed" do
+      it "should create appropriate indexes" do
+        SampleClass.hashish_insert(@sample_data_5)
+        @sample_data_5[@index_value].each do |index_value|
+          Hashish.redis_connection.zscore("#{@options[:key_prefix]}!#{@index_name}=#{index_value}", "#{@options[:key_prefix]}@#{SampleClass.send(:hashish_get_key, @sample_data_5)}").should_not be_nil
+        end
+      end
+    end
+    
+  context "when indexes with single values are passed" do
+      it "should create appropriate indexes" do
+        SampleClass.hashish_insert(@sample_data_1)
+        Hashish.redis_connection.zscore("#{@options[:key_prefix]}!#{@index_name}=#{@sample_data_1[@index_value]}", "#{@options[:key_prefix]}@#{SampleClass.send(:hashish_get_key, @sample_data_1)}").should_not be_nil
+        Hashish.redis_connection.zscore("#{@options[:key_prefix]}!#{@proc_index_name}=#{@proc_index_value.call(@sample_data_1)}", "#{@options[:key_prefix]}@#{SampleClass.send(:hashish_get_key, @sample_data_1)}").should_not be_nil
+      end
     end
 
     it "should create appropriate sorters" do
@@ -75,6 +90,14 @@ describe Hashish do
   end
 
   describe ".hashish_list" do
+    it "should return only elements inserted between specified time" do
+      t = Time.now
+      SampleClass.hashish_insert(@sample_data_1)
+      Time.stubs(:now).returns(t + 3600)
+      SampleClass.hashish_insert(@sample_data_2)
+      SampleClass.hashish_list(:from => (t + 1800).to_i).should == [@sample_data_2]
+    end
+    
     it "should return all the items from the list" do
       test_data = [@sample_data_2, @sample_data_1, @sample_data_3]
       test_data.each do |data|

data/spec/spec_helper.rb

@@ -6,6 +6,14 @@ require 'rspec/autorun'
 require 'test/unit'
 require 'mocha'
 
+require 'simplecov'
+SimpleCov.start do
+  add_filter '/spec/'
+end
+
+require 'coveralls'
+Coveralls.wear!
+
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}

metadata

@@ -2,7 +2,7 @@
 name: acts_as_hashish
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors: 
 - Schubert Cardozo
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-04-29 00:00:00 Z
+date: 2013-04-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: redis
@@ -18,7 +18,7 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         version: 3.0.2
   type: :runtime
@@ -29,7 +29,7 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         version: 1.6.6
   type: :runtime
@@ -67,6 +67,28 @@ dependencies:
         version: 0.12.7
   type: :development
   version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: simplecov
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.7.1
+  type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: coveralls
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.6.7
+  type: :development
+  version_requirements: *id007
 description: A sortable and searchable list backed by Redis.  You can use it as a quick actionable workflow queue which you can search/sort and paginate thorough
 email: 
 - cardozoschubert@gmail.com