diva 0.3.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68d766412779aaedc71ea2ab874be3861238afff5b896d4d4bdab9e50e2c5103
-  data.tar.gz: 7ca9cc8bec5f1b284fe51b078501831572519263feab02619b641ee7498543bd
+  metadata.gz: 65b2025d22ea687dfa98ca063ca511630ce75a4928e0e6be9581f7b6f2216ce2
+  data.tar.gz: 6b514157b95438022b2b28ab72b0af436489e3f8edf8e8c12bca80e1298a1b69
 SHA512:
-  metadata.gz: 77ca8065a2a25a922bebdf0fe297242363f17e4277f411f4f72ece8ed0b61e26893452c6683d7815a55c96e5944f58e86436d77d38952fc9bf30c97c24e2c815
-  data.tar.gz: 77627879b34087e1a4877125c54c489b0b799d768fee187bffff8f237e337cce67981ccae60eaa7481b964bbe841fd02bbed68740ab5f972f60c7aa7b7ac6517
+  metadata.gz: ea64c7762bc79c8c4eba0f9ac41fd3622a3af663c2a9f2057175695da9ba0f9226b4dbb71133e91c288dfc2799cdfae6d075fb84dab1905cc19ec2b7081b7045
+  data.tar.gz: af41fb3db4368b08f71af3cc1886ae44553865d4797f6402278ec1a6a812e2095e94ec752785734592c09f757f58fcde3198e185efc49a494260692dd2afb45f

data/diva.gemspec

@@ -18,11 +18,11 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.12"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "minitest", "~> 5.0"
-  spec.add_development_dependency "pry"
-  spec.add_development_dependency "simplecov"
+  spec.add_development_dependency "bundler", '>= 1.16.1', '< 2.1'
+  spec.add_development_dependency "rake", '>= 12.3.2', '< 13.0'
+  spec.add_development_dependency "minitest", '>= 5.11.3', '< 5.12'
+  spec.add_development_dependency "pry", '>= 0.12.2', '< 1.0'
+  spec.add_development_dependency "simplecov", '>= 0.16.1', '< 1.0'
 
-  spec.add_dependency "addressable", ">= 2.5", "< 2.6"
+  spec.add_dependency "addressable", ">= 2.5.2", "< 2.7"
 end

data/lib/diva/field.rb

@@ -27,6 +27,13 @@ module Diva
       required
     end
 
+    def schema
+      {
+        name: @name.to_s,
+        constraint: @type.schema
+      }
+    end
+
     def to_sym
       name
     end

data/lib/diva/model.rb

@@ -3,7 +3,6 @@
   いろんなリソースの基底クラス
 =end
 
-require 'diva/combinator'
 require 'diva/model_extend'
 require 'diva/uri'
 require 'diva/spec'
@@ -12,7 +11,6 @@ require 'securerandom'
 
 class Diva::Model
   include Comparable
-  include Diva::Combinable
   extend Diva::ModelExtend
 
   def initialize(args)
@@ -145,6 +143,16 @@ class Diva::Model
     end
   end
 
+  def dig(key, *args)
+    return nil unless key.respond_to?(:to_sym)
+    value = fetch(key)
+    if value.nil? || args.empty?
+      value
+    else
+      value.dig(*args)
+    end
+  end
+
   private
   # URIがデフォルトで使うpath要素
   def path

data/lib/diva/model_extend.rb

@@ -57,6 +57,17 @@ module Diva::ModelExtend
   alias :keys :fields
   deprecate :keys, "fields", 2018, 02
 
+  def schema
+    {
+      fields: fields.map(&:schema),
+      uri: uri
+    }
+  end
+
+  def uri
+    @uri ||= Diva::URI("diva://object.type/#{slug || SecureRandom.uuid}")
+  end
+
   #
   # プライベートクラスメソッド
   #

data/lib/diva/type.rb

@@ -28,6 +28,7 @@ Diva::Modelのサブクラスであれば、それを制約とすることがで
 
 =end
 require "time"
+require 'diva/uri'
 
 module Diva::Type
   extend self
@@ -41,14 +42,18 @@ module Diva::Type
   end
 
   def optional(type)
-    OptionalType.new(type)
+    UnionType.new(NULL, type)
+  end
+
+  def union(*types)
+    UnionType.new(*types)
   end
 
   # 全てのType共通のスーパークラス
   class MetaType
     attr_reader :name
 
-    def initialize(name, *rest, &cast)
+    def initialize(name, *, &cast)
       @name = name.to_sym
       if cast
         define_singleton_method :cast, &cast
@@ -73,9 +78,26 @@ module Diva::Type
   end
 
   class AtomicType < MetaType
+    def initialize(name, recommended_class, *rest, &cast)
+      super(name, *rest, &cast)
+      @recommended_classes = Array(recommended_class)
+    end
+
+    def recommendation_point(value)
+      _, point = @recommended_classes.map.with_index{|k, i| [k, i] }.find{|k, _| value.is_a?(k) }
+      point
+    end
+
+    def schema
+      @schema ||= {type: uri}.freeze
+    end
+
+    def uri
+      @uri ||= Diva::URI("diva://atomic.type/#{name}")
+    end
   end
 
-  INT = AtomicType.new(:int) do |v|
+  INT = AtomicType.new(:int, [Integer]) do |v|
     case v
     when Integer
       v
@@ -89,7 +111,7 @@ module Diva::Type
       raise Diva::InvalidTypeError, "The value is not a `#{name}'."
     end
   end
-  FLOAT = AtomicType.new(:float) do |v|
+  FLOAT = AtomicType.new(:float, [Float]) do |v|
     case v
     when Float
       v
@@ -99,7 +121,7 @@ module Diva::Type
       raise Diva::InvalidTypeError, "The value is not a `#{name}'."
     end
   end
-  BOOL = AtomicType.new(:bool) do |v|
+  BOOL = AtomicType.new(:bool, [TrueClass, FalseClass]) do |v|
     case v
     when TrueClass, FalseClass
       v
@@ -111,7 +133,7 @@ module Diva::Type
       raise Diva::InvalidTypeError, "The value is not a `#{name}'."
     end
   end
-  STRING = AtomicType.new(:string) do |v|
+  STRING = AtomicType.new(:string, String) do |v|
     case v
     when Diva::Model, Enumerable
       raise Diva::InvalidTypeError, "The value is not a `#{name}'."
@@ -124,7 +146,7 @@ module Diva::Type
       cast(value).iso8601
     end
   end
-  TIME = TimeType.new(:time) do |v|
+  TIME = TimeType.new(:time, [Time, String]) do |v|
     case v
     when Time
       v
@@ -136,7 +158,7 @@ module Diva::Type
       raise Diva::InvalidTypeError, "The value is not a `#{name}'."
     end
   end
-  URI = AtomicType.new(:uri) do |v|
+  URI = AtomicType.new(:uri, [Diva::URI, Addressable::URI, ::URI::Generic]) do |v|
     case v
     when Diva::URI, Addressable::URI, ::URI::Generic
       v
@@ -146,6 +168,13 @@ module Diva::Type
       raise Diva::InvalidTypeError, "The value is not a `#{name}'."
     end
   end
+  NULL = AtomicType.new(:null, NilClass) do |v|
+    if v.nil?
+      v
+    else
+      raise Diva::InvalidTypeError, "The value is not a `#{name}'."
+    end
+  end
 
   class ModelType < MetaType
     attr_reader :model
@@ -154,6 +183,10 @@ module Diva::Type
       @model = model
     end
 
+    def recommendation_point(v)
+      v.is_a?(model) && 0
+    end
+
     def cast(value)
       case value
       when model
@@ -165,9 +198,17 @@ module Diva::Type
       end
     end
 
+    def schema
+      @schema ||= {type: uri}.freeze
+    end
+
     def to_s
       "#{model} #{name}"
     end
+
+    def uri
+      model.uri
+    end
   end
 
   class ArrayType < MetaType
@@ -177,6 +218,10 @@ module Diva::Type
       @type = type
     end
 
+    def recommendation_point(values)
+      values.is_a?(Enumerable) && values.all?{|v| @type.recommendation_point(v) } && 0
+    end
+
     def cast(value)
       raise Diva::InvalidTypeError, "The value is not a `#{name}'." unless value.is_a?(Enumerable)
       value.to_a.map(&@type.method(:cast))
@@ -189,35 +234,55 @@ module Diva::Type
     def to_s
       "Array of #{@type.to_s}"
     end
+
+    def schema
+      @schema ||= { array: @type.schema }.freeze
+    end
   end
 
-  class OptionalType < MetaType
-    def initialize(type)
-      super("optional_#{type.name}")
-      @type = type
+  class UnionType < MetaType
+    def initialize(*types)
+      @types = types.flatten.map(&Diva.method(:Type)).freeze
+      super("union_#{@types.map(&:name).join('_')}")
+    end
+
+    def recommendation_point(v)
+      @types.map{|t| t.recommendation_point(v) }.compact.min
     end
 
     def cast(value)
-      if value.nil?
-        value
-      else
-        @type.cast(value)
-      end
+      recommended_type_of(value).cast(value)
     end
 
     def dump_for_json(value)
-      if value.nil?
-        value
-      else
-        @type.dump_for_json(value)
-      end
+      recommended_type_of(value).dump_for_json(value)
     end
 
     def to_s
-      "#{@type.to_s}|nil"
+      @types.map(&:name).join('|').freeze
+    end
+
+    def schema
+      @schema ||= { union: @types.map(&:schema) }.freeze
     end
-  end
 
+    def recommended_type_of(value)
+      @types.map{|t|
+        [t, t.recommendation_point(value)]
+      }.select{|_,p| p }.sort_by{|_,p| p }.each{|t,_|
+        return t
+      }
+      @types.each do |type|
+        begin
+          type.cast(value)
+          return type
+        rescue Diva::InvalidTypeError
+          # try next
+        end
+      end
+      raise Diva::InvalidTypeError, "The value is not #{self}"
+    end
+  end
 end
 
 module Diva
@@ -237,10 +302,16 @@ module Diva
       Diva::Type::TIME
     when :uri
       Diva::Type::URI
+    when :null
+      Diva::Type::NULL
     when ->x{x.class == Class && x.ancestors.include?(Diva::Model) }
       Diva::Type.model_of(type)
     when Array
-      Diva::Type.array_of(type.first)
+      if type.size >= 2
+        Diva::Type.union(*type)
+      else
+        Diva::Type.array_of(type.first)
+      end
     else
       fail "Invalid type #{type.inspect} (#{type.class})."
     end

data/lib/diva/uri.rb

@@ -32,6 +32,7 @@ require 'addressable/uri'
 
 class Diva::URI
   def initialize(uri)
+    @uri = @uri_string = @uri_hash = nil
     case uri.freeze
     when URI, Addressable::URI
       @uri = uri
@@ -96,8 +97,8 @@ class Diva::URI
     super
   end
 
-  def respond_to?(method)
-    super or to_uri.respond_to?(method)
+  def respond_to_missing?(method, include_private)
+    to_uri.respond_to?(method, include_private)
   end
 
   def method_missing(method, *rest, &block)

data/lib/diva/version.rb

@@ -1,3 +1,3 @@
 module Diva
-  VERSION = "0.3.2"
+  VERSION = "1.0.0"
 end

metadata

@@ -1,105 +1,135 @@
 --- !ruby/object:Gem::Specification
 name: diva
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 1.0.0
 platform: ruby
 authors:
 - Toshiaki Asai
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-29 00:00:00.000000000 Z
+date: 2019-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.16.1
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: 1.16.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 5.11.3
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 5.11.3
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.12'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.12.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.12.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.16.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.16.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: 2.5.2
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '2.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: 2.5.2
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '2.7'
 description: 
 email:
 - toshi.alternative@gmail.com
@@ -117,7 +147,6 @@ files:
 - bin/setup
 - diva.gemspec
 - lib/diva.rb
-- lib/diva/combinator.rb
 - lib/diva/datasource.rb
 - lib/diva/error.rb
 - lib/diva/field.rb
@@ -147,8 +176,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Implementation of expression for handling things.

data/lib/diva/combinator.rb

@@ -1,106 +0,0 @@
-# -*- coding: utf-8 -*-
-
-module Diva::Combinable
-  class Combinator
-    def initialize(a, b)
-      @a, @b = a, b
-    end
-
-    # コンストラクタに渡された二つの値が _behavior_ をサポートしていれば真を返す
-    # ==== Args
-    # [behavior] 想定する振る舞い(Symbol)
-    # ==== Return
-    # true or false
-    def =~(behavior)
-      fail 'Not implement'
-    end
-
-    def ===(behavior)
-      self =~ behavior
-    end
-
-    # このCombinatorが持っている値のすべての組み合わせのうち、適切に _behavior_
-    # をサポートしている組み合わせについて繰り返すEnumeratorを返す
-    # ==== Args
-    # [behavior] 想定する振る舞い(Symbol)
-    # ==== Return
-    # [レシーバ, 引数] のペアを列挙するEnumerator
-    def enum(behavior)
-      Enumerator.new do |yielder|
-        yielder << [@a, @b] if a_b(behavior)
-        yielder << [@b, @a] if b_a(behavior)
-      end
-    end
-
-    def method_missing(behavior, *rest)
-      if rest.empty?
-        return self =~ behavior
-      end
-      super
-    end
-
-    private
-
-    def a_b(behavior)
-      @a.respond_to?(behavior) && @a.__send__(behavior, @b)
-    end
-
-    def b_a(behavior)
-      @b.respond_to?(behavior) && @b.__send__(behavior, @a)
-    end
-  end
-
-  class PluralCombinator < Combinator
-    def enum(behavior)
-      Enumerator.new do |yielder|
-        @b.each do |b|
-          (b | @a).enum(behavior).each(&yielder.method(:<<))
-        end
-      end
-    end
-  end
-
-  class SingleCombinator < Combinator
-    def =~(behavior)
-      a_b(behavior) || b_a(behavior)
-    end
-  end
-
-  class AnyCombinator < PluralCombinator
-    def =~(behavior)
-      @b.any?{|b| b | @a =~ behavior }
-    end
-  end
-
-  class AllCombinator < PluralCombinator
-    def =~(behavior)
-      @b.all?{|b| b | @a =~ behavior }
-    end
-  end
-
-  # _other_ との Diva::Conbinable::Combinator を生成する
-  # ==== Args
-  # [other] Diva::Modelか、Diva::Modelを列挙するEnumerable
-  # ==== Return
-  # Diva::Conbinable::Combinator
-  def |(other)
-    if other.is_a? Enumerable
-      AnyCombinator.new(self, other)
-    else
-      SingleCombinator.new(self, other)
-    end
-  end
-
-  # _other_ との Diva::Conbinable::Combinator を生成する
-  # ==== Args
-  # [other] Diva::Modelか、Diva::Modelを列挙するEnumerable
-  # ==== Return
-  # Diva::Conbinable::Combinator
-  def &(other)
-    if other.is_a? Enumerable
-      AllCombinator.new(self, other)
-    else
-      SingleCombinator.new(self, other)
-    end
-  end
-end