almicube 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55a123750b7adb55f8eb6800860c14ac89327d12
-  data.tar.gz: eda4674e0bb42a6849da342887ccba392a458e23
+  metadata.gz: 9fa0b027e6a3cbdfc138f59cc9a9b9a6704227bd
+  data.tar.gz: ffb6baa33b5d9940c5fe10c1dd3571d1d44427c1
 SHA512:
-  metadata.gz: 7c5a877e0cf9ab583175ea85741aa5f285dd17487c897e9a5603b7bfaea54f76605b73c13764e81ce1ddb73ed11721e6d9642400aa9a023cb36de84ec6c3739b
-  data.tar.gz: be52c99e63936850c70c80f4387e0c332159d5a68f7980bf0b41ff6b0f7893d424739747dd4f08fd53a766c36fe8146bb315dc8bdc8b903b17813d6845958c44
+  metadata.gz: e23331dfcd4ef85a623a8bb406172cefa9f4fb411931e11532d29becf51f610f9006db9ac6b79b76111da3a627afa2615685225bb70feae891365e041a8d1ea3
+  data.tar.gz: abbdecc865510ee154bfec2350167b1b5a8252d0348a89f7455eb8fb35a389e40487ff17b8f5f8713b59e315e59875379a595bed359b5f22c6470de4fbeb1ece

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    almicube (0.0.4)
+    almicube (0.0.5)
       activemodel (~> 4.0)
       activesupport (~> 4.0)
       redis (~> 3.0)

data/lib/almicube/aggregator/base.rb

@@ -12,7 +12,7 @@ module Almicube
       def aggregate(ranking=nil)
         self.ranking = ranking unless active? || ranking.nil?
 
-        self.ranking.selector.before_aggregate if self.ranking.selector.respond_to? :before_aggregate
+        self.ranking.selector.before_aggregate unless self.ranking.selector.nil?
 
         if self.ranking.data?
           data_aggregate self.ranking.key

data/lib/almicube/aggregator/sum_aggregator.rb

@@ -4,11 +4,11 @@ module Almicube
       protected
 
       def sub_aggregate(key)
-        keys = ranking.bundled_keys.select { |k| self.class.connection.zcard(k) > 0 }
+        keys = ranking.bundled_keys.select { |k| self.class.connection.exists(k) }
+        raise "enabled keys are empty" if keys.length == 0
+
         keys << ranking.selector.interstore if ranking.selector.interstore
-        if keys.length > 0
-          self.class.connection.zinterstore(key, keys)
-        end
+        self.class.connection.zinterstore(key, keys)
       end
     end
   end

data/lib/almicube/builder.rb

@@ -12,7 +12,7 @@ module Almicube
 
     def data(date=nil)
       date ||= self.date
-      Almicube::Ranking::DataRanking.new options
+      Almicube::Ranking::DataRanking.new options.merge( date: date )
     end
 
     def options

data/lib/almicube/ranking/base.rb

@@ -33,7 +33,6 @@ module Almicube
       end
 
       def page(page=1)
-        aggregate!
         page = [1, page.to_i].max
         revrange = connection.zrevrange(key, (page - 1) * per_page, page * per_page - 1)
         records = class_name.where("id IN (?)", revrange).all

data/lib/almicube/version.rb

@@ -1,3 +1,3 @@
 module Almicube
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: almicube
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - niaeashes