has_metrics 0.0.3 → 0.0.6

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 290cd9839b6158645e6952a21045665372b5d2fe
+  data.tar.gz: f26872bf500a652a99816716a8cbfbe3be85afc9
+SHA512:
+  metadata.gz: 4ab5e73e945e0698c8fd82e620c64be6cb780d5b6c6ef46bce90d2b5539f252487cfa2f3ffb71fc801934c9715fd8dd5ac02255458fd781a337b07e525f6ebcb
+  data.tar.gz: aa6fb41dfd66fcaf7b541f3861b2237cc7e4d82faf9f0e5a92736cc41b334598ed399e3e0c3004c970686fe3a57c7f3261b52b60d40a351a53f13ffef99a7ddc

data/.gitignore

@@ -4,6 +4,8 @@
 .config
 .yardoc
 .rvmrc
+.ruby-version
+.ruby-gemset
 Gemfile.lock
 InstalledFiles
 _yardoc
@@ -16,4 +18,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
-test/test.db
+test/test.db

data/Gemfile

@@ -2,3 +2,9 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in has_metrics.gemspec
 gemspec
+
+group :test do
+  gem 'pry'
+  gem 'rspec'
+  gem 'sqlite3'
+end

data/Rakefile

@@ -1,11 +1,7 @@
 #!/usr/bin/env rake
 require "bundler/gem_tasks"
+require 'rspec/core/rake_task'
 
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs      << 'lib' << 'test'
-  test.pattern   = 'test/{functional,unit}/**/*_test.rb'
-  test.verbose   = true
-end
+RSpec::Core::RakeTask.new(:spec)
 
-task :default => :test
+task :default => :spec

data/has_metrics.gemspec

@@ -2,22 +2,24 @@
 require File.expand_path('../lib/has_metrics/version', __FILE__)
 
 Gem::Specification.new do |gem|
+  gem.name          = "has_metrics"
+  gem.version       = HasMetrics::VERSION
   gem.authors       = ["Allan Grant"]
   gem.email         = ["allan@allangrant.net"]
   gem.description   = %q{Calculate metrics and store them in the DB.}
   gem.summary       = %q{Calculate "metrics" (any expensive methods) on ActiveRecord entries and memoize them to an automagical table.}
   gem.homepage      = "http://github.com/allangrant/has_metrics"
+  gem.license       = "MIT"
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.name          = "has_metrics"
   gem.require_paths = ["lib"]
-  gem.version       = HasMetrics::VERSION
 
   gem.add_dependency "activerecord"
   gem.add_development_dependency "rake"
-  gem.add_development_dependency "shoulda"
-  gem.add_development_dependency "sqlite3"
-  gem.add_development_dependency "pry"
+  gem.add_development_dependency "bundler"
+  # gem.add_development_dependency "shoulda"
+  # gem.add_development_dependency "sqlite3"
+  # gem.add_development_dependency "pry"
 end

data/lib/has_metrics/metrics.rb

@@ -13,7 +13,7 @@ module Metrics
       belongs_to base.to_s.underscore.to_sym, :foreign_key => 'id'
       @object_class = base
     end
-    
+
     base.class_eval do
       if klass.table_exists?
         @metrics_class = klass
@@ -23,7 +23,7 @@ module Metrics
         @metrics_class = base
         base.extend(Metrics::MetricsClass)
       end
-      
+
       def metrics
         @metrics ||= self.class.metrics_class.find_or_create_by_id(id)
       end
@@ -54,7 +54,7 @@ module Metrics
           result = nil if result.is_a?(Float) && !result.finite?
           begin
             metrics.send "#{name}=", result
-            metrics.send "#{datestamp_column}=", Time.now
+            metrics.send "#{datestamp_column}=", Time.current
           rescue NoMethodError => e
             raise e unless e.name == "#{name}=".to_sym
             # This happens if the migrations haven't run yet for this metric. We should still calculate & return the metric.
@@ -67,6 +67,7 @@ module Metrics
       end
 
       (@metrics ||= []) << name.to_sym
+      @metrics.uniq!
 
       if respond_to?(:has_custom_order_by)  # TODO: carve out has_custom_order_by functionality into this gem
         unless metrics_class == self
@@ -75,7 +76,7 @@ module Metrics
           end
         end
       end
-      
+
       if options[:type] && (options[:type].to_sym == :float)
         (@float_metrics ||= []) << name.to_sym
       end
@@ -84,7 +85,7 @@ module Metrics
     def metrics
       @metrics
     end
-    
+
     def metrics_column_type(column)
       case
       when (column.to_s =~ /^by_(.+)$/) && respond_to?(:segment_categories) && segment_categories.include?($1.to_sym) # TODO: carve out segementation functionality into this gem
@@ -97,7 +98,7 @@ module Metrics
         :integer
       end
     end
-    
+
     def update_all_metrics!(*args)
       metrics_class.migrate!
       # start_time = Time.zone.now
@@ -107,8 +108,13 @@ module Metrics
       #   puts "Updating #{total} records."
       #   progress_bar = ProgressBar.new("Progress", total)
       # end
-      for record in all(:order => "id desc")
-        record.update_metrics!(*args)
+      find_in_batches do |batch|
+        metrics_class.transaction do
+          batch.each do |record|
+            # puts "Updating record ##{record.id}: #{record}"
+            record.update_metrics!(*args)
+          end
+        end
         # progress_bar.inc if progress_bar
       end
       # progress_bar.finish if progress_bar
@@ -118,14 +124,14 @@ module Metrics
     end
   end
   ### END CLASS METHODS, START INSTANCE METHODS
-  
+
   def update_metrics!(*args)
     self.class.metrics.each do |metric|
       send(metric, *args)
     end
   end
   ### END INSTANCE METHODS
-  
+
   ### Sets up a class like "SiteMetrics".  These are all CLASS methods:
   module MetricsClass
     def object_class
@@ -137,7 +143,7 @@ module Metrics
     end
 
     def required_columns
-        @object_class.metrics.map(&:to_s) + metrics_updated_at_columns
+      @object_class.metrics.map(&:to_s) + metrics_updated_at_columns
     end
 
     def missing_columns
@@ -151,9 +157,9 @@ module Metrics
         raise "Cannot determine if there were extra columns for has_metric when using the table itself for storing the metric!  Remove any columns manually"
         [] # We wont know what columns are excessive if the source changed
       else
-        (columns.map(&:name) - %w(id created_at updated_at)) - required_columns   
+        (columns.map(&:name) - %w(id created_at updated_at)) - required_columns
       end
-      
+
     end
 
     class Metrics::Migration < ActiveRecord::Migration
@@ -177,15 +183,18 @@ module Metrics
       old_metrics = @object_class.metrics
       @object_class.class_eval { @metrics = [] }
       migrate!
-      @object_class.class_eval { @metrics = old_metrics }      
+      @object_class.class_eval { @metrics = old_metrics }
       migrate!
     end
 
     def migrate!
+      # don't migrate if metrics are kept in current class
+      return if @object_class == self
+
       Metrics::Migration.setup(self)
-      Metrics::Migration.down unless @object_class == self || extra_columns.empty?
+      Metrics::Migration.down unless extra_columns.empty?
       Metrics::Migration.up unless missing_columns.empty?
       reset_column_information
     end
   end
-end
+end

data/lib/has_metrics/version.rb

@@ -1,3 +1,3 @@
 module HasMetrics
-  VERSION = "0.0.3"
+  VERSION = "0.0.6"
 end

data/spec/metrics_spec.rb

@@ -0,0 +1,55 @@
+require 'spec_helper'
+
+describe Metrics do
+  describe "defining metrics" do
+    let(:user) { User.create(:name => "Fuzz") }
+
+    before do
+      create_tables_for(:user)
+
+      class User < ActiveRecord::Base
+        include Metrics
+        has_metric :name_length do
+          name.length
+        end
+      end
+
+      User.update_all_metrics!
+    end
+
+    it "creates rows for the metrics" do
+      UserMetrics.columns.count.should == 3
+      User.has_metric :name_length_squared do
+        name_length * name_length
+      end
+      User.update_all_metrics!
+      UserMetrics.columns.count.should == 5
+      user.name_length_squared.should == 16
+    end
+
+    it "calculates their block when called" do
+      user.name.should == "Fuzz"
+      user.name_length.should == 4
+
+      user.name = "Bib"
+
+      # since 20 hours hasn't passed, the value is pulled from cache, not recalculated
+      user.name_length.should == 4
+      # (true) forces it to recalculate right away
+      user.name_length(true).should == 3
+
+      # since it wasn't saved, it's the same in the DB
+      User.find_by_name("Fuzz").name_length.should == 4
+
+      user.save
+      user.name_length(true).should == 3
+      User.find_by_name("Bib").name_length.should == 3
+    end
+
+    it "has their values precomputed" do
+      user
+      User.update_all_metrics!
+      UserMetrics.count(:group => :name_length).should == {4=>1}
+    end
+  end
+end

data/spec/segmentation_spec.rb

@@ -0,0 +1,36 @@
+require 'spec_helper'
+
+describe Segmentation do
+  before do
+    create_tables_for(:post)
+
+    class Post < ActiveRecord::Base
+      include Metrics
+      include Segmentation
+
+      segment_by :name_length do
+        case name.length
+        when 0..6
+          "short"
+        when 7
+          "seven"
+        else
+          "long"
+        end
+      end
+    end
+  end
+
+  describe "defining segments" do
+    before do
+      Post.create(:name => "Shorty")
+      Post.create(:name => "Seven!!")
+      Post.create(:name => "Really long")
+      Post.update_all_metrics!
+    end
+
+    it "segments properly" do
+      PostMetrics.count(:group => :by_name_length).should == {'short'=>1, 'seven'=>1, 'long'=>1}
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,10 @@
+require 'rubygems'
+require 'bundler/setup'
+require 'pry'
+require 'active_record'
+require 'support/active_record'
+require 'has_metrics'
+
+RSpec.configure do |config|
+  # some (optional) config here
+end

data/spec/support/active_record.rb

@@ -0,0 +1,10 @@
+ActiveRecord::Base.establish_connection adapter: "sqlite3", database: ":memory:"
+
+# ActiveRecord::Migrator.up "db/migrate"
+
+def create_tables_for(model = :user)
+  ActiveRecord::Migration.create_table "#{model}s", :force => true do |t|
+    t.string   "name"
+  end
+  ActiveRecord::Migration.create_table "#{model}_metrics", :force => true
+end

metadata

@@ -1,94 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: has_metrics
 version: !ruby/object:Gem::Version
-  version: 0.0.3
-  prerelease: 
+  version: 0.0.6
 platform: ruby
 authors:
 - Allan Grant
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-13 00:00:00.000000000 Z
+date: 2013-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: shoulda
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Calculate metrics and store them in the DB.
@@ -108,42 +69,37 @@ files:
 - lib/has_metrics/metrics.rb
 - lib/has_metrics/segmentation.rb
 - lib/has_metrics/version.rb
-- test.db
-- test/functional/metrics_test.rb
-- test/functional/segmentation_test.rb
-- test/test_helper.rb
+- spec/metrics_spec.rb
+- spec/segmentation_spec.rb
+- spec/spec_helper.rb
+- spec/support/active_record.rb
 homepage: http://github.com/allangrant/has_metrics
-licenses: []
+licenses:
+- MIT
+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'
-      segments:
-      - 0
-      hash: 3863609123876362244
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3863609123876362244
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Calculate "metrics" (any expensive methods) on ActiveRecord entries and memoize
   them to an automagical table.
 test_files:
-- test/functional/metrics_test.rb
-- test/functional/segmentation_test.rb
-- test/test_helper.rb
+- spec/metrics_spec.rb
+- spec/segmentation_spec.rb
+- spec/spec_helper.rb
+- spec/support/active_record.rb

data/test/functional/metrics_test.rb

@@ -1,51 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + "/../test_helper")
-
-class User < ActiveRecord::Base
-  include Metrics
-  has_metric :name_length do
-    name.length
-  end
-end
-
-class MetricsTest < Test::Unit::TestCase
-  context "when defining metrics" do
-    setup do
-      CreateTestTables.up(:user)
-      @user = User.create(:name => "Fuzz")
-      User.update_all_metrics!
-    end
-    
-    should "create rows for the metrics" do
-      assert_equal 3, UserMetrics.columns.count
-      User.has_metric :name_length_squared do
-        name_length * name_length
-      end
-      User.update_all_metrics!
-      assert_equal 5, UserMetrics.columns.count
-      assert_equal 16, @user.name_length_squared
-    end
-
-    should "calculate their block when called" do
-      assert_equal "Fuzz", @user.name
-      assert_equal 4, @user.name_length
-
-      @user.name = "Bib"
-
-      # since 20 hours hasn't passed, the value is pulled from cache, not recalculated
-      assert_equal 4, @user.name_length
-      # (true) forces it to recalculate right away
-      assert_equal 3, @user.name_length(true)
-      
-      # since it wasn't saved, it's the same in the DB
-      assert_equal 4, User.find_by_name("Fuzz").name_length
-      
-      @user.save
-      assert_equal 3, @user.name_length(true)
-      assert_equal 3, User.find_by_name("Bib").name_length      
-    end
-    
-    should "have their values precomputed" do
-      assert_equal({4=>1}, UserMetrics.count(:group => :name_length))
-    end
-  end
-end

data/test/functional/segmentation_test.rb

@@ -1,34 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + "/../test_helper")
-
-class Post < ActiveRecord::Base
-  include Metrics
-  include Segmentation
-
-  segment_by :name_length do
-    case name.length
-    when 0..6
-      "short"
-    when 7
-      "seven"
-    else
-      "long"
-    end
-  end
-end
-
-class SegmentationTest < Test::Unit::TestCase
-  context "when defining segments" do
-    setup do
-      CreateTestTables.up(:post)
-
-      Post.create(:name => "Shorty")
-      Post.create(:name => "Seven!!")
-      Post.create(:name => "Really long")
-      Post.update_all_metrics!
-    end
-  
-    should "segment properly" do
-      assert_equal({'short'=>1, 'seven'=>1, 'long'=>1}, PostMetrics.count(:group => :by_name_length))
-    end
-  end
-end

data/test/test_helper.rb

@@ -1,28 +0,0 @@
-require 'rubygems'
-
-# Want to test the files here, in lib, not in an installed version of the gem.
-$:.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
-
-require 'shoulda'
-# require 'mocha'
-require 'active_record'
-require 'sqlite3'
-require 'has_metrics'
-require 'pry'
-
-ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => File.expand_path(File.dirname(__FILE__) + "/../test.db"))
-
-
-class CreateTestTables < ActiveRecord::Migration
-  def self.up(model = :user)
-    create_table "#{model}s", :force => true do |t|
-      t.string   "name"
-    end
-    create_table "#{model}_metrics", :force => true
-  end
-  
-  def self.down(model = :user)
-    drop_table "#{model}s"
-    drop_table "#{model}_metrics"    
-  end
-end