aggtive_record 0.1.5 → 0.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzM2ZGIxNTQ3MjU2MmI0ZGQ2YmJmOTJjMjQxYjQxZTJmNGYwODI1ZQ==
+    M2M3MDM5ZjQxYTBjYjQ4NTU1ODBmZmEwMzgyMTUwZTcwNmU4ZTUwOA==
   data.tar.gz: !binary |-
-    MmY0YmQ4ZDE1NGNkNTU2ZDZkNjFmNzg2YTczNjIyY2Q4NjIxZGFkNQ==
+    Y2VlZDg2MTU3NTBiZTk1OTNmNWE0NDM5Njk5YzkzMTFmYzA2ZDgwMw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MGZkMWFhMTFiMGMzODllNmY0ZDI5MmNmYWM4Zjg0NDA4MjRkZjQ4YmNhNzFm
-    MmQ1ODRlMWVlMjg1ZDY0MmJjNDZmOTBiMDRmMjNmMzBiZDYxOTc4NjFlNWM0
-    M2JhMWM3NDJhN2IxMWNkOWU5ZTNmMTJlYTg2MjU0YWFiMTZjYzg=
+    NmQxZGFhMmY1ZWU5Y2IyMmJlNDViOTVkNDM0ZGFmMmIyMzliNDhmOTczMGMz
+    Nzc3ZmNjNzVkMjAzMmMxODlhNWFiMzdjYzJjOWRjMjZlZWYxYzE5NjZkZGQ3
+    ZWQyZGViMzAyZTE3Yzc2MDhlMjY4ZDQxNjg0YjZjNmNkMDcwZDc=
   data.tar.gz: !binary |-
-    MGQyOWZhNWMzMjgwMjVmNGM1N2RkMGJhZDA0NjI1MWEyZjNiNzk4YjJiNTNm
-    ZjRiMzNjNjlhZmYyMWUzODcwNTA3OWYwNzRhNzhlZWQ1NzhlMTZhMzE3Y2I1
-    MmI5Mzk2NWI0MzM2NGJkZmJhNGYyODkyOTNmNDAwNTlkODNjMjU=
+    ZTM5ZTdhYWQyYmFjMjU3YTY3YTQ2YWNhMDk5ZGY0OTYwMzkxYWQwNWM3YzYy
+    NTJkMTdmNzk1NzlkMTI2NmE0NmI4OGU3ODVkNGQ1NTBlODI0OTg1Njg3NzYz
+    YjBhZDdlYzM0ZjUxOGU2NWNjNGI2OTRiOWYzOWMxNzFhNmUzMDA=

data/Gemfile

@@ -4,7 +4,7 @@ source "http://rubygems.org"
 group :development do
   gem "rspec", "~> 2.14.1"
   gem "bundler"
-  gem "jeweler", "~> 1.8.4"
+  gem "jeweler"
   gem 'pry'
   gem 'database_cleaner', '~> 1.0.1'
   gem 'mysql2'

data/Gemfile.lock

@@ -34,7 +34,7 @@ GEM
     highline (1.6.19)
     httpauth (0.2.0)
     i18n (0.6.5)
-    jeweler (1.8.7)
+    jeweler (1.8.8)
       builder
       bundler (~> 1.0)
       git (>= 1.2.5)
@@ -47,7 +47,7 @@ GEM
     jwt (0.1.8)
       multi_json (>= 1.5)
     method_source (0.8.2)
-    multi_json (1.8.0)
+    multi_json (1.8.1)
     multi_xml (0.5.5)
     multipart-post (1.2.0)
     mysql2 (0.3.13)
@@ -77,7 +77,7 @@ GEM
     rspec-mocks (2.14.3)
     slop (3.4.6)
     timecop (0.6.3)
-    tzinfo (0.3.37)
+    tzinfo (0.3.38)
 
 PLATFORMS
   ruby
@@ -88,7 +88,7 @@ DEPENDENCIES
   bundler
   database_cleaner (~> 1.0.1)
   groupdate
-  jeweler (~> 1.8.4)
+  jeweler
   mysql2
   pry
   rspec (~> 2.14.1)

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.2.0

data/aggtive_record.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "aggtive_record"
-  s.version = "0.1.5"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dan Nguyen"]
-  s.date = "2013-10-02"
+  s.date = "2013-10-11"
   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 = [
@@ -63,7 +63,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<activesupport>, ["~> 3.2.14"])
       s.add_development_dependency(%q<rspec>, ["~> 2.14.1"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<pry>, [">= 0"])
       s.add_development_dependency(%q<database_cleaner>, ["~> 1.0.1"])
       s.add_development_dependency(%q<mysql2>, [">= 0"])
@@ -74,7 +74,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<activesupport>, ["~> 3.2.14"])
       s.add_dependency(%q<rspec>, ["~> 2.14.1"])
       s.add_dependency(%q<bundler>, [">= 0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<pry>, [">= 0"])
       s.add_dependency(%q<database_cleaner>, ["~> 1.0.1"])
       s.add_dependency(%q<mysql2>, [">= 0"])
@@ -86,7 +86,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<activesupport>, ["~> 3.2.14"])
     s.add_dependency(%q<rspec>, ["~> 2.14.1"])
     s.add_dependency(%q<bundler>, [">= 0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<pry>, [">= 0"])
     s.add_dependency(%q<database_cleaner>, ["~> 1.0.1"])
     s.add_dependency(%q<mysql2>, [">= 0"])

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

@@ -17,12 +17,15 @@ module AggtiveRecord
             # tk: this may be unnecessary
             records = self.scoped.to_a
 
-            time_period_secs = AggtiveRecord::Time.to_seconds(time_period)
+            # eg. :hour is 3600 seconds
+            time_period_in_secs = AggtiveRecord::Time.to_seconds(time_period)
+
+            #e.g. whatever is passed in, or all of them from the beginning to end of reconrds
             timespan_in_seconds ||= self.timespan_to_now(records)
 
                       
 
-            return records.size.to_f * time_period_secs / timespan_in_seconds
+            return records.size.to_f * time_period_in_secs / timespan_in_seconds
           end
 
           # defines rate_per_year, rate_per_hour
@@ -31,18 +34,16 @@ module AggtiveRecord
           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?
+            define_method foo_name do |*args|              
+              if args[0].present? && args[0] !~ /^overall$/
               # 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_/
+                past_scope = args[0]  # past_year, :overall
+                raise ArgumentError, "Must be a scope with 'past_' or 'overall'" 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
+              else # overall or no argument
                 time_scoped_records = scoped
                 past_period_in_seconds = self.timespan_to_now(time_scoped_records)
               end

data/lib/aggtive_record/egg_scopes/time_bucket.rb

@@ -20,8 +20,6 @@ module AggtiveRecord
             send( groupdate_foo_name, self.datetime_attribute )
           }         
         end 
-
-
       end
     
 

data/lib/aggtive_record/egg_scopes/time_span.rb

@@ -11,6 +11,8 @@ module AggtiveRecord
 
         scope :past_time_periods, ->(num, period_name){ where("#{self.datetime_attribute} >= ?", num.send(period_name).send(:ago)  ) }
 
+        # just include all records
+        scope :overall, ->(){ where("#{self.datetime_attribute} IS NOT ?", nil) }
 
         # singular time periods       
         # e.g. scope :past_year, ->{ past_time_periods(1, :year)}

data/spec/functional/collation_spec.rb

@@ -18,10 +18,23 @@ describe AggtiveRecord do
       expect(MusicRecord.past_14_days.count).to eq 1
     end
 
+    it '#overall' do 
+      expect(MusicRecord.overall.count).to eq 4
+    end
+
+    it '#rate_per_week(:overall)'  do
+      old_time = MusicRecord.order('published_at').pluck(:published_at).first
+      new_time = Time.now
+
+      expect(MusicRecord.rate_per_week(:overall)).to eq   4.0 * AggtiveRecord::Time.to_seconds(:week) /  (new_time - old_time)
+    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

data/spec/spec_helper.rb

@@ -47,6 +47,12 @@ DatabaseCleaner.strategy = :truncation
 
 
 RSpec.configure do |config|
+  config.filter_run_excluding skip: true 
+  config.run_all_when_everything_filtered = true
+  config.filter_run :focus => true
+
+
+
   config.color_enabled = true
   config.tty = true
   config.formatter = :documentation # :progress, :html, :textmate

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aggtive_record
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors:
 - Dan Nguyen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-02 00:00:00.000000000 Z
+date: 2013-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: groupdate
@@ -70,16 +70,16 @@ dependencies:
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.8.4
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.8.4
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement