komagire 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e243cd2e04dc79cf9cdb9dc08a1c9d9d0a6ede3447a4831cdd676f2d5780aee2
-  data.tar.gz: 9934082d1267ba1988a9d0f7ca3b4b9a14e03cd0161de7000ebf1abfe9d3a5aa
+  metadata.gz: 6d5336efdba118ffeb861d0e4975cfa2718abd80b225623421ed30cc298901fb
+  data.tar.gz: ddfad6a6ef6a4104d477acca9ed3eb15a5bfb12a5abee7028b0f09948c71925e
 SHA512:
-  metadata.gz: ac04c14a317f4ac2450564c916e54d8126809ff31fa188118b540526b979bc26f5c6b769b8f8303e2ed888295b6cb6c64b0c40ffcffd2e9516adbf58e56bc722
-  data.tar.gz: 638f833d47fdb02759c3aa5419204d3c8522b3314b3ef1df228e4c862ce4d93804df20da52297a83d2367fdc2dd3b6060918db0e31946568131ee1daa3c23508
+  metadata.gz: 8626dc808d40df4be9f2acb4b58a48f2d650067e3a94e6c985a24aee74e1a6b6f4d49ae09dc893c97a8646e2249190527ff285dcd3ae9f4cec9abf327a929569
+  data.tar.gz: 7417972d05f22a8f2975a9437e2daa3da55ce73c9be0eea1b5011d47efe192aa234dea330043f01ea8d8e8b4a8435f9193c5d2c84cde8ed0eabeee2376b26e4e

data/.travis.yml

@@ -3,13 +3,14 @@ rvm:
   - 2.4.6
   - 2.5.5
   - 2.6.3
-  - 2.7.0-preview1
+  - 2.7.0
 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
 script:
   - bundle install
   - bundle exec rake spec
@@ -17,5 +18,13 @@ matrix:
   exclude:
     - rvm: 2.4.6
       gemfile: gemfiles/rails_6.0.gemfile
-  allow_failures:
-    rvm: 2.7.0-preview1
+    - rvm: 2.4.6
+      gemfile: gemfiles/rails_6.1.gemfile
+    - rvm: 2.7.0
+      gemfile: gemfiles/rails_4.2.gemfile
+    - rvm: 2.7.0
+      gemfile: gemfiles/rails_5.0.gemfile
+    - rvm: 2.7.0
+      gemfile: gemfiles/rails_5.1.gemfile
+    - rvm: 2.7.0
+      gemfile: gemfiles/rails_5.2.gemfile

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 ## Unreleased
 
+## 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)

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_4.2.gemfile

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 source 'http://rubygems.org/'
 
 gem 'activerecord', '~> 4.2.0'
 gem 'activesupport', '~> 4.2.0'
 gem 'sqlite3', '~> 1.3.6'
 
-gemspec :path => '../'
+gemspec path: '../'

data/gemfiles/rails_5.0.gemfile

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 source 'http://rubygems.org/'
 
 gem 'activerecord', '~> 5.0.0'
 gem 'activesupport', '~> 5.0.0'
 gem 'sqlite3', '~> 1.3.6'
 
-gemspec :path => '../'
+gemspec path: '../'

data/gemfiles/rails_5.1.gemfile

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

data/gemfiles/rails_5.2.gemfile

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 source 'http://rubygems.org/'
 
 gem 'activerecord', '~> 5.2.0'
 gem 'activesupport', '~> 5.2.0'
 
-gemspec :path => '../'
+gemspec path: '../'

data/gemfiles/rails_6.0.gemfile

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 source 'http://rubygems.org/'
 
 gem 'activerecord', '~> 6.0.0'
 gem 'activesupport', '~> 6.0.0'
 
-gemspec :path => '../'
+gemspec path: '../'

data/gemfiles/rails_6.1.gemfile

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+source 'http://rubygems.org/'
+
+gem 'activerecord', '~> 6.1.0.rc1'
+gem 'activesupport', '~> 6.1.0.rc1'
+
+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,14 @@ 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.2.0'
+  spec.required_ruby_version = '>= 2.4.0'
 
-  spec.add_runtime_dependency "activesupport", ">= 4.0", "< 6.1"
-  spec.add_runtime_dependency "activerecord", ">= 4.0", "< 6.1"
+  spec.add_runtime_dependency "activerecord", ">= 4.0", "< 6.2"
+  spec.add_runtime_dependency "activesupport", ">= 4.0", "< 6.2"
   spec.add_development_dependency "active_hash"
 
   spec.add_development_dependency "bundler", ">= 1.16"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", ">= 10.0"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "sqlite3"
 

data/lib/komagire.rb

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

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
@@ -50,11 +52,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 +84,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.4.0'
+  VERSION = '0.5.0'
 end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: komagire
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Takumi IINO
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-23 00:00:00.000000000 Z
+date: 2020-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -19,7 +19,7 @@ dependencies:
         version: '4.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,9 +29,9 @@ dependencies:
         version: '4.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +39,7 @@ dependencies:
         version: '4.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ dependencies:
         version: '4.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: active_hash
   requirement: !ruby/object:Gem::Requirement
@@ -82,14 +82,14 @@ dependencies:
   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
@@ -157,6 +157,7 @@ files:
 - gemfiles/rails_5.1.gemfile
 - gemfiles/rails_5.2.gemfile
 - gemfiles/rails_6.0.gemfile
+- gemfiles/rails_6.1.gemfile
 - komagire.gemspec
 - lib/komagire.rb
 - lib/komagire/active_record_extension.rb
@@ -176,14 +177,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.0
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Compose an object from comma separated keys.