event-counter 0.0.1 → 0.1.0

data/lib/event_counter/version.rb

@@ -1,4 +1,4 @@
 # This module contains VERSION
 module EventCounterVersion
-  VERSION = '0.0.1'
+  VERSION = '0.1.0'
 end

data/spec/lib/event_counter_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe EventCounter do
-  let(:ball) { Fabricate(:ball) }
+  let(:ball) { Ball.create! }
 
   it 'has version' do
     expect(EventCounter::VERSION).to match(/\d+\.\d+\.\d+/)
@@ -15,7 +15,7 @@ describe EventCounter do
       expected = {
         countable_id: ball.id,
         countable_type: ball.class.name,
-        created_at: Time.now.floor(300),
+        created_at: Time.zone.now.floor(300),
         name: 'rotations',
         value: 3
       }.with_indifferent_access
@@ -27,7 +27,7 @@ describe EventCounter do
   end
 
   it '#make on time' do
-    on_time = Time.mktime(2012, 12, 12, 12, 12)
+    on_time = Time.mktime(2014, 1, 1, 1, 14).in_time_zone
     expect {
       counter = ball.rotations.make(
         3, on_time: on_time)
@@ -48,7 +48,7 @@ describe EventCounter do
   end
 
   it '#make on time with interval as symbol' do
-    on_time = Time.mktime(2012, 12, 12, 12, 12)
+    on_time = Time.mktime(2014, 1, 1, 1, 1).in_time_zone
     [:week, :month, :year].each do |interval|
       expect {
         counter = ball.send(:"rotations_by_#{interval}").make(
@@ -73,7 +73,7 @@ describe EventCounter do
 end
 
 describe Ball do
-  let(:ball) { Fabricate(:ball) }
+  let(:ball) { Ball.create! }
 
   it 'creates a new counter while incrementing' do
     expect {
@@ -230,12 +230,12 @@ describe Ball do
 
   def setup_counters(countable_count = 1)
     [1, 1, 2, 3, 5, 8, 13, 21, 34].each do |n|
-      on_time = Time.mktime(2012, 12, 12, 12, n)
+      on_time = Time.mktime(2014, 1, 1, 1, n).in_time_zone
       if countable_count == 1
         ball.rotations.make n, on_time: on_time
       else
         countable_count.times do
-          Fabricate(:ball).rotations.make n, on_time: on_time
+          Ball.create!.rotations.make n, on_time: on_time
         end
       end
     end
@@ -282,9 +282,9 @@ describe Ball do
     end
 
     it 'with a greater interval and a time range' do
-      range_start = Time.mktime 2012, 12, 12, 12, 15
-      range_end =   Time.mktime 2012, 12, 12, 12, 45
-      range = range_start..range_end
+      range_start = Time.mktime 2014, 1, 1, 1, 15
+      range_end =   Time.mktime 2014, 1, 1, 1, 45
+      range = range_start.in_time_zone..range_end.in_time_zone
 
       data = [ [ 10, 13 ], [ 20, 21 ], [ 30, 34 ], [ 40, 0] ]
 
@@ -293,7 +293,7 @@ describe Ball do
     end
 
     it 'with a greater interval as symbol' do
-      beginning_of_week = Time.mktime(2012, 12, 12).beginning_of_week
+      beginning_of_week = Time.mktime(2014).in_time_zone.beginning_of_week
 
       data = [ [ beginning_of_week, 88 ] ]
 
@@ -305,29 +305,64 @@ describe Ball do
 
   context '.data_for' do
 
+    subject { Ball }
+
     before { setup_counters(3) }
 
     it 'with a default interval' do
       data = [
         # [ minute, value ]
-        [ 0, 21   ],
-        [ 5, 39  ],
+        [ 0, 21 ],
+        [ 5, 39 ],
         [ 10, 39 ],
-        [ 15, 0  ],
+        [ 15, 0 ],
         [ 20, 63 ],
-        [ 25, 0  ],
+        [ 25, 0 ],
         [ 30, 102 ]
       ]
       expect(subject.data_for(:rotations)).to eql_data(data)
     end
 
+    it 'with a greater interval' do
+      data = [ [ 0, 60 ], [ 10, 39 ], [ 20, 63 ], [ 30, 102 ] ]
+
+      expect(subject.data_for(:rotations, interval: 10.minutes))
+        .to eql_data(data)
+    end
+
+    it 'with a greater interval within range' do
+      data = [ [ 10, 39 ], [ 20, 63 ] ]
+
+      range_start = Time.mktime(2014, 1, 1, 1, 15).in_time_zone
+      range_end = Time.mktime(2014, 1, 1, 1, 29).in_time_zone
+      range = range_start..range_end
+
+      expect(subject.data_for(:rotations, interval: 10.minutes, range: range))
+        .to eql_data(data)
+    end
+
     it 'with a greater interval as symbol and a simple data' do
-      beginning_of_month = Time.mktime(2012, 12, 12).beginning_of_month
-      data = [ [ beginning_of_month, 264 ] ]
-      expect(subject.data_for(:rotations, interval: :month)).to eql(data)
+      bmonth = Time.mktime(2014, 1, 1).in_time_zone.beginning_of_month
+      data = [ [ bmonth, 264 ] ]
+
+      expect(subject.data_for(:rotations, interval: :month))
+        .to match_array(data)
     end
 
-    it 'with a greater interval as symbol and a large data' do
+    it 'with a greater interval as symbol and a simple data within range' do
+      bmonth = Time.mktime(2014, 1, 1).in_time_zone.beginning_of_month
+      data = [ [ bmonth, 264 ] ]
+
+      range_start = bmonth
+      range_end = bmonth.end_of_month
+      range = range_start..range_end
+
+      expect(subject.data_for(:rotations, interval: :month, range: range))
+        .to match_array(data)
+    end
+
+
+    it 'with a greater interval as symbol on large data set within range' do
       EventCounter.all.each do |counter|
         11.times do |x|
           created_at = counter.created_at - (x + 1).months
@@ -337,9 +372,14 @@ describe Ball do
         end
       end
 
-      data = (1..12).map { |x| [ Time.mktime(2012, x), 264 ] }
+      data = (6..12).map { |x| [ Time.mktime(2013, x).in_time_zone, 264 ] }
+
+      range_start = data[0][0].beginning_of_month
+      range_end = data[-1][0].end_of_month
+      range = range_start..range_end
 
-      expect(subject.data_for(:rotations, interval: :month)).to eql(data)
+      expect(subject.data_for(:rotations, interval: :month, range: range))
+        .to match_array(data)
     end
 
   end

data/spec/lib/performance_spec.rb

@@ -1,55 +1,106 @@
 require 'spec_helper'
 
-describe Ball, performance: true do
+describe Ball, slow: true do
 
-  let(:range_start) { (Time.mktime 2011, 12).beginning_of_month }
-  let(:range_end)   { (Time.mktime 2012, 11).end_of_month }
+  before(:suite) do
+    DatabaseCleaner.strategy = :truncation
+    DatabaseCleaner.clean_with(:truncation)
+  end
+
+  let(:range_start) { (Time.mktime 2013, 7).in_time_zone.beginning_of_month }
+  let(:range_end)   { (Time.mktime 2014, 6).in_time_zone.end_of_month       }
   let(:range)       { range_start..range_end }
 
-  before(:all) do
-    @logger = ActiveRecord::Base.logger
+  def disable_logging(&blk)
+    logger = ActiveRecord::Base.logger
     ActiveRecord::Base.logger = nil
+    yield
+    ActiveRecord::Base.logger = logger
   end
 
-  after(:all) do
-    ActiveRecord::Base.logger = @logger
+
+  def connection
+    ActiveRecord::Base.connection.raw_connection
   end
 
-  def setup_data(countable = 10, step = 1.day)
-    (1..countable).map do |x|
-      ball = Fabricate(:ball)
+  def setup_data(countable = 1000, step = 1.day)
+
+    ball = Ball.create!
+
+    (Time.mktime(2012).to_i..Time.mktime(2015).to_i).step(step) do |i|
+      on_time = Time.at(i)
+      ball.rotations.make on_time: on_time
+    end
+
+    path = File.expand_path('../../fixtures/event_counters.sql', __FILE__)
+
+    skip_count = 0
+
 
-      (range_start.to_i..range_end.to_i).step(step) do |i|
-        on_time = Time.at(i)
-        ball.rotations.make on_time: on_time
+    export_sql = "COPY event_counters TO STDOUT (DELIMITER '|')"
+    connection.copy_data(export_sql) do
+      File.open(path, 'w') do |f|
+        while line = connection.get_copy_data
+          skip_count += 1
+          f.write(line)
+        end
+      end
+    end
+
+    File.open(path, 'a+') do |f|
+      lines = f.readlines
+      last_ids = lines.last.split('|')[0, 4]
+      id, countable_id = last_ids.first.to_i, last_ids.last.to_i
+      (2..countable).each do |i|
+        countable_id += 1
+        lines.each do |line|
+          id += 1
+          split = line.split('|')
+          split[0] = id
+          split[3] = countable_id
+          f.write split.join('|')
+        end
+      end
+    end
+
+    import_sql = "COPY event_counters FROM STDIN (DELIMITER '|')"
+    connection.copy_data(import_sql) do
+      File.open(path, 'r') do |f|
+        i = 0
+        while line = f.gets
+          i += 1
+          next if i <= skip_count
+          connection.put_copy_data line
+        end
       end
     end
   end
 
   context '#data_for' do
 
-    before { setup_data }
-
     it 'performance is adequate' do
+      disable_logging { setup_data }
+
       data = [
-        {"created_at"=>"2011-12-01 00:00:00+04", "value"=>"310"},
-        {"created_at"=>"2012-01-01 00:00:00+04", "value"=>"310"},
-        {"created_at"=>"2012-02-01 00:00:00+04", "value"=>"290"},
-        {"created_at"=>"2012-03-01 00:00:00+04", "value"=>"310"},
-        {"created_at"=>"2012-04-01 00:00:00+04", "value"=>"300"},
-        {"created_at"=>"2012-05-01 00:00:00+04", "value"=>"310"},
-        {"created_at"=>"2012-06-01 00:00:00+04", "value"=>"300"},
-        {"created_at"=>"2012-07-01 00:00:00+04", "value"=>"310"},
-        {"created_at"=>"2012-08-01 00:00:00+04", "value"=>"310"},
-        {"created_at"=>"2012-09-01 00:00:00+04", "value"=>"300"},
-        {"created_at"=>"2012-10-01 00:00:00+04", "value"=>"310"},
-        {"created_at"=>"2012-11-01 00:00:00+04", "value"=>"300"}
+        {"created_at"=>"2013-07-01 00:00:00", "value"=>"31000"},
+        {"created_at"=>"2013-08-01 00:00:00", "value"=>"31000"},
+        {"created_at"=>"2013-09-01 00:00:00", "value"=>"30000"},
+        {"created_at"=>"2013-10-01 00:00:00", "value"=>"31000"},
+        {"created_at"=>"2013-11-01 00:00:00", "value"=>"30000"},
+        {"created_at"=>"2013-12-01 00:00:00", "value"=>"31000"},
+        {"created_at"=>"2014-01-01 00:00:00", "value"=>"31000"},
+        {"created_at"=>"2014-02-01 00:00:00", "value"=>"28000"},
+        {"created_at"=>"2014-03-01 00:00:00", "value"=>"31000"},
+        {"created_at"=>"2014-04-01 00:00:00", "value"=>"30000"},
+        {"created_at"=>"2014-05-01 00:00:00", "value"=>"31000"},
+        {"created_at"=>"2014-06-01 00:00:00", "value"=>"30000"}
       ]
 
-      expect {
-        expect(Ball.data_for(:rotations, interval: :month, range: range, raw: true))
-          .to eql(data)
-      }.to take_less_than(0.1).seconds
+      #expect {
+        expect(
+          Ball.data_for(:rotations, interval: :month, range: range, raw: true)
+        ).to match_array(data)
+      #}.to take_less_than(0.1).seconds
     end
   end
 end

data/spec/spec_helper.rb

@@ -3,7 +3,6 @@ require 'bundler/setup'
 
 require 'active_record'
 require 'database_cleaner'
-require 'fabrication'
 require 'logger'
 require 'event_counter'
 
@@ -20,11 +19,12 @@ YAML.load(File.open(conf).read).values.each do |config|
   ActiveRecord::Base.establish_connection config
 end
 
+ActiveRecord::Base.default_timezone = :utc
+Time.zone = 'Moscow'
+
 ActiveRecord::Schema.define do
   self.verbose = false
 
-  create_table :cubes, force: true
-
   create_table :balls, force: true
 
   create_table :event_counters, force: true do |t|
@@ -35,9 +35,9 @@ ActiveRecord::Schema.define do
     t.datetime :created_at
   end
 
-  add_index :event_counters, :countable_type
-  add_index :event_counters, [:countable_type, :name, :countable_id, :created_at],
-    name: 'composite'
+  add_index :event_counters, :created_at#, name: 'idx_created_at_desc'
+  add_index :event_counters, [:countable_type, :name, :countable_id],
+    name: 'idx_composite'
 end
 
 # :nodoc:
@@ -54,18 +54,15 @@ Dir[File.expand_path('../support/*.rb', __FILE__)].each do |file|
 end
 
 RSpec.configure do |config|
+
   config.before(:suite) do
     DatabaseCleaner.strategy = :transaction
     DatabaseCleaner.clean_with(:truncation)
   end
 
-  config.before(:each) do
-    DatabaseCleaner.start
-  end
-
-  config.after(:each) do
-    DatabaseCleaner.clean
+  config.around(:each) do |example|
+    DatabaseCleaner.cleaning { example.run }
   end
 
-  config.filter_run_excluding performance: true
+  config.filter_run_excluding slow: true unless ENV['RUN_ALL']
 end

data/spec/support/matchers.rb

@@ -11,10 +11,12 @@ RSpec::Matchers.define :be_eql do |expected|
   diffable
 end
 
-RSpec::Matchers.define :eql_data do |expected|
-  match do |actual|
-    expected.map! { |a, b| [ Time.mktime(2012, 12, 12, 12, a), b ] }
-    expect(actual).to eql(expected)
+module RSpec
+  module Matchers
+    def eql_data(items)
+      items.map! { |a, b| [ Time.mktime(2014, 1, 1, 1, a).in_time_zone, b ] }
+      contain_exactly(*items)
+    end
   end
 end
 

metadata

@@ -1,113 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: event-counter
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Anton Orel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-18 00:00:00.000000000 Z
+date: 2014-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
-  name: pg
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
-- !ruby/object:Gem::Dependency
-  name: database_cleaner
-  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: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
-  name: fabrication
+  name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
 description: Database based event counter with throttling per time intervals
 email:
 - eagle.anton@gmail.com
@@ -117,20 +61,34 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rubocop.yml"
+- ".travis.yml"
+- Appraisals
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - config/database.ci.yml
 - event-counter.gemspec
+- gemfiles/pg_ar_30.gemfile
+- gemfiles/pg_ar_30.gemfile.lock
+- gemfiles/pg_ar_31.gemfile
+- gemfiles/pg_ar_31.gemfile.lock
+- gemfiles/pg_ar_32.gemfile
+- gemfiles/pg_ar_32.gemfile.lock
+- gemfiles/pg_ar_40.gemfile
+- gemfiles/pg_ar_40.gemfile.lock
+- gemfiles/pg_ar_41.gemfile
+- gemfiles/pg_ar_41.gemfile.lock
 - lib/event-counter.rb
 - lib/event_counter.rb
 - lib/event_counter/active_record_extension.rb
 - lib/event_counter/version.rb
+- log/.gitkeep
+- spec/fixtures/.gitkeep
 - spec/lib/event_counter_spec.rb
 - spec/lib/performance_spec.rb
 - spec/spec_helper.rb
-- spec/support/fabrications.rb
 - spec/support/matchers.rb
 homepage: https://github.com/skyeagle/event-counter
 licenses:
@@ -157,9 +115,9 @@ signing_key:
 specification_version: 4
 summary: Event counter with throttling per time interval
 test_files:
+- spec/fixtures/.gitkeep
 - spec/lib/event_counter_spec.rb
 - spec/lib/performance_spec.rb
 - spec/spec_helper.rb
-- spec/support/fabrications.rb
 - spec/support/matchers.rb
 has_rdoc: