zermelo 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc193e2da0a7a65f2a3643520bd99663172a3d2e
-  data.tar.gz: ee336568cf9e99aae87ac54bbe6ce0db00500e42
+  metadata.gz: c8442ff692747d2d56fc983ec85bc6665656748a
+  data.tar.gz: a2ef423d8095fb2d9e7f12f5cf84ca2dadc9c528
 SHA512:
-  metadata.gz: 46fea7c0eee8e85846323a42ce4a83caee6761e48ad672c7ba70fa0a2ddd862b5d5aac849a8ce7d7d0b9c4c7deebec9bf90d1c918878c9ec73fe8b08a130cb9d
-  data.tar.gz: 0257355f3e92135da783b321db21850adb806758ba1089bf6a3837bf661b93925a66771ad760ad6796914fbeb269a3495720f604dad5977c1d103144143d5756
+  metadata.gz: 5364e3f2a9ea70de9f7ec5142909736952d4ab3d3167823877ed40c49759ddbffa002756cbe730d60357776768707f92f0557120b1fe3877439d30a56833ef45
+  data.tar.gz: d15a22b19592f45711c46b684d0fe0d943c971c87a21843a2d291692c5af51756cb8542545e55e7a88042429c45c5021158e35034bf9b98916ecf3dca006072c

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## Zermelo Changelog
 
+# 1.2.1 - 2015-08-07
+
+ * 'empty' filter method (637d0c9c)
+ * bugfix; temp redis set not deleted when matching against multiple values for a field (9df5241d)
+ * use Redis .scan instead of .keys for regex index lookup if available (de75802c)
+
 # 1.2.0 - 2015-06-24
 
 * spec cleanup, apply to multiple backends if not backend-specific

data/Gemfile

@@ -1,20 +1,11 @@
 source 'https://rubygems.org'
 
-if RUBY_VERSION.split('.')[0] == '1' && RUBY_VERSION.split('.')[1] == '8'
-  gemspec :name => 'zermelo-ruby1.8'
-else
-  gemspec :name => 'zermelo'
-end
+gemspec :name => 'zermelo'
 
 group :test do
-  gem 'influxdb'
+  gem 'influxdb', '0.1.9'
   gem 'redis'
   gem 'rspec', '>= 3.0.0'
   gem 'simplecov', :require => false
-
-  if RUBY_VERSION.split('.')[0] == '1' && RUBY_VERSION.split('.')[1] == '8'
-    gem 'timecop', '0.6.1'
-  else
-    gem 'timecop'
-  end
+  gem 'timecop'
 end

data/lib/zermelo/associations/multiple.rb

@@ -6,12 +6,13 @@ module Zermelo
 
       extend Forwardable
 
-      def_delegators :filter, :intersect, :union, :diff, :sort,
-                       :find_by_id, :find_by_ids, :find_by_id!, :find_by_ids!,
-                       :page, :all, :each, :collect, :map,
-                       :select, :find_all, :reject, :destroy_all,
-                       :ids, :count, :empty?, :exists?,
-                       :associated_ids_for
+      def_delegators :filter,
+        :intersect, :union, :diff, :sort, :offset, :page, :empty,
+        :find_by_id, :find_by_ids, :find_by_id!, :find_by_ids!,
+        :all, :each, :collect, :map,
+        :select, :find_all, :reject, :destroy_all,
+        :ids, :count, :empty?, :exists?,
+        :associated_ids_for
 
       def initialize(type, parent_klass, parent_id, name)
         @type         = type

data/lib/zermelo/backends/redis.rb

@@ -15,10 +15,6 @@ module Zermelo
       #   :timestamp
       # end
 
-      def generate_lock
-        Zermelo::Locks::RedisLock.new
-      end
-
       def filter(ids_key, associated_class, callback_target_class = nil,
         callback_target_id = nil, callbacks = nil, sort_order = nil)
 
@@ -194,10 +190,22 @@ module Zermelo
               :object => :index
             ))
 
-            matching_sets = Zermelo.redis.keys(key_root + ":*").inject([]) do |memo, k|
+            key_pat = "#{key_root}:?*"
+
+            matching_sets = if (Zermelo.redis_version.split('.') <=> ['2', '8', '0']) == 1
+              # lock will be subsumed by outer lock if present -- required to
+              # know that scan is getting consistent results
+              associated_class.lock do
+                Zermelo.redis.scan_each(:match => key_pat).to_a
+              end
+            else
+              # SCAN is only supported in Redis >= 2.8.0
+              Zermelo.redis.keys(key_pat)
+            end
+
+            matching_sets.select! do |k|
               k =~ /^#{key_root}:(.+)$/
-              memo << k if value === $1
-              memo
+              value === $1
             end
 
             Zermelo.redis.sunionstore(idx_result, matching_sets) unless matching_sets.empty?

data/lib/zermelo/filter.rb

@@ -4,6 +4,7 @@ require 'zermelo/records/errors'
 
 require 'zermelo/filters/steps/list_step'
 require 'zermelo/filters/steps/set_step'
+require 'zermelo/filters/steps/empty_step'
 require 'zermelo/filters/steps/sort_step'
 
 module Zermelo
@@ -76,6 +77,12 @@ module Zermelo
           :limit => per_page}, {}))
     end
 
+    def empty
+      self.class.new(@backend, @initial_key, @associated_class,
+        @callback_target_class, @callback_target_id, @callbacks, @sort_order,
+        self, ::Zermelo::Filters::Steps::EmptyStep.new({}, {}))
+    end
+
     # step users
     def exists?(e_id)
       lock(false) { _exists?(e_id) }

data/lib/zermelo/filters/steps/empty_step.rb

@@ -0,0 +1,45 @@
+require 'zermelo/filters/steps/base_step'
+
+# NB: temp keys for now are bare redis keys, should be full Key objects
+module Zermelo
+  module Filters
+    class Steps
+      class EmptyStep < Zermelo::Filters::Steps::BaseStep
+        def self.accepted_types
+          [:set, :sorted_set, :list]
+        end
+
+        def self.returns_type
+          nil # same as the source type
+        end
+
+        def resolve(backend, associated_class, opts = {})
+          case backend
+          when Zermelo::Backends::Redis
+            source    = opts[:source]
+            temp_keys = opts[:temp_keys]
+            shortcut  = opts[:shortcut]
+
+            dest_set = associated_class.send(:temp_key, source.type)
+            r_dest_set = backend.key_to_redis_key(dest_set)
+            temp_keys << dest_set
+
+            return dest_set if shortcut.nil?
+
+            shortcut_params = case source.type
+            when :sorted_set
+              [r_dest_set, order] + opts[:shortcut_args]
+            else
+              [r_dest_set] + opts[:shortcut_args]
+            end
+
+            Zermelo::Filters::Redis::SHORTCUTS[source.type][shortcut].
+              call(*shortcut_params)
+          when Zermelo::Backends::InfluxDB
+            # FIXME
+          end
+        end
+      end
+    end
+  end
+end

data/lib/zermelo/filters/steps/set_step.rb

@@ -39,6 +39,7 @@ module Zermelo
 
                 if val.is_a?(Enumerable)
                   conditions_set = associated_class.send(:temp_key, source.type)
+                  temp_keys << conditions_set
                   r_conditions_set = backend.key_to_redis_key(conditions_set)
 
                   backend.temp_key_wrap do |conditions_temp_keys|
@@ -130,7 +131,8 @@ module Zermelo
 
               return dest_set if shortcut.nil?
 
-              shortcut_params = if source.type == :sorted_set
+              shortcut_params = case source.type
+              when :sorted_set
                 [r_dest_set, order] + opts[:shortcut_args]
               else
                 [r_dest_set] + opts[:shortcut_args]

data/lib/zermelo/records/class_methods.rb

@@ -20,12 +20,13 @@ module Zermelo
 
       extend Forwardable
 
-      def_delegators :filter, :intersect, :union, :diff, :sort,
-                       :find_by_id, :find_by_ids, :find_by_id!, :find_by_ids!,
-                       :page, :all, :each, :collect, :map,
-                       :select, :find_all, :reject, :destroy_all,
-                       :ids, :count, :empty?, :exists?,
-                       :associated_ids_for
+      def_delegators :filter,
+        :intersect, :union, :diff, :sort, :offset, :page, :empty,
+        :find_by_id, :find_by_ids, :find_by_id!, :find_by_ids!,
+        :all, :each, :collect, :map,
+        :select, :find_all, :reject, :destroy_all,
+        :ids, :count, :empty?, :exists?,
+        :associated_ids_for
 
       def generate_id
         return SecureRandom.uuid if SecureRandom.respond_to?(:uuid)

data/lib/zermelo/version.rb

@@ -1,3 +1,3 @@
 module Zermelo
-  VERSION = '1.2.0'
+  VERSION = '1.2.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zermelo
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Ali Graham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-28 00:00:00.000000000 Z
+date: 2015-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -85,6 +85,7 @@ files:
 - lib/zermelo/filters/influxdb.rb
 - lib/zermelo/filters/redis.rb
 - lib/zermelo/filters/steps/base_step.rb
+- lib/zermelo/filters/steps/empty_step.rb
 - lib/zermelo/filters/steps/list_step.rb
 - lib/zermelo/filters/steps/set_step.rb
 - lib/zermelo/filters/steps/sort_step.rb