strongmind-pageviews 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc87f3d132f28d4832ee629573f7e9297be1de55450ea1c7d73d07c1b6aa71e3
-  data.tar.gz: 9e0c31fbb68ed70f6fada87f4f2c621182e2824a204fddae2b74c20dab5eef12
+  metadata.gz: 41b7fb2917ed1b78a02787be000602bb55f8e5bbff0bb95d288427e9855d461c
+  data.tar.gz: beb9c453a35bfa2db400b053b2826127f8f80b6bcf36dcb41585af2f3e24aff9
 SHA512:
-  metadata.gz: c82279018abc6329e12301c11eaa10f9c4f83d6962203f0d082cc7d3cee0ab305fd64bdd16c98fe4c549b14c752132623a8784617536420d2d9ccc192e5508f3
-  data.tar.gz: fb3a0532a36ddd08eb814379665b76031b34843e612bd048b2a91cc022e115d5bda151cfbc4b9cc94c7fc9ae44656bd0483a746f71722039de122e46816ec449
+  metadata.gz: ed97884b408f4e6e77f919aab6a9364768a4338531b84e5857d444d15595f1282b6a858b244aff2f16bd1e25c9b3d2cc608e27aa556c6993ea02e8d4f36355e5
+  data.tar.gz: cdbaf21e5e5b6dbe8e409c2fb00720c274295948fc5e12e1db80a83134711288c3e1733ff934d453f59489674eb6f1d868f45131aaff93b9fa5fd3ca9a9297e9

data/lib/generators/pageviews/pageviews_generator.rb

@@ -5,16 +5,12 @@ class PageviewsGenerator < Rails::Generators::Base
   include Rails::Generators::Migration
   source_root File.join(File.dirname(__FILE__), 'templates')
 
-  def self.next_migration_number(dirname)
-    sleep 1
-    if ActiveRecord::Base.timestamped_migrations
-      Time.now.utc.strftime("%Y%m%d%H%M%S")
-    else
-      "%.3d" % (current_migration_number(dirname) + 1)
-    end
+  def self.next_migration_number(_dirname)
+    Time.now.utc.strftime("%Y%m%d%H%M%S")
   end
 
   def create_migration_file
     migration_template 'create_pageviews_table.rb', 'db/migrate/create_pageviews_table.rb'
   end
 end
+# Compare this snippet from lib/pageviews/version.rb:

data/lib/generators/pageviews/templates/create_pageviews_table.rb

@@ -1,6 +1,6 @@
-class CreatePageviewsTable < ActiveRecord::Migration
-  def self.up
-    create_table :pageviews, :force => true do |t|
+class CreatePageviewsTable < ActiveRecord::Migration[ActiveRecord::Migration.current_version]
+  def change
+    create_table :pageviews, force: true do |t|
       t.string :pageview_type
       t.integer :pageview_id
       t.integer :user_id
@@ -14,17 +14,14 @@ class CreatePageviewsTable < ActiveRecord::Migration
       t.text :params
       t.timestamps
     end
-    add_index :pageviews, [:pageview_type, :pageview_id, :request_hash], :name => "poly_request_index", :unique => false
-    add_index :pageviews, [:pageview_type, :pageview_id, :ip_address], :name => "poly_ip_index", :unique => false
-    add_index :pageviews, [:pageview_type, :pageview_id, :session_hash], :name => "poly_session_index", :unique => false
-    add_index :pageviews, [:controller_name,:action_name,:request_hash], :name => "controlleraction_request_index", :unique => false
-    add_index :pageviews, [:controller_name,:action_name,:ip_address], :name => "controlleraction_ip_index", :unique => false
-    add_index :pageviews, [:controller_name,:action_name,:session_hash], :name => "controlleraction_session_index", :unique => false
-    add_index :pageviews, [:pageview_type, :pageview_id, :params], :name => "poly_params_request_index", :unique => false
-    add_index :pageviews, :user_id
-  end
 
-  def self.down
-    drop_table :pageviews
+    add_index :pageviews, [:pageview_type, :pageview_id, :request_hash], name: "poly_request_index"
+    add_index :pageviews, [:pageview_type, :pageview_id, :ip_address], name: "poly_ip_index"
+    add_index :pageviews, [:pageview_type, :pageview_id, :session_hash], name: "poly_session_index"
+    add_index :pageviews, [:controller_name, :action_name, :request_hash], name: "controlleraction_request_index"
+    add_index :pageviews, [:controller_name, :action_name, :ip_address], name: "controlleraction_ip_index"
+    add_index :pageviews, [:controller_name, :action_name, :session_hash], name: "controlleraction_session_index"
+    add_index :pageviews, [:pageview_type, :pageview_id, :params], name: "poly_params_request_index"
+    add_index :pageviews, :user_id
   end
 end

data/lib/pageviews/acts_as_pageviews.rb

@@ -1,21 +1,21 @@
 module Pageviews
   module ActiveRecord
     module InstanceMethods
-      def views(action=nil)
-        if action
-          pageviews.where(action_name: action).count
-        else
-          pageviews.count
-        end
+      def views(action = nil)
+        scope = pageviews
+        scope = scope.where(action_name: action) if action.present?
+        scope.count
       end
     end
   end
 end
 
-class ActiveRecord::Base
+ActiveSupport.on_load(:active_record) do
+  extend Pageviews::ActiveRecord::InstanceMethods
+
   def self.acts_as_pageviews
-    include Pageviews::ActiveRecord::InstanceMethods
     has_many :pageviews, as: :pageview, dependent: :destroy
+    include Pageviews::ActiveRecord::InstanceMethods
   end
 end
 

data/lib/pageviews/engine.rb

@@ -4,7 +4,7 @@ require 'active_record'
 # require 'active_support'
 
 module Pageviews
-  class Engine < Rails::Engine
+  class Engine < ::Rails::Engine
     initializer 'pageviews.controller' do
       ActiveSupport.on_load(:action_controller) do
         include PageviewsController::InstanceMethods
@@ -12,4 +12,4 @@ module Pageviews
       end
     end
   end
-end
+end

data/lib/pageviews/version.rb

@@ -1,3 +1,3 @@
 module Pageviews
-  VERSION = "0.2.0"
+  VERSION = '0.2.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: strongmind-pageviews
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - StrongMind