occurro 0.2.5 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 820dbd667977ad499b6e91e7b0d200d36dce82eb
-  data.tar.gz: eaf179afff4b590d3e5990e6e2038ac2a3488228
+  metadata.gz: 69457548952e55cee15bbbdf3b78e0acd4173199
+  data.tar.gz: b4ec6b1156db2d9c956bd2ce5cc9935df88d11dc
 SHA512:
-  metadata.gz: 764c8834ae8b34481ce0820e3018e8799d75a9a3482e75500902884c180c32f2bac1fb35d17ef21648306c7e6653a8b956bb9e6660155dafa2b9083c723dfef5
-  data.tar.gz: e3df221a6302186694ae48a4eb7da9aa7e4f4f291be220c0f4072625f6e834dbfbeae6c3795d0e5f5815a17c6a701ab9a80d15a4db546f3cd192ea985adcc6a2
+  metadata.gz: 01ce6151574846a2a7914d9c1ed4f1fb3211f03775097e2a47902a339b08a9359c9af3870d508b8ea6d296f2485db0f18da2170ac5533d049931e68545162f88
+  data.tar.gz: 779de3d5bb3500346e4636b3caf6d5480a4b05802c48af8b6b56148a95d635f0f360e23789fe488a35178fa20ddbdaa4cae9359ed938aafab6ab552e7be62f8e

data/app/controllers/occurro/counters_controller.rb

@@ -1,20 +1,20 @@
 module Occurro
   class CountersController < ApplicationController
     respond_to :js
-    before_filter :get_countable
 
     def increment
-      if Occurro::CachedSession.unique_visitor?(@countable, session)
-        @countable.increment_counter
-        Occurro::CachedSession.add_cache(@countable, session)
+      if Occurro::CachedSession.unique_visitor?(countable, session)
+        countable.increment_counter
+        Occurro::CachedSession.add_cache(countable, session)
       end
       render text: ""
     end
 
     private
 
-    def get_countable
-      @countable = params[:countable_type].constantize.find params[:countable_id]
+    def countable
+      @countable ||=
+        params[:countable_type].constantize.find params[:countable_id]
     end
 
   end

data/app/models/occurro/counter.rb

@@ -7,41 +7,53 @@ module Occurro
 
     # Public: Rotate the counter value for the period_type
     #
-    # * period_type: 
+    # * period_type:
     #   :daily   #=> daily rotation
     #   :weekly  #=> weekly rotation
     #   :monthly #=> monthly rotation
     #
     def update_counter(period_type)
-      column_from, column_to =
-        case period_type.to_s
-        when 'daily'
-          ['today', 'yesterday']
-        when 'weekly'
-          ['this_week', 'last_week']
-        when 'monthly'
-          ['this_month', 'last_month']
-        else
-          return false
-        end
-
-      self.send("#{column_to}=", self.send(column_from))
-      self.send("#{column_from}=", 0)
-      self.save 
+      column_from, column_to = self.class.columns_to_shift(period_type)
+      return unless column_from && column_to
+
+      self.update_attributes({
+        column_to => self[column_from],
+        column_from => 0
+      })
+    end
+
+    def self.update_counters(period_type)
+      column_from, column_to = columns_to_shift(period_type)
+      return unless column_from && column_to
+
+      update_all("#{column_to} = #{column_from}, #{column_from} = 0")
     end
 
     # Public: increments 'model' counters by a 'count' factor
     #
     def self.increment_counters(model, count = 1)
-      counter = Occurro::Counter.find_or_create_by_countable_type_and_countable_id(model.class.base_class.name, model.id)
+      counter = Occurro::Counter.find_or_create_by(countable_type: model.class.base_class.name, countable_id: model.id)
       counter.update_attributes({
         :today      => counter.today      + count,
         :this_week  => counter.this_week  + count,
         :this_month => counter.this_month + count,
         :total      => counter.total      + count
-      }) 
+      })
       Occurro::DailyCounter.increment_counters(model, count) if model.class.use_daily_counters?
     end
 
+    def self.columns_to_shift(period_type)
+      case period_type.to_s
+      when 'daily'
+        ['today', 'yesterday']
+      when 'weekly'
+        ['this_week', 'last_week']
+      when 'monthly'
+        ['this_month', 'last_month']
+      else
+        [false, false]
+      end
+    end
+
   end
 end

data/app/models/occurro/daily_counter.rb

@@ -6,7 +6,12 @@ module Occurro
     belongs_to :countable, polymorphic: true
 
     def self.increment_counters(model, count = 1)
-      counter = Occurro::DailyCounter.find_or_create_by_countable_type_and_countable_id_and_created_on(model.class.base_class.name, model.id, Date.today)
+      counter =
+        Occurro::DailyCounter.find_or_create_by({
+          countable_type: model.class.base_class.name,
+          countable_id: model.id,
+          created_on: Date.today
+        })
       counter.increment!(:total, count)
     end
   end

data/lib/occurro/version.rb

@@ -1,3 +1,3 @@
 module Occurro
-  VERSION = "0.2.5"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,97 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: occurro
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.3.0
 platform: ruby
 authors:
 - Tiago Scolari
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-11 00:00:00.000000000 Z
+date: 2014-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   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: database_cleaner
   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: factory_girl_rails
   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: resque
   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: delayed_job_active_record
   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: Tasks and models for counting model visualizations.
@@ -101,6 +101,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- MIT-LICENSE
+- README.rdoc
+- Rakefile
 - app/assets/javascripts/occurro/application.js
 - app/assets/stylesheets/occurro/application.css
 - app/controllers/occurro/application_controller.rb
@@ -112,8 +115,9 @@ files:
 - config/routes.rb
 - db/migrate/create_occurro_counters.rb
 - db/migrate/create_occurro_daily_counters.rb
-- lib/generators/occurro/migrations/migrations_generator.rb
 - lib/generators/occurro/migrations/USAGE
+- lib/generators/occurro/migrations/migrations_generator.rb
+- lib/occurro.rb
 - lib/occurro/cached_counter.rb
 - lib/occurro/cached_session.rb
 - lib/occurro/engine.rb
@@ -123,11 +127,7 @@ files:
 - lib/occurro/jobs/sender.rb
 - lib/occurro/tasks.rb
 - lib/occurro/version.rb
-- lib/occurro.rb
 - lib/tasks/occurro_tasks.rake
-- MIT-LICENSE
-- Rakefile
-- README.rdoc
 homepage: https://github.com/tscolari/occurro
 licenses: []
 metadata: {}
@@ -137,17 +137,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Simple counters for ActiveRecord visualizations.