komagire 0.2.2 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e00ac6aa8201c16a19a9c4ba817a2a8358010a25
-  data.tar.gz: d62a8c077be504fe72c97d808d1741cf0df00c6d
+SHA256:
+  metadata.gz: '08112e71017b77c5d9eacece167c6138c2d4aec68f42e00c8634a33290a4875e'
+  data.tar.gz: 91b7db0ac2005076e2bc25b282ecbc6bd69b5191ebf8e2c23c3ece60eb3575eb
 SHA512:
-  metadata.gz: ac155f5e5ced1036ac217750aea09c212b2dd49005473636da2c4d5afa8745b7c11fbd9dea66c1463d79b8089e27004c52304a327e0ede7a6180279fed3df1ac
-  data.tar.gz: 4abd6d26a29a17580fe31bed90c4efcac6c950be2699d20a42912ba43cb4329381c7f4fb6bec3f59053acca7d4292db95031e4d221b2519e62ea85f9f020b936
+  metadata.gz: 3c0602d61599ae90e3dbe61c25ff4716e18f911e3fc3396cbeee21b070c63e941e0a9c18501faed9392146820d34868d286f5ea1471f3955aa3e56542ffc4d2e
+  data.tar.gz: 48de96f1ab5cc03b6d7e2afc41f24ec34feb839aacb04f70dc739a735e4c4ba5764bf1d0223d28d66c0cbe479a81070fa5835af151790a9bd3a28277dea26bcf

data/.github/workflows/ruby.yml

@@ -0,0 +1,38 @@
+name: Ruby
+
+on:
+  push:
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ['2.6', '2.7', '3.0']
+        rails-version: ['5.2', '6.0', '6.1', '7.0']
+        exclude:
+          - ruby-version: '2.6'
+            rails-version: '7.0'
+          - ruby-version: '2.7'
+            rails-version: '5.2'
+          - ruby-version: '3.0'
+            rails-version: '5.2'
+
+    env:
+      APPRAISAL: rails_${{ matrix.rails-version }}
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+    - name: Install dependencies
+      run: |
+        bundle install
+        bundle exec appraisal $APPRAISAL bundle install
+    - name: Run tests
+      run: bundle exec appraisal $APPRAISAL rake

data/.gitignore

@@ -4,6 +4,8 @@
 /_yardoc/
 /coverage/
 /doc/
+/gemfiles/.bundle/
+/gemfiles/*.lock
 /pkg/
 /spec/reports/
 /tmp/

data/Appraisals

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+appraise "rails_5.2" do
+  gem "activerecord", "~> 5.2.0"
+  gem "activesupport", "~> 5.2.0"
+end
+
+appraise "rails_6.0" do
+  gem "activerecord", "~> 6.0.0"
+  gem "activesupport", "~> 6.0.0"
+  gem "sqlite3", "~> 1.4"
+end
+
+appraise "rails_6.1" do
+  gem "activerecord", "~> 6.1.0"
+  gem "activesupport", "~> 6.1.0"
+  gem "sqlite3", "~> 1.4"
+end
+
+appraise "rails_7.0" do
+  gem "activerecord", "~> 7.0.0"
+  gem "activesupport", "~> 7.0.0"
+  gem "sqlite3", "~> 1.4"
+end

data/CHANGELOG.md

@@ -1,5 +1,28 @@
 ## Unreleased
 
+## 0.6.0
+
+- Avoid needless override in `KeyList#freeze` (#13)
+- Change required ruby version to 2.6+ (#14)
+- Change required rails version to 5.2+ (#14)
+- Migrate CI from Travis CI to GitHub Actions (#14)
+
+## 0.5.0
+
+- Support Ruby 2.7 (#10)
+- Change required ruby version to 2.4+ (#11)
+- Prevent extra query when cskeys are empty (#12)
+- Add support Rails 6.1.0.rc1 (#13)
+
+## 0.4.0
+
+- CI against for Rails 6.0.0 and drop Ruby 2.2/2.3 supports (#9)
+- Add Rails 6.0.0.rc2 support and update Ruby version for CI (#8)
+
+## 0.3.0
+
+- Change support versions of Ruby and Rails (#7)
+
 ## 0.2.2
 
 - Support Rails 5.1 (#4)

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in komagire.gemspec

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 

data/bin/console

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require "bundler/setup"
 require "komagire"

data/gemfiles/rails_5.2.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 5.2.0"
+gem "activesupport", "~> 5.2.0"
+
+gemspec path: "../"

data/gemfiles/rails_6.0.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 6.0.0"
+gem "activesupport", "~> 6.0.0"
+gem "sqlite3", "~> 1.4"
+
+gemspec path: "../"

data/gemfiles/rails_6.1.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 6.1.0"
+gem "activesupport", "~> 6.1.0"
+gem "sqlite3", "~> 1.4"
+
+gemspec path: "../"

data/gemfiles/rails_7.0.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 7.0.0"
+gem "activesupport", "~> 7.0.0"
+gem "sqlite3", "~> 1.4"
+
+gemspec path: "../"

data/komagire.gemspec

@@ -1,5 +1,6 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'komagire/version'
 
@@ -19,14 +20,15 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = '>= 2.0.0'
+  spec.required_ruby_version = '>= 2.6.0'
 
-  spec.add_runtime_dependency "activesupport", ">= 4.0", "< 5.2"
-  spec.add_runtime_dependency "activerecord", ">= 4.0", "< 5.2"
+  spec.add_runtime_dependency "activerecord", ">= 5.2"
+  spec.add_runtime_dependency "activesupport", ">= 5.2"
   spec.add_development_dependency "active_hash"
 
-  spec.add_development_dependency "bundler", "~> 1.10"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "appraisal", ">= 2.4.1"
+  spec.add_development_dependency "bundler", ">= 1.16"
+  spec.add_development_dependency "rake", ">= 10.0"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "sqlite3"
 

data/lib/komagire/active_record_extension.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Komagire
   module ActiveRecordExtension
     # @param [Symbol] part_id

data/lib/komagire/id_list.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Komagire
   class IdList < KeyList
     # @param [String] content_class_name
@@ -28,7 +30,7 @@ module Komagire
       if ancestors.include?('ActiveHash::Base')
         values = _keys.map { |id| content_class_name.constantize.find_by_id(id) }.compact
         if @sort
-          values.sort_by { |v| v.id }
+          values.sort_by(&:id)
         else
           values
         end
@@ -39,15 +41,14 @@ module Komagire
 
     class Converter < KeyList::Converter
       def convert_to_cskeys_from_array(values)
-        case
-        when values.all? { |v| v.is_a?(String) }
+        if values.all? { |v| v.is_a?(String) }
           values.join(delimiter)
-        when values.all? { |v| v.is_a?(Integer) }
+        elsif values.all? { |v| v.is_a?(Integer) }
           values.join(delimiter)
-        when values.all? { |v| v.is_a?(content_class_name.constantize) }
+        elsif values.all? { |v| v.is_a?(content_class_name.constantize) }
           values.map(&attribute).join(delimiter)
         else
-          fail DifferentContentClass
+          raise DifferentContentClass
         end
       end
     end

data/lib/komagire/key_list.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'delegate'
 
 module Komagire
@@ -30,15 +32,6 @@ module Komagire
       ([''] + key_values + ['']).join(@delimiter)
     end
 
-    def freeze
-      case __getobj__
-      when ActiveRecord::Relation
-        # avoid ActiveRecord::Relation is frozen
-      else
-        super
-      end
-    end
-
     private
 
     def _convert(cskeys)
@@ -50,11 +43,14 @@ module Komagire
     end
 
     def _find_by_cskeys
-      values = content_class_name.constantize.where(@attribute => _keys).compact
+      keys = _keys
+      return [] if keys.empty?
+
+      values = content_class_name.constantize.where(@attribute => keys).compact
       if @sort
         values.sort_by { |v| v.public_send(@attribute) }
       else
-        values.index_by { |v| v.public_send(@attribute).to_s }.values_at(*_keys)
+        values.index_by { |v| v.public_send(@attribute).to_s }.values_at(*keys)
       end
     end
 
@@ -79,27 +75,26 @@ module Komagire
           if value.content_class_name == content_class_name && value.attribute == attribute
             return value.cskeys
           end
-          fail DifferentContentClass
+
+          raise DifferentContentClass
         else
-          values = case
-                   when value.is_a?(Array) then value
-                   when value.respond_to?(:to_a) then value.to_a
-                   when value.respond_to?(:to_ary) then value.to_ary
+          values = if value.is_a?(Array) then value
+                   elsif value.respond_to?(:to_a) then value.to_a
+                   elsif value.respond_to?(:to_ary) then value.to_ary
                    else
-                     fail ArgumentError
+                     raise ArgumentError
                    end
           convert_to_cskeys_from_array(values.compact)
         end
       end
 
       def convert_to_cskeys_from_array(values)
-        case
-        when values.all? { |v| v.is_a?(String) }
+        if values.all? { |v| v.is_a?(String) }
           values.join(delimiter)
-        when values.all? { |v| v.is_a?(content_class_name.constantize) }
+        elsif values.all? { |v| v.is_a?(content_class_name.constantize) }
           values.map(&attribute).join(delimiter)
         else
-          fail ArgumentError
+          raise ArgumentError
         end
       end
     end

data/lib/komagire/railtie.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Komagire
   class Railtie < Rails::Railtie
     initializer 'komagire' do

data/lib/komagire/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Komagire
-  VERSION = '0.2.2'
+  VERSION = '0.6.0'
 end

data/lib/komagire.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'komagire/version'
 require 'komagire/key_list'
 require 'komagire/id_list'

metadata

@@ -1,23 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: komagire
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.6.0
 platform: ruby
 authors:
 - Takumi IINO
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2017-11-27 00:00:00.000000000 Z
+date: 2021-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.0'
-    - - "<"
       - !ruby/object:Gem::Version
         version: '5.2'
   type: :runtime
@@ -25,19 +22,13 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.0'
-    - - "<"
       - !ruby/object:Gem::Version
         version: '5.2'
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.0'
-    - - "<"
       - !ruby/object:Gem::Version
         version: '5.2'
   type: :runtime
@@ -45,9 +36,6 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.0'
-    - - "<"
       - !ruby/object:Gem::Version
         version: '5.2'
 - !ruby/object:Gem::Dependency
@@ -64,32 +52,46 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.4.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.4.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.16'
 - !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'
 - !ruby/object:Gem::Dependency
@@ -141,9 +143,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
+- Appraisals
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -152,11 +155,10 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- gemfiles/rails_4.0.gemfile
-- gemfiles/rails_4.1.gemfile
-- gemfiles/rails_4.2.gemfile
-- 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
 - komagire.gemspec
 - lib/komagire.rb
 - lib/komagire/active_record_extension.rb
@@ -168,7 +170,7 @@ homepage: https://github.com/troter/komagire
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -176,16 +178,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.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.6.11
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Compose an object from comma separated keys.
 test_files: []

data/.travis.yml

@@ -1,31 +0,0 @@
-language: ruby
-rvm:
-  - 2.0.0
-  - 2.1.0
-  - 2.2.2
-  - 2.3.0
-  - 2.4.0
-gemfile:
-  - gemfiles/rails_4.0.gemfile
-  - gemfiles/rails_4.1.gemfile
-  - gemfiles/rails_4.2.gemfile
-  - gemfiles/rails_5.0.gemfile
-  - gemfiles/rails_5.1.gemfile
-matrix:
-  exclude:
-    - rvm: 2.0.0
-      gemfile: gemfiles/rails_5.0.gemfile
-    - rvm: 2.0.0
-      gemfile: gemfiles/rails_5.1.gemfile
-    - rvm: 2.1.0
-      gemfile: gemfiles/rails_5.0.gemfile
-    - rvm: 2.1.0
-      gemfile: gemfiles/rails_5.1.gemfile
-    - rvm: 2.4.0
-      gemfile: gemfiles/rails_4.0.gemfile
-    - rvm: 2.4.0
-      gemfile: gemfiles/rails_4.1.gemfile
-before_install: gem install bundler -v 1.10.5
-script:
-  - bundle install
-  - bundle exec rake spec

data/gemfiles/rails_4.0.gemfile

@@ -1,6 +0,0 @@
-source 'http://rubygems.org/'
-
-gem 'activerecord', '~> 4.0.0'
-gem 'activesupport', '~> 4.0.0'
-
-gemspec :path => '../'

data/gemfiles/rails_4.1.gemfile

@@ -1,6 +0,0 @@
-source 'http://rubygems.org/'
-
-gem 'activerecord', '~> 4.1.0'
-gem 'activesupport', '~> 4.1.0'
-
-gemspec :path => '../'

data/gemfiles/rails_4.2.gemfile

@@ -1,6 +0,0 @@
-source 'http://rubygems.org/'
-
-gem 'activerecord', '~> 4.2.0'
-gem 'activesupport', '~> 4.2.0'
-
-gemspec :path => '../'

data/gemfiles/rails_5.0.gemfile

@@ -1,6 +0,0 @@
-source 'http://rubygems.org/'
-
-gem 'activerecord', '~> 5.0.0'
-gem 'activesupport', '~> 5.0.0'
-
-gemspec :path => '../'

data/gemfiles/rails_5.1.gemfile

@@ -1,6 +0,0 @@
-source 'http://rubygems.org/'
-
-gem 'activerecord', '~> 5.1.0'
-gem 'activesupport', '~> 5.1.0'
-
-gemspec :path => '../'