diva 1.1.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b6dbf4fc204edb2a8609e74e10c19ad8bc785d999f9d914a4a950c6e2dd6818
-  data.tar.gz: 5db0369283d2decb0fa0d3dff43b3fe96825e527c2df2f3a2c2c86e6350d07a6
+  metadata.gz: 52c5dec5bafdde2ee52163337ccb79c65cf1ffa0090da2401585dbf567e92abc
+  data.tar.gz: b022d6956eb21bcca85203eb989b7d1c8b4dd4b3854f17348b2c150af3b2a3c6
 SHA512:
-  metadata.gz: 44db1ef485a1282e7591e333fff55af4e03bb539804bd532c05e9092fbc54da503fa1f115c42547559da63e25a6b3d0d8db17f265f01f046d99c5edb3c8e59e2
-  data.tar.gz: a842952e5be329924c9d342eb0b3412fc665ace24eb9230025eebeb5a33dffdd1f3d477c02a6dfedd6c4acbcb4a54d6760afc783d14b3fe9313744568031267f
+  metadata.gz: 6d7b1858e1b3722d22fe28f45c612dbdaa2a9c30f19658c6d876acf41d6b6e93cd252f6ca69563ef5826148e83881ff8bad34057d71eb4dee1f6b6123543dd2d
+  data.tar.gz: f11d4bd094c84857fb5f5dc78644cc9940489e47d506b09930dec55d222b7cc2f58f608265d7acaedfb98bcf78e90a959b1d6ea3356eb255d78c297d5a6a70f4

data/.circleci/config.yml

@@ -6,7 +6,7 @@ executors:
       tag:
         type: string
     docker:
-      - image: circleci/ruby:<< parameters.tag >>
+      - image: ruby:<< parameters.tag >>
 
 jobs:
   build:
@@ -49,19 +49,19 @@ workflows:
     jobs:
       - lint:
           name: 'lint'
-          ruby-version: '3.0.2'
+          ruby-version: '3.0.3'
       - build:
-          name: 'ruby-2.6'
-          ruby-version: '2.6.7'
+          name: 'ruby-2.7'
+          ruby-version: '2.7.5'
           requires:
             - 'lint'
       - build:
-          name: 'ruby-2.7'
-          ruby-version: '2.7.4'
+          name: 'ruby-3.0'
+          ruby-version: '3.0.3'
           requires:
             - 'lint'
       - build:
-          name: 'ruby-3.0'
-          ruby-version: '3.0.2'
+          name: 'ruby-3.1'
+          ruby-version: '3.1.0-preview1'
           requires:
             - 'lint'

data/.rubocop.yml

@@ -1,5 +1,5 @@
 AllCops:
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: '2.7'
 
 Metrics/BlockLength:
   Exclude:
@@ -340,4 +340,55 @@ Style/RedundantArgument: # (new in 1.4)
   Enabled: true
 Style/SwapValues: # (new in 1.1)
   Enabled: true
-
+Gemspec/DateAssignment: # new in 1.10
+  Enabled: true
+Gemspec/RequireMFA: # new in 1.23
+  Enabled: true
+Layout/LineEndStringConcatenationIndentation: # new in 1.18
+  Enabled: true
+Lint/AmbiguousOperatorPrecedence: # new in 1.21
+  Enabled: false
+Lint/AmbiguousRange: # new in 1.19
+  Enabled: true
+  RequireParenthesesForMethodChains: true
+Lint/EmptyInPattern: # new in 1.16
+  Enabled: true
+Lint/IncompatibleIoSelectWithFiberScheduler: # new in 1.21
+  Enabled: true
+Lint/NumberedParameterAssignment: # new in 1.9
+  Enabled: true
+Lint/OrAssignmentToConstant: # new in 1.9
+  Enabled: true
+Lint/RequireRelativeSelfPath: # new in 1.22
+  Enabled: true
+Lint/SymbolConversion: # new in 1.9
+  Enabled: true
+Lint/TripleQuotes: # new in 1.9
+  Enabled: true
+Lint/UselessRuby2Keywords: # new in 1.23
+  Enabled: true
+Security/IoMethods: # new in 1.22
+  Enabled: true
+Style/HashConversion: # new in 1.10
+  Enabled: true
+Style/IfWithBooleanLiteralBranches: # new in 1.9
+  Enabled: true
+Style/InPatternThen: # new in 1.16
+  Enabled: true
+Style/MultilineInPatternThen: # new in 1.16
+  Enabled: true
+Style/NumberedParameters: # new in 1.22
+  Enabled: true
+Style/NumberedParametersLimit: # new in 1.22
+  Enabled: true
+  Max: 1
+Style/OpenStructUse: # new in 1.23
+  Enabled: true
+Style/QuotedSymbols: # new in 1.16
+  Enabled: true
+Style/RedundantSelfAssignmentBranch: # new in 1.19
+  Enabled: true
+Style/SelectByRegexp: # new in 1.22
+  Enabled: true
+Style/StringChars: # new in 1.12
+  Enabled: true

data/Rakefile

@@ -1,10 +1,10 @@
-require "bundler/gem_tasks"
-require "rake/testtask"
+require 'bundler/gem_tasks'
+require 'rake/testtask'
 
 Rake::TestTask.new(:test) do |t|
-  t.libs << "test"
-  t.libs << "lib"
+  t.libs << 'test'
+  t.libs << 'lib'
   t.test_files = FileList['test/**/*_test.rb']
 end
 
-task :default => :test
+task default: :test

data/bin/console

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
-require "bundler/setup"
-require "diva"
+require 'bundler/setup'
+require 'diva'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
@@ -10,5 +10,5 @@ require "diva"
 # require "pry"
 # Pry.start
 
-require "irb"
+require 'irb'
 IRB.start

data/diva.gemspec

@@ -1,29 +1,33 @@
 # coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'diva/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "diva"
+  spec.name          = 'diva'
   spec.version       = Diva::VERSION
-  spec.authors       = ["Toshiaki Asai"]
-  spec.email         = ["toshi.alternative@gmail.com"]
+  spec.authors       = ['Toshiaki Asai']
+  spec.email         = ['toshi.alternative@gmail.com']
 
-  spec.summary       = %q{Implementation of expression for handling things.}
-  spec.homepage      = "https://github.com/toshia/diva"
-  spec.license       = "MIT"
-  spec.required_ruby_version = '>= 2.6.0'
+  spec.summary       = 'Implementation of expression for handling things.'
+  spec.homepage      = 'https://github.com/toshia/diva'
+  spec.license       = 'MIT'
+  spec.required_ruby_version = '>= 2.7.0'
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r<^(test|spec|features)/>) }
+  spec.bindir        = 'exe'
+  spec.executables   = spec.files.grep(%r<^exe/>) { |f| File.basename(f) }
+  spec.require_paths = ['lib']
 
-  spec.add_development_dependency "bundler", '>= 1.16.1', '< 3.0'
-  spec.add_development_dependency "rake", '>= 13.0.1', '< 14.0'
-  spec.add_development_dependency "minitest", '>= 5.14.4', '< 5.15'
-  spec.add_development_dependency "irb", '>= 1.3.7', '< 2.0'
-  spec.add_development_dependency "simplecov", '>= 0.17.1', '< 1.0'
-  spec.add_development_dependency "rubocop", '>= 1.20.0', '< 1.21.0'
-  spec.add_dependency "addressable", ">= 2.5.2", "< 3.0"
+  spec.add_development_dependency 'bundler', '>= 1.16.1', '< 3.0'
+  spec.add_development_dependency 'irb', '>= 1.3.7', '< 2.0'
+  spec.add_development_dependency 'minitest', '>= 5.14.4', '< 5.15'
+  spec.add_development_dependency 'rake', '>= 13.0.1', '< 14.0'
+  spec.add_development_dependency 'rubocop', '>= 1.23.0', '< 1.24.0'
+  spec.add_development_dependency 'simplecov', '>= 0.17.1', '< 1.0'
+  spec.add_dependency 'addressable', '>= 2.5.2', '< 3.0'
+  spec.metadata = {
+    'rubygems_mfa_required' => 'true'
+  }
 end

data/lib/diva/model.rb

@@ -24,7 +24,7 @@ class Diva::Model
   # selfにあってotherにもあるカラムはotherの内容で上書きされる。
   # 上書き後、データはDataSourceに保存される
   def merge(other)
-    @value.update(other.to_hash)
+    @value.update(other.to_h)
     validate
     self.class.store_datum(self)
   end
@@ -80,7 +80,7 @@ class Diva::Model
     self == other
   end
 
-  def to_hash
+  def to_h
     self.class.fields.to_h { |f| [f.name, fetch(f.name)] }
   end
 
@@ -114,7 +114,7 @@ class Diva::Model
   # キーとして定義されていない値を全て除外した配列を生成して返す。
   # また、Modelを子に含んでいる場合、それを外部キーに変換する。
   def filtering
-    datum = to_hash
+    datum = to_h
     result = {}
     self.class.fields.each do |field|
       result[field.name] = field.type.cast(datum[field.name])
@@ -146,6 +146,14 @@ class Diva::Model
     end
   end
 
+  def deconstruct_keys(keys)
+    if keys
+      @value.slice(*keys) # 高速化のため、fetchを呼び出していない
+    else
+      @value
+    end
+  end
+
   private
 
   # URIがデフォルトで使うpath要素

data/lib/diva/version.rb

@@ -1,3 +1,3 @@
 module Diva
-  VERSION = '1.1.1'.freeze
+  VERSION = '2.0.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: diva
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Toshiaki Asai
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-10-22 00:00:00.000000000 Z
+date: 2021-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -31,25 +31,25 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: irb
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 13.0.1
+        version: 1.3.7
     - - "<"
       - !ruby/object:Gem::Version
-        version: '14.0'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 13.0.1
+        version: 1.3.7
     - - "<"
       - !ruby/object:Gem::Version
-        version: '14.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -71,65 +71,65 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5.15'
 - !ruby/object:Gem::Dependency
-  name: irb
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.7
+        version: 13.0.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '14.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.7
+        version: 13.0.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '14.0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.17.1
+        version: 1.23.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.24.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.17.1
+        version: 1.23.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.24.0
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.20.0
+        version: 0.17.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: 1.21.0
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.20.0
+        version: 0.17.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: 1.21.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
@@ -182,7 +182,8 @@ files:
 homepage: https://github.com/toshia/diva
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -191,14 +192,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.21
+rubygems_version: 3.2.29
 signing_key:
 specification_version: 4
 summary: Implementation of expression for handling things.