look_up_table 0.1.0.rc5 → 0.1.0.rc6

data/lib/look_up_table/version.rb

@@ -1,3 +1,3 @@
 module LookUpTable
-  VERSION = "0.1.0.rc5"
+  VERSION = "0.1.0.rc6"
 end

data/lib/look_up_table.rb

@@ -1,9 +1,13 @@
-# TODO
+# TODO:
 # * move Methods to different modules
 # * add private/protected
 # * add class_names to CacheKey per default
 # * if key allready used, transform values to array
 # * somehow handle "cache-overflow"
+# * use symbols freely
+
+# FIXME:
+# * Avoid @@class_variables, issues if "subclassed"
 module LookUpTable
   extend ActiveSupport::Concern
 
@@ -16,7 +20,8 @@ module LookUpTable
         :batch_size     => 10000,
         :read_on_init   => false,
         :skip_memcached => false,
-        :sql_mode       => true
+        :sql_mode       => true.
+        :where          => nil
       }.merge(options)
 
       self.lut_proc[lut_name.to_sym]    = block
@@ -51,27 +56,27 @@ module LookUpTable
 
     # Reloads allready loaded LUTs.
     # Will also rewrites cache.
-    def lut_reload(name=nil)
+    def lut_reload(name = nil)
       if name
         lut_reset(name)
         lut(name)
       else
         lut_keys.each { |k| lut_reload(k) }
       end
+
+      return lut_keys
     end
 
     # Init complete LUT with all keys define.
     # But won't rewrite cache if allready written!
-    def lut_init(name=nil)
+    def lut_init(name = nil)
       if name
         lut(name)
       else
-        lut_keys.each do |key|
-          lut_init(key)
-        end
+        lut_keys.each { |k| lut_init(k) }
       end
 
-      return lut_options.keys
+      return lut_keys
     end
 
 
@@ -134,7 +139,7 @@ module LookUpTable
         lut   = {}
         block = lut_proc(name)
 
-        self.find_in_batches(:batch_size => lut_options(name)[:batch_size]) do |items|
+        self.where(lut_options(name)[:where]).find_in_batches(:batch_size => lut_options(name)[:batch_size]) do |items| #FIXME not DRY here
           items.each do |item|
             if block
               block.call(lut, item)
@@ -178,6 +183,7 @@ module LookUpTable
         lut = {}
 
         while item = lut_read_cache_item(name, i)
+          # HACK: merge will override existing values
           lut.merge!(item) if item
           i += 1
         end
@@ -206,7 +212,7 @@ module LookUpTable
       def lut_write_to_cache_sql_mode(name)
         batch_count = 0
 
-        self.find_in_batches(:batch_size => lut_options(name)[:batch_size]) do |items|
+        self.where(lut_options(name)[:where]).find_in_batches(:batch_size => lut_options(name)[:batch_size]) do |items| #FIXME not DRY here
           lut   = {}
           block = lut_proc(name)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: look_up_table
 version: !ruby/object:Gem::Version
-  version: 0.1.0.rc5
+  version: 0.1.0.rc6
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-24 00:00:00.000000000Z
+date: 2011-11-01 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &78353190 !ruby/object:Gem::Requirement
+  requirement: &86496530 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *78353190
+  version_requirements: *86496530
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &78352440 !ruby/object:Gem::Requirement
+  requirement: &86496070 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *78352440
+  version_requirements: *86496070
 description: A simple LookUpTable to cache large (!) and static(!) data
 email:
 - ph@werbeboten.de
@@ -102,7 +102,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -241222499
+      hash: 506016211
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: