almicube 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b5b3dee4cf2a4ca349f8b5d218fe23cbb6fbb7c
-  data.tar.gz: d5423d3770485d8176bd9cb0ac306e0ed2e32ac0
+  metadata.gz: 948970158c93ec780b0cc67776325fc29a956c4c
+  data.tar.gz: 6c3099a7e13fd8342534eea3487aeadc74d1c787
 SHA512:
-  metadata.gz: 86cc68a0f86730eb0d64e526dd49135265090574ac085ea3bbdf267940573cfd1f222abbf6b1eae7348b408684de7f204a0552b0927666850f0b61a0a2d29b04
-  data.tar.gz: a3d2279edd141c513f93a6e34ae80ab77089d7e01f2c7c354af3fa5ee048ca22e2eea82fa630e850787c78e77b23266e298ecdf2d7395ee12245633a6b12e986
+  metadata.gz: ef17980b825c462379eb5e3cf3214b51ea058fe5fa07ef43b35856d1ac928fe548753bd7042496e4da2c61cd23bcacdb9d69c2ba3430ad5296e1ce9c476f373c
+  data.tar.gz: 0068d378bd9bbfa1ef7e60b973172e74307016346d7cb7df9640e9e4f1d2db5f9ad899c9964017d68db27002fbc730d0528d570f0098036deec7fefa943df0d9

data/Gemfile.lock

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

data/lib/almicube/aggregator/avg_aggregator.rb

@@ -0,0 +1,16 @@
+module Almicube
+  module Aggregator
+    class AvgAggregator
+      protected
+
+      def sub_aggregate(key)
+        keys = ranking.bundled_keys.select { |k| self.class.connection.zcard(k) > 0 }
+        keys << ranking.selector.interstore
+        weights = keys.map { 1/keys.length }
+        if keys.length
+          self.class.connection.zinterstore(key, keys, weights)
+        end
+      end
+    end
+  end
+end

data/lib/almicube/aggregator/base.rb

@@ -20,6 +20,16 @@ module Almicube
           sub_aggregate self.ranking.key
         end
       end
+
+      protected
+
+      def data_aggregate(key)
+        ranking.records.each do |record|
+          value = record.send(ranking.attribute_name) if record.respond_to? ranking.attribute_name
+          value = ranking.default_score if value.nil?
+          self.class.connection.zadd(key, value, record.to_param)
+        end
+      end
     end
   end
 end

data/lib/almicube/aggregator/sum_aggregator.rb

@@ -3,17 +3,9 @@ module Almicube
     class SumAggregator < Base
       protected
 
-      def data_aggregate(key)
-        ranking.records.each do |record|
-          value = record.send(ranking.attribute_name) if record.respond_to? ranking.attribute_name
-          value = ranking.default_score if value.nil?
-          self.class.connection.zadd(key, value, record.to_param)
-        end
-      end
-
       def sub_aggregate(key)
         keys = ranking.bundled_keys.select { |k| self.class.connection.zcard(k) > 0 }
-        keys << ranking.selector.interstore
+        keys << ranking.selector.interstore if ranking.selector.interstore
         if keys.length
           self.class.connection.zinterstore(key, keys)
         end

data/lib/almicube/config.rb

@@ -28,7 +28,7 @@ module Almicube
 
     def connection(env = :default)
       @connection ||= { default: nil }
-      raise ArgumentError, "connection does not exist" unless @connection.has_key? env
+      raise ArgumentError, "connection does not exist" unless @connection.has_key? env.to_sym
       @redis ||= Redis.new @connection[env] unless @connection[env].nil?
       @redis ||= Redis.new
     end

data/lib/almicube/key.rb

@@ -42,5 +42,6 @@ module Almicube
     end
 
     alias :to_s :to_str
+    alias :inspect :to_str
   end
 end

data/lib/almicube/ranking/data_ranking.rb

@@ -45,7 +45,7 @@ module Almicube
       end
 
       def data_key
-        key_format(@options[:data_key], @options.merge({ type: :data }))
+        Almicube::Key.new self, @options.merge( type: :data )
       end
 
       def attribute_name

data/lib/almicube/version.rb

@@ -1,3 +1,3 @@
 module Almicube
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

data/lib/almicube.rb

@@ -34,6 +34,7 @@ module Almicube
   module Aggregator
     autoload :Base, 'almicube/aggregator/base'
     autoload :SumAggregator, 'almicube/aggregator/sum_aggregator'
+    autoload :AvgAggregator, 'almicube/aggregator/avg_aggregator'
   end
 
   if defined? ActiveRecord

data/spec/almicube/aggregator/sum_aggregator_spec.rb

@@ -1,92 +1,38 @@
 require 'spec_helper'
 
 describe Almicube::Aggregator::SumAggregator do
-  let(:size) { 1 }
-  let(:size_d) { size * 10 }
-
   before(:all) { @connection = Redis.new }
-  before { @connection.flushdb }
-
-  it { expect(size).to be > 0 }
-
-  shared_examples "correct aggregation" do
-    before { aggregator.ranking = ranking }
-
-    it "add new sorted set" do
-      expect{ aggregator.aggregate }.to change{ @connection.dbsize }.by 1
-    end
-    it "has correct items" do
-      expect(@connection.zcard(ranking.key)).to eq 0
-      aggregator.aggregate
-      expect(@connection.zcard(ranking.key)).to eq ranking.records.count
-    end
+  before do
+    @connection.flushdb
+    Almicube::Config.config.stub(:connection) { @connection }
   end
 
-  context "data ranking" do
-    context "target attribute is score" do
-      let(:ranking) { double( key: "sample:score", attribute_name: :score, data?: true ) }
-      let(:aggregator) { described_class.new }
-      before do
-        ranking.stub(:records) { size_d.times.map { |i| double( to_param: i, score: i*10 ) } }
-      end
-      it_behaves_like "correct aggregation"
-    end
+  describe "#aggregate" do
+    [10, 100, 300].each do |size|
+      describe "with #{size} records" do
+        let(:key) { "sample" }
+        let(:ranking) { double( records: records, selector: nil, data?: true, key: key, attribute_name: attribute ) }
+        let(:records) { size.times.map { |i| double( to_param: i+1, score: 100, access: (i + 2) * 12 ) } }
+        let(:aggregator) { described_class.new }
+        let(:attribute) { :score }
 
-    context "target attribute is access" do
-      let(:ranking) { double( key: "sample:access", attribute_name: :access, data?: true) }
-      let(:aggregator) { described_class.new }
-      before do
-        ranking.stub(:records) { size_d.times.map { |i| double( to_param: i, access: 1000 ) } }
-      end
-      it_behaves_like "correct aggregation"
-    end
-  end
+        before { aggregator.ranking = ranking }
 
-  context "sub ranking" do
-    context "target attribute is score" do
-      let(:ranking) { double( key: "sample:score", bundled_keys: ["sample:score:1", "sample:score:2"], attribute_name: :score, data?: false ) }
-      let(:aggregator) { described_class.new }
-      before do
-        ranking.stub(:records) { size_d.times.map { |i| double( to_param: i, score: i*10 ) } }
-        2.times.each do |i|
-          ranking.records.each do |record|
-            @connection.zadd("sample:score:#{i+1}", 20, record.to_param )
-          end
-        end
-      end
-      it_behaves_like "correct aggregation"
-      it "has ranking to set all score 40" do
-        aggregator.ranking = ranking
-        aggregator.aggregate
-        @connection.zrange("sample:score", 0, -1).each do |id|
-          expect(@connection.zscore("sample:score", id)).to eq 40
-        end
-      end
-    end
+        it { expect(records.length).to eq size }
+        it { expect{ aggregator.aggregate }.not_to raise_error }
+        it { expect{ aggregator.aggregate }.to change{ @connection.zcard(key) }.by size }
 
-    context "target attribute is access" do
-      let(:key) { "sample:access" }
-      let(:bundled_keys) { ["#{key}:1", "#{key}:2"] }
-      let(:ranking) { double( key: key, bundled_keys: bundled_keys, attribute_name: :access, data?: false ) }
-      let(:aggregator) { described_class.new }
-      before do
-        ranking.stub(:records) { size_d.times.map { |i| double( to_param: i, access: 1000 ) } }
-        2.times.each do |i|
-          ranking.records.each { |record| @connection.zadd("#{key}:#{i+1}", 1000, record.to_param ) }
+        describe "for score" do
+          before { aggregator.aggregate }
+          it { records.each { |record| expect(@connection.zscore(key, record.to_param)).to eq 100 } }
         end
-      end
-      it_behaves_like "correct aggregation"
-      it "has ranking to set all score 2000" do
-        aggregator.ranking = ranking
-        aggregator.aggregate
-        @connection.zrange("sample:access", 0, -1).each do |id|
-          expect(@connection.zscore("sample:access", id)).to eq 2000
+
+        describe "for access" do
+          let(:attribute) { :access }
+          before { aggregator.aggregate }
+          it { records.each { |record| expect(@connection.zscore(key, record.to_param)).to eq (record.to_param+1)*12} }
         end
       end
     end
   end
-
-  it_behaves_like "ranking cog" do
-    let(:target) { described_class.new }
-  end
 end

data/spec/almicube/config_spec.rb

@@ -20,12 +20,12 @@ describe Almicube::Config do
     end
 
     context "with default connection" do
-      before { Redis.should_receive(:new).with( default_param ) }
+      before { Redis.should_receive(:new).with( default_param ) { true } }
       it { described_class.config.connection }
     end
 
     context "with actual connection" do
-      before { Redis.should_receive(:new).with( development_param ) }
+      before { Redis.should_receive(:new).with( development_param ) { true } }
       it { described_class.config.connection :development }
     end
 

data/spec/almicube/ranking/base_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Almicube::Ranking::Base do
   describe "#bundled_keys" do
-    let(:bundler) { double( keys: ["1", "2"] ) }
+    let(:bundler) { double( keys: ["1", "2"], :"ranking=" => nil ) }
     let(:ranking) { described_class.new bundler: bundler }
     it { expect(ranking.bundled_keys).to eq ["1", "2"] }
   end

data/spec/almicube/ranking/sub_ranking_spec.rb

@@ -6,7 +6,7 @@ describe Almicube::Ranking::SubRanking do
 
   describe "#key" do
     let(:ranking) { described_class.new(data_ranking, bundler: bundler) }
-    let(:bundler) { double( bundle: :bundled ) }
+    let(:bundler) { double( bundle: :bundled, :"ranking=" => nil ) }
 
     it { expect(ranking.key).not_to match /:data:/ }
     it { expect(ranking.key).to match /:built:/ }
@@ -15,7 +15,7 @@ describe Almicube::Ranking::SubRanking do
 
   describe "#selector" do
     context "uses optional selector" do
-      let(:selector) { double( records: [] ) }
+      let(:selector) { double( records: [], :"ranking=" => nil ) }
       let(:ranking) { described_class.new(data_ranking, selector: selector) }
       it { expect(ranking.selector).to eq selector }
     end
@@ -27,7 +27,7 @@ describe Almicube::Ranking::SubRanking do
   end
 
   describe "#records" do
-    let(:selector) { double( records: ["a", "b"] ) }
+    let(:selector) { double( records: ["a", "b"], :"ranking=" => nil ) }
     let(:ranking) { described_class.new(data_ranking, selector: selector) }
     it { expect(ranking.records).to eq selector.records }
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: almicube
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - niaeashes
@@ -82,6 +82,7 @@ files:
 - Rakefile
 - almicube.gemspec
 - lib/almicube.rb
+- lib/almicube/aggregator/avg_aggregator.rb
 - lib/almicube/aggregator/base.rb
 - lib/almicube/aggregator/sum_aggregator.rb
 - lib/almicube/builder.rb