has_metrics 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f48a7598ad01f84ad88033cbd27f3db579471077
-  data.tar.gz: 8f2bc339c0a146c2c787e9d605c9097963c3dc69
+  metadata.gz: cebdeea08917071eeaaed9b9872d2d423de1e2cb
+  data.tar.gz: 4eaa44ee624b9859a153a69e5acab96a5630457e
 SHA512:
-  metadata.gz: 05f470ca3023d9c5ed3ebd1a2dd6f8dc3b3c6cbc2a20b96f9af249646b4afc7c72453e653b2a363165b8942d883afa899255615228b48d2b99e0270d809dd871
-  data.tar.gz: 4363c5d42770658fd5a197e36ebad47a495fe75915654dcd39becbe5c9e81a13bb3515e437a5de66d441d19fb70017c9db1100af62b88d8bc8d211715643ad06
+  metadata.gz: c180c3f247487600bdfc16b49775fe0e6e6759e90d2a9d68f312de1adba64dc8862dd344c6bd44b0e272964eaafb3ae092dcb8db044c604cb41a1a91b8ff8fe5
+  data.tar.gz: b9bca19f30f5caeb68fc7476584273ec1b58ff42333c85cf514082293f7a7c58b7fb02c3093a0218dbcf451b8cac4151cae1af05195f7db0a35d500d496e1ed6

data/has_metrics.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "has_metrics"
-  s.version = "0.1.1"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Allan Grant"]
@@ -17,21 +17,7 @@ Gem::Specification.new do |s|
   s.summary = "Calculate \"metrics\" (any expensive methods) on ActiveRecord entries and memoize them to an automagical table."
   s.test_files = ["spec/metrics_spec.rb", "spec/segmentation_spec.rb", "spec/spec_helper.rb", "spec/support/active_record.rb"]
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 4
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activerecord>, ["< 4.0"])
-      s.add_development_dependency(%q<rake>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, [">= 0"])
-    else
-      s.add_dependency(%q<activerecord>, ["< 4.0"])
-      s.add_dependency(%q<rake>, [">= 0"])
-      s.add_dependency(%q<bundler>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<activerecord>, ["< 4.0"])
-    s.add_dependency(%q<rake>, [">= 0"])
-    s.add_dependency(%q<bundler>, [">= 0"])
-  end
+  s.add_dependency "activerecord"
+  s.add_development_dependency "rake"
+  s.add_development_dependency "bundler"
 end

data/lib/has_metrics/metrics.rb

@@ -25,7 +25,14 @@ module Metrics
       end
 
       def metrics
-        @metrics ||= self.class.metrics_class.find_or_initialize_by_id(id)
+        @metrics ||= begin
+          metrics_class = self.class.metrics_class
+          if metrics_class.respond_to?(:find_or_initialize_by)
+            metrics_class.find_or_initialize_by(id: id)
+          else
+            metrics_class.find_or_initialize_by_id(id)
+          end
+        end
       end
     end
   end
@@ -42,8 +49,11 @@ module Metrics
 
       metrics[name.to_sym] ||= {}
       metrics[name.to_sym].merge!(options)
-      metrics_class.class_eval do
-        attr_accessible(name, "updated__#{name}__at")
+
+      if metrics_class.respond_to?(:attr_accessible)
+        metrics_class.class_eval do
+          attr_accessible(name, "updated__#{name}__at") rescue RuntimeError
+        end
       end
     end
 
@@ -141,7 +151,15 @@ module Metrics
         ActiveRecord::Base.logger = existing_logger
 
         unless sql_capturer.query.count != 1
-          subquery = sql_capturer.query.first.gsub(warmup.id.to_s, "#{metrics_class.table_name}.id")
+          single_query = sql_capturer.query.first
+          subquery = if single_query =~ /(\?|\$\d+)/
+                       # AR 4 parameterized query style
+                       single_query
+                         .gsub(/\[\[.*?\]\]/, '')
+                         .gsub(/(\?|\$\d+)/, "#{metrics_class.table_name}.id")
+                     else
+                       single_query.gsub(warmup.id.to_s, "#{metrics_class.table_name}.id")
+                     end
           unless subquery == %Q{SELECT "#{metrics_class.table_name}".* FROM "#{metrics_class.table_name}" WHERE "#{metrics_class.table_name}"."id" = #{metrics_class.table_name}.id LIMIT 1}
             update_sql = %Q{
               UPDATE #{metrics_class.table_name}

data/lib/has_metrics/version.rb

@@ -1,3 +1,3 @@
 module HasMetrics
-  VERSION = "0.0.9"
+  VERSION = "0.2.0"
 end

data/spec/metrics_spec.rb

@@ -13,11 +13,16 @@ end
 
 class Activity < ActiveRecord::Base
   belongs_to :actor, class_name: 'Identity'
-  attr_accessible :actor
+  if respond_to?(:attr_accessible)
+    attr_accessible :actor rescue RuntimeError
+  end
+  self.inheritance_column = nil
 end
 
 class User < ActiveRecord::Base
-  attr_accessible :identity, :name
+  if respond_to?(:attr_accessible)
+    attr_accessible :identity, :name rescue RuntimeError
+  end
   include Metrics
   belongs_to :identity
 
@@ -83,7 +88,12 @@ describe Metrics do
     it "has their values precomputed" do
       user
       User.update_all_metrics!
-      UserMetrics.count(:group => :name_length).should == {4=>1}
+      count = if RAILS_4_OR_GREATER
+                UserMetrics.group(:name_length).count
+              else
+                UserMetrics.count(:group => :name_length)
+              end
+      count.should == { 4 => 1 }
     end
 
     describe 'aggregate functions' do

data/spec/segmentation_spec.rb

@@ -30,7 +30,12 @@ describe Segmentation do
     end
 
     it "segments properly" do
-      PostMetrics.count(:group => :by_name_length).should == {'short'=>1, 'seven'=>1, 'long'=>1}
+      count = if RAILS_4_OR_GREATER
+                PostMetrics.group(:by_name_length).count
+              else
+                PostMetrics.count(:group => :by_name_length)
+              end
+      count.should == {'short'=>1, 'seven'=>1, 'long'=>1}
     end
   end
 end

data/spec/spec_helper.rb

@@ -5,6 +5,10 @@ require 'active_record'
 require 'support/active_record'
 require 'has_metrics'
 
+RAILS_4_OR_GREATER = ::ActiveRecord.respond_to?(:version) && ::ActiveRecord.version >= Gem::Version.new('4.0.0')
+
+ActiveRecord::Base.default_timezone = :local
+
 RSpec.configure do |config|
   # some (optional) config here
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: has_metrics
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Allan Grant
@@ -14,16 +14,16 @@ dependencies:
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement