zermelo 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae0c1829b05137f5e13c5207d3566b90f780f9af
-  data.tar.gz: a5657d99593052349f359f0386c84a7f7c4b69a1
+  metadata.gz: a21c0260c1633e48c3203e3418f61a07c181d444
+  data.tar.gz: d0ab97b66d0ce06f6350ec2708c42008ee5f4991
 SHA512:
-  metadata.gz: 94d2147aeea3514e4df3c2af4e59a1290840c6b4eb367f02ee5ae2633e6b9e10cc1675a044c2c1dce6d93c85843969dac77f4c5096ac60f7af0eaf149b736770
-  data.tar.gz: 6a01b9dc40dca07ca4be3b65b27c3ca432da402014873306f217ba55c8d0785b263af335d6dd4a69b06d7a4afb94504101e781efee8a0dad90adb1e79275a054
+  metadata.gz: cb2ff5d282451aa8e3d1e9d69b8f4bc7abea99020af24ff75e9a8c33bb9b916db312db311b354b10425be5f1f4f7ad9244778900f8fc28764dacb29df4fc9f01
+  data.tar.gz: 5de6172e640d28f471a2430d038a3f360236e1c6e3bd2aa4966bf249acc678773854f556190d9ea5153e0628182b4afe1c60df09c76b1b6fa44ee2456aaa7805

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## Zermelo Changelog
 
+# 1.4.2 - 2015-12-01
+
+ * methods to dump generated keys and backend key names
+
 # 1.4.1 - 2015-11-24
 
  * bugfix require statements

data/lib/zermelo/associations/index.rb

@@ -46,6 +46,16 @@ module Zermelo
         )
       end
 
+      def key_dump
+        k = Zermelo::Records::Key.new(
+          :klass  => @parent_klass,
+          :name   => "by_#{@attribute_name}:*",
+          :type   => :set,
+          :object => :index
+        )
+        [@backend.key_to_backend_key(k), k]
+      end
+
     end
   end
 end

data/lib/zermelo/associations/multiple.rb

@@ -111,6 +111,10 @@ module Zermelo
         end
       end
 
+      def key_dump
+        [@backend.key_to_backend_key(@record_ids_key), @record_ids_key]
+      end
+
       private
 
       def _inverse

data/lib/zermelo/associations/range_index.rb

@@ -39,6 +39,9 @@ module Zermelo
         )
       end
 
+      def key_dump
+        [@backend.key_to_backend_key(key), key]
+      end
     end
   end
 end

data/lib/zermelo/associations/singular.rb

@@ -62,6 +62,10 @@ module Zermelo
         v
       end
 
+      def key_dump
+        [@backend.key_to_backend_key(@record_id_key), @record_id_key]
+      end
+
       private
 
       # on_remove already runs inside a lock & transaction

data/lib/zermelo/associations/unique_index.rb

@@ -39,6 +39,9 @@ module Zermelo
         )
       end
 
+      def key_dump
+        [@backend.key_to_backend_key(key), key]
+      end
     end
   end
 end

data/lib/zermelo/backends/influxdb.rb

@@ -17,9 +17,9 @@ module Zermelo
 
       include Zermelo::Backend
 
-      # def default_sorted_set_key
-      #   :time
-      # end
+      def key_to_backend_key(key)
+        "TODO"
+      end
 
       def filter(ids_key, associated_class, callback_target_class = nil,
                  callback_target_id = nil, callbacks = nil, sort_order = nil)

data/lib/zermelo/backends/redis.rb

@@ -17,9 +17,24 @@ module Zermelo
         @changes = nil
       end
 
-      # def default_sorted_set_key
-      #   :timestamp
-      # end
+      def key_to_backend_key(key)
+        class_key = key.klass.send(:class_key)
+
+        obj = case key.object
+        when :attribute
+          'attrs'
+        when :association
+          'assocs'
+        when :index
+          'indices'
+        when :temporary
+          'tmp'
+        end
+
+        name = Zermelo::COLLECTION_TYPES.has_key?(key.type) ? ":#{key.name}" : ''
+
+        "#{class_key}:#{key.id.nil? ? '' : key.id}:#{obj}#{name}"
+      end
 
       def filter(ids_key, associated_class, callback_target_class = nil,
         callback_target_id = nil, callbacks = nil, sort_order = nil)
@@ -31,7 +46,7 @@ module Zermelo
 
       def get_multiple(*attr_keys)
         attr_keys.inject({}) do |memo, attr_key|
-          redis_attr_key = key_to_redis_key(attr_key)
+          redis_attr_key = key_to_backend_key(attr_key)
 
           class_key = attr_key.klass.send(:class_key)
 
@@ -124,25 +139,6 @@ module Zermelo
         true
       end
 
-      def key_to_redis_key(key)
-        class_key = key.klass.send(:class_key)
-
-        obj = case key.object
-        when :attribute
-          'attrs'
-        when :association
-          'assocs'
-        when :index
-          'indices'
-        when :temporary
-          'tmp'
-        end
-
-        name = Zermelo::COLLECTION_TYPES.has_key?(key.type) ? ":#{key.name}" : ''
-
-        "#{class_key}:#{key.id.nil? ? '' : key.id}:#{obj}#{name}"
-      end
-
       def temp_key_wrap
         return unless block_given?
         temp_keys = []
@@ -152,7 +148,7 @@ module Zermelo
           raise
         ensure
           unless temp_keys.empty?
-            Zermelo.redis.del(*temp_keys.collect {|tk| key_to_redis_key(tk)})
+            Zermelo.redis.del(*temp_keys.collect {|tk| key_to_backend_key(tk)})
             temp_keys.clear
           end
         end
@@ -171,12 +167,12 @@ module Zermelo
 
           idx_key = associated_class.send(:temp_key, type)
           temp_keys << idx_key
-          idx_result = key_to_redis_key(idx_key)
+          idx_result = key_to_backend_key(idx_key)
 
           starts_with_string_re = /^string:/
           case idx_class.name
           when 'Zermelo::Associations::UniqueIndex'
-            index_key = key_to_redis_key(Zermelo::Records::Key.new(
+            index_key = key_to_backend_key(Zermelo::Records::Key.new(
               :klass  => associated_class,
               :name   => "by_#{att}",
               :type   => :hash,
@@ -197,7 +193,7 @@ module Zermelo
               end
             end
           when 'Zermelo::Associations::Index'
-            key_root = key_to_redis_key(Zermelo::Records::Key.new(
+            key_root = key_to_backend_key(Zermelo::Records::Key.new(
               :klass  => associated_class,
               :name   => "by_#{att}:string",
               :type   => :set,
@@ -242,14 +238,14 @@ module Zermelo
             idx_key = associated_class.send(:temp_key, type)
             temp_keys << idx_key
 
-            val = Zermelo.redis.hget(key_to_redis_key(index.key),
+            val = Zermelo.redis.hget(key_to_backend_key(index.key),
                                index_keys(attr_type, value).join(':'))
 
             case type
             when :set
-              Zermelo.redis.sadd(key_to_redis_key(idx_key), val)
+              Zermelo.redis.sadd(key_to_backend_key(idx_key), val)
             when :sorted_set
-              Zermelo.redis.zadd(key_to_redis_key(idx_key), [1, val])
+              Zermelo.redis.zadd(key_to_backend_key(idx_key), [1, val])
             end
             idx_key
           when Zermelo::Associations::Index
@@ -259,7 +255,7 @@ module Zermelo
       end
 
       def range_lookup(key, range, type, attr_type, associated_class, temp_keys)
-        r_key = key_to_redis_key(key)
+        r_key = key_to_backend_key(key)
         opts = case type
         when :set
           {}
@@ -281,7 +277,7 @@ module Zermelo
         ret_key = associated_class.send(:temp_key, key.type)
         temp_keys << ret_key
         unless result.empty?
-          r_key = key_to_redis_key(ret_key)
+          r_key = key_to_backend_key(ret_key)
           case type
           when :set
             Zermelo.redis.sadd(r_key, result)
@@ -318,7 +314,7 @@ module Zermelo
           # TODO check that collection types handle nil value for whole thing
           if Zermelo::COLLECTION_TYPES.has_key?(key.type)
 
-            complex_attr_key = key_to_redis_key(key)
+            complex_attr_key = key_to_backend_key(key)
 
             case op
             when :add, :set
@@ -351,14 +347,14 @@ module Zermelo
             when :move
               case key.type
               when :set
-                Zermelo.redis.smove(complex_attr_key, key_to_redis_key(key_to), value)
+                Zermelo.redis.smove(complex_attr_key, key_to_backend_key(key_to), value)
               when :list
                 # TODO via sort 'nosort', or the workaround required prior to
                 # https://github.com/antirez/redis/issues/2079
                 raise "Not yet implemented"
               when :hash
                 Zermelo.redis.hdel(complex_attr_key, *value.keys)
-                Zermelo.redis.hset(key_to_redis_key(key_to), *value_to.to_a.flatten)
+                Zermelo.redis.hset(key_to_backend_key(key_to), *value_to.to_a.flatten)
               when :sorted_set
                 Zermelo.redis.zadd(complex_attr_key, *value_to)
               end
@@ -380,7 +376,7 @@ module Zermelo
           elsif :purge.eql?(op)
             purges << ["#{key.klass.send(:class_key)}:#{key.id}:attrs"]
           else
-            simple_attr_key = key_to_redis_key(key)
+            simple_attr_key = key_to_backend_key(key)
             simple_attrs[simple_attr_key] ||= {}
 
             case op

data/lib/zermelo/backends/stub.rb

@@ -8,6 +8,10 @@ module Zermelo
 
       include Zermelo::Backend
 
+      def key_to_backend_key(key)
+        raise "Not supported"
+      end
+
       def filter(ids_key, associated_class, callback_target_class = nil,
         callback_target_id = nil, callbacks = nil, sort_order = nil)
 

data/lib/zermelo/filters/redis.rb

@@ -89,7 +89,7 @@ module Zermelo
           end
 
           sc = Zermelo::Filters::Redis::SHORTCUTS[@initial_key.type][shortcut]
-          r_key = backend.key_to_redis_key(@initial_key)
+          r_key = backend.key_to_backend_key(@initial_key)
           shortcut_params = if @initial_key.type == :sorted_set
             [r_key, @sort_order] + args
           else

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

@@ -21,7 +21,7 @@ module Zermelo
             shortcut  = opts[:shortcut]
 
             dest_set = associated_class.send(:temp_key, source.type)
-            r_dest_set = backend.key_to_redis_key(dest_set)
+            r_dest_set = backend.key_to_backend_key(dest_set)
             temp_keys << dest_set
 
             return dest_set if shortcut.nil?

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

@@ -33,13 +33,13 @@ module Zermelo
             # TODO need a guaranteed non-existing key for non-sorting 'sort'
 
             # TODO check if source is in temp_keys, use a generated temp_key instead if not
-            r_source = backend.key_to_redis_key(source)
+            r_source = backend.key_to_backend_key(source)
 
             result, r_result = case source.type
             when :sorted_set
               limited = associated_class.send(:temp_key, :sorted_set)
               temp_keys << limited
-              r_limited = backend.key_to_redis_key(limited)
+              r_limited = backend.key_to_backend_key(limited)
 
               lim = Zermelo.redis.send(
                 :desc.eql?(opts[:sort_order]) ? :zrevrange : :zrange,
@@ -68,7 +68,7 @@ module Zermelo
                 else
                   limited = associated_class.send(:temp_key, :list)
                   temp_keys << limited
-                  r_limited = backend.key_to_redis_key(limited)
+                  r_limited = backend.key_to_backend_key(limited)
 
                   Zermelo.redis.rpush(r_limited, data)
 

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

@@ -39,14 +39,14 @@ module Zermelo
               if [Set, Array].any? {|t| value.is_a?(t) }
                 conditions_set = associated_class.send(:temp_key, source.type)
                 temp_keys << conditions_set
-                r_conditions_set = backend.key_to_redis_key(conditions_set)
+                r_conditions_set = backend.key_to_backend_key(conditions_set)
 
                 backend.temp_key_wrap do |conditions_temp_keys|
                   if use_sort_attr
                     range_keys = value.collect {|v|
                       rl = backend.range_lookup(associated_class.ids_key, v,
                         source_type, attr_types[att], associated_class, conditions_temp_keys)
-                      backend.key_to_redis_key(rl)
+                      backend.key_to_backend_key(rl)
                     }
 
                     case source.type
@@ -69,7 +69,7 @@ module Zermelo
                         when Zermelo::Associations::Multiple
                           co.instance_variable_get('@record_ids_key')
                         end
-                        backend.key_to_redis_key(k)
+                        backend.key_to_backend_key(k)
                       end
 
                       case source.type
@@ -100,7 +100,7 @@ module Zermelo
                     index_keys = value.collect {|v|
                       il = backend.index_lookup(att, associated_class, source.type,
                         idx_class, v, attr_types[att], conditions_temp_keys)
-                      backend.key_to_redis_key(il)
+                      backend.key_to_backend_key(il)
                     }
 
                     case source.type
@@ -126,7 +126,7 @@ module Zermelo
                 else
                   ts = associated_class.send(:temp_key, source.type)
                   temp_keys << ts
-                  r_ts = backend.key_to_redis_key(ts)
+                  r_ts = backend.key_to_backend_key(ts)
                   case source.type
                   when :set
                     s_id = value.is_a?(Zermelo::Associations::Singular) ? value.id : value
@@ -144,8 +144,8 @@ module Zermelo
               end
             end
 
-            r_source_key  = backend.key_to_redis_key(source)
-            r_source_keys = source_keys.collect {|sk| backend.key_to_redis_key(sk) }
+            r_source_key  = backend.key_to_backend_key(source)
+            r_source_keys = source_keys.collect {|sk| backend.key_to_backend_key(sk) }
 
             op = @options[:op]
             shortcut = opts[:shortcut]
@@ -156,7 +156,7 @@ module Zermelo
                 backend.temp_key_wrap do |shortcut_temp_keys|
                   dest_set = associated_class.send(:temp_key, :set)
                   shortcut_temp_keys << dest_set
-                  r_dest_set = backend.key_to_redis_key(dest_set)
+                  r_dest_set = backend.key_to_backend_key(dest_set)
 
                   Zermelo.redis.sinterstore(r_dest_set, *r_source_keys)
                   Set.new(Zermelo.redis.sunion(r_source_key, r_dest_set))
@@ -167,7 +167,7 @@ module Zermelo
                 backend.temp_key_wrap do |shortcut_temp_keys|
                   dest_set = associated_class.send(:temp_key, :set)
                   shortcut_temp_keys << dest_set
-                  r_dest_set = backend.key_to_redis_key(dest_set)
+                  r_dest_set = backend.key_to_backend_key(dest_set)
 
                   Zermelo.redis.sinterstore(r_dest_set, *r_source_keys)
                   Set.new(Zermelo.redis.sdiff(r_source_key, r_dest_set))
@@ -175,12 +175,12 @@ module Zermelo
               end
             else
               dest_set = associated_class.send(:temp_key, source.type)
-              r_dest_set = backend.key_to_redis_key(dest_set)
+              r_dest_set = backend.key_to_backend_key(dest_set)
               temp_keys << dest_set
 
               case op
               when :union
-                r_initial_key = backend.key_to_redis_key(initial_key)
+                r_initial_key = backend.key_to_backend_key(initial_key)
 
                 if source.type == :sorted_set
                   Zermelo.redis.zinterstore(r_dest_set,

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

@@ -22,7 +22,7 @@ module Zermelo
 
             dest_list = associated_class.send(:temp_key, :list)
             temp_keys << dest_list
-            r_dest_list = backend.key_to_redis_key(dest_list)
+            r_dest_list = backend.key_to_backend_key(dest_list)
 
             # TODO raise error in step construction if keys not
             # passed as expected below
@@ -40,7 +40,7 @@ module Zermelo
             # TODO check if complex attribute types or associations
             # can be used for sorting
 
-            r_source = backend.key_to_redis_key(source)
+            r_source = backend.key_to_backend_key(source)
 
             # this set will be overwritten by the result list
             case source.type

data/lib/zermelo/records/class_methods.rb

@@ -64,6 +64,16 @@ module Zermelo
         @backend
       end
 
+      def key_dump
+        klass_keys = [backend.key_to_backend_key(ids_key), ids_key]
+        self.send(:with_index_data) do |d|
+          d.keys.each do |k|
+            klass_keys += self.send("#{k}_index".to_sym).key_dump
+          end
+        end
+        Hash[ *klass_keys ]
+      end
+
       protected
 
       def set_backend(backend_type)

data/lib/zermelo/records/instance_methods.rb

@@ -95,7 +95,7 @@ module Zermelo
         run_callbacks( (creating ? :create : :update) ) do
 
           idx_attrs = self.class.send(:with_index_data) do |d|
-            idx_attrs = d.each_with_object({}) do |(name, data), memo|
+            d.each_with_object({}) do |(name, data), memo|
               memo[name.to_s] = data.index_klass
             end
           end
@@ -164,7 +164,7 @@ module Zermelo
       end
 
       def destroy
-        raise "Record was not persisted" if !persisted?
+        raise "Record was not persisted" unless persisted?
 
         run_callbacks :destroy do
 
@@ -197,6 +197,21 @@ module Zermelo
         end
       end
 
+      def key_dump
+        inst_keys = []
+
+        attr_key = attribute_keys.values.first
+        unless attr_key.nil?
+          inst_keys += [backend.key_to_backend_key(attr_key), attr_key]
+        end
+
+        self.class.send(:with_associations, self) do |assoc|
+          inst_keys += assoc.key_dump
+        end
+
+        Hash[*inst_keys]
+      end
+
       private
 
       def backend

data/lib/zermelo/version.rb

@@ -1,3 +1,3 @@
 module Zermelo
-  VERSION = '1.4.1'
+  VERSION = '1.4.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zermelo
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Ali Graham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-24 00:00:00.000000000 Z
+date: 2015-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel