almicube 0.0.6 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9fa0b027e6a3cbdfc138f59cc9a9b9a6704227bd
-  data.tar.gz: ffb6baa33b5d9940c5fe10c1dd3571d1d44427c1
+  metadata.gz: eb295b819df1854c96c9b2fbf911ab09b5063f8f
+  data.tar.gz: 861bf7962f333e61d85bd695c9d3ab92a8611fbd
 SHA512:
-  metadata.gz: e23331dfcd4ef85a623a8bb406172cefa9f4fb411931e11532d29becf51f610f9006db9ac6b79b76111da3a627afa2615685225bb70feae891365e041a8d1ea3
-  data.tar.gz: abbdecc865510ee154bfec2350167b1b5a8252d0348a89f7455eb8fb35a389e40487ff17b8f5f8713b59e315e59875379a595bed359b5f22c6470de4fbeb1ece
+  metadata.gz: 191a40acc01416bf0b3f4b50ff9601939f679dbe10c212a0eb4f4ebe82631f42d635988945cb3d0b3969511e6bfb41c592351be108b54da8923f1ac345c2fc72
+  data.tar.gz: 1acffa0eeaed6337e4a8601b0df6890b57363594fe29c6faa1d6cf175a00cf61f727d32cf9b60944e3355666dfa3470781b34b77cf4ff425e3ff155a00dc8d6c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    almicube (0.0.5)
+    almicube (0.0.7)
       activemodel (~> 4.0)
       activesupport (~> 4.0)
       redis (~> 3.0)
@@ -20,9 +20,11 @@ GEM
       tzinfo (~> 1.1)
     builder (3.2.2)
     diff-lcs (1.2.5)
+    docile (1.1.3)
     i18n (0.6.9)
     json (1.8.1)
     minitest (5.3.3)
+    multi_json (1.10.0)
     redis (3.0.7)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
@@ -32,6 +34,11 @@ GEM
     rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.6)
+    simplecov (0.8.2)
+      docile (~> 1.1.0)
+      multi_json
+      simplecov-html (~> 0.8.0)
+    simplecov-html (0.8.0)
     thread_safe (0.3.3)
     tzinfo (1.1.0)
       thread_safe (~> 0.1)
@@ -42,3 +49,4 @@ PLATFORMS
 DEPENDENCIES
   almicube!
   rspec (~> 2.0)
+  simplecov

data/almicube.gemspec

@@ -22,4 +22,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "activemodel", "~> 4.0"
 
   spec.add_development_dependency "rspec", "~> 2.0"
+  spec.add_development_dependency "simplecov"
 end

data/lib/almicube/aggregator/base.rb

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

data/lib/almicube/bundler/today_bundler.rb

@@ -1,9 +1,6 @@
 module Almicube
   module Bundler
     class TodayBundler < Base
-      def keys
-        []
-      end
     end
   end
 end

data/lib/almicube/cog.rb

@@ -7,5 +7,11 @@ module Almicube
     end
 
     alias :has_ranking? :active?
+
+    def before_aggregate
+    end
+
+    def after_aggregate
+    end
   end
 end

data/lib/almicube/key.rb

@@ -10,10 +10,15 @@ module Almicube
 
     def initialize(ranking, options={})
       @ranking = ranking
-      @options = ranking.options.merge(options).select { |k| self.class::ALLOWED_OPTIONS.include? k.to_sym }
+      @options = select ranking.options.merge(options)
       @config ||= Config.config
     end
 
+    def merge!(options={})
+      @options = select @options.merge(options)
+      self
+    end
+
     def [](name)
       options[name.to_sym]
     end
@@ -43,5 +48,11 @@ module Almicube
 
     alias :to_s :to_str
     alias :inspect :to_str
+
+    protected
+
+    def select(options={})
+      options.select { |k| self.class::ALLOWED_OPTIONS.include? k.to_sym }
+    end
   end
 end

data/lib/almicube/model.rb

@@ -23,16 +23,18 @@ module Almicube
                 Almicube::AssociationProxy.new(self.class.#{ranker}_ranking(date), self)
               end
 
-              def #{ranker}_rank(date = Date.today)
-                self.#{ranker}_ranking(date).rank
+              attr_accessor :current_ranking
+
+              def #{ranker}_rank
+                @current_ranking.rank(self)
               end
 
-              def #{ranker}_score(date = Date.today)
-                self.#{ranker}_ranking(date).score
+              def #{ranker}_score
+                @current_ranking.score(self)
               end
 
-              def #{ranker}_incr(date = Date.today, score = 1)
-                self.#{ranker}_ranking(date).incr(score)
+              def #{ranker}_incr
+                @current_ranking.incr(score)
               end
             EVAL
           end

data/lib/almicube/ranking/base.rb

@@ -5,19 +5,15 @@ module Almicube
       attr_accessor :per_page
 
       def initialize(options={})
-        @selector = options[:selector]
-        @aggregator = options[:aggregator] || Aggregator::SumAggregator.new
-        @bundler = options[:bundler]
+        self.selector = options[:selector]
+        self.aggregator = options[:aggregator] || Aggregator::SumAggregator.new
+        self.bundler = options[:bundler]
         @prefix = options[:prefix]
         @suffix = options[:suffix]
         @date = options[:date] || Date.today
         @class_name = options[:class_name]
         @class_name = @class_name.constantize if @class_name.is_a? String
         @per_page = options[:per_page] || 10
-
-        @selector.ranking = self unless @selector.nil?
-        @aggregator.ranking = self unless @aggregator.nil?
-        @bundler.ranking = self unless @bundler.nil?
       end
 
       def records
@@ -35,12 +31,38 @@ module Almicube
       def page(page=1)
         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
+        records = class_name.where("id IN (?)", revrange)
+        records.each { |record| record.current_ranking = self }
         revrange.inject([]) { |l, v| l << records.detect { |r| r.to_param == v } }
       end
 
+      def selector=(value)
+        @selector = value
+        @selector.ranking = self unless @selector.nil?
+      end
+
+      def aggregator=(value)
+        @aggregator = value
+        @aggregator.ranking = self unless @aggregator.nil?
+      end
+
+      def bundler=(value)
+        @bundler = value
+        @bundler.ranking = self unless @bundler.nil?
+      end
+
+      def cogs
+        cogs = []
+        cogs << @selector unless @selector.nil?
+        cogs << @aggregator unless @aggregator.nil?
+        cogs << @bundler unless @bundler.nil?
+        cogs
+      end
+
       def aggregate!(options = {})
+        cogs.each { |cog| cog.before_aggregate }
         @aggregator.aggregate self
+        cogs.each { |cog| cog.after_aggregate }
       end
 
       def aggregate(options = {})
@@ -54,6 +76,18 @@ module Almicube
         false
       end
 
+      def score(item)
+        ( connection.zscore key, item.to_param ) || @options.fetch(:default_score, 0)
+      end
+
+      def rank(item)
+        connection.zrevrank(key, item.to_param) + 1
+      end
+
+      def incr(item, score = 1)
+        connection.zincrby key, score, item.to_param
+      end
+
       protected
 
       attr_reader :prefix, :suffix

data/lib/almicube/ranking/data_ranking.rb

@@ -17,10 +17,6 @@ module Almicube
             default_score: 0,
             class_name: nil }
         end
-
-        def build(options={})
-          self.new options
-        end
       end
 
       def initialize(options={})
@@ -72,10 +68,6 @@ module Almicube
         SubRanking.new(self).ranged(name)
       end
 
-      def per_page=(value)
-        @options[:per_page] = value
-      end
-
       def options
         @options.select{ |k| k != :type }.merge({ selector: selector, aggregator: aggregator })
       end
@@ -91,38 +83,6 @@ module Almicube
       def default_score
         @options.fetch(:default_score, 0)
       end
-
-      def score(item)
-        actual_score = ( connection.zscore key, item.to_param ) || @options.fetch(:default_score, 0)
-        case @options[:as].to_s
-        when "Integer"
-          actual_score.to_i
-        when "Float"
-          actual_score.to_f
-        else
-          actual_score
-        end
-      end
-
-      def rank(item)
-        connection.zrevrank(key, item.to_param) + 1
-      end
-
-      def incr(item, score = 1)
-        connection.zincrby key, score, item.to_param
-      end
-
-      protected
-
-      def key_format(key_base, options)
-        key = key_base.to_s.clone
-        tmp_options = options.merge date: options.fetch(:date, Date.today).strftime(@options[:date_format])
-        tmp_options[:type] ||= :data
-        key.match( self.class::KEY_PATTERN ) do |m|
-          key.gsub! m[0], tmp_options.fetch(m[1].to_sym, '').to_s
-        end while key =~ self.class::KEY_PATTERN
-        key
-      end
     end
   end
 end

data/lib/almicube/ranking/sub_ranking.rb

@@ -13,10 +13,7 @@ module Almicube
       end
 
       def key
-        key = ranking.key
-        key[:type] = :built
-        key[:suffix] = suffix
-        key[:selector] = selector
+        key = ranking.key.merge!( type: :built, suffix: suffix, selector: selector )
         key[:distinction] = "%{date}:in-%{selector}" unless selector.is_a? Selector::AllSelector
         key
       end
@@ -25,16 +22,6 @@ module Almicube
         ranking.key
       end
 
-      def bundler=(value)
-        @bundler = value
-        value.ranking = self
-      end
-
-      def selector=(value)
-        @selector = value
-        value.ranking = self
-      end
-
       def ranged(name)
         bundler_class = "Almicube::Bundler::#{name.to_s.classify}Bundler".constantize
         self.bundler = bundler_class.new if bundler_class.is_a? Class

data/lib/almicube/version.rb

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

data/spec/almicube/aggregator/sum_aggregator_spec.rb

@@ -8,31 +8,53 @@ describe Almicube::Aggregator::SumAggregator do
   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 }
-
-        before { aggregator.ranking = ranking }
-
-        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 }
-
-        describe "for score" do
-          before { aggregator.aggregate }
-          it { records.each { |record| expect(@connection.zscore(key, record.to_param)).to eq 100 } }
-        end
+    let(:key) { "sample" }
+    let(:aggregator) { described_class.new }
+    let(:attribute) { :score }
+
+    context "with data ranking" do
+      [10, 100, 300].each do |size|
+        describe "and #{size} records" do
+          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 ) } }
+
+          before { aggregator.ranking = ranking }
 
-        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} }
+          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 }
+
+          describe "for score" do
+            before { aggregator.aggregate }
+            it { records.each { |record| expect(@connection.zscore(key, record.to_param)).to eq 100 } }
+          end
+
+          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
+
+    context "with sub ranking" do
+      let(:size) { 10 }
+      let(:keys) { ["sample1", "sample2"] }
+      let(:selector) { double( interstore: nil, before_aggregate: nil ) }
+      let(:ranking) { double( bundled_keys: keys, selector: selector, data?: false, key: key ) }
+
+      before do
+        keys.each { |key| size.times { |i| @connection.zadd(key, 10, i) } }
+        aggregator.ranking = ranking
+      end
+
+      it { expect{ aggregator.aggregate }.to change{ @connection.zcard(key) }.by size }
+
+      describe "for score" do
+        before { aggregator.aggregate }
+        it { size.times { |i| expect(@connection.zscore(key, i)).to eq 20 } }
+      end
+    end
   end
 end

data/spec/almicube/builder/today_bundler_spec.rb

@@ -0,0 +1,8 @@
+require 'spec_helper'
+
+describe Almicube::Bundler::TodayBundler do
+  let(:bundler) { described_class.new }
+  describe "#keys" do
+    it { expect(bundler.keys).to eq [] }
+  end
+end

data/spec/almicube/ranking/base_spec.rb

@@ -1,9 +1,63 @@
 require 'spec_helper'
 
 describe Almicube::Ranking::Base do
+  before { @connection = Redis.new }
+
+  def setup_datastore(key)
+    @connection.del key
+    @connection.zadd key, 10, 1
+    @connection.zadd key, 20, 2
+  end
+
   describe "#bundled_keys" do
     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
+
+  describe "#page" do
+    let(:ranking) { described_class.new class_name: MockModel }
+    before do
+      ranking.stub(:key) { "sample" }
+      setup_datastore "sample"
+      Almicube::Config.config.stub(:connection) { @connection }
+      MockModel.should_receive(:where).with("id IN (?)", ["2", "1"]) { [] }
+    end
+    it { ranking.page 1 }
+  end
+
+  describe "#data?" do
+    let(:ranking) { described_class.new }
+    it { expect(ranking).not_to be_data }
+  end
+
+  describe "score" do
+    let(:ranking) { described_class.new class_name: MockModel }
+    before do
+      ranking.stub(:key) { "sample" }
+      setup_datastore "sample"
+      Almicube::Config.config.stub(:connection) { @connection }
+    end
+    it { expect(ranking.score(1)).to eq 10 }
+    it { expect(ranking.score(2)).to eq 20 }
+  end
+
+  describe "rank" do
+    let(:ranking) { described_class.new class_name: MockModel }
+    before do
+      ranking.stub(:key) { "sample" }
+      setup_datastore "sample"
+      Almicube::Config.config.stub(:connection) { @connection }
+    end
+    it { expect(ranking.rank(1)).to eq 2 }
+    it { expect(ranking.rank(2)).to eq 1 }
+  end
+
+  describe "#aggregate" do
+    context "raises exception from aggregator" do
+      let(:ranking) { described_class.new class_name: MockModel }
+      before { ranking.stub(:aggregate!).and_raise "exception" }
+      it { expect(ranking.aggregate).to eq false }
+    end
+  end
 end

data/spec/almicube/ranking/data_ranking_spec.rb

@@ -35,6 +35,47 @@ describe Almicube::Ranking::DataRanking do
     it { expect(ranking.per_page).to eq 10 }
   end
 
+  describe "#default_score" do
+    context "don't set default_score" do
+      let(:ranking) { described_class.new }
+      it { expect(ranking.default_score).to eq 0 }
+    end
+
+    context "sets default_score by options" do
+      let(:ranking) { described_class.new default_score: 0 }
+      it { expect(ranking.default_score).to eq 0 }
+    end
+  end
+
+  describe "#attribute_name" do
+    context "don't set attribute_name" do
+      let(:ranking) { described_class.new }
+      it { expect(ranking.attribute_name).to eq :score }
+    end
+
+    context "sets attribute_name by options" do
+      %i[score access].each do |name|
+        describe "to #{name}" do
+          let(:ranking) { described_class.new attribute_name: :score }
+          it { expect(ranking.attribute_name).to eq :score }
+        end
+      end
+    end
+  end
+
+  describe "#date" do
+    context "don't set date" do
+      let(:ranking) { described_class.new }
+      it { expect(ranking.date).to eq Date.today }
+    end
+
+    context "sets date by options" do
+      let(:date) { Date.today - 12.days }
+      let(:ranking) { described_class.new date: date }
+      it { expect(ranking.date).to eq date }
+    end
+  end
+
   describe "#class_name" do
     let(:ranking) { described_class.new class_name: MockModel }
     it { expect(ranking.class_name).to eq MockModel }
@@ -96,8 +137,55 @@ describe Almicube::Ranking::DataRanking do
       it { expect(options).to have_key key }
     end
 
-    %i[type].each do |key|
-      it { expect(options).not_to have_key key }
+    %i[type].each { |key| it { expect(options).not_to have_key key } }
+  end
+
+  describe "#in" do
+    context "with correct instance" do
+      let(:ranking) { described_class.new class_name: MockModel }
+      let(:target) { double( mock_models: [] ) }
+
+      before do
+        Almicube::Selector::HasManySelector.any_instance.stub(:"ranking=")
+      end
+
+      it { expect(ranking.in(target)).to be_kind_of Almicube::Ranking::SubRanking }
+    end
+
+    context "without correct instance" do
+      let(:ranking) { described_class.new }
+      let(:target) { double() }
+
+      before do
+        Almicube::Selector::HasManySelector.any_instance.stub(:"ranking=")
+      end
+
+      it { expect(ranking.in(target)).not_to be_kind_of Almicube::Ranking::SubRanking }
     end
   end
+
+  describe "#exists?" do
+    let(:ranking) { described_class.new }
+    let(:key) { "sample" }
+    before do
+      @connection = Redis.new
+      Almicube::Config.config.stub(:connection) { @connection }
+      ranking.stub(:key).and_return(key)
+    end
+
+    context "exists key in redis" do
+      before { @connection.del key }
+      it { expect(ranking).not_to be_exists }
+    end
+
+    context "don't exist key in redis" do
+      before { @connection.zadd key, 10, 10 }
+      it { expect(ranking).to be_exists }
+    end
+  end
+
+  describe "#ranged" do
+    let(:ranking) { described_class.new }
+    it { expect(ranking.ranged(:yesterday)).to be_kind_of Almicube::Ranking::SubRanking }
+  end
 end

data/spec/almicube/selector/all_selector_spec.rb

@@ -16,6 +16,11 @@ describe Almicube::Selector::AllSelector do
     end
   end
 
+  describe "#label" do
+    let(:selector) { described_class.new }
+    it { expect(selector.label).to eq :data }
+  end
+
   it_behaves_like "ranking cog" do
     let(:target) { described_class.new }
   end

data/spec/almicube/selector/has_many_selector_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+describe Almicube::Selector::HasManySelector do
+  before { @connection = Redis.new }
+
+  describe "#before_aggregate" do
+    let(:target) { double( items: [double(to_param: 10)] ) }
+    let(:selector) { described_class.new target: target, association_name: :items }
+    before { Almicube::Config.config.stub(:connection) { @connection } }
+    before { selector.stub(:interstore_key) { "sample-has-many-selector" } }
+    it { expect{ selector.before_aggregate }.to change{ @connection.zcard("sample-has-many-selector") }.by 1 }
+  end
+
+  describe "#label" do
+    let(:target) { double( items: [double(to_param: 10)], to_param: 10) }
+    let(:selector) { described_class.new target: target, association_name: :items }
+    it { expect(selector.label).to eq "r_spec/mocks/mock-10" }
+  end
+
+  describe "#interstore" do
+    let(:target) { double( items: [double(to_param: 10)], to_param: 10) }
+    let(:key) { Almicube::Key.new double(options: {}), {} }
+    let(:selector) { described_class.new target: target, association_name: :items }
+    before { selector.ranking = double(key: key) }
+    it { expect(selector.interstore.to_s).to match /r_spec\/mocks\/mock-10/ }
+  end
+end

data/spec/spec_helper.rb

@@ -4,6 +4,12 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__)))
 require 'bundler/setup'
 Bundler.require
 
+require 'simplecov'
+SimpleCov.start 'rails' do
+  add_filter '/tmp/'
+  add_filter '/spec/'
+end
+
 Dir[File.join(File.dirname(__FILE__), "supports", "*.rb")].each {|f| require f}
 Dir[File.join(File.dirname(__FILE__), "mocks", "*.rb")].each {|f| require f}
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: almicube
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.1.0
 platform: ruby
 authors:
 - niaeashes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-11 00:00:00.000000000 Z
+date: 2014-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -66,6 +66,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Provide raking system for your ActiveRecord Model on Rails 4 with SortedSet
   of Redis DataBase.
 email:
@@ -106,6 +120,7 @@ files:
 - lib/almicube/selector/method_selector.rb
 - lib/almicube/version.rb
 - spec/almicube/aggregator/sum_aggregator_spec.rb
+- spec/almicube/builder/today_bundler_spec.rb
 - spec/almicube/builder_sprc.rb
 - spec/almicube/bundler/days_ago_bundler_spec.rb
 - spec/almicube/bundler/today_bundler_spec.rb
@@ -116,6 +131,7 @@ files:
 - spec/almicube/ranking/data_ranking_spec.rb
 - spec/almicube/ranking/sub_ranking_spec.rb
 - spec/almicube/selector/all_selector_spec.rb
+- spec/almicube/selector/has_many_selector_spec.rb
 - spec/almicube/selector/method_selector_spec.rb
 - spec/almicube/selector/mock_spec.rb
 - spec/mocks/aggregator.rb
@@ -150,6 +166,7 @@ specification_version: 4
 summary: Ranking extension for your model
 test_files:
 - spec/almicube/aggregator/sum_aggregator_spec.rb
+- spec/almicube/builder/today_bundler_spec.rb
 - spec/almicube/builder_sprc.rb
 - spec/almicube/bundler/days_ago_bundler_spec.rb
 - spec/almicube/bundler/today_bundler_spec.rb
@@ -160,6 +177,7 @@ test_files:
 - spec/almicube/ranking/data_ranking_spec.rb
 - spec/almicube/ranking/sub_ranking_spec.rb
 - spec/almicube/selector/all_selector_spec.rb
+- spec/almicube/selector/has_many_selector_spec.rb
 - spec/almicube/selector/method_selector_spec.rb
 - spec/almicube/selector/mock_spec.rb
 - spec/mocks/aggregator.rb