diva 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2929c06c06248e820556866e691d09ca8b17701c
-  data.tar.gz: df318101c0fc97e58705d17f8f996e9dac248216
+  metadata.gz: bc21e64173564102b7a3da104909d3a1742e5c58
+  data.tar.gz: 0c826bb45017d63bde247bc292e775e04b17b9fc
 SHA512:
-  metadata.gz: ce219d41da367da84d92c36fdd312ede04a7f302bdaa9a48f1446546e006c9146ed753f3ff91fc2aed845381c36c626a8dc50bf49850315914fb7e15d7e2bb37
-  data.tar.gz: 7274106f32830aaaacb8365b63ebd8f9de4e60b7afce1f0107173cd9fb347324fbfd2338f3ae43072d6b3fdbc616829257ec223c6cc1219936da02e11c956ce1
+  metadata.gz: 17bdfd00b4008192e9b859276a9684b5a3b475d6dde53f2e94b8845236373f95f66fdda5db0410fe29cb19acfb4bbffc3239809f423005ee4c104072a8d0bebd
+  data.tar.gz: 534176c4015edc96efc3714c004692084cd49e78b94e4be8541c755a7fa855823ccba4d88c39cf70c9f2f8a4d82e3629699c3c797abf18e7014d37c5341144af

data/lib/diva/combinator.rb

@@ -0,0 +1,66 @@
+# -*- 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)
+      @a.respond_to?(behavior) && @a.__send__(behavior, @b) || @b.respond_to?(behavior) && @b.__send__(behavior, @a)
+    end
+    alias_method :===, :=~
+
+    # このCombinatorが持っている値のすべての組み合わせのうち、適切に _behavior_
+    # をサポートしている組み合わせについて繰り返すEnumeratorを返す
+    # ==== Args
+    # [behavior] 想定する振る舞い(Symbol)
+    # ==== Return
+    # [レシーバ, 引数] のペアを列挙するEnumerator
+    def enum(behavior)
+      Enumerator.new do |yielder|
+        yielder << [@a, @b] if @a.respond_to?(behavior) && @a.__send__(behavior, @b)
+        yielder << [@b, @a] if @b.respond_to?(behavior) && @b.__send__(behavior, @a)
+      end
+    end
+
+    def method_missing(behavior, *rest)
+      if rest.empty?
+        return self =~ behavior
+      end
+      super
+    end
+  end
+
+  class EnumerableCombinator < Combinator
+    def =~(behavior)
+      @b.any?{|b| !enum(behavior).empty? }
+    end
+
+    def enum(behavior)
+      Enumerator.new do |yielder|
+        @b.each do |b|
+          (@a | b).enum(behavior).each(&yielder.method(:<<))
+        end
+      end
+    end
+  end
+
+  # _other_ との Diva::Conbinable::Combinator を生成する
+  # ==== Args
+  # [other] Diva::Modelか、Diva::Modelを列挙するEnumerable
+  # ==== Return
+  # Diva::Conbinable::Combinator
+  def |(other)
+    if other.is_a? Enumerable
+      EnumerableCombinator.new(self, other)
+    else
+      Combinator.new(self, other)
+    end
+  end
+end

data/lib/diva/model.rb

@@ -3,6 +3,7 @@
   いろんなリソースの基底クラス
 =end
 
+require 'diva/combinator'
 require 'diva/model_extend'
 require 'diva/uri'
 require 'diva/spec'
@@ -11,6 +12,7 @@ require 'securerandom'
 
 class Diva::Model
   include Comparable
+  include Diva::Combinable
   extend Diva::ModelExtend
 
   def initialize(args)

data/lib/diva/type.rb

@@ -144,8 +144,14 @@ module Diva::Type
     end
 
     def cast(value)
-      raise Diva::InvalidTypeError, "The value is not a `#{model}'." unless value.is_a?(model)
-      value
+      case value
+      when model
+        value
+      when Hash
+        model.new(value)
+      else
+        raise Diva::InvalidTypeError, "The value #{value.inspect} is not a `#{model}'."
+      end
     end
 
     def to_s
@@ -166,7 +172,7 @@ module Diva::Type
     end
 
     def to_s
-      "Array of #{type.to_s}"
+      "Array of #{@type.to_s}"
     end
   end
 
@@ -185,7 +191,7 @@ module Diva::Type
     end
 
     def to_s
-      "#{type.to_s}|nil"
+      "#{@type.to_s}|nil"
     end
   end
 

data/lib/diva/version.rb

@@ -1,3 +1,3 @@
 module Diva
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: diva
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Toshiaki Asai
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-28 00:00:00.000000000 Z
+date: 2017-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -117,6 +117,7 @@ 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,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Implementation of expression for handling things.