ar_aggregate_by_interval 1.1.5 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c298fefa29a3f10b604344514cbdb4107f3ae14
-  data.tar.gz: 25ac0e6e1bc2aec6002ead9f3ed97d45cab933ab
+  metadata.gz: 60d194e4f1346228225b37d2c176e1699da97d01
+  data.tar.gz: 82aead17f908b020f50909b1589cc9a500233dfa
 SHA512:
-  metadata.gz: 2e101fa39c200ca502387d95b63c3dae825e25273c57ab04bb5ca05a32b2cd3932f6e6fea0cbf21d3754aec4449e77cd09a9dfe245b16d803269cf12012485f0
-  data.tar.gz: d99af5d4a6cd05e067c933e66a2fd9fc88613b933d8511a4a44557e4a46b3a16579c82b44a63564c3db1b8286ba58ba3288531c83532915cbf80691e4ea7a0ad
+  metadata.gz: 123c5a51bb2c75d8a60628b20d46dae8b28e3c0b52ef62ae504cf3c4038a6f600ebe98c79ad337fcd0799e83b8e066c346148e75bb2c5ef64272720a6f9f523f
+  data.tar.gz: 13c5c11f9575481558e9d97e0dabbf320a45ed44efa43e512b68f899257b96efc3a7166ac5aa54b3ef8789aaa5e7eba79ed6793314bc84a6b32b32347bad46bd

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.DS_Store

data/CHANGELOG.md

@@ -3,6 +3,13 @@ All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 This file adheres to [Keep a changelog](http://keepachangelog.com/).
 
+## [1.1.6] - 2015-03-15 (maintenance)
+### Added
+- Tests run on MySQL, Postgres and SQLite
+
+### Changed
+- Remove memoization from Utils
+
 ## [1.1.5] - 2015-03-08 (maintenance)
 ### Changed
 - Raise ArgumentError instead of NoMethodError or RuntimeError on bad args

data/README.md

@@ -1,13 +1,23 @@
-# ArAggregateByInterval
+# ArAggregateByInterval (Time series)
 ---
 
 [![Circle CI](https://circleci.com/gh/jotto/ar_aggregate_by_interval.svg?style=svg)](https://circleci.com/gh/jotto/ar_aggregate_by_interval)
 
+For MySQL or Postgres.
+
 Build arrays of counts, sums and averages from Ruby on Rails ActiveRecord models grouped by days, weeks or months. e.g.:
 ```ruby
-# default 'group by' is 'created_at'
-Blog.count_weekly(1.month.ago).values
+# (group_by_col, from, to = Time.now)
+Blog.count_weekly(:created_at, 1.month.ago).values
 => [4, 2, 2, 0]
+
+# (group_by_col, aggregate_col, from, to = Time.now)
+Blog.sum_weekly(:created_at, :pageviews, 1.month.ago).values
+=> [400, 350, 375, 250]
+
+# (group_by_col, aggregate_col, from, to = Time.now)
+Blog.avg_weekly(:created_at, :pageviews, 1.month.ago).values
+=> [25, 20, 40, 10]
 ```
 
 ## Why?
@@ -16,7 +26,13 @@ Blog.count_weekly(1.month.ago).values
 
 ## Usage
 ```ruby
-ActiveRecordModel.{sum,count,avg}_{daily,weekly,monthly}(arg_hash).{values,values_and_dates}
+# be explicit and pass a hash
+# [:group_by_column, :from, :to, :aggregate_column]
+
+# or just pass arguments
+# count: arg_hash can be arguments: (group_by_col, from, to)
+# sum and avg: arg_hash can be arguments: (group_by_col, aggregate_col, from, to)
+Blog.{count,sum,avg}_{daily,weekly,monthly}(arg_hash).{values,values_and_dates}
 ```
 
 ```ruby

data/ar_aggregate_by_interval.gemspec

@@ -19,9 +19,11 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'bundler', '~> 1.5'
   s.add_development_dependency 'rake'
-  s.add_development_dependency 'database_cleaner', '~> 1.4'
   s.add_development_dependency 'guard-rspec', '~> 4.5'
+  s.add_development_dependency 'mysql2'
+  s.add_development_dependency 'pg'
   s.add_development_dependency 'sqlite3'
+  s.add_development_dependency 'rails', '~> 4.2' # for database tasks
   s.add_dependency 'activesupport', '~> 4.0'
   s.add_dependency 'activerecord', '~> 4.0'
   s.add_dependency 'classy_hash', '~> 0.1'

data/helpers.rb

@@ -0,0 +1,40 @@
+ActiveRecord::Base.establish_connection adapter: 'mysql2', database: 'stocks'
+class Quote < ActiveRecord::Base
+end
+
+
+
+ActiveRecord::Base.establish_connection adapter: 'postgresql', database: 'traianbasecu'
+class Click < ActiveRecord::Base
+end
+r=Click.count_daily(:created_at, 3.month.ago).values_and_dates.collect{|z|z[:date]}
+
+
+
+
+
+
+r=Click.count_weekly(:created_at, 3.month.ago).instance_variable_get('@wut').to_a.first.attributes
+
+
+ArAggregateByInterval::Utils.ar_to_hash(Click.count_daily(:created_at, 3.month.ago).instance_variable_get('@wut'), {'datechunk__' => 'totalchunked__'})
+ArAggregateByInterval::Utils.ar_to_hash(Click.count_weekly(:created_at, 3.month.ago).instance_variable_get('@wut'), {'datechunk__' => 'totalchunked__'})
+
+
+Bundler.require
+require 'rails'
+ActiveRecord::Base.configurations = YAML.load_file('./config/database.yml')
+
+ActiveRecord::Tasks::DatabaseTasks.send(:each_local_configuration) do |config|
+  begin
+    ActiveRecord::Tasks::DatabaseTasks.send(:drop, config)
+  rescue
+  end
+  begin
+    ActiveRecord::Tasks::DatabaseTasks.send(:create, config)
+  rescue
+  end
+
+  ActiveRecord::Base.establish_connection config
+  load './spec/ar_bootstrap/schema.rb'
+end

data/lib/ar_aggregate_by_interval/utils.rb

@@ -48,7 +48,7 @@ module ArAggregateByInterval
     end
 
     def ruby_strftime_map
-      @ruby_strftime_map ||= {
+      {
         'monthly' => '%Y-%m',
         # sqlite doesn't support ISO weeks
         'weekly' => Utils.db_vendor.match(/sqlite/i) ? '%Y-%U' : '%G-%V',
@@ -82,9 +82,8 @@ module ArAggregateByInterval
     end
 
     def db_vendor
-      @db_vendor ||=
-        ActiveRecord::Base.connection_config.try(:symbolize_keys).try(:[], :adapter) ||
-        ENV['DATABASE_URL']
+      ActiveRecord::Base.connection_config.try(:symbolize_keys).try(:[], :adapter) ||
+      ENV['DATABASE_URL']
     end
 
     # converts args like: [weekly, beginning] to beginning_of_week

data/lib/ar_aggregate_by_interval/version.rb

@@ -1,3 +1,3 @@
 module ArAggregateByInterval
-  VERSION = '1.1.5'
+  VERSION = '1.1.6'
 end

data/spec/ar_bootstrap/database.yml

@@ -0,0 +1,15 @@
+mysql:
+  adapter: mysql2
+  encoding: utf8
+  database: 'ar_aggregate_by_interval_test'
+  pool: 1
+postgresql:
+  adapter: postgresql
+  encoding: utf8
+  database: 'ar_aggregate_by_interval_test'
+  pool: 1
+sqlite3:
+  adapter: sqlite3
+  encoding: utf8
+  database: './db/ar_aggregate_by_interval_test.sqlite3'
+  pool: 1

data/spec/ar_bootstrap/init.rb

@@ -1,8 +1,29 @@
+PROJECT_ROOT = File.expand_path File.join(File.dirname(__FILE__), '../..')
+
 require 'active_record'
 
-ActiveRecord::Base.establish_connection adapter: 'sqlite3', database: ':memory:'
+# rails is needed for ActiveRecord::Tasks::DatabaseTasks
+require 'rails'
+
+# Rails.root is needed for ActiveRecord::Tasks::DatabaseTasks
+def Rails.root
+  PROJECT_ROOT
+end
 
-load File.join(File.dirname(__FILE__), './schema.rb')
+# load database.yml
+ActiveRecord::Base.configurations = YAML.load_file(File.join(PROJECT_ROOT, 'spec/ar_bootstrap/database.yml'))
+# drop all DBs
+ActiveRecord::Tasks::DatabaseTasks.drop_all
+
+# iterate through each connection in database.yml
+ActiveRecord::Tasks::DatabaseTasks.send(:each_local_configuration) do |config|
+  # create DB
+  ActiveRecord::Tasks::DatabaseTasks.send(:create, config)
+  # connect to it
+  ActiveRecord::Base.establish_connection config
+  # load schema into it
+  load File.join(PROJECT_ROOT, 'spec/ar_bootstrap/schema.rb')
+end
 
 class Blog < ActiveRecord::Base
   has_many :page_views

data/spec/lib/ar_aggregate_by_interval_spec.rb

@@ -2,150 +2,165 @@ require 'ar_aggregate_by_interval'
 
 describe ArAggregateByInterval do
 
-  before(:all) do |example|
-    @from = DateTime.parse '2013-08-05'
-    @to = @from
-    blog1 = Blog.create arbitrary_number: 10, created_at: @from
-    blog2 = Blog.create arbitrary_number: 20, created_at: @from
-    blog1.page_views.create date: @from
-    blog1.page_views.create date: @from
+  after(:all) do
+    ActiveRecord::Tasks::DatabaseTasks.drop_all
   end
 
-  shared_examples_for 'count .values_and_dates' do
-    it 'returns value and date with expected values' do
-      expect(subject.values_and_dates).to eq([date: @from.beginning_of_week.to_date, value: 2])
-    end
-  end
+  shared_examples_for 'working gem' do |db_config|
 
-  shared_examples_for 'sum .values_and_dates' do
-    it 'returns value and date with expected values' do
-      expect(subject.values_and_dates).to eq([date: @from.beginning_of_week.to_date, value: 30])
-    end
-  end
+    before(:all) do |example|
+      # connect to DB specified by db_config (a symbol matching database.yml keys)
+      ActiveRecord::Base.establish_connection db_config
 
-  shared_examples_for 'avg .values_and_dates' do
-    it 'returns value and date with expected values' do
-      expect(subject.values_and_dates).to eq([date: @from.beginning_of_week.to_date, value: 15])
+      @from = DateTime.parse '2013-08-05'
+      @to = @from
+      blog1 = Blog.create! arbitrary_number: 10, created_at: @from
+      blog2 = Blog.create! arbitrary_number: 20, created_at: @from
+      blog1.page_views.create! date: @from
+      blog1.page_views.create! date: @from
     end
-  end
 
-  context 'ActiveRecord::Relation scoped' do
-    subject do
-      # `where` returns ActiveRecord::Relation
-      Blog.where('id > 0').count_weekly(:created_at, @from, @from)
+    shared_examples_for 'count .values_and_dates' do
+      it "returns value and date with expected values on #{db_config}" do
+        expect(subject.values_and_dates).to eq([date: @from.beginning_of_week.to_date, value: 2])
+      end
     end
-    it_behaves_like 'count .values_and_dates'
-  end
 
-  context 'Array scoped' do
-    subject do
-      # `associations` return arrays
-      Blog.first.page_views.count_weekly(:date, @from, @from)
+    shared_examples_for 'sum .values_and_dates' do
+      it "returns value and date with expected values on #{db_config}" do
+        expect(subject.values_and_dates).to eq([date: @from.beginning_of_week.to_date, value: 30])
+      end
     end
-    it_behaves_like 'count .values_and_dates'
-  end
 
-  context 'hash args' do
+    shared_examples_for 'avg .values_and_dates' do
+      it "returns value and date with expected values on #{db_config}" do
+        expect(subject.values_and_dates).to eq([date: @from.beginning_of_week.to_date, value: 15])
+      end
+    end
 
-    context 'for count' do
+    context 'ActiveRecord::Relation scoped' do
       subject do
-        Blog.count_weekly({
-          group_by_column: :created_at,
-          from: @from,
-          to: @to
-        })
+        # `where` returns ActiveRecord::Relation
+        Blog.where('id > 0').count_weekly(:created_at, @from, @from)
       end
       it_behaves_like 'count .values_and_dates'
     end
 
-    context 'for sum' do
+    context 'Array scoped' do
       subject do
-        Blog.sum_weekly({
-          group_by_column: :created_at,
-          aggregate_column: :arbitrary_number,
-          from: @from,
-          to: @to
-        })
+        # `associations` return arrays
+        Blog.first.page_views.count_weekly(:date, @from, @from)
       end
-      it_behaves_like 'sum .values_and_dates'
+      it_behaves_like 'count .values_and_dates'
+    end
+
+    context 'hash args' do
 
-      context 'with strings' do
+      context 'for count' do
+        subject do
+          Blog.count_weekly({
+            group_by_column: :created_at,
+            from: @from,
+            to: @to
+          })
+        end
+        it_behaves_like 'count .values_and_dates'
+      end
+
+      context 'for sum' do
         subject do
           Blog.sum_weekly({
-            group_by_column: 'created_at',
-            aggregate_column: 'arbitrary_number',
+            group_by_column: :created_at,
+            aggregate_column: :arbitrary_number,
             from: @from,
             to: @to
           })
         end
         it_behaves_like 'sum .values_and_dates'
-      end
-    end
 
-    context 'for avg' do
-      subject do
-        Blog.avg_weekly({
-          group_by_column: :created_at,
-          aggregate_column: :arbitrary_number,
-          from: @from,
-          to: @to
-        })
+        context 'with strings' do
+          subject do
+            Blog.sum_weekly({
+              group_by_column: 'created_at',
+              aggregate_column: 'arbitrary_number',
+              from: @from,
+              to: @to
+            })
+          end
+          it_behaves_like 'sum .values_and_dates'
+        end
       end
-      it_behaves_like 'avg .values_and_dates'
-    end
-
-  end
 
-  context 'normal args' do
-    context 'for count' do
-      subject do
-        Blog.count_weekly(:created_at, @from, @from)
+      context 'for avg' do
+        subject do
+          Blog.avg_weekly({
+            group_by_column: :created_at,
+            aggregate_column: :arbitrary_number,
+            from: @from,
+            to: @to
+          })
+        end
+        it_behaves_like 'avg .values_and_dates'
       end
-      it_behaves_like 'count .values_and_dates'
+
     end
-    context 'for sum' do
-      subject do
-        Blog.sum_weekly(:created_at, :arbitrary_number, @from, @from)
-      end
-      it_behaves_like 'sum .values_and_dates'
 
-      context 'with strings' do
+    context 'normal args' do
+      context 'for count' do
         subject do
-          Blog.sum_weekly('created_at', 'arbitrary_number', @from, @from)
+          Blog.count_weekly(:created_at, @from, @from)
         end
-        it_behaves_like 'sum .values_and_dates'
+        it_behaves_like 'count .values_and_dates'
       end
-    end
-    context 'for avg' do
-      subject do
-        Blog.avg_weekly(:created_at, :arbitrary_number, @from, @from)
-      end
-      it_behaves_like 'avg .values_and_dates'
-    end
-  end
+      context 'for sum' do
+        subject do
+          Blog.sum_weekly(:created_at, :arbitrary_number, @from, @from)
+        end
+        it_behaves_like 'sum .values_and_dates'
 
-  context 'bad args' do
-    context 'for count' do
-      subject do
-        Blog.count_weekly(:created_at, {}, {})
+        context 'with strings' do
+          subject do
+            Blog.sum_weekly('created_at', 'arbitrary_number', @from, @from)
+          end
+          it_behaves_like 'sum .values_and_dates'
+        end
       end
-      it 'raise ArgumentError' do
-        expect do
-          subject
-        end.to raise_error(ArgumentError)
+      context 'for avg' do
+        subject do
+          Blog.avg_weekly(:created_at, :arbitrary_number, @from, @from)
+        end
+        it_behaves_like 'avg .values_and_dates'
       end
     end
 
-    context 'for sum' do
-      subject do
-        Blog.sum_weekly(:created_at, @from, @from)
+    context 'bad args' do
+      context 'for count' do
+        subject do
+          Blog.count_weekly(:created_at, {}, {})
+        end
+        it 'raise ArgumentError' do
+          expect do
+            subject
+          end.to raise_error(ArgumentError)
+        end
       end
-      it 'raise ArgumentError' do
-        expect do
-          subject
-        end.to raise_error(ArgumentError, /aggregate_column/)
+
+      context 'for sum' do
+        subject do
+          Blog.sum_weekly(:created_at, @from, @from)
+        end
+        it 'raise ArgumentError' do
+          expect do
+            subject
+          end.to raise_error(ArgumentError, /aggregate_column/)
+        end
       end
     end
+
   end
 
+  it_behaves_like 'working gem', :mysql
+  it_behaves_like 'working gem', :postgresql
+  it_behaves_like 'working gem', :sqlite3
+
 end

data/spec/spec_helper.rb

@@ -1,5 +1,3 @@
-require 'database_cleaner'
-
 # This file was generated by the `rspec --init` command. Conventionally, all
 # specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
 # The generated `.rspec` file contains `--require spec_helper` which will cause this
@@ -18,17 +16,6 @@ require 'database_cleaner'
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
 
-  config.before(:suite) do
-    DatabaseCleaner.strategy = :transaction
-    # DatabaseCleaner.clean_with(:truncation)
-  end
-
-  config.around(:each) do |example|
-    DatabaseCleaner.cleaning do
-      example.run
-    end
-  end
-
   # rspec-expectations config goes here. You can use an alternate
   # assertion/expectation library such as wrong or the stdlib/minitest
   # assertions if you prefer.
@@ -102,4 +89,4 @@ RSpec.configure do |config|
 =end
 end
 
-require 'ar_bootstrap/init'
+require 'ar_bootstrap/init'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ar_aggregate_by_interval
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
 platform: ruby
 authors:
 - Jonathan Otto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-09 00:00:00.000000000 Z
+date: 2015-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -39,33 +39,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: database_cleaner
+  name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '4.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '4.5'
 - !ruby/object:Gem::Dependency
-  name: guard-rspec
+  name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.5'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.5'
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pg
+  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: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -154,11 +182,13 @@ files:
 - Rakefile
 - ar_aggregate_by_interval.gemspec
 - circle.yml
+- helpers.rb
 - lib/ar_aggregate_by_interval.rb
 - lib/ar_aggregate_by_interval/query_result.rb
 - lib/ar_aggregate_by_interval/query_runner.rb
 - lib/ar_aggregate_by_interval/utils.rb
 - lib/ar_aggregate_by_interval/version.rb
+- spec/ar_bootstrap/database.yml
 - spec/ar_bootstrap/init.rb
 - spec/ar_bootstrap/schema.rb
 - spec/lib/ar_aggregate_by_interval/utils_spec.rb
@@ -188,6 +218,7 @@ signing_key:
 specification_version: 4
 summary: add [sum|count]_[daily|weekly|monthly] to your AR models for MySQL AND Postgres
 test_files:
+- spec/ar_bootstrap/database.yml
 - spec/ar_bootstrap/init.rb
 - spec/ar_bootstrap/schema.rb
 - spec/lib/ar_aggregate_by_interval/utils_spec.rb