almicube 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94b199c38dcd6cb5b6599020ca0f935f7081810c
-  data.tar.gz: fe414a3b3946b9cfee359866f94780e36c75dc6e
+  metadata.gz: f5974ef075edf11c09d6e8c44485968661fcc8a5
+  data.tar.gz: ff7ca640f98417dc29d755aa314a57a8ebefca42
 SHA512:
-  metadata.gz: 8200ccaadf03f53d208f55f8e0659089e38075fd5c40ef0d0bca1e2bf306dd86a30020c74861c88c4065ad731cadc8f74fc690943be20beb17aef9bdad999dcb
-  data.tar.gz: ecae74f249d13c1668cc564b9420ae2c33fa1f4a9c9453e6a8ece13a4f852d435647cffd70c0d32b69b6198f7e446afdaad66a9865e6fbedf3f71861ff88e5a4
+  metadata.gz: 999950f31e8406189ebfce9726f6c5a6b99f7d4c389bb54e644dbcc9538d30c16e50169c449b35cbb86ce2cd3b3e214166a3c1acc0b2fd0b95d77d06c825f001
+  data.tar.gz: ae64515586232c660796d417702a84e3d72907aa0f1e89563548a44c40d04617f56c653eaca9aedf74fed83ab555bcbbf15aa6316af3aa96ddb4abfbd06f8c05

data/README.md

@@ -12,7 +12,7 @@ class Item < ActiveRecord::Base
 end
 ```
 
-in `app/controllers/items\_controller.rb`
+in `app/controllers/items_controller.rb`
 
 ```ruby
 class ItemsController
@@ -20,6 +20,7 @@ class ItemsController
     @items = Item.access_ranking.page params[:page]
   end
 end
+```
 
 in `app/views/items/index.html.erb`
 
@@ -35,3 +36,4 @@ Note
 --------
 
 - Almicube uses Redis for DataStore.
+- Example Project: https://github.com/niaeashes/almicube-sample

data/lib/almicube/builder/average_ranking_builder.rb

@@ -0,0 +1,35 @@
+module Almicube
+  module Builder
+    class AverageRankingBuilder
+      extend Base
+
+      register :average
+
+      def initialize(options)
+        @options = self.default_options.merge(options)
+      end
+
+      def default_options
+        { ranking_class: Almicube::Ranking, aggregate: :std }
+      end
+
+      def build(date)
+        ranking_class.new(ranking_options(date))
+      end
+
+      protected
+
+      RANKING_OPTIONS = %i[class_name as date_format attribute_name per_page aggregate default_score]
+
+      def ranking_options(date = Date.today)
+        ( @options.select{ |k| self.class::RANKING_OPTIONS.include? k } ).merge( date: date )
+      end
+
+      %i[ranking_class].each do |name|
+        define_method(name) do
+          @options[name]
+        end
+      end
+    end
+  end
+end

data/lib/almicube/builder/countable_ranking_builder.rb

@@ -0,0 +1,35 @@
+module Almicube
+  module Builder
+    class CountableRankingBuilder
+      extend Base
+
+      register :countable
+
+      def initialize(options)
+        @options = self.default_options.merge(options)
+      end
+
+      def default_options
+        { ranking_class: Almicube::Ranking, aggregate: :sum }
+      end
+
+      def build(date)
+        ranking_class.new(ranking_options(date))
+      end
+
+      protected
+
+      RANKING_OPTIONS = %i[class_name as date_format attribute_name per_page aggregate default_score]
+
+      def ranking_options(date = Date.today)
+        ( @options.select{ |k| self.class::RANKING_OPTIONS.include? k } ).merge( date: date )
+      end
+
+      %i[ranking_class].each do |name|
+        define_method(name) do
+          @options[name]
+        end
+      end
+    end
+  end
+end

data/lib/almicube/builder.rb

@@ -0,0 +1,41 @@
+module Almicube
+  module Builder
+    class << self
+      def instance(name, options={})
+        raise ArgumentError, "invalid #1 name" unless has_builder? name
+        builders[name].new options
+      end
+
+      def register(name, builder_class)
+        raise TypeError, 'invalid builder class' unless builder_class.kind_of? Builder::Base
+        builders[name] = builder_class
+      end
+
+      def has_builder?(name)
+        load_builder name
+        builders.has_key? name
+      end
+
+      def builders
+        @builders ||= {}
+      end
+
+      def load_builder(name)
+        "Almicube::Builder::#{"#{name}_ranking_builder".classify}".constantize
+      end
+    end
+
+    module Base
+      def self.included(base)
+        base.include InstanceMethods
+      end
+
+      def register(name)
+        Builder.register(name, self)
+      end
+
+      class InstanceMethods
+      end
+    end
+  end
+end

data/lib/almicube/model.rb

@@ -8,16 +8,18 @@ module Almicube
 
           def ranking_with(ranker, options={})
             ranker = ranker.to_s
-            options.symbolize_keys!.merge(Ranking.default_options)
+            options = options.symbolize_keys!.merge(class_name: self, attribute_name: ranker.to_sym)
 
-            class_name = ( options.fetch :class_name, Almicube::Ranking ).to_s
-            as = options.fetch :as, Float
-            per_page = options.fetch :per_page, 10
+            builder_name = options.delete :builder
+            builder_name = :countable unless builder_name
+
+            @ranking_builders ||= {}
+            @ranking_builders[ranker.to_sym] = Almicube::Builder.instance(builder_name, options)
 
             class_eval <<-EVAL
               def self.#{ranker}_ranking(date = Date.today)
                 @rankings ||= {}
-                @rankings[:"#{ranker}:\#{date.to_s}"] ||= #{class_name}.build attribute_name: :#{ranker}, class_name: self, as: #{as}, date: date, per_page: #{per_page}
+                @rankings[:"#{ranker}:\#{date.to_s}"] ||= @ranking_builders[:#{ranker}].build(date)
               end
 
               def #{ranker}_ranking(date = Date.today)

data/lib/almicube/ranged_ranking.rb

@@ -12,7 +12,18 @@ module Almicube
         keys << key if connection.exists key
         keys
       end
-      connection.zunionstore key, keys, aggregate: :sum
+      if %i[sum max min].include? aggregate_method
+        connection.zunionstore key, keys, aggregate: aggregate_method
+      elsif aggregate_method == :std
+        weights = Array.new keys.length, (1.0/keys.length)
+        connection.zunionstore key, keys, aggregate: :sum, weights: weights
+      else
+        connection.zunionstore key, keys, aggregate: :sum
+      end
+    end
+
+    def date
+      super - 1.days
     end
 
     def range
@@ -23,6 +34,10 @@ module Almicube
       :weekly
     end
 
+    def aggregate_method
+      aggregate = @options.fetch(:aggregate, :sum)
+    end
+
     protected
 
     def range_days(range, default = nil)
@@ -31,8 +46,6 @@ module Almicube
         1
       when :weekly
         7
-      when :twice_weekly
-        14
       when :monthly
         30
       else

data/lib/almicube/ranking.rb

@@ -14,7 +14,8 @@ module Almicube
           date: Date.today,
           per_page: 10,
           as: Float,
-          default_score: 0 }
+          default_score: 0,
+          class_name: nil }
       end
 
       def connection
@@ -49,7 +50,7 @@ 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 = target_class.find(revrange)
+      records = target_class.where("id IN (?)", revrange).all
       revrange.inject([]) { |l, v| l << records.detect { |r| r.to_param == v } }
     end
 
@@ -122,7 +123,7 @@ module Almicube
     end
 
     def key_format(key_base, options)
-      key = key_base.clone
+      key = key_base.to_s.clone
       tmp_options = options.merge date: options.fetch(:date, Date.today).strftime(@options[:date_format])
       key.match( self.class::KEY_PATTERN ) do |m|
         key.gsub! m[0], tmp_options.fetch(m[1].to_sym, '').to_s

data/lib/almicube/version.rb

@@ -1,3 +1,3 @@
 module Almicube
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

data/lib/almicube.rb

@@ -4,6 +4,12 @@ module Almicube
   autoload :Model, 'almicube/model'
   autoload :AssociationProxy, 'almicube/proxy/association_proxy'
 
+  autoload :Builder, 'almicube/builder'
+  module Builder
+    autoload :CountableRankingBuilder, 'almicube/builder/countable_ranking_builder'
+    autoload :AverageRankingBuilder, 'almicube/builder/average_ranking_builder'
+  end
+
   if defined? ActiveRecord
     ActiveRecord::Base.send :include, Almicube::Model
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: almicube
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - niaeashes
@@ -52,6 +52,9 @@ files:
 - README.md
 - almicube.gemspec
 - lib/almicube.rb
+- lib/almicube/builder.rb
+- lib/almicube/builder/average_ranking_builder.rb
+- lib/almicube/builder/countable_ranking_builder.rb
 - lib/almicube/model.rb
 - lib/almicube/proxy/association_proxy.rb
 - lib/almicube/ranged_ranking.rb