simple_group 0.4.0 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: '039af7efa148ef672e9c5b87c8e7e2865cd9df2e'
-  data.tar.gz: 9dcb95fe258f967f878e35ef40e52adb7a787836
+SHA256:
+  metadata.gz: d7036207fe56bf40c7ebb1b651824ecf939d1220fa90541f421f5bb2f0ffbc17
+  data.tar.gz: 808af7f7f09e2993a110b1d89386be23c563c715302aa2c2c2da98f0c46ef2c8
 SHA512:
-  metadata.gz: 7840967ce6c2de3a16b44091b5b15114c787ee835417a2e6511ff8010a2c34cd8678eb4f6220a3ca1b70ced364f5589c7e70d5707ad6632ebf314d105b5f537f
-  data.tar.gz: 9f683ce5bb9f31636c3a89d6a881c803a7189698beeb076104cc3538232058ee58f251a3ac61bbceb40e59e93f5c2368a9805a4846f73fe44d27b7794f543264
+  metadata.gz: 75fa5eff76ffd68d391f06b544866171cc114c78073f015255bfe9f53c016c99370c7e12d269c4ec7db6da76f2826558a7a337448556c96f8f6d1fe69ae96008
+  data.tar.gz: 6bfd576e17be89c2cf611b206a4482572cb70756ce70b14d7b53ca1ecebf207c495b17d0eba910e67efa22942e2877689546694cc16419e659b21d6c04c41d6c

data/.github/workflows/gem-push.yml

@@ -0,0 +1,36 @@
+name: Ruby Gem
+
+on:
+  workflow_run:
+    workflows:
+      - Test
+    types:
+      - completed
+    branches: [ master ]
+
+jobs:
+  build:
+    name: Build + Publish
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    if: ${{ github.event.workflow_run.conclusion == 'success' }}
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby 2.6
+      uses: actions/setup-ruby@v1
+      with:
+        ruby-version: 2.6.x
+
+    - name: Publish to RubyGems
+      run: |
+        mkdir -p $HOME/.gem
+        touch $HOME/.gem/credentials
+        chmod 0600 $HOME/.gem/credentials
+        printf -- "---\n:rubygems_api_key: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
+        gem build *.gemspec
+        gem push *.gem
+      env:
+        GEM_HOST_API_KEY: "${{secrets.RUBYGEMS_AUTH_TOKEN}}"

data/.github/workflows/test.yml

@@ -0,0 +1,42 @@
+name: Test
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby: [2.6, 2.7, 3.0, 3.1]
+        gemfile: [rails_5.0, rails_5.1, rails_5.2, rails_6.0, rails_6.1, rails_7.0]
+        exclude:
+          - ruby: 2.6
+            gemfile: rails_7.0
+          - ruby: 3.0
+            gemfile: rails_5.0
+          - ruby: 3.0
+            gemfile: rails_5.1
+          - ruby: 3.0
+            gemfile: rails_5.2
+          - ruby: 3.1
+            gemfile: rails_5.0
+          - ruby: 3.1
+            gemfile: rails_5.1
+          - ruby: 3.1
+            gemfile: rails_5.2
+    env:
+      BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - name: Run tests
+        run: bundle exec rake

data/.gitignore

@@ -8,4 +8,14 @@
 /spec/reports/
 /spec/internal/log/
 /tmp/
-*.sqlite3
+/log/
+
+# rspec failure tracking
+.rspec_status
+.ruby-version
+Gemfile.lock
+.circleci/config.processed.yml
+
+/gemfiles/*.gemfile.lock
+/gemfiles/.bundle
+*.sqlite3

data/.rspec

@@ -1,2 +1,3 @@
 --format documentation
 --color
+--require spec_helper

data/Gemfile

@@ -1,16 +1,5 @@
 source 'https://rubygems.org'
+git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in simple_group.gemspec
 gemspec
-
-rails_version = ENV['RAILS_VERSION'] || 'default'
-
-rails = case rails_version
-          when 'master'
-            { :github => 'rails/rails' }
-          when 'default'
-            '~> 4.0.0'
-          else
-            "~> #{rails_version}"
-        end
-gem 'rails', rails

data/README.md

@@ -2,14 +2,14 @@
 
 simple_group gem is able to add group function to ActiveRecord.
 
-[![Build Status](https://travis-ci.org/patorash/simple_group.svg?branch=master)](https://travis-ci.org/patorash/simple_group)
-[![Dependency Status](https://gemnasium.com/patorash/simple_group.svg)](https://gemnasium.com/patorash/simple_group)
+[![Test](https://github.com/patorash/simple_group/actions/workflows/test.yml/badge.svg)](https://github.com/patorash/simple_group/actions/workflows/test.yml)
+
 [![Code Climate](https://codeclimate.com/github/patorash/simple_group/badges/gpa.svg)](https://codeclimate.com/github/patorash/simple_group)
 [![Test Coverage](https://codeclimate.com/github/patorash/simple_group/badges/coverage.svg)](https://codeclimate.com/github/patorash/simple_group)
 
 ## Installation
 
-### Rails 4.0+
+### Rails 5.0+
 
 Add this line to your application's Gemfile:
 

data/Rakefile

@@ -1,2 +1,6 @@
 require "bundler/gem_tasks"
+require "rspec/core/rake_task"
 
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec

data/gemfiles/rails_5.0.gemfile

@@ -0,0 +1,8 @@
+source 'https://rubygems.org'
+
+gem 'activerecord', '~> 5.0.0'
+gem 'activesupport', '~> 5.0.0'
+gem 'railties', '~> 5.0.0'
+gem 'sqlite3', '~> 1.3.0'
+
+gemspec path: '../'

data/gemfiles/rails_5.1.gemfile

@@ -0,0 +1,8 @@
+source 'https://rubygems.org'
+
+gem 'activerecord', '~> 5.1.0'
+gem 'activesupport', '~> 5.1.0'
+gem 'railties', '~> 5.1.0'
+gem 'sqlite3', '~> 1.3.0'
+
+gemspec path: '../'

data/gemfiles/rails_5.2.gemfile

@@ -0,0 +1,8 @@
+source 'https://rubygems.org'
+
+gem 'activerecord', '~> 5.2.0'
+gem 'activesupport', '~> 5.2.0'
+gem 'railties', '~> 5.2.0'
+gem 'sqlite3', '~> 1.4'
+
+gemspec path: '../'

data/gemfiles/rails_6.0.gemfile

@@ -0,0 +1,8 @@
+source 'https://rubygems.org'
+
+gem 'activerecord', '~> 6.0.0'
+gem 'activesupport', '~> 6.0.0'
+gem 'railties', '~> 6.0.0'
+gem 'sqlite3', '~> 1.4'
+
+gemspec path: '../'

data/gemfiles/rails_6.1.gemfile

@@ -0,0 +1,8 @@
+source 'https://rubygems.org'
+
+gem 'activerecord', '~> 6.1.0'
+gem 'activesupport', '~> 6.1.0'
+gem 'railties', '~> 6.1.0'
+gem 'sqlite3', '~> 1.4'
+
+gemspec path: '../'

data/gemfiles/rails_7.0.gemfile

@@ -0,0 +1,8 @@
+source 'https://rubygems.org'
+
+gem 'activerecord', '~> 7.0.0'
+gem 'activesupport', '~> 7.0.0'
+gem 'railties', '~> 7.0.0'
+gem 'sqlite3', '~> 1.4'
+
+gemspec path: '../'

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

@@ -24,8 +24,20 @@ module SimpleGroup
 
     def create_migration_file
       if self.class.orm_has_migration?
-        migration_template 'migration.rb', 'db/migrate/simple_group_migration.rb'
+        migration_template 'migration.rb',
+                           'db/migrate/simple_group_migration.rb',
+                           migration_version: migration_version
       end
     end
+
+    def migration_version
+      if over_rails5?
+        "[#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}]"
+      end
+    end
+
+    def over_rails5?
+      Rails::VERSION::MAJOR >= 5
+    end
   end
 end

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

@@ -1,4 +1,4 @@
-class SimpleGroupMigration < ActiveRecord::Migration
+class SimpleGroupMigration < ActiveRecord::Migration<%= migration_version %>
   def self.up
     create_table :simple_group_combinations do |t|
       t.references :group_item, polymorphic: true

data/lib/simple_group/combination.rb

@@ -2,12 +2,6 @@ module SimpleGroup
   class Combination < ::ActiveRecord::Base
     self.table_name = 'simple_group_combinations'
 
-    if ::ActiveRecord::VERSION::MAJOR < 4
-      attr_accessible :group_id, :group_type,
-                      :group_item_id, :group_item_type,
-                      :group, :group_item
-    end
-
     belongs_to :group, polymorphic: true
     belongs_to :group_item, polymorphic: true
 

data/lib/simple_group/group.rb

@@ -2,7 +2,6 @@ module SimpleGroup
   module Group
     def self.included(base)
       base.class_eval do
-        belongs_to :group, polymorphic: true
         has_many :combinations, class_name: 'SimpleGroup::Combination', as: :group, dependent: :destroy, inverse_of: :group do
           def group_items
             includes(:group_item).map(&:group_item)

data/lib/simple_group/group_item.rb

@@ -3,8 +3,7 @@ module SimpleGroup
 
     def self.included(base)
       base.class_eval do
-        belongs_to :group_item, polymorphic: true
-        has_many :combinations, :class_name => 'SimpleGroup::Combination', :as => :group_item, :dependent => :destroy do
+        has_many :combinations, class_name: 'SimpleGroup::Combination', as: :group_item, dependent: :destroy do
           def groups
             includes(:group).map(&:group)
           end

data/lib/simple_group/version.rb

@@ -1,3 +1,3 @@
 module SimpleGroup
-  VERSION = "0.4.0"
+  VERSION = "0.5.2"
 end

data/simple_group.gemspec

@@ -12,16 +12,18 @@ Gem::Specification.new do |spec|
   spec.description   = %q{simple_group is able to add group function to ActiveRecord.}
   spec.homepage      = "https://github.com/patorash/simple_group"
   spec.license       = "MIT"
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.6.0")
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", ">= 1.7.6"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_dependency "activerecord", '< 7.1.0', '>= 5.0.0'
+  spec.add_dependency "activesupport", '< 7.1.0', '>= 5.0.0'
+  spec.add_dependency "railties", '< 7.1.0', '>= 5.0.0'
+  spec.add_development_dependency 'rake', '>= 12.3.3'
   spec.add_development_dependency "pry"
-  spec.add_development_dependency "rspec", ">= 3.0.0"
+  spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "sqlite3"
-  spec.add_development_dependency "database_rewinder", '~> 0.8.0'
-  spec.add_development_dependency 'combustion', '~> 0.5.3'
+  spec.add_development_dependency 'database_cleaner', '~> 2.0'
 end

metadata

@@ -1,73 +1,91 @@
 --- !ruby/object:Gem::Specification
 name: simple_group
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.2
 platform: ruby
 authors:
 - Toyoaki Oko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-16 00:00:00.000000000 Z
+date: 2021-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.6
-  type: :development
+        version: 5.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 7.1.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.6
+        version: 5.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 7.1.0
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
+        version: 5.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 7.1.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 5.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 7.1.0
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: 5.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 7.1.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 7.1.0
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,33 +99,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: database_rewinder
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  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: combustion
+  name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: '2.0'
 description: simple_group is able to add group function to ActiveRecord.
 email:
 - chariderpato@gmail.com
@@ -115,15 +147,22 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/gem-push.yml"
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/console
 - bin/setup
+- 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
+- gemfiles/rails_7.0.gemfile
 - lib/generators/simple_group/migration/migration_generator.rb
 - lib/generators/simple_group/migration/templates/active_record/migration.rb
 - lib/simple_group.rb
@@ -146,15 +185,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: simple_group is able to add group function to ActiveRecord.

data/.travis.yml

@@ -1,10 +0,0 @@
-language: ruby
-rvm:
-  - 2.2.2
-  - 2.3.3
-env:
-  - RAILS_VERSION=5.0.1
-  - RAILS_VERSION=4.2.7.1
-  - RAILS_VERSION=4.1
-  - RAILS_VERSION=4.0
-script: bundle exec rspec