aggtive_record 0.1.2 → 0.1.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzUxOTY3OTI2MWVmYjg0ZWU0YzVmOTUyMjA0NzhmNGEzMTU5ODhhMg==
+    NzM2ZGIxNTQ3MjU2MmI0ZGQ2YmJmOTJjMjQxYjQxZTJmNGYwODI1ZQ==
   data.tar.gz: !binary |-
-    YmIzZWJjOGMzMzEzYTc0NzQwZjc0ODQ1YjUyNTVjZWU4ZTFhMmNmZA==
+    MmY0YmQ4ZDE1NGNkNTU2ZDZkNjFmNzg2YTczNjIyY2Q4NjIxZGFkNQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZDBhZGYwOThkN2U5NjQ4NjNiOTA1ZDdkMTA1MTE4YmNmYjI3M2VjZWQxZDg0
-    NWZkNDE2NDYxNGRiM2QxYjMwMTJmNDIwMDM2MGFhYTAzNDBhM2Y5MGFmMjQw
-    MzI3NGRiYjkzZjMwNWU5NjdiYzhkMjA4OTA5YjBkMmZhNzExYzg=
+    MGZkMWFhMTFiMGMzODllNmY0ZDI5MmNmYWM4Zjg0NDA4MjRkZjQ4YmNhNzFm
+    MmQ1ODRlMWVlMjg1ZDY0MmJjNDZmOTBiMDRmMjNmMzBiZDYxOTc4NjFlNWM0
+    M2JhMWM3NDJhN2IxMWNkOWU5ZTNmMTJlYTg2MjU0YWFiMTZjYzg=
   data.tar.gz: !binary |-
-    ZWQyMjNiMzE3Y2ZlYzZiYmE5MWJkYjdhOWQ1NGM3ODY4YzhmYmUyZDJhNWJl
-    MTg4MWUxOWRlZThkNTYyMWM5ZWUyNWZkN2QwN2MyNzQwNmRjNDhjYzM1ZDc0
-    NzdhMGU3OWVhNGVmMDRhZjNmMDkyY2Q4Yzk4NTVjODlkYzc1ZjY=
+    MGQyOWZhNWMzMjgwMjVmNGM1N2RkMGJhZDA0NjI1MWEyZjNiNzk4YjJiNTNm
+    ZjRiMzNjNjlhZmYyMWUzODcwNTA3OWYwNzRhNzhlZWQ1NzhlMTZhMzE3Y2I1
+    MmI5Mzk2NWI0MzM2NGJkZmJhNGYyODkyOTNmNDAwNTlkODNjMjU=

data/Gemfile

@@ -9,6 +9,7 @@ group :development do
   gem 'database_cleaner', '~> 1.0.1'
   gem 'mysql2'
   gem 'activerecord', '~> 3.2.14'
+  gem 'timecop'
 end
 
 gem 'groupdate'

data/Gemfile.lock

@@ -76,6 +76,7 @@ GEM
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.3)
     slop (3.4.6)
+    timecop (0.6.3)
     tzinfo (0.3.37)
 
 PLATFORMS
@@ -91,3 +92,4 @@ DEPENDENCIES
   mysql2
   pry
   rspec (~> 2.14.1)
+  timecop

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.5

data/aggtive_record.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "aggtive_record"
-  s.version = "0.1.2"
+  s.version = "0.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dan Nguyen"]
-  s.date = "2013-09-23"
+  s.date = "2013-10-02"
   s.description = "This is not even remotely finished or even started on. Please don't download."
   s.email = "dansonguyen@gmail.com"
   s.extra_rdoc_files = [
@@ -35,12 +35,13 @@ Gem::Specification.new do |s|
     "lib/aggtive_record/egg_scopes.rb",
     "lib/aggtive_record/egg_scopes/collation.rb",
     "lib/aggtive_record/egg_scopes/collation/count_by.rb",
-    "lib/aggtive_record/egg_scopes/collation/rate.rb",
+    "lib/aggtive_record/egg_scopes/collation/rate_per.rb",
     "lib/aggtive_record/egg_scopes/time_bucket.rb",
     "lib/aggtive_record/egg_scopes/time_span.rb",
     "lib/aggtive_record/memo.rb",
     "lib/aggtive_record/time.rb",
     "spec/functional/basic_object_run_spec.rb",
+    "spec/functional/collation_spec.rb",
     "spec/lib/aggable_spec.rb",
     "spec/lib/count_by_spec.rb",
     "spec/lib/rate_spec.rb",
@@ -67,6 +68,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<database_cleaner>, ["~> 1.0.1"])
       s.add_development_dependency(%q<mysql2>, [">= 0"])
       s.add_development_dependency(%q<activerecord>, ["~> 3.2.14"])
+      s.add_development_dependency(%q<timecop>, [">= 0"])
     else
       s.add_dependency(%q<groupdate>, [">= 0"])
       s.add_dependency(%q<activesupport>, ["~> 3.2.14"])
@@ -77,6 +79,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<database_cleaner>, ["~> 1.0.1"])
       s.add_dependency(%q<mysql2>, [">= 0"])
       s.add_dependency(%q<activerecord>, ["~> 3.2.14"])
+      s.add_dependency(%q<timecop>, [">= 0"])
     end
   else
     s.add_dependency(%q<groupdate>, [">= 0"])
@@ -88,6 +91,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<database_cleaner>, ["~> 1.0.1"])
     s.add_dependency(%q<mysql2>, [">= 0"])
     s.add_dependency(%q<activerecord>, ["~> 3.2.14"])
+    s.add_dependency(%q<timecop>, [">= 0"])
   end
 end
 

data/lib/aggtive_record/egg_scopes/collation/count_by.rb

@@ -12,8 +12,19 @@ module AggtiveRecord
             span_foo = "by_#{time_period}"
             self.send(span_foo).count
           end
+
+          # define dynamically
+          AggtiveRecord::Time.periods.each do |period_name|          
+            foo_name = "count_by_#{period_name}".to_sym
+            # defining scope here, dynamically
+            define_method foo_name do
+              self.count_by(period_name)
+            end
+          end
         end
 
+
+
       end
     end
   end

data/lib/aggtive_record/egg_scopes/collation/rate_per.rb

@@ -0,0 +1,76 @@
+module AggtiveRecord
+  module EggScopes
+    module Collation
+      module Rate 
+        extend ActiveSupport::Concern
+
+        # Public: a rate
+        # expects that ActiveRelation has a grouping
+        # self is a ActiveRecord scope
+
+        module ClassMethods
+
+          # Public
+          #
+          # Returns float indicating rate of records per given time period
+          def rate_per(time_period, timespan_in_seconds = nil)
+            # tk: this may be unnecessary
+            records = self.scoped.to_a
+
+            time_period_secs = AggtiveRecord::Time.to_seconds(time_period)
+            timespan_in_seconds ||= self.timespan_to_now(records)
+
+                      
+
+            return records.size.to_f * time_period_secs / timespan_in_seconds
+          end
+
+          # defines rate_per_year, rate_per_hour
+          # except that rate_per_year also accepts an optional argument
+        
+          AggtiveRecord::Time.periods.each do |period_name|          
+            foo_name = "rate_per_#{period_name}".to_sym
+            # defining scope here, dynamically
+            define_method foo_name do |*args|
+
+              
+              if args[0].present?
+              # i.e: #rate_per_month(:past_year)
+                past_scope = args[0]  # past_year
+                raise ArgumentError, "Must be a scope with 'past_'" unless past_scope.to_s =~ /^past_/
+
+                time_scoped_records = self.send( past_scope )
+                past_time_span_name = past_scope.to_s.match(/past_(\w+)/)[1]
+                past_period_in_seconds = AggtiveRecord::Time.to_seconds(past_time_span_name)
+              else
+                time_scoped_records = scoped
+                past_period_in_seconds = self.timespan_to_now(time_scoped_records)
+              end
+
+#              puts "Past #{past_time_span_name} in seconds: #{past_period_in_seconds}"
+              time_scoped_records.send( :rate_per, period_name, past_period_in_seconds )
+            end
+          end 
+        end
+
+
+        # included do 
+
+        #   # singular time periods       
+        #   # e.g. scope :past_year, ->{ past_time_periods(1, :year)}
+          
+
+        # end
+
+      end
+    end
+  end
+end
+
+=begin
+ 
+Record.rate_per :hour
+      .rate_per :day
+
+
+=end

data/lib/aggtive_record/egg_scopes/collation.rb

@@ -1,5 +1,5 @@
 require_relative 'collation/count_by'
-require_relative 'collation/rate'
+require_relative 'collation/rate_per'
 
 module AggtiveRecord
   module EggScopes

data/lib/aggtive_record/time.rb

@@ -21,8 +21,12 @@ module AggtiveRecord
     SECONDS_PER_DAY = 60 * 60 * 24
 
     # probably reinventing the wheel here...
-    def self.to_seconds(sym)
-      case sym.to_sym
+    def self.to_seconds(str)
+
+      num, period = str.to_s.match(/^(\d*)_?(\w+?)s?$/)[1..2]
+      num = num.to_i > 0 ? num.to_i : 1 # ugh
+
+      secs = case period.to_sym
       when :year
         SECONDS_PER_DAY * 365
       when :month
@@ -38,6 +42,8 @@ module AggtiveRecord
       when :second
         1
       end
+
+      num * secs
     end
 
 

data/spec/functional/collation_spec.rb

@@ -0,0 +1,45 @@
+require 'spec_helper'
+
+
+describe AggtiveRecord do 
+
+
+  context 'collation methods acting in concert' do
+    before(:each) do 
+      Timecop.freeze(Time.parse '2013-10-02')
+      MusicRecord.create(published_at: 5.days.ago)
+      MusicRecord.create(published_at: 1.month.ago)
+      MusicRecord.create(published_at: 9.months.ago)
+      MusicRecord.create(published_at: 14.months.ago)
+    end
+
+
+    it '#past_14_days' do 
+      expect(MusicRecord.past_14_days.count).to eq 1
+    end
+
+    it '#rate_per_week(:past_14_days)' do 
+      expect(MusicRecord.rate_per_week(:past_14_days)).to eq 0.5
+    end
+
+    it '#past_year' do 
+      expect(MusicRecord.past_year.count).to eq 3
+    end
+
+
+    it '#past_year.count_by_year' do 
+      expect(MusicRecord.past_year.count_by_year).to eq( {Time.new(Time.now.year) => 3})
+    end
+
+
+    it '#past_year.count_by_week' do 
+       expect(MusicRecord.past_year.count_by_week).to eq( 
+        { Time.parse( "2012-12-30 00:00:00 -0500") =>1, 
+          Time.parse( "2013-09-01 00:00:00 -0400") =>1, 
+          Time.parse( "2013-09-22 00:00:00 -0400") =>1
+        }
+      )
+    end
+
+  end 
+end

data/spec/lib/rate_spec.rb

@@ -3,47 +3,34 @@ require 'spec_helper'
 describe "AggtiveRecord::EggScopes -- .rate" do
 
 
-    describe '#rate_for' do 
+    describe '#rate_per' do 
       context 'singular periods' do 
         it 'should get about 1 a year' do 
           @record = MusicRecord.create published_at: 12.months.ago
           expect(MusicRecord.scoped.rate_per(:year) ).to be_within(0.1).of 1
         end
-      end
-
-      context 'has two optional parameters' do 
-
-        before(:each) do 
-          MusicRecord.create(published_at: 1.day.ago )
-        end
+      
 
-        let(:records){ MusicRecord.scoped }
-        
-        context 'first parameter is the :start_time' do 
-          it 'bounds range with :start_time and Time.now' do 
-            pending 'rethink'
-            expect(records.rate_per(:day, 2.days.ago)).to be_within(0.1).of 0.5
+        context 'meta methods' do 
+          it 'should have #rate_per_month' do 
+            MusicRecord.create published_at: (1.month.ago - 1.second)
+            MusicRecord.create published_at: 12.days.ago
+            expect(MusicRecord.rate_per_month ).to be_within(0.01).of 2
           end
-        end
 
-        context 'second parameter is the end_time' do 
-          it 'bounds range with :start_time and :end_time' do 
-            pending 'rethink'
-            expect(records.rate_per(:day, 2.days.ago)).to be_within(0.1).of 0.5
+          it 'should have #rate_per_hour' do 
+            MusicRecord.create published_at: (59.minutes.ago)
+            MusicRecord.create published_at: 59.minutes.ago
+            expect(MusicRecord.rate_per_hour ).to be_within(0.1).of 2
           end
 
-          it 'has no effect on :where' do 
-            pending('This is troublesome. What if a user calls:
-             records.past_year.rate_per(:day, 10.days.ago, 3.days.ago) 
-              -- too many surprises here!
-             ')
-          end
         end
 
-        
+
         it 'should raise an error when a non-time period is passed in'
-        it 'should play nicely with other methods'
+
       end
+
     end
   
     describe '#timespan_of' do 
@@ -64,6 +51,36 @@ describe "AggtiveRecord::EggScopes -- .rate" do
 
       it 'should get #latest record in a set without re-querying database'
     end
+end
+
+
+# This is not usable
+#
+# context 'has two optional parameters' do 
+
+#         before(:each) do 
+#           MusicRecord.create(published_at: 1.day.ago )
+#         end
+
+#         let(:records){ MusicRecord.scoped }
+        
+#         context 'first parameter is the :start_time' do 
+#           it 'bounds range with :start_time and Time.now' do 
+#             pending 'rethink'
+#             expect(records.rate_per(:day, 2.days.ago)).to be_within(0.1).of 0.5
+#           end
+#         end
 
+#         context 'second parameter is the end_time' do 
+#           it 'bounds range with :start_time and :end_time' do 
+#             pending 'rethink'
+#             expect(records.rate_per(:day, 2.days.ago)).to be_within(0.1).of 0.5
+#           end
 
-end
+#           it 'has no effect on :where' do 
+#             pending('This is troublesome. What if a user calls:
+#              records.past_year.rate_per(:day, 10.days.ago, 3.days.ago) 
+#               -- too many surprises here!
+#              ')
+#           end
+#         end

data/spec/spec_helper.rb

@@ -9,6 +9,8 @@ require 'database_cleaner'
 require 'aggtive_record'
 require 'pry'
 
+require 'timecop'
+
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aggtive_record
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.5
 platform: ruby
 authors:
 - Dan Nguyen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-23 00:00:00.000000000 Z
+date: 2013-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: groupdate
@@ -136,6 +136,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.2.14
+- !ruby/object:Gem::Dependency
+  name: timecop
+  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: This is not even remotely finished or even started on. Please don't download.
 email: dansonguyen@gmail.com
 executables: []
@@ -162,12 +176,13 @@ files:
 - lib/aggtive_record/egg_scopes.rb
 - lib/aggtive_record/egg_scopes/collation.rb
 - lib/aggtive_record/egg_scopes/collation/count_by.rb
-- lib/aggtive_record/egg_scopes/collation/rate.rb
+- lib/aggtive_record/egg_scopes/collation/rate_per.rb
 - lib/aggtive_record/egg_scopes/time_bucket.rb
 - lib/aggtive_record/egg_scopes/time_span.rb
 - lib/aggtive_record/memo.rb
 - lib/aggtive_record/time.rb
 - spec/functional/basic_object_run_spec.rb
+- spec/functional/collation_spec.rb
 - spec/lib/aggable_spec.rb
 - spec/lib/count_by_spec.rb
 - spec/lib/rate_spec.rb

data/lib/aggtive_record/egg_scopes/collation/rate.rb

@@ -1,35 +0,0 @@
-module AggtiveRecord
-  module EggScopes
-    module Collation
-      module Rate 
-        extend ActiveSupport::Concern
-
-        # Public: a rate
-        # expects that ActiveRelation has a grouping
-        # self is a ActiveRecord scope
-
-        module ClassMethods
-
-          # Public
-          #
-          # Returns float indicating rate of records per given time period
-          def rate_per(time_period)
-            time_period_secs = AggtiveRecord::Time.to_seconds(time_period)
-            records = self.scoped.to_a
-
-            return records.size.to_f * time_period_secs / self.timespan_to_now(records)
-          end
-        end
-
-      end
-    end
-  end
-end
-
-=begin
- 
-Record.rate_per :hour
-      .rate_per :day
-
-
-=end