multirow_counter 0.0.2 → 0.0.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 250181796c25350c1166b39ab8d0ff56f0f4ed2b
+  data.tar.gz: 878c3644f5bccacb41e4c006f1ab80613284ae69
+SHA512:
+  metadata.gz: ddbbb2213381c12d5251289070ddb23b4981b7dfc60d2c5fcc2ee62df5d632309ed27aa0c6b6d226c945546d144c8bbe57206c593ddbfb114cf64e96e7ecabc8
+  data.tar.gz: f4cf08244e0f71a4ae5fd0c5bbf7c2677353e822dc77ff939cb19ed3aa59c697a31d86086313427732f93e1367b442d639eb9ffe3bbab080553fdd781b174d94

data/lib/generators/templates/multirow_counter_migration.rb

@@ -1,25 +1,14 @@
 class Add<%= counter_name.classify %>CounterTo<%= model_name.classify %> < ActiveRecord::Migration
 
   def self.up
-    create_table :<%= [model_name, counter_name].join('_').tableize %> do |t|
-      t.integer :id
-      t.integer :<%= model_name %>_id
-      t.integer :counter_id
-      t.integer :value
-    end
-
-    add_index :<%= [model_name, counter_name].join('_').tableize %>, :<%= model_name %>_id
-
-    # You may want to consider moving this into a background task if it takes too long
-    <%= model_name.classify %>.find_each do |<%= model_name %>|
-      1.upto(<%= number_of_counter_rows %>) do |num|
-        MultirowCounter::<%= model_name.classify %><%= counter_name.classify %>.create! do |row|
-          row.<%= model_name %>_id = <%= model_name %>.id
-          row.counter_id = num
-          row.value = 0
-        end
-      end
-    end
+    execute <<-SQL
+      CREATE TABLE <%= [model_name, counter_name].join('_').tableize %> (
+        <%= model_name %>_id INT     NOT NULL,
+        counter_id           TINYINT NOT NULL,
+        value                INT     NOT NULL,
+        PRIMARY KEY (<%= model_name %>_id, counter_id)
+      )
+    SQL
   end
 
   def self.down

data/lib/multirow_counter.rb

@@ -1,4 +1,3 @@
 require 'multirow_counter/extension'
-require 'multirow_counter/counter_model_creator'
 require 'multirow_counter/railtie' if defined?(Rails)
 

data/lib/multirow_counter/extension.rb

@@ -4,25 +4,54 @@ module MultirowCounter
       num_rows = options[:rows] || raise(ArgumentError, "You need to specify how many rows will be used eg. :rows => 3")
       class_name = self.name
 
-      creator = CounterModelCreator.new(counter_name.to_s, class_name)
-      const = creator.create
+      assoc = class_name.foreign_key
+      table_name = [class_name, counter_name.to_s.camelize].join.tableize
 
       # define getter method
       getter = lambda do
-        counter_relation = const.where(class_name.foreign_key => id)
-        counter_relation.sum(:value)
+        ivar_name = "@#{counter_name}"
+        if x = instance_variable_get(ivar_name)
+          return x
+        else
+          val = ActiveRecord::Base.connection.select_value <<-SQL
+            SELECT IFNULL(SUM(value),0) FROM #{table_name} WHERE #{assoc}=#{self.id}
+          SQL
+          instance_variable_set(ivar_name, val.to_i)
+        end
       end
 
       define_method(counter_name, &getter)
       define_method("multirow_counter_#{counter_name}", &getter)
 
       # define increment method
-      define_method("increment_#{counter_name}") do |incr = 1|
-        counter_relation = const.where(class_name.foreign_key => id)
+      define_method("new_#{counter_name}!") do |incr = 1|
+        ivar_name = "@#{counter_name}"
+        if x = instance_variable_get(ivar_name)
+          instance_variable_set(ivar_name, x + incr)
+        end
+
         randomly_selected_counter_row = rand(num_rows) + 1
 
-        counter_relation.where(:counter_id => randomly_selected_counter_row).limit(1).update_all("value = value+#{Integer(incr)}")
+        num_changed = ActiveRecord::Base.connection.update <<-SQL
+          UPDATE #{table_name} SET value=value+#{Integer(incr)}
+            WHERE #{assoc}=#{self.id} AND counter_id=#{randomly_selected_counter_row}
+        SQL
+
+        if num_changed == 0 # row doesn't exist. We create it instead.
+          ActiveRecord::Base.connection.execute <<-SQL
+            INSERT INTO #{table_name} (#{assoc}, counter_id, value)
+              VALUES (#{self.id}, #{randomly_selected_counter_row}, #{Integer(incr)})
+              ON DUPLICATE KEY UPDATE value=value+#{Integer(incr)};
+          SQL
+        end
       end
+
+      define_method("reload_with_#{counter_name}_reset") do
+        instance_variable_set("@#{counter_name}", nil)
+        send("reload_without_#{counter_name}_reset")
+      end
+
+      alias_method_chain :reload, "#{counter_name}_reset".to_sym
     end
   end
 end

data/test/multirow_counter_test.rb

@@ -1,6 +1,8 @@
 require 'helper'
 
 describe MultirowCounter do
+  include MultirowCounterTables
+
   before do
     reset_tables
   end
@@ -14,30 +16,30 @@ describe MultirowCounter do
   end
 
   it "should allow incrementing" do
-    @shop.increment_version
+    @shop.new_version!
     assert_equal 1, @shop.version
   end
 
   it "supports many increments" do
-    10.times { @shop.increment_version }
+    10.times { @shop.new_version! }
     assert_equal 10, @shop.version
   end
 
   it "supports batch increments" do
-    @shop.increment_version(10)
+    @shop.new_version!(10)
     assert_equal 10, @shop.version
   end
 
   it "should not send all increments to the same row" do
-    10.times { @shop.increment_version }
+    10.times { @shop.new_version! }
 
-    shop_versions = MultirowCounter::ShopVersion.where(:shop_id => @shop.id)
+    shop_versions = ShopVersion.where(:shop_id => @shop.id)
     refute shop_versions.any? { |v| v.value == 10 }
   end
 
   it "requires the number of rows to be specified" do
     class Foo < ActiveRecord::Base
-      lambda { 
+      lambda {
         multirow_counter :the_count, :random => 'oops'
       }.must_raise ArgumentError
     end
@@ -46,5 +48,15 @@ describe MultirowCounter do
   it "defines a second obscure getter" do
     @shop.multirow_counter_version.must_equal @shop.version
   end
+
+  it "resets the memoized value when reloading" do
+    @shop.new_version!
+    @other_instance = Shop.find(@shop.id)
+    @other_instance.new_version!
+
+    @shop.reload
+
+    assert_equal @shop.version, @other_instance.version
+  end
 end
 

metadata

@@ -1,38 +1,93 @@
 --- !ruby/object:Gem::Specification
 name: multirow_counter
 version: !ruby/object:Gem::Version
-  version: 0.0.2
-  prerelease: 
+  version: 0.0.3
 platform: ruby
 authors:
 - Jesse Storimer
 autorequire: 
 bindir: bin
-cert_chain: []
-date: 2012-07-17 00:00:00.000000000 Z
+cert_chain:
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIDcDCCAligAwIBAgIBATANBgkqhkiG9w0BAQUFADA/MQ8wDQYDVQQDDAZhZG1p
+  bnMxFzAVBgoJkiaJk/IsZAEZFgdzaG9waWZ5MRMwEQYKCZImiZPyLGQBGRYDY29t
+  MB4XDTE0MDUxNTIwMzM0OFoXDTE1MDUxNTIwMzM0OFowPzEPMA0GA1UEAwwGYWRt
+  aW5zMRcwFQYKCZImiZPyLGQBGRYHc2hvcGlmeTETMBEGCgmSJomT8ixkARkWA2Nv
+  bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL0/81O3e1vh5smcwp2G
+  MpLQ6q0kejQLa65bPYPxdzWA1SYOKyGfw+yR9LdFzsuKpwWzKq6zX35lj1IckWS4
+  bNBEQzxmufUxU0XPM02haFB8fOfDJzdXsWte9Ge4IFwahwn68gpMqN+BvxL+KMYz
+  Iut9YmN44d4LZdsENEIO5vmybuG2vYDz7R56qB0PA+Q2P2CdhymsBad2DQs69FBo
+  uico9V6VMYYctL9lCYdzu9IXrOYNTt88suKIVzzAlHOKeN0Ng5qdztFoTR8sfxDr
+  Ydg3KHl5n47wlpgd8R0f/4b5gGxW+v9pyJCgQnLlRu7DedVSvv7+GMtj3g9r3nhJ
+  KqECAwEAAaN3MHUwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFI/o
+  maf34HXbUOQsdoLHacEKQgunMB0GA1UdEQQWMBSBEmFkbWluc0BzaG9waWZ5LmNv
+  bTAdBgNVHRIEFjAUgRJhZG1pbnNAc2hvcGlmeS5jb20wDQYJKoZIhvcNAQEFBQAD
+  ggEBADkK9aj5T0HPExsov4EoMWFnO+G7RQ28C30VAfKxnL2UxG6i4XMHVs6Xi94h
+  qXFw1ec9Y2eDUqaolT3bviOk9BB197+A8Vz/k7MC6ci2NE+yDDB7HAC8zU6LAx8Y
+  Iqvw7B/PSZ/pz4bUVFlTATif4mi1vO3lidRkdHRtM7UePSn2rUpOi0gtXBP3bLu5
+  YjHJN7wx5cugMEyroKITG5gL0Nxtu21qtOlHX4Hc4KdE2JqzCPOsS4zsZGhgwhPs
+  fl3hbtVFTqbOlwL9vy1fudXcolIE/ZTcxQ+er07ZFZdKCXayR9PPs64heamfn0fp
+  TConQSX2BnZdhIEYW+cKzEC/bLc=
+  -----END CERTIFICATE-----
+date: 2014-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2180916380 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2180916380
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: &2180915820 !ruby/object:Gem::Requirement
-    none: false
+  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'
+- !ruby/object:Gem::Dependency
+  name: rake
+  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'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2180915820
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Typically SQL is not a great place to store a counter that is incremented
   often. For instance if you're counting the number of visits to a page by incrementing
   a SQL column and that page gets popular then there's a good chance that the SQL
@@ -47,34 +102,32 @@ extra_rdoc_files: []
 files:
 - lib/generators/multirow_counter_generator.rb
 - lib/generators/templates/multirow_counter_migration.rb
-- lib/multirow_counter/counter_model_creator.rb
+- lib/multirow_counter.rb
 - lib/multirow_counter/extension.rb
 - lib/multirow_counter/railtie.rb
-- lib/multirow_counter.rb
 - test/multirow_counter_test.rb
-homepage: http://github.com/Shopify/multirow-counter
+homepage: http://github.com/Shopify/multirow_counter
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Encapsulates a multi-row counter for SQL.
 test_files:
 - test/multirow_counter_test.rb

metadata.gz.sig

@@ -0,0 +1,3 @@
+x�e�G���7
y���&Z��\�����y�I������˄@�X8����n����ez���:m��Y��H��_x�.�t;�^�K���כ��	��ٜt�c�O,��劅?_n�:y�����T:���lҡyг�
+��,���]���c�Є�K��tČ����){MId�*�a�¥���OU�3����y���D��8;����NyZ�rS�.����� ���G�a}uً��P��qt4�]
+,=ul�Ǜ��F7�

data/lib/multirow_counter/counter_model_creator.rb

@@ -1,9 +0,0 @@
-class CounterModelCreator < Struct.new(:counter_name, :class_name)
-  def create
-    counter_class = Class.new(ActiveRecord::Base)
-    const_name = [class_name, counter_name.classify].join
-    MultirowCounter.const_set(const_name, counter_class)
-  end
-end
-
-