diva 1.0.3 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bcdd3aba855cf6fa2b14b6ea0a396c80610d768a17a512c7683055af150ea2b6
-  data.tar.gz: d4db4b5de59960f5b77f4f5f58adeb54c96bbb93db8a5881f5c99796c5bd5236
+  metadata.gz: e1f4b5814e98320545b1b911edff9206dd0d701065496f6bc61a89c3ad1e102b
+  data.tar.gz: d07c6bcca5ad1c5c12d45373f3c813232356833fe000c39122b51686af2877d7
 SHA512:
-  metadata.gz: b7d47a4e79a6f34fc98c352b63bf5089c7ce2f073f3f9be11f828e69089827f395a3a6724742bf5e8251b8a0ba2f488f446faa776fdd02f3ca15ee4b2eeec128
-  data.tar.gz: 8c871d68c3ea3e31525334cad2d85568b2a99ae5f78acaf768c3e801ca14759a00acf8e3d319bbe1e7da5199283d236761eeca0bae2884d7ff2ec6cb02a983ec
+  metadata.gz: a0bfefc01f13322c81d39ef8cd7c4d31f1e66e30f12b5bb9061b25069eccd524989e0f83b9a84ea82f4d9f63f93a68376100ebbb77f2d1e095aaf06e3c02b53f
+  data.tar.gz: a1c7995794e5aec9cced403b1f59cd57b2e615ecb4dff64acf395b040792af26837f450ab08891aac6c9a0d271cd9fef200a4fed935c6d1ce63e64c2e57b9a14

data/.circleci/config.yml

@@ -6,7 +6,7 @@ executors:
       tag:
         type: string
     docker:
-      - image: circleci/ruby:<< parameters.tag >>
+      - image: ruby:<< parameters.tag >>
 
 jobs:
   build:
@@ -26,15 +26,42 @@ jobs:
     - run:
         name: test
         command: bundle exec rake test
+  lint:
+    parameters:
+       ruby-version:
+         type: string
+    executor:
+      name: ruby
+      tag: << parameters.ruby-version >>
+    steps:
+    - checkout
+    - run:
+        name: Which bundler?
+        command: bundle -v
+    - run:
+        command: bundle install --path vendor/bundle
+    - run:
+        name: rubocop
+        command: bundle exec rubocop lib/
+
 workflows:
   build:
     jobs:
+      - lint:
+          name: 'lint'
+          ruby-version: '3.0.3'
       - build:
-          name: 'ruby-2.5'
-          ruby-version: '2.5.7'
+          name: 'ruby-2.7'
+          ruby-version: '2.7.5'
+          requires:
+            - 'lint'
       - build:
-          name: 'ruby-2.6'
-          ruby-version: '2.6.5'
+          name: 'ruby-3.0'
+          ruby-version: '3.0.3'
+          requires:
+            - 'lint'
       - build:
-          name: 'ruby-2.7'
-          ruby-version: '2.7.0'
+          name: 'ruby-3.1'
+          ruby-version: '3.1.0-preview1'
+          requires:
+            - 'lint'

data/.rubocop.yml

@@ -0,0 +1,394 @@
+AllCops:
+  TargetRubyVersion: '2.7'
+
+Metrics/BlockLength:
+  Exclude:
+    - test/**/*.rb
+    - lib/tasks/**/*.rake
+    - Gemfile
+  Max: 156
+
+Layout/LineLength:
+  AllowHeredoc: true
+  AllowURI: true
+  Max: 293
+  Exclude:
+    - test/**/*.rb
+
+Metrics/ModuleLength:
+  Max: 109
+  CountAsOne: ['array', 'hash', 'heredoc']
+  Exclude:
+    - test/**/*.rb
+
+Naming/AccessorMethodName:
+  Enabled: false
+
+Style/Alias:
+  Enabled: false
+
+Style/AsciiComments:
+  Enabled: false
+
+Naming/AsciiIdentifiers:
+  Enabled: false
+
+Metrics/BlockNesting:
+  Enabled: false
+
+Style/CaseEquality:
+  Enabled: false
+
+Style/ClassAndModuleChildren:
+  Enabled: false
+
+Metrics/ClassLength:
+  Enabled: false
+
+Style/ClassVars:
+  Enabled: false
+
+Style/CollectionMethods:
+  PreferredMethods:
+    collect: map
+    detect: find
+    find_all: select
+    member?: include?
+    reduce: inject
+
+Style/ColonMethodCall:
+  Enabled: true
+
+Style/CommentAnnotation:
+  Enabled: false
+
+Metrics/CyclomaticComplexity:
+  Enabled: false
+
+Style/Documentation:
+  Enabled: false
+
+Layout/DotPosition:
+  EnforcedStyle: leading
+
+Style/DoubleNegation:
+  Enabled: false
+
+Style/EachWithObject:
+  Enabled: false
+
+Style/EmptyLiteral:
+  Enabled: true
+
+Style/Encoding:
+  Enabled: false
+
+Style/FormatString:
+  EnforcedStyle: percent
+
+Style/FrozenStringLiteralComment:
+  Enabled: false
+
+Style/GlobalVars:
+  Enabled: true
+
+Style/GuardClause:
+  Enabled: false
+
+Style/IfUnlessModifier:
+  Enabled: false
+
+Style/IfWithSemicolon:
+  Enabled: false
+
+Layout/IndentationConsistency:
+  EnforcedStyle: normal
+
+Style/InlineComment:
+  Enabled: false
+
+Style/Lambda:
+  EnforcedStyle: literal
+
+Style/LambdaCall:
+  Enabled: false
+
+Metrics/MethodLength:
+  Enabled: false
+
+Style/ModuleFunction:
+  Enabled: false
+
+Style/NegatedIf:
+  Enabled: true
+  EnforcedStyle: both
+
+Style/Next:
+  Enabled: false
+
+# false と nil の違いで分岐するようなコードは書くべきではない。
+# `if a.nil?` のようなコードは、 `if a` に置き換える。
+# nil と false を区別せざるを得ないところでのみ、 Style/NilComparison を無効化して nil? 利用すること
+Style/NilComparison:
+  EnforcedStyle: comparison
+
+Style/NumericLiterals:
+  Enabled: false
+
+Style/OneLineConditional:
+  Enabled: false
+
+Style/ParallelAssignment:
+  Enabled: false
+
+Metrics/ParameterLists:
+  Enabled: false
+
+Naming/PredicateName:
+  ForbiddenPrefixes:
+    - is_
+  MethodDefinitionMacros:
+    - define_method
+    - define_singleton_method
+    - defdsl
+  Exclude:
+    - 'test/*/'
+
+Style/RaiseArgs:
+  Enabled: false
+
+Style/RegexpLiteral:
+  Enabled: false
+
+Style/SingleLineBlockParams:
+  Enabled: false
+
+Style/SignalException:
+  Enabled: false
+
+Style/StringLiterals:
+  EnforcedStyle: single_quotes
+
+Style/TrailingCommaInArrayLiteral:
+  Enabled: true
+  EnforcedStyleForMultiline: no_comma
+
+Style/TrailingCommaInHashLiteral:
+  Enabled: true
+  EnforcedStyleForMultiline: no_comma
+
+Style/TrailingCommaInArguments:
+  Enabled: true
+  EnforcedStyleForMultiline: no_comma
+
+Style/FormatStringToken:
+  EnforcedStyle: template
+
+Style/TrivialAccessors:
+  Enabled: false
+
+Lint/UnusedMethodArgument:
+  Enabled: false
+
+Naming/VariableNumber:
+  Enabled: false
+
+Style/WhileUntilModifier:
+  Enabled: false
+
+Style/WordArray:
+  Enabled: false
+
+Lint/AssignmentInCondition:
+  AllowSafeAssignment: false
+
+Lint/SuppressedException:
+  Enabled: false
+
+Lint/UnderscorePrefixedVariableName:
+  AllowKeywordBlockArguments: true
+
+Lint/Void:
+  Enabled: true
+
+Lint/UselessAssignment:
+  Exclude:
+    - test/**/*.rb
+
+Layout/EmptyLines:
+  Exclude:
+    - test/**/*.rb
+
+Style/NumericPredicate:
+  EnforcedStyle: comparison
+
+# 結果が配列になるもの　　　→ []
+# 　　　配列にならないもの　→ <>
+Style/PercentLiteralDelimiters:
+  PreferredDelimiters:
+    "%":  '<>'
+    "%i": '[]'
+    "%q": '<>'
+    "%Q": '<>'
+    "%r": '<>'
+    "%s": '<>'
+    "%w": '[]'
+    "%W": '[]'
+    "%x": '<>'
+
+Layout/SpaceAroundMethodCallOperator:
+  Enabled: true
+
+Lint/RaiseException:
+  Enabled: true
+
+Lint/StructNewOverride:
+  Enabled: true
+
+Style/ExponentialNotation:
+  Enabled: true
+
+Style/HashEachMethods:
+  Enabled: true
+
+Style/HashTransformKeys:
+  Enabled: true
+
+Style/HashTransformValues:
+  Enabled: true
+
+Style/PreferredHashMethods:
+  EnforcedStyle: verbose
+
+Layout/EmptyLineAfterGuardClause:
+  Enabled: false
+
+Style/BlockDelimiters:
+  EnforcedStyle: braces_for_chaining
+
+Metrics/AbcSize:
+  Max: 24.27
+
+Style/MultilineBlockChain:
+  Enabled: false
+
+Layout/MultilineMethodCallIndentation:
+  EnforcedStyle: indented_relative_to_receiver
+
+Naming/MemoizedInstanceVariableName:
+  EnforcedStyleForLeadingUnderscores: optional
+
+Layout/SpaceAroundOperators:
+  EnforcedStyleForExponentOperator: space
+
+Layout/SpaceAroundEqualsInParameterDefault:
+  EnforcedStyle: no_space
+
+Style/BlockComments:
+  Enabled: false
+
+Naming/MethodName:
+  EnforcedStyle: snake_case
+  IgnoredPatterns:
+    - URI
+    - Type
+
+Naming/RescuedExceptionsVariableName:
+  PreferredName: "exception"
+
+Layout/SpaceBeforeBrackets: # (new in 1.7)
+  Enabled: true
+Lint/AmbiguousAssignment: # (new in 1.7)
+  Enabled: true
+Lint/DeprecatedConstants: # (new in 1.8)
+  Enabled: true
+Lint/DuplicateBranch: # (new in 1.3)
+  Enabled: true
+Lint/DuplicateRegexpCharacterClassElement: # (new in 1.1)
+  Enabled: true
+Lint/EmptyBlock: # (new in 1.1)
+  Enabled: true
+Lint/EmptyClass: # (new in 1.3)
+  Enabled: true
+Lint/LambdaWithoutLiteralBlock: # (new in 1.8)
+  Enabled: true
+Lint/NoReturnInBeginEndBlocks: # (new in 1.2)
+  Enabled: true
+Lint/RedundantDirGlobSort: # (new in 1.8)
+  Enabled: true
+Lint/ToEnumArguments: # (new in 1.1)
+  Enabled: true
+Lint/UnexpectedBlockArity: # (new in 1.5)
+  Enabled: true
+Lint/UnmodifiedReduceAccumulator: # (new in 1.1)
+  Enabled: true
+Style/ArgumentsForwarding: # (new in 1.1)
+  Enabled: true
+Style/CollectionCompact: # (new in 1.2)
+  Enabled: true
+Style/DocumentDynamicEvalDefinition: # (new in 1.1)
+  Enabled: true
+Style/EndlessMethod: # (new in 1.8)
+  Enabled: true
+Style/HashExcept: # (new in 1.7)
+  Enabled: true
+Style/NegatedIfElseCondition: # (new in 1.2)
+  Enabled: true
+Style/NilLambda: # (new in 1.3)
+  Enabled: true
+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,28 +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.summary       = %q{Implementation of expression for handling things.}
-  spec.homepage      = "https://github.com/toshia/diva"
-  spec.license       = "MIT"
+  spec.authors       = ['Toshiaki Asai']
+  spec.email         = ['toshi.alternative@gmail.com']
 
-  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.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.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.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_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/datasource.rb

@@ -18,7 +18,8 @@ module Diva::DataSource
 
   # 取得できたらそのDivaのインスタンスをキーにして実行されるDeferredを返す
   def idof(id)
-    Thread.new{ findbyid(id) } end
+    Thread.new { findbyid(id) }
+  end
   alias [] idof
 
   # データの保存

data/lib/diva/error.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+
 module Diva
   class DivaError < StandardError; end
 
@@ -15,5 +16,4 @@ module Diva
 
   # URIとして受け付けられない値を渡された
   class InvalidURIError < InvalidTypeError; end
-
 end

data/lib/diva/field_generator.rb

@@ -9,6 +9,10 @@ class Diva::FieldGenerator
     @model_klass.add_field(field_name, type: :int, required: required)
   end
 
+  def float(field_name, required: false)
+    @model_klass.add_field(field_name, type: :float, required: required)
+  end
+
   def string(field_name, required: false)
     @model_klass.add_field(field_name, type: :string, required: required)
   end
@@ -29,11 +33,3 @@ class Diva::FieldGenerator
     @model_klass.add_field(field_name, type: type, required: required)
   end
 end
-
-
-
-
-
-
-
-

data/lib/diva/model.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+
 =begin rdoc
   いろんなリソースの基底クラス
 =end
@@ -23,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
@@ -56,13 +57,13 @@ class Diva::Model
   end
 
   def hash
-    @_hash ||= self.uri.to_s.hash ^ self.class.hash
+    @_hash ||= uri.to_s.hash ^ self.class.hash
   end
 
   def <=>(other)
     if other.is_a?(Diva::Model)
       created - other.created
-    elsif other.respond_to?(:[]) and other[:created]
+    elsif other.respond_to?(:[]) && other[:created]
       created - other[:created]
     else
       id - other
@@ -79,14 +80,12 @@ class Diva::Model
     self == other
   end
 
-  def to_hash
-    Hash[self.class.fields.map{|f| [f.name, fetch(f.name)] }]
+  def to_h
+    self.class.fields.to_h { |f| [f.name, fetch(f.name)] }
   end
 
   def to_json(*rest)
-    Hash[
-      self.class.fields.map{|f| [f.name, f.dump_for_json(fetch(f.name))] }
-    ].to_json(*rest)
+    self.class.fields.to_h { |f| [f.name, f.dump_for_json(fetch(f.name))] }.to_json(*rest)
   end
 
   # カラムの生の内容を返す
@@ -100,32 +99,27 @@ class Diva::Model
   def []=(key, value)
     @value[key.to_sym] = value
     self.class.store_datum(self)
-    value
   end
 
   # カラムと型が違うものがある場合、例外を発生させる。
   def validate
-    raise RuntimeError, "argument is #{@value}, not Hash" if not @value.is_a?(Hash)
+    raise "argument is #{@value}, not Hash" unless @value.is_a?(Hash)
     self.class.fields.each do |field|
-      begin
-        @value[field.name] = field.type.cast(@value[field.name])
-      rescue Diva::InvalidTypeError => err
-        raise Diva::InvalidTypeError, "#{err} in field `#{field}'"
-      end
+      @value[field.name] = field.type.cast(@value[field.name])
+    rescue Diva::InvalidTypeError
+      raise Diva::InvalidTypeError, "#{self.class}.#{field} (#{field.type}): Invalid assign #{@value[field.name].inspect}:#{@value[field.name].class}"
     end
   end
 
   # キーとして定義されていない値を全て除外した配列を生成して返す。
   # また、Modelを子に含んでいる場合、それを外部キーに変換する。
   def filtering
-    datum = self.to_hash
-    result = Hash.new
+    datum = to_h
+    result = {}
     self.class.fields.each do |field|
-      begin
-        result[field.name] = field.type.cast(datum[field.name])
-      rescue Diva::InvalidTypeError => err
-        raise Diva::InvalidTypeError, "#{err} in field `#{field}'"
-      end
+      result[field.name] = field.type.cast(datum[field.name])
+    rescue Diva::InvalidTypeError => exception
+      raise Diva::InvalidTypeError, "#{exception} in field `#{field}'"
     end
     result
   end
@@ -133,10 +127,9 @@ class Diva::Model
   # このインスタンスのタイトル。
   def title
     fields = self.class.fields.lazy.map(&:name)
-    case
-    when fields.include?(:name)
+    if fields.include?(:name)
       name.gsub("\n", '')
-    when fields.include?(:description)
+    elsif fields.include?(:description)
       description.gsub("\n", '')
     else
       to_s.gsub("\n", '')
@@ -146,18 +139,25 @@ class Diva::Model
   def dig(key, *args)
     return nil unless key.respond_to?(:to_sym)
     value = fetch(key)
-    if value.nil? || args.empty?
+    if value == nil || args.empty?
       value
     else
       value.dig(*args)
     end
   end
 
+  def deconstruct_keys(keys)
+    if keys
+      @value.slice(*keys) # 高速化のため、fetchを呼び出していない
+    else
+      @value
+    end
+  end
+
   private
+
   # URIがデフォルトで使うpath要素
   def path
     @path ||= "/#{SecureRandom.uuid}"
   end
-
 end
-

data/lib/diva/model_extend.rb

@@ -15,14 +15,14 @@ module Diva::ModelExtend
   # ==== Return
   # [String] URIスキーム
   def scheme
-    @_scheme ||= self.to_s.split('::',2).first.gsub(/\W/,'').downcase.freeze
+    @_scheme ||= to_s.split('::', 2).first.gsub(/\W/, '').downcase.freeze
   end
 
   # Modelのインスタンスのホスト名。オーバライドして適切な値にする
   # ==== Return
   # [String] ホスト名
   def host
-    @_host ||= self.to_s.split('::',2).last.split('::').reverse.join('.').gsub(/[^\w\.]/,'').downcase.freeze
+    @_host ||= to_s.split('::', 2).last.split('::').reverse.join('.').gsub(/[^\w.]/, '').downcase.freeze
   end
 
   # Modelにフィールドを追加する。
@@ -55,7 +55,7 @@ module Diva::ModelExtend
     @fields ||= []
   end
   alias :keys :fields
-  deprecate :keys, "fields", 2018, 02
+  deprecate :keys, 'fields', 2018, 2
 
   def schema
     {

data/lib/diva/spec.rb

@@ -5,5 +5,5 @@ Diva::ModelSpec = Struct.new(
   :name,
   :reply,
   :myself,
-  :timeline,
+  :timeline
 )

data/lib/diva/type.rb

@@ -27,7 +27,7 @@ Diva::Modelのサブクラスであれば、それを制約とすることがで
 配列の全ての要素が設定された制約を満たしていれば、配列制約が満たされたことになる。
 
 =end
-require "time"
+require 'time'
 require 'diva/uri'
 
 module Diva::Type
@@ -73,7 +73,7 @@ module Diva::Type
     end
 
     def inspect
-      "Diva::Type(#{to_s})"
+      "Diva::Type(#{self})"
     end
   end
 
@@ -84,12 +84,12 @@ module Diva::Type
     end
 
     def recommendation_point(value)
-      _, point = @recommended_classes.map.with_index{|k, i| [k, i] }.find{|k, _| value.is_a?(k) }
+      _, point = @recommended_classes.map.with_index { |k, i| [k, i] }.find { |k, _| value.is_a?(k) }
       point
     end
 
     def schema
-      @schema ||= {type: uri}.freeze
+      @schema ||= { type: uri }.freeze
     end
 
     def uri
@@ -153,7 +153,11 @@ module Diva::Type
     when Integer, Float
       Time.at(v)
     when String
-      Time.iso8601(v)
+      begin
+        Time.iso8601(v)
+      rescue StandardError
+        Time.parse(v)
+      end
     else
       raise Diva::InvalidTypeError, "The value is not a `#{name}'."
     end
@@ -169,7 +173,7 @@ module Diva::Type
     end
   end
   NULL = AtomicType.new(:null, NilClass) do |v|
-    if v.nil?
+    if v == nil
       v
     else
       raise Diva::InvalidTypeError, "The value is not a `#{name}'."
@@ -178,13 +182,14 @@ module Diva::Type
 
   class ModelType < MetaType
     attr_reader :model
+
     def initialize(model, *rest, &cast)
       super(:model, *rest)
       @model = model
     end
 
-    def recommendation_point(v)
-      v.is_a?(model) && 0
+    def recommendation_point(value)
+      value.is_a?(model) && 0
     end
 
     def cast(value)
@@ -199,7 +204,7 @@ module Diva::Type
     end
 
     def schema
-      @schema ||= {type: uri}.freeze
+      @schema ||= { type: uri }.freeze
     end
 
     def to_s
@@ -219,7 +224,7 @@ module Diva::Type
     end
 
     def recommendation_point(values)
-      values.is_a?(Enumerable) && values.all?{|v| @type.recommendation_point(v) } && 0
+      values.is_a?(Enumerable) && values.all? { |v| @type.recommendation_point(v) } && 0
     end
 
     def cast(value)
@@ -232,7 +237,7 @@ module Diva::Type
     end
 
     def to_s
-      "Array of #{@type.to_s}"
+      "Array of #{@type}"
     end
 
     def schema
@@ -246,8 +251,8 @@ module Diva::Type
       super("union_#{@types.map(&:name).join('_')}")
     end
 
-    def recommendation_point(v)
-      @types.map{|t| t.recommendation_point(v) }.compact.min
+    def recommendation_point(value)
+      @types.map { |t| t.recommendation_point(value) }.compact.min
     end
 
     def cast(value)
@@ -267,18 +272,18 @@ module Diva::Type
     end
 
     def recommended_type_of(value)
-      @types.map{|t|
+      available_types = @types.map { |t|
         [t, t.recommendation_point(value)]
-      }.select{|_,p| p }.sort_by{|_,p| p }.each{|t,_|
-        return t
-      }
+      }.select { |_, p| p }
+      unless available_types.empty?
+        best, = available_types.min_by { |_, p| p }
+        return best
+      end
       @types.each do |type|
-        begin
-          type.cast(value)
-          return type
-        rescue Diva::InvalidTypeError
-          # try next
-        end
+        type.cast(value)
+        return type
+      rescue Diva::InvalidTypeError
+        # try next
       end
       raise Diva::InvalidTypeError, "The value is not #{self}"
     end
@@ -304,7 +309,7 @@ module Diva
       Diva::Type::URI
     when :null
       Diva::Type::NULL
-    when ->x{x.class == Class && x.ancestors.include?(Diva::Model) }
+    when ->(x) { x.instance_of?(Class) && x.ancestors.include?(Diva::Model) }
       Diva::Type.model_of(type)
     when Array
       if type.size >= 2

data/lib/diva/uri.rb

@@ -46,9 +46,9 @@ class Diva::URI
   def ==(other)
     case other
     when URI, Addressable::URI, String
-      other.to_s == self.to_s
+      other.to_s == to_s
     when Diva::URI
-      if has_string? or other.has_string?
+      if has_string? || other.has_string?
         to_s == other.to_s
       else
         other.to_uri == to_uri
@@ -60,6 +60,10 @@ class Diva::URI
     to_s.hash ^ self.class.hash
   end
 
+  def eql?(other)
+    self == other
+  end
+
   def has_string?
     !!@uri_string
   end
@@ -69,15 +73,15 @@ class Diva::URI
   end
 
   def to_s
-    @uri_string ||= to_uri.to_s.freeze
+    @uri_string ||= to_uri.to_s.freeze # rubocop:disable Naming/MemoizedInstanceVariableName
   end
 
   def to_uri
-    @uri ||= generate_uri.freeze
+    @uri ||= generate_uri.freeze # rubocop:disable Naming/MemoizedInstanceVariableName
   end
 
   def scheme
-    if has_string? and !has_uri?
+    if has_string? && !has_uri?
       match = @uri_string.match(%r<\A(\w+):>)
       if match
         match[1]

data/lib/diva/version.rb

@@ -1,3 +1,3 @@
 module Diva
-  VERSION = "1.0.3"
+  VERSION = '2.0.1'.freeze
 end

data/lib/diva.rb

@@ -1,4 +1,5 @@
 # coding: utf-8
+
 require 'diva/version'
 require 'diva/datasource'
 require 'diva/error'
@@ -8,8 +9,6 @@ require 'diva/model'
 require 'diva/spec'
 require 'diva/type'
 require 'diva/uri'
-require 'diva/version'
-
 
 module Diva
   def self.URI(uri)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: diva
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 2.0.1
 platform: ruby
 authors:
 - Toshiaki Asai
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-09-11 00:00:00.000000000 Z
+date: 2021-12-18 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,25 +71,45 @@ 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: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.23.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.24.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.23.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.24.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -139,6 +159,7 @@ extra_rdoc_files: []
 files:
 - ".circleci/config.yml"
 - ".gitignore"
+- ".rubocop.yml"
 - ".travis.yml"
 - Gemfile
 - LICENSE.txt
@@ -161,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:
@@ -170,14 +192,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '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.