diva 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc21e64173564102b7a3da104909d3a1742e5c58
-  data.tar.gz: 0c826bb45017d63bde247bc292e775e04b17b9fc
+  metadata.gz: 294ace1f70016d867a7485564ddcc874b0fa1c34
+  data.tar.gz: ae3ee191438c3fe8a41e0a6963de64f7d243e305
 SHA512:
-  metadata.gz: 17bdfd00b4008192e9b859276a9684b5a3b475d6dde53f2e94b8845236373f95f66fdda5db0410fe29cb19acfb4bbffc3239809f423005ee4c104072a8d0bebd
-  data.tar.gz: 534176c4015edc96efc3714c004692084cd49e78b94e4be8541c755a7fa855823ccba4d88c39cf70c9f2f8a4d82e3629699c3c797abf18e7014d37c5341144af
+  metadata.gz: 17d75018efc53746ca4b23ba3c7d64d17efe8e5e733367ee03f6f3dc3c586d9745d8ece953a2779d0723fd15d073278dd03a6764ed6ce152a807cdeef9be3862
+  data.tar.gz: 4465ccf523a84506f4a3c00e127357407a236fe95cabe2e02a263fae9478ca31bb397a40e478d0f0f9e3e7c33f28f03c496f6e8e6721cad7fd511ff294702123

data/lib/diva/combinator.rb

@@ -12,9 +12,12 @@ module Diva::Combinable
     # ==== Return
     # true or false
     def =~(behavior)
-      @a.respond_to?(behavior) && @a.__send__(behavior, @b) || @b.respond_to?(behavior) && @b.__send__(behavior, @a)
+      fail 'Not implement'
+    end
+
+    def ===(behavior)
+      self =~ behavior
     end
-    alias_method :===, :=~
 
     # このCombinatorが持っている値のすべての組み合わせのうち、適切に _behavior_
     # をサポートしている組み合わせについて繰り返すEnumeratorを返す
@@ -24,8 +27,8 @@ module Diva::Combinable
     # [レシーバ, 引数] のペアを列挙する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)
+        yielder << [@a, @b] if a_b(behavior)
+        yielder << [@b, @a] if b_a(behavior)
       end
     end
 
@@ -35,22 +38,46 @@ module Diva::Combinable
       end
       super
     end
-  end
 
-  class EnumerableCombinator < Combinator
-    def =~(behavior)
-      @b.any?{|b| !enum(behavior).empty? }
+    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|
-          (@a | b).enum(behavior).each(&yielder.method(:<<))
+          (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
@@ -58,9 +85,22 @@ module Diva::Combinable
   # Diva::Conbinable::Combinator
   def |(other)
     if other.is_a? Enumerable
-      EnumerableCombinator.new(self, other)
+      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
-      Combinator.new(self, other)
+      SingleCombinator.new(self, other)
     end
   end
 end

data/lib/diva/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: diva
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Toshiaki Asai
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-04 00:00:00.000000000 Z
+date: 2017-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler