acts_as_footprintable 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc9280a30690056a250801e928173079736e8d31
-  data.tar.gz: 5c7a079403b3a2bec4686dd885d51872d85b3ae0
+  metadata.gz: 8e8915ee9a150cadf7601e9f54d18ee0d373f6c9
+  data.tar.gz: bbbf50a358d50691ac80a361b0139e6b56405efd
 SHA512:
-  metadata.gz: 14df9393a2ab8708884564d186907f8655b1edb414fad55e90528333aefdce293c12e3bdf3f333f9e4eba2877000daea192e48b59ab30d27cfa5c2f228965eef
-  data.tar.gz: bad6e2bc48854594db1f4507431a80660a0164e972778b9b1f5cb3471a4f742e2333449502a07639ac7c697510198ef2ca9efe4dbd472f7acdeaa69d98d0b778
+  metadata.gz: 250b5cc290a53082fd2af8b2f692d9ec43025d420807ce16983f2a0f6288f0cf68309e7fcea4cec920b2d6eddbb01d445adf5637e94f280a0f834cc8396f03e8
+  data.tar.gz: e49ee10b5b6ba5fed9fff2e525f0f424b75e263094badf48ee8841af9cf1b05d7ebab2b78f732b9aba7d99bcd442b7d055fc29423ada85b9cf138fc37a503597

data/.travis.yml

@@ -1,8 +1,12 @@
 language: ruby
 rvm:
+  - 2.3.1
+  - 2.2.5
+  - 2.1.10
   - 2.0.0
-  - 1.9.3
 env:
+  - "RAILS_VERSION=4.2.0"
+  - "RAILS_VERSION=4.1.0"
   - "RAILS_VERSION=4.0.0"
   - "RAILS_VERSION=3.2.0"
 branches:

data/acts_as_footprintable.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'rspec', ">= 3.0.0"
   spec.add_development_dependency 'pg'
   spec.add_development_dependency 'timecop'
   spec.add_development_dependency 'database_cleaner', "~> 1.0.1"

data/lib/acts_as_footprintable/footprinter.rb

@@ -30,7 +30,7 @@ module ActsAsFootprintable
 
     private
     def get_access_history_records(target, limit=nil)
-      footprints.where(:id => recent_footprint_ids(target, limit))
+      footprints.where(:id => recent_footprint_ids(target, limit)).order("created_at DESC")
     end
 
     def table_name

data/lib/acts_as_footprintable/version.rb

@@ -1,4 +1,4 @@
 # coding: utf-8
 module ActsAsFootprintable
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/lib/generators/acts_as_footprintable/migration/templates/active_record/migration.rb

@@ -4,7 +4,7 @@ class ActsAsFootprintableMigration < ActiveRecord::Migration
     create_table :footprints do |t|
       t.references :footprintable, :polymorphic => true
       t.references :footprinter, :polymorphic => true
-      t.timestamps
+      t.timestamps :null => false
     end
 
     if ActiveRecord::VERSION::MAJOR < 4

data/spec/footprintable_spec.rb

@@ -4,11 +4,11 @@ require 'spec_helper'
 describe ActsAsFootprintable::Footprintable do
 
   it "should not be a footprintable" do
-    NotFootprintable.should_not be_footprintable
+    expect(NotFootprintable).not_to be_footprintable
   end
 
   it "should be a footprintable" do
-    Footprintable.should be_footprintable
+    expect(Footprintable).to be_footprintable
   end
 
   describe 'leave footprints by footprinter' do
@@ -22,7 +22,7 @@ describe ActsAsFootprintable::Footprintable do
     end
 
     it "should be leave footprints" do
-      @footprintable.leave_footprints(@user).should be_true
+      expect(@footprintable.leave_footprints(@user)).to be_truthy
     end
 
     it "足跡の数が増えていること" do
@@ -56,7 +56,7 @@ describe ActsAsFootprintable::Footprintable do
       context "1週間の場合" do
         it "35の足跡があること" do
           Timecop.travel(Time.parse("2013/9/30 10:00:00")) do
-            @footprintable.footprint_count_between(1.week.ago..Time.now).should == 35
+            expect(@footprintable.footprint_count_between(1.week.ago..Time.now)).to eq 35
           end
         end
       end
@@ -64,7 +64,7 @@ describe ActsAsFootprintable::Footprintable do
       context "1ヶ月の場合" do
         it "150の足跡があること" do
           Timecop.travel(Time.parse("2013/9/30 10:00:00")) do
-            @footprintable.footprint_count_between(1.month.ago..Time.now).should == 150
+            expect(@footprintable.footprint_count_between(1.month.ago..Time.now)).to eq 150
           end
         end
       end
@@ -89,8 +89,10 @@ describe ActsAsFootprintable::Footprintable do
         month = Time.new(2013,9,1)
         Footprintable.access_ranking(month.beginning_of_month...1.week.since(month), 5)
       end
-      it { should == {7 => 7, 6 => 6, 5 => 5, 4 => 4, 3 => 3 }}
-      it { should have(5).items }
+      it { is_expected.to eq ({7 => 7, 6 => 6, 5 => 5, 4 => 4, 3 => 3 }) }
+      it '5件取得できること' do
+        expect(subject.count).to eq 5
+      end
     end
   end
 end

data/spec/footprinter_spec.rb

@@ -5,11 +5,11 @@ require 'acts_as_footprintable/footprinter'
 describe ActsAsFootprintable::Footprinter do
 
   it "should not be a footprinter" do
-    NotUser.should_not be_footprinter
+    expect(NotUser).not_to be_footprinter
   end
 
   it "should be a footprinter" do
-    User.should be_footprinter
+    expect(User).to be_footprinter
   end
 
   describe "ユーザーのアクセス履歴を" do
@@ -27,28 +27,29 @@ describe ActsAsFootprintable::Footprinter do
 
     context "対象のモデル毎に" do
       it "取得できること" do
-        @user.access_histories_for(Footprintable).should have(5).items
-        @user.access_histories_for(Footprintable).map{|footprint| footprint.footprintable.name}.should == (1..5).to_a.reverse.map{|index| "footprintable#{index}"}
+        expect(@user.access_histories_for(Footprintable).count).to eq 5
+        expect(@user.access_histories_for(Footprintable).map{|footprint| footprint.footprintable.name}).to eq (1..5).to_a.reverse.map{|index| "footprintable#{index}"}
       end
 
       it "件数を絞り込めること" do
-        @user.access_histories_for(Footprintable, 3).should have(3).items
-        @user.access_histories_for(Footprintable, 3).map{|footprint| footprint.footprintable.name}.should == (3..5).to_a.reverse.map{|index| "footprintable#{index}"}
+        expect(@user.access_histories_for(Footprintable, 3).count).to eq 3
+        expect(@user.access_histories_for(Footprintable, 3).map{|footprint| footprint.footprintable.name}).to eq (3..5).to_a.reverse.map{|index| "footprintable#{index}"}
       end
     end
 
     context "全てのモデルを通じて" do
       it "取得できること" do
-        @user.access_histories.should have(10).items
-        @user.access_histories.map{|footprint| footprint.footprintable.name}.should == (1..5).to_a.reverse.inject([]) do |results, index|
+        expect(@user.access_histories.count).to eq 10
+        footprintable_names = (1..5).to_a.reverse.inject([]) do |results, index|
           results.push "second_footprintable#{index}"
           results.push "footprintable#{index}"
           results
         end
+        expect(@user.access_histories.map{|footprint| footprint.footprintable.name}).to eq footprintable_names
       end
 
       it "件数を絞り込める事" do
-        @user.access_histories(3).should have(3).items
+        expect(@user.access_histories(3).count).to eq 3
       end
     end
   end

data/spec/internal/db/schema.rb

@@ -3,7 +3,7 @@ ActiveRecord::Schema.define do
   create_table :footprints, :force => true do |t|
     t.references :footprintable, :polymorphic => true
     t.references :footprinter, :polymorphic => true
-    t.timestamps
+    t.timestamps :null => false
   end
 
   add_index :footprints, [:footprintable_id, :footprintable_type]

data/spec/spec_helper.rb

@@ -8,7 +8,6 @@ require 'timecop'
 Combustion.initialize! :active_record
 
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_footprintable
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Toyoaki Oko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-19 00:00:00.000000000 Z
+date: 2016-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -148,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Rails gem to allowing records to leave footprints
@@ -164,4 +164,3 @@ test_files:
 - spec/internal/db/schema.rb
 - spec/internal/log/.gitignore
 - spec/spec_helper.rb
-has_rdoc: