acts_as_footprintable 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 85e9ba8e6751b4b6283c82ec50f63b47020346e6
-  data.tar.gz: a3b0911907c9e35b53265be7e9be4bba2a726cb1
+SHA256:
+  metadata.gz: 4a3c1fe11e9f93ed9d4f25697085f46cedc641c0bbad515aadfebd074e710ab4
+  data.tar.gz: 43d0572a3355ab1f3a45c6a3bbc46861ef9b9e8252bf949b3eb77ad3c70d36ed
 SHA512:
-  metadata.gz: 6099f7edf3f822541610d8ad545b6c0c8204e5bce974374465432f38f99694c43720b5acb9589c1832b3922c7d74a180708872509267972bacf91ca7fd30ee50
-  data.tar.gz: f5ba915af7149fc90fea6bfebd431c671b83713deb332c9746688277d36a73f4b29410993095557b45c4eabc8ffcb0733c5af7d7b4ca4fced45e09a118a0e384
+  metadata.gz: 0d0ad6b039d031835987b43d616a7901f048fd1a295d1e83403d251783de71e8505b207c41c571daa0a900169f6209d0b84c8f7c03520f6795983759c8db8dda
+  data.tar.gz: c9476e013836d614bbca4e586b2b779abd0cfb4561cbf3623c49c2fba7e10d2b6a57369282af6ff1fb86ab271dcf6037e5519a91e817bd98dc633e042dad31fa

data/.circleci/config.yml

@@ -0,0 +1,218 @@
+version: 2.1
+
+executors:
+  ruby:
+    parameters:
+      ruby_version:
+        default: '2.7.2'
+        type: enum
+        enum: ['2.5.8', '2.6.6', '2.7.2']
+    working_directory: ~/repo
+    docker:
+      - image: circleci/ruby:<< parameters.ruby_version >>-node-browsers
+      - image: circleci/postgres:11.2-alpine-postgis-ram
+
+commands:
+  bundle_install:
+    parameters:
+      rails_version:
+        default: '6.1'
+        type: enum
+        enum: ['5.0', '5.1', '5.2', '6.0', '6.1']
+    steps:
+      - run: gem install bundler --version=2.1.4 -N
+      - run:
+          name: bundle install
+          command: |
+            export BUNDLE_GEMFILE=$PWD/gemfiles/rails_<< parameters.rails_version >>.gemfile
+            bundle check || bundle install --jobs=4 --retry=3
+
+  rspec:
+    parameters:
+      rails_version:
+        default: '6.1'
+        type: enum
+        enum: ['5.0', '5.1', '5.2', '6.0', '6.1']
+    steps:
+      - run:
+          name: run tests
+          command: |
+            export BUNDLE_GEMFILE=$PWD/gemfiles/rails_<< parameters.rails_version >>.gemfile
+            mkdir /tmp/test-results
+            TEST_FILES="$(circleci tests glob "spec/**/*_spec.rb" | \
+              circleci tests split --split-by=timings)"
+
+            bundle exec rspec \
+              --format progress \
+              --format RspecJunitFormatter \
+              --out /tmp/test-results/rspec.xml \
+              --format progress \
+              $TEST_FILES
+
+  run_test:
+    parameters:
+      rails_version:
+        default: '6.1'
+        type: enum
+        enum: ['5.0', '5.1', '5.2', '6.0', '6.1']
+    steps:
+      - checkout
+      - bundle_install:
+          rails_version: << parameters.rails_version >>
+      - rspec:
+          rails_version: << parameters.rails_version >>
+      # collect reports
+      - store_test_results:
+          path: /tmp/test-results
+      - store_artifacts:
+          path: /tmp/test-results
+          destination: test-results
+
+jobs:
+  test:
+    parameters:
+      ruby_version:
+        type: enum
+        enum: ['2.5.8', '2.6.6', '2.7.2']
+      rails_version:
+        type: enum
+        enum: ['5.0', '5.1', '5.2', '6.0', '6.1']
+    executor:
+      name: ruby
+      ruby_version: << parameters.ruby_version >>
+    parallelism: 1
+    steps:
+      - run_test:
+          rails_version: << parameters.rails_version >>
+
+  release:
+    executor:
+      name: ruby
+    parallelism: 1
+    steps:
+      - checkout
+      - add_ssh_keys:
+          fingerprints:
+            - "ac:6c:e5:dc:f5:60:53:57:0c:60:d3:32:98:98:0e:30"
+      - run: gem install bundler --version=2.1.4 -N
+      - run:
+          name: bundle install
+          command: bundle check || bundle install --jobs=4 --retry=3
+      - run:
+          name: RubyGems.org | Set credential
+          command: |
+            mkdir -p ~/.gem
+            echo ":rubygems_api_key: $RUBYGEMS_API_KEY" > ~/.gem/credentials
+            chmod 0600 ~/.gem/credentials
+      - run:
+          name: Setup git
+          command: |
+            git config push.default current
+            git config user.email "chariderpato@gmail.com"
+            git config user.name "patorash"
+      - run:
+          name: rake release
+          command: |
+            set +e
+            filename=$(for n in *; do printf '%s\n' "$n"; done | grep gemspec)
+            gem_name=`ruby -e "require 'rubygems'; spec = Gem::Specification::load('${filename}'); puts spec.name"`
+            gem_version=`ruby -e "require 'rubygems'; spec = Gem::Specification::load('${filename}'); puts spec.version"`
+            gem list --prerelease --all --remote $gem_name \
+              | grep -E "^${gem_name}" \
+              | sed -e "s/^.*(\(.*\)).*\$/\1/" \
+              | grep -q -v $gem_version
+            result=$?
+            if [ $result = 0 ]; then
+              bundle exec rake build
+              bundle exec rake release
+            fi
+      - run:
+          name: Delete credentials
+          command: |
+            shred -u ~/.gem/credentials
+
+workflows:
+  build:
+    jobs:
+      - test:
+          name: 'Ruby 2.5.8-Rails 5.0'
+          ruby_version:  '2.5.8'
+          rails_version: '5.0'
+      - test:
+          name: 'Ruby 2.6.6-Rails 5.0'
+          ruby_version:  '2.6.6'
+          rails_version: '5.0'
+      - test:
+          name: 'Ruby 2.7.2-Rails 5.0'
+          ruby_version:  '2.7.2'
+          rails_version: '5.0'
+      - test:
+          name: 'Ruby 2.5.8-Rails 5.1'
+          ruby_version:  '2.5.8'
+          rails_version: '5.1'
+      - test:
+          name: 'Ruby 2.6.6-Rails 5.1'
+          ruby_version:  '2.6.6'
+          rails_version: '5.1'
+      - test:
+          name: 'Ruby 2.7.2-Rails 5.1'
+          ruby_version:  '2.7.2'
+          rails_version: '5.1'
+      - test:
+          name: 'Ruby 2.5.8-Rails 5.2'
+          ruby_version:  '2.5.8'
+          rails_version: '5.2'
+      - test:
+          name: 'Ruby 2.6.6-Rails 5.2'
+          ruby_version:  '2.6.6'
+          rails_version: '5.2'
+      - test:
+          name: 'Ruby 2.7.2-Rails 5.2'
+          ruby_version:  '2.7.2'
+          rails_version: '5.2'
+      - test:
+          name: 'Ruby 2.5.8-Rails 6.0'
+          ruby_version:  '2.5.8'
+          rails_version: '6.0'
+      - test:
+          name: 'Ruby 2.6.6-Rails 6.0'
+          ruby_version:  '2.6.6'
+          rails_version: '6.0'
+      - test:
+          name: 'Ruby 2.7.2-Rails 6.0'
+          ruby_version:  '2.7.2'
+          rails_version: '6.1'
+      - test:
+          name: 'Ruby 2.5.8-Rails 6.1'
+          ruby_version:  '2.5.8'
+          rails_version: '6.1'
+      - test:
+          name: 'Ruby 2.6.6-Rails 6.1'
+          ruby_version:  '2.6.6'
+          rails_version: '6.1'
+      - test:
+          name: 'Ruby 2.7.2-Rails 6.1'
+          ruby_version:  '2.7.2'
+          rails_version: '6.1'
+      - release:
+          context:
+            - rubygems.org
+          requires:
+            - 'Ruby 2.5.8-Rails 5.0'
+            - 'Ruby 2.6.6-Rails 5.0'
+            - 'Ruby 2.7.2-Rails 5.0'
+            - 'Ruby 2.5.8-Rails 5.1'
+            - 'Ruby 2.6.6-Rails 5.1'
+            - 'Ruby 2.7.2-Rails 5.1'
+            - 'Ruby 2.5.8-Rails 5.2'
+            - 'Ruby 2.6.6-Rails 5.2'
+            - 'Ruby 2.7.2-Rails 5.2'
+            - 'Ruby 2.5.8-Rails 6.0'
+            - 'Ruby 2.6.6-Rails 6.0'
+            - 'Ruby 2.7.2-Rails 6.0'
+            - 'Ruby 2.5.8-Rails 6.1'
+            - 'Ruby 2.6.6-Rails 6.1'
+            - 'Ruby 2.7.2-Rails 6.1'
+          filters:
+            branches:
+              only: master

data/.gitignore

@@ -19,3 +19,5 @@ test/tmp
 test/version_tmp
 tmp
 *.log
+gemfiles/*.gemfile.lock
+.rspec_status

data/.rspec

@@ -1 +1,3 @@
---drb --colour --format documentation
+--format documentation
+--color
+--require spec_helper

data/Gemfile

@@ -1,31 +1,9 @@
 # coding: utf-8
 source 'https://rubygems.org'
+git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in acts_as_footprintable.gemspec
 gemspec
 
-rails_version = ENV['RAILS_VERSION'] || 'default'
-rails = case rails_version
-          when 'master'
-            { :github => 'rails/rails' }
-          when 'default'
-            '~> 3.2.0'
-          else
-            "~> #{rails_version}"
-        end
-
-gem 'rails', rails
-group :development do
-  if rails_version == 'default' ||
-      (Gem::Version.correct?(rails_version) && Gem::Version.new(rails_version) < Gem::Version.new("4.0.0"))
-    # rails < 4 needs combustion v0.5.2 (does not work with v0.5.3)
-    # An error occurred while loading ./spec/footprinter_spec.rb.
-    # Failure/Error: Combustion.initialize! :active_record
-    #
-    # PG::ConnectionBad:
-    #   FATAL:  database "acts_as_footprintable" does not exist
-    gem 'combustion', "0.5.2"
-  else
-    gem 'combustion'
-  end
-end
+gem 'rails'
+gem 'pg'

data/README.md

@@ -1,5 +1,5 @@
 # ActsAsFootprintable
-[![Build Status](https://travis-ci.org/patorash/acts_as_footprintable.png)](https://travis-ci.org/patorash/acts_as_footprintable)
+[![patorash](https://circleci.com/gh/patorash/acts_as_footprintable.svg?style=svg)](https://circleci.com/gh/patorash/acts_as_footprintable)
 
 Acts As Footprintable is a Ruby Gem specifically written for Rails/ActiveRecord models.
 The main goals of this gem are:
@@ -11,12 +11,12 @@ The main goals of this gem are:
 
 ## Installation
 
-### Rails 3.2 and 4.0+
+### Rails 5.x and 6.x
 
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'acts_as_footprintable', '~> 0.4.0'
+gem 'acts_as_footprintable', '~> 0.6.0'
 ```
 
 And then execute:
@@ -44,7 +44,7 @@ class Post < ActiveRecord::Base
   acts_as_footprintable
 end
 
-@post = Post.create(:name => 'my post!')
+@post = Post.create(name: 'my post!')
 
 @post.leave_footprints @user
 @post.footprints.size # => 1

data/Rakefile

@@ -1,10 +1,6 @@
-# coding: utf-8
 require "bundler/gem_tasks"
+require "rspec/core/rake_task"
 
-require 'rspec/core/rake_task'
-
-desc "Run specs"
 RSpec::Core::RakeTask.new(:spec)
 
-desc 'Default: run specs.'
 task :default => :spec

data/acts_as_footprintable.gemspec

@@ -18,11 +18,12 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency 'bundler', '~> 1.3'
-  spec.add_development_dependency 'rake', '~> 0'
-  spec.add_development_dependency 'rspec', '~> 3.0', '>= 3.0.0'
-  spec.add_development_dependency 'pg', '~> 0'
+  spec.add_development_dependency 'bundler', '~> 2.1'
+  spec.add_development_dependency 'rake', '>= 12.3.3'
   spec.add_development_dependency 'timecop', '~> 0'
-  spec.add_development_dependency 'database_cleaner', '~> 1.0', '>= 1.0.1'
+  spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'combustion', '~> 1.3'
   spec.add_development_dependency 'pry', '~> 0'
+  spec.add_development_dependency 'database_cleaner', '~> 2.0'
+  spec.add_development_dependency 'rspec_junit_formatter', '~> 0.4.1'
 end

data/config.ru

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require "rubygems"
+require "bundler"
+
+Bundler.require :default, :development
+
+Combustion.initialize! :all
+run Combustion::Application

data/gemfiles/rails_5.0.gemfile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+gem 'rails', '~> 5.0.0'
+gem 'pg', '~> 0.21'
+
+gemspec path: '../'

data/gemfiles/rails_5.1.gemfile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+gem 'rails', '~> 5.1.0'
+gem 'pg', '~> 0.21'
+
+gemspec path: '../'

data/gemfiles/rails_5.2.gemfile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+gem 'rails', '~> 5.2.0'
+gem 'pg', '~> 1.2'
+
+gemspec path: '../'

data/gemfiles/rails_6.0.gemfile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+gem 'rails', '~> 6.0.0'
+gem 'pg', '~> 1.2'
+
+gemspec path: '../'

data/gemfiles/rails_6.1.gemfile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+gem 'rails', '~> 6.1.0'
+gem 'pg', '~> 1.2'
+
+gemspec path: '../'

data/lib/acts_as_footprintable.rb

@@ -1,4 +1,3 @@
-# coding: utf-8
 require 'active_record'
 require 'active_support/inflector'
 

data/lib/acts_as_footprintable/footprint.rb

@@ -1,19 +1,12 @@
-# coding: utf-8
 module ActsAsFootprintable
   class Footprint < ::ActiveRecord::Base
-    if ::ActiveRecord::VERSION::MAJOR < 4
-      attr_accessible :footprintable_id, :footprintable_type,
-                      :footprinter_id,  :footprinter_type,
-                      :footprintable, :footprinter
-    end
+    belongs_to :footprintable, polymorphic: true
+    belongs_to :footprinter, polymorphic: true
 
-    belongs_to :footprintable, :polymorphic => true
-    belongs_to :footprinter, :polymorphic => true
+    scope :for_type, lambda{|klass| where(footprintable_type: klass.name)}
+    scope :by_type,  lambda{|klass| where(footprinter_type: klass.name)}
 
-    scope :for_type, lambda{|klass| where(:footprintable_type => klass.name)}
-    scope :by_type,  lambda{|klass| where(:footprinter_type   => klass.name)}
-
-    validates :footprintable_id, :presence => true
-    validates :footprinter_id, :presence => true
+    validates :footprintable_id, presence: true
+    validates :footprinter_id, presence: true
   end
 end

data/lib/acts_as_footprintable/footprintable.rb

@@ -1,10 +1,9 @@
-# coding: utf-8
 module ActsAsFootprintable
   module Footprintable
 
     def self.included(base)
       base.class_eval do
-        has_many :footprints, :class_name => 'ActsAsFootprintable::Footprint', :as => :footprintable, :dependent => :destroy do
+        has_many :footprints, class_name: 'ActsAsFootprintable::Footprint', as: :footprintable, dependent: :destroy do
           def footprinters
             includes(:footprinter).map(&:footprinter)
           end
@@ -13,12 +12,8 @@ module ActsAsFootprintable
     end
 
     def leave_footprints(footprinter)
-      footprint = ActsAsFootprintable::Footprint.new(:footprintable => self, :footprinter => footprinter)
-      if footprint.save
-        true
-      else
-        false
-      end
+      footprint = ActsAsFootprintable::Footprint.new(footprintable: self, footprinter: footprinter)
+      footprint.save
     end
 
     def footprint_count
@@ -26,7 +21,7 @@ module ActsAsFootprintable
     end
 
     def footprint_count_between(range)
-      footprints.where(:created_at => range).count
+      footprints.where(created_at: range).count
     end
   end
 end

data/lib/acts_as_footprintable/footprinter.rb

@@ -1,9 +1,8 @@
-# coding: utf-8
 module ActsAsFootprintable
   module Footprinter
     def self.included(base)
       base.class_eval do
-        has_many :footprints, :class_name => 'ActsAsFootprintable::Footprint', :as => :footprinter, :dependent => :destroy do
+        has_many :footprints, class_name: 'ActsAsFootprintable::Footprint', as: :footprinter, dependent: :destroy do
           def footprintable
             includes(:footprintable).map(&:footprintable)
           end
@@ -12,12 +11,8 @@ module ActsAsFootprintable
     end
 
     def leave_footprints(footprintable)
-      footprint = ActsAsFootprintable::Footprint.new(:footprintable => footprintable, :footprinter => self)
-      if footprint.save
-        true
-      else
-        false
-      end
+      footprint = ActsAsFootprintable::Footprint.new(footprintable: footprintable, footprinter: self)
+      footprint.save
     end
 
     def access_histories_for(klass, limit=nil)
@@ -30,7 +25,7 @@ module ActsAsFootprintable
 
     private
     def get_access_history_records(target, limit=nil)
-      footprints.where(:id => recent_footprint_ids(target, limit)).order("created_at DESC")
+      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,3 @@
-# coding: utf-8
 module ActsAsFootprintable
-  VERSION = "0.5.0"
+  VERSION = '0.6.0'
 end

data/lib/generators/acts_as_footprintable/migration/migration_generator.rb

@@ -1,4 +1,3 @@
-# coding: utf-8
 require 'rails/generators/migration'
 
 module ActsAsFootprintable
@@ -30,13 +29,13 @@ module ActsAsFootprintable
     end
 
     def migration_version
-      if rails5?
+      if over_rails5?
         "[#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}]"
       end
     end
 
-    def rails5?
-      Rails.version.start_with? '5'
+    def over_rails5?
+      Rails::VERSION::MAJOR >= 5
     end
   end
 end

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

@@ -1,10 +1,9 @@
-# coding: utf-8
 class ActsAsFootprintableMigration < ActiveRecord::Migration<%= migration_version %>
   def self.up
     create_table :footprints do |t|
-      t.references :footprintable, :polymorphic => true
-      t.references :footprinter, :polymorphic => true
-      t.timestamps :null => false
+      t.references :footprintable, polymorphic: true
+      t.references :footprinter, polymorphic: true
+      t.timestamps null: false
     end
 
     if ActiveRecord::VERSION::MAJOR < 4

data/spec/footprintable_spec.rb

@@ -1,7 +1,4 @@
-# coding: utf-8
-require 'spec_helper'
-
-describe ActsAsFootprintable::Footprintable do
+RSpec.describe ActsAsFootprintable::Footprintable, type: :model do
 
   it "should not be a footprintable" do
     expect(NotFootprintable).not_to be_footprintable
@@ -12,59 +9,55 @@ describe ActsAsFootprintable::Footprintable do
   end
 
   describe 'leave footprints by footprinter' do
-
-    before do
-      @user  = User.create!(:name => 'i can footprint!')
-      @user2 = User.create!(:name => 'a new person')
-
-      @footprintable  = Footprintable.create!(:name => 'a footprinting model')
-      @footprintable2 = Footprintable.create!(:name => 'a 2nd footprinting model')
-    end
+    let(:user) { User.create!(:name => 'i can footprint!') }
+    let(:user2) { User.create!(:name => 'a new person') }
+    let(:footprintable) { Footprintable.create!(:name => 'a footprinting model') }
+    let(:footprintable2) { Footprintable.create!(:name => 'a 2nd footprinting model') }
 
     it "should be leave footprints" do
-      expect(@footprintable.leave_footprints(@user)).to be_truthy
+      expect(footprintable.leave_footprints(user)).to be_truthy
     end
 
     it "足跡の数が増えていること" do
       expect {
-        @footprintable.leave_footprints @user
-      }.to change{ @footprintable.footprint_count }.from(0).to(1)
+        footprintable.leave_footprints user
+      }.to change { footprintable.footprint_count }.from(0).to(1)
     end
 
     it "10回アクセスしたら10になること" do
       expect {
-        10.times { @footprintable.leave_footprints @user }
-      }.to change{ @footprintable.footprint_count }.from(0).to(10)
+        10.times { footprintable.leave_footprints user }
+      }.to change { footprintable.footprint_count }.from(0).to(10)
     end
 
     it "複数人でアクセスしたら合計されること" do
       expect {
-        5.times { @footprintable.leave_footprints @user }
-        5.times { @footprintable.leave_footprints @user2 }
-      }.to change{ @footprintable.footprint_count }.from(0).to(10)
+        5.times { footprintable.leave_footprints user }
+        5.times { footprintable.leave_footprints user2 }
+      }.to change { footprintable.footprint_count }.from(0).to(10)
     end
 
     describe "期間指定をする" do
       before do
         (1..30).each do |day|
-          Timecop.travel(Time.parse("2013/9/#{day}")) do
-            5.times {@footprintable.leave_footprints @user}
+          Timecop.travel(Time.parse("2013-09-#{day}")) do
+            5.times { footprintable.leave_footprints user }
           end
         end
       end
 
       context "1週間の場合" do
         it "35の足跡があること" do
-          Timecop.travel(Time.parse("2013/9/30 10:00:00")) do
-            expect(@footprintable.footprint_count_between(1.week.ago..Time.now)).to eq 35
+          Timecop.travel(Time.parse("2013-09-30 10:00:00")) do
+            expect(footprintable.footprint_count_between(1.week.ago..Time.now)).to eq 35
           end
         end
       end
 
       context "1ヶ月の場合" do
         it "150の足跡があること" do
-          Timecop.travel(Time.parse("2013/9/30 10:00:00")) do
-            expect(@footprintable.footprint_count_between(1.month.ago..Time.now)).to eq 150
+          Timecop.travel(Time.parse("2013-09-30 10:00:00")) do
+            expect(footprintable.footprint_count_between(1.month.ago..Time.now)).to eq 150
           end
         end
       end
@@ -72,24 +65,22 @@ describe ActsAsFootprintable::Footprintable do
   end
 
   describe "アクセスランキングを作成" do
-    before do
-      @user  = User.create!(:name => 'i can footprint!')
-    end
+    let(:user) { User.create!(:name => 'i can footprint!') }
 
     context "件数と期間を制限" do
       before do
         (1..30).each do |index|
-          Timecop.travel(Time.parse("2013/9/#{index}")) do
+          Timecop.travel(Time.parse("2013-09-#{index}")) do
             footprintable = Footprintable.create!(:name => "Footprintable#{index}")
-            index.times {footprintable.leave_footprints @user}
+            index.times { footprintable.leave_footprints user }
           end
         end
       end
       subject do
-        month = Time.new(2013,9,1)
+        month = Time.new(2013, 9, 1)
         Footprintable.access_ranking(month.beginning_of_month...1.week.since(month), 5)
       end
-      it { is_expected.to eq ({7 => 7, 6 => 6, 5 => 5, 4 => 4, 3 => 3 }) }
+      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

data/spec/footprinter_spec.rb

@@ -1,8 +1,6 @@
-# coding: utf-8
-require 'spec_helper'
 require 'acts_as_footprintable/footprinter'
 
-describe ActsAsFootprintable::Footprinter do
+RSpec.describe ActsAsFootprintable::Footprinter, type: :model do
 
   it "should not be a footprinter" do
     expect(NotUser).not_to be_footprinter
@@ -13,11 +11,11 @@ describe ActsAsFootprintable::Footprinter do
   end
 
   describe "ユーザーのアクセス履歴を" do
-    let!(:user_1) { User.create!(:name => "user_1") }
+    let!(:user_1) { User.create!(name: "user_1") }
     before do
       (1..5).each do |index|
-        footprintable = Footprintable.create!(:name => "footprintable#{index}")
-        second_footprintable = SecondFootprintable.create!(:name => "second_footprintable#{index}")
+        footprintable = Footprintable.create!(name: "footprintable#{index}")
+        second_footprintable = SecondFootprintable.create!(name: "second_footprintable#{index}")
         3.times do
           footprintable.leave_footprints user_1
           second_footprintable.leave_footprints user_1
@@ -28,12 +26,12 @@ describe ActsAsFootprintable::Footprinter do
     context "対象のモデル毎に" do
       it "取得できること" do
         expect(user_1.access_histories_for(Footprintable).count).to eq 5
-        expect(user_1.access_histories_for(Footprintable).map{|footprint| footprint.footprintable.name}).to eq (1..5).to_a.reverse.map{|index| "footprintable#{index}"}
+        expect(user_1.access_histories_for(Footprintable).map { |footprint| footprint.footprintable.name }).to eq (1..5).to_a.reverse.map { |index| "footprintable#{index}" }
       end
 
       it "件数を絞り込めること" do
         expect(user_1.access_histories_for(Footprintable, 3).count).to eq 3
-        expect(user_1.access_histories_for(Footprintable, 3).map{|footprint| footprint.footprintable.name}).to eq (3..5).to_a.reverse.map{|index| "footprintable#{index}"}
+        expect(user_1.access_histories_for(Footprintable, 3).map { |footprint| footprint.footprintable.name }).to eq (3..5).to_a.reverse.map { |index| "footprintable#{index}" }
       end
     end
 
@@ -45,7 +43,7 @@ describe ActsAsFootprintable::Footprinter do
           results.push "footprintable#{index}"
           results
         end
-        expect(user_1.access_histories.map{|footprint| footprint.footprintable.name}).to eq footprintable_names
+        expect(user_1.access_histories.map { |footprint| footprint.footprintable.name }).to eq footprintable_names
       end
 
       it "件数を絞り込める事" do

data/spec/internal/config/database.yml

@@ -1,5 +1,7 @@
 test:
   adapter: postgresql
   encoding: unicode
+  user: postgres
+  host: localhost
   database: acts_as_footprintable
   min_messages: WARNING

data/spec/spec_helper.rb

@@ -2,22 +2,31 @@
 require 'rubygems'
 require 'bundler/setup'
 require 'combustion'
-require 'database_cleaner'
+require 'database_cleaner/active_record'
 require 'timecop'
 require 'pry'
 
 Combustion.initialize! :active_record
 
 RSpec.configure do |config|
-  config.run_all_when_everything_filtered = true
-  config.filter_run :focus
+  # Enable flags like --only-failures and --next-failure
+  config.example_status_persistence_file_path = ".rspec_status"
 
-  config.before :suite do
+  # Disable RSpec exposing methods globally on `Module` and `main`
+  config.disable_monkey_patching!
+
+  config.expect_with :rspec do |c|
+    c.syntax = :expect
+  end
+
+  config.before(:suite) do
     DatabaseCleaner.strategy = :truncation
   end
+
   config.before :each do
     DatabaseCleaner.start
   end
+
   config.after :each do
     DatabaseCleaner.clean
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_footprintable
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Toyoaki Oko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-05 00:00:00.000000000 Z
+date: 2021-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,16 +16,30 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 12.3.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 12.3.3
+- !ruby/object:Gem::Dependency
+  name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -45,9 +59,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -55,25 +66,22 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.0
 - !ruby/object:Gem::Dependency
-  name: pg
+  name: combustion
   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'
 - !ruby/object:Gem::Dependency
-  name: timecop
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -92,48 +100,48 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rspec_junit_formatter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.1
 description: Rails gem to allowing records to leave footprints
 email: chariderpato@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - acts_as_footprintable.gemspec
+- config.ru
+- gemfiles/rails_5.0.gemfile
+- gemfiles/rails_5.1.gemfile
+- gemfiles/rails_5.2.gemfile
+- gemfiles/rails_6.0.gemfile
+- gemfiles/rails_6.1.gemfile
 - lib/acts_as_footprintable.rb
 - lib/acts_as_footprintable/extenders/footprintable.rb
 - lib/acts_as_footprintable/extenders/footprinter.rb
@@ -173,8 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Rails gem to allowing records to leave footprints

data/.travis.yml

@@ -1,33 +0,0 @@
-language: ruby
-rvm:
-  - 2.4.2
-  - 2.3.4
-  - 2.2.7
-  - 2.1.10
-env:
-  - "RAILS_VERSION=5.1.4"
-  - "RAILS_VERSION=5.0.0"
-  - "RAILS_VERSION=4.2.8"
-  - "RAILS_VERSION=4.2.0"
-  - "RAILS_VERSION=4.1.0"
-  - "RAILS_VERSION=4.0.0"
-  - "RAILS_VERSION=3.2.0"
-branches:
-  only:
-    - master
-    - travis
-
-matrix:
-  exclude:
-    - rvm: 2.1.10
-      env: "RAILS_VERSION=5.1.4"
-    - rvm: 2.1.10
-      env: "RAILS_VERSION=5.0.0"
-    - rvm: 2.4.2
-      env: "RAILS_VERSION=4.2.0"
-    - rvm: 2.4.2
-      env: "RAILS_VERSION=4.1.0"
-    - rvm: 2.4.2
-      env: "RAILS_VERSION=4.0.0"
-    - rvm: 2.4.2
-      env: "RAILS_VERSION=3.2.0"