punching_bag 0.3.6 → 0.3.7

data/spec/lib/punching_bag_spec.rb

@@ -9,7 +9,7 @@ describe PunchingBag do
 
   describe '.punch' do
     it 'does nothing when the request is from a bot' do
-      expect(PunchingBag.punch(article, bot_request)).to be_false
+      expect(PunchingBag.punch(article, bot_request)).to be false
     end
 
     it 'creates a new punch when the request is valid' do
@@ -30,4 +30,4 @@ describe PunchingBag do
       expect(PunchingBag.average_time(punch_1, punch_2)).to eql (time + 25.seconds)
     end
   end
-end
+end

data/spec/models/punch_spec.rb

@@ -14,50 +14,59 @@ describe Punch do
 
   context 'with one hit' do
     its(:hits) { should eql 1 }
-    its(:jab?) { should be_true }
-    its(:combo?) { should be_false }
+    its(:jab?) { should be true }
+    its(:combo?) { should be false }
   end
 
   context 'with two hits' do
     let(:attrs) { {hits: 2} }
 
     its(:hits) { should eql 2 }
-    its(:jab?) { should be_false }
-    its(:combo?) { should be_true }
+    its(:jab?) { should be false }
+    its(:combo?) { should be true }
   end
 
   context 'with start time same as end time' do
     its(:timeframe) { should eql :second }
-    its(:day_combo?) { should be_false }
-    its(:month_combo?) { should be_false }
-    its(:year_combo?) { should be_false }
+    its(:day_combo?) { should be false }
+    its(:month_combo?) { should be false }
+    its(:year_combo?) { should be false }
   end
 
   context 'with start time in the same day as end time' do
     let(:attrs) { {starts_at: day + 1.hour, ends_at: day + 2.hours } }
 
     its(:timeframe) { should eql :day }
-    its(:day_combo?) { should be_true }
-    its(:month_combo?) { should be_false }
-    its(:year_combo?) { should be_false }
+    its(:day_combo?) { should be true }
+    its(:month_combo?) { should be false }
+    its(:year_combo?) { should be false }
   end
 
   context 'with start time in the same month as end time' do
     let(:attrs) { {starts_at: month + 1.day, ends_at: month + 2.days } }
 
     its(:timeframe) { should eql :month }
-    its(:day_combo?) { should be_false }
-    its(:month_combo?) { should be_true }
-    its(:year_combo?) { should be_false }
+    its(:day_combo?) { should be false }
+    its(:month_combo?) { should be true }
+    its(:year_combo?) { should be false }
   end
 
   context 'with start time in the same year as end time' do
     let(:attrs) { {starts_at: year + 1.month, ends_at: year + 2.months } }
 
     its(:timeframe) { should eql :year }
-    its(:day_combo?) { should be_false }
-    its(:month_combo?) { should be_false }
-    its(:year_combo?) { should be_true }
+    its(:day_combo?) { should be false }
+    its(:month_combo?) { should be false }
+    its(:year_combo?) { should be true }
+  end
+
+  context 'with only one punch on a day' do
+    let(:other_punch) { nil }
+    before { punch.save! }
+
+    describe '#combine_with' do
+      it { expect { punch.combine_with other_punch }.to_not change { Punch.count } }
+    end
   end
 
   context 'with another punch on the same day' do
@@ -95,4 +104,4 @@ describe Punch do
       end
     end
   end
-end
+end

data/spec/spec_helper.rb

@@ -8,11 +8,11 @@ Bundler.require :default
 Combustion.initialize! :active_record
 
 require 'rspec/rails'
-require 'rspec/autorun'
+require 'rspec/its'
 
 require 'active_support/time'
 require 'ostruct'
 
 RSpec.configure do |config|
   config.use_transactional_fixtures = true
-end
+end

metadata

@@ -1,99 +1,119 @@
 --- !ruby/object:Gem::Specification
 name: punching_bag
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - Adam Crownoble
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-22 00:00:00.000000000 Z
+date: 2014-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: voight_kampff
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: combustion
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+- !ruby/object:Gem::Dependency
+  name: rspec-its
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
 description: PunchingBag is a hit counting and simple trending engine for Ruby on
   Rails
 email: adam@obledesign.com
@@ -103,23 +123,23 @@ extra_rdoc_files: []
 files:
 - MIT-LICENSE
 - app/models/punch.rb
-- lib/punching_bag/version.rb
-- lib/punching_bag/engine.rb
-- lib/punching_bag/acts_as_taggable_on.rb
-- lib/punching_bag/acts_as_punchable.rb
 - lib/generators/punching_bag/punching_bag_generator.rb
 - lib/generators/punching_bag/templates/create_punches_table.rb
 - lib/punching_bag.rb
+- lib/punching_bag/acts_as_punchable.rb
+- lib/punching_bag/acts_as_taggable_on.rb
+- lib/punching_bag/engine.rb
+- lib/punching_bag/version.rb
 - lib/tasks/punching_bag.rake
-- spec/spec_helper.rb
+- spec/internal/app/models/article.rb
+- spec/internal/config/database.yml
+- spec/internal/db/combustion_test.sqlite
+- spec/internal/db/schema.rb
+- spec/internal/log/test.log
 - spec/lib/punching_bag_spec.rb
 - spec/models/punch_spec.rb
 - spec/models/punchable_spec.rb
-- spec/internal/db/schema.rb
-- spec/internal/db/combustion_test.sqlite
-- spec/internal/config/database.yml
-- spec/internal/app/models/article.rb
-- spec/internal/log/test.log
+- spec/spec_helper.rb
 homepage: https://github.com/biola/punching_bag
 licenses:
 - MIT
@@ -130,17 +150,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: PunchingBag hit conter and trending plugin
@@ -154,3 +174,4 @@ test_files:
 - spec/internal/config/database.yml
 - spec/internal/app/models/article.rb
 - spec/internal/log/test.log
+has_rdoc: