enumerable_lz 0.1.0 → 0.1.1

data/ChangeLog

@@ -2,3 +2,7 @@
 
 * 1st release
 
+== 0.1.1 / 2011-02-23
+
+* Improve performance (except for MacRuby)
+

data/README.md

@@ -60,10 +60,6 @@ These expanded methods are inplemented with fundamental filter and transformatio
 
     gem install enumerable_lz
 
-or
-
-    gem install antimon2-enumerable_lz
-
 
 ## License
 

data/lib/enumerable_lz/filter.rb

@@ -16,11 +16,16 @@ module Enumerable
       @init_block = init_block unless init_block.nil?
       super() do |y|
         @init_block.call unless @init_block.nil?
-        catch :do_break do
-          @org_enum.each do |*el|
-            y.yield *el if matches_filter? *el
+        the_enum = (@filter||[]).inject(@org_enum) do |r,f|
+          Enumerator.new do |iy|
+            r.each do |el|
+              iy.yield el if f.call(el)
+            end
           end
         end
+        catch :do_break do
+          the_enum.each {|el| y.yield el}
+        end
       end
       filter! the_filter if the_filter
     end
@@ -28,9 +33,9 @@ module Enumerable
     def filter! pattern=nil, &block
       @filter||=[]
       if pattern.is_a? Array
-        @filter.push(*pattern)
+        pattern.each{|el| @filter << conv_proc(el)}
       else
-        @filter<<(pattern || block)
+        @filter << conv_proc(pattern || block)
       end
       self
     end
@@ -49,18 +54,14 @@ module Enumerable
     end
 
     private
-    def matches_filter? obj, *others
-      return true if @filter.nil?
-      args = [obj, *others]
-      @filter.all? do |filter|
-        case filter
-        when nil
-          true
-        when Proc
-          filter[*args]
-        else
-          filter===obj
-        end
+    def conv_proc pattern
+      case pattern
+      when nil
+        Proc.new{true}
+      when Proc
+        pattern
+      else
+        pattern.respond_to?(:to_proc) ? pattern.to_proc : Proc.new{|el|pattern===el}
       end
     end
   end

data/lib/enumerable_lz/filter_18.rb

@@ -9,7 +9,6 @@ module Enumerable
   end
 
   class Filter < Enumerator
-    require 'generator'
     def initialize obj, *args
       the_filter = args.shift
       init_block, the_filter = [the_filter, args.shift] unless args.empty?
@@ -20,11 +19,12 @@ module Enumerable
 
     def each &block
       return self unless block_given?
+      @init_block.call unless @init_block.nil?
+      the_enum = (@filter||[]).inject(@org_enum) do |r,f|
+        CompliedFilter.new r, f
+      end
       catch :do_break do
-        @init_block.call unless @init_block.nil?
-        @org_enum.each do |*el|
-          block.call(*el) if matches_filter? *el
-        end
+        the_enum.each{|el| block.call(el)}
       end
       self
     end
@@ -32,9 +32,9 @@ module Enumerable
     def filter! pattern=nil, &block
       @filter||=[]
       if pattern.is_a? Array
-        @filter.push(*pattern)
+        pattern.each{|el| @filter << conv_proc(el)}
       else
-        @filter<<(pattern || block)
+        @filter << conv_proc(pattern || block)
       end
       self
     end
@@ -53,17 +53,26 @@ module Enumerable
     end
 
     private
-    def matches_filter? obj, *others
-      return true if @filter.nil?
-      args = [obj, *others]
-      @filter.all? do |filter|
-        case filter
-        when nil
-          true
-        when Proc
-          filter[*args]
-        else
-          filter===obj
+    def conv_proc pattern
+      case pattern
+      when nil
+        Proc.new{true}
+      when Proc
+        pattern
+      else
+        pattern.respond_to?(:to_proc) ? pattern.to_proc : Proc.new{|el|pattern===el}
+      end
+    end
+
+    class CompliedFilter
+      def initialize org_enum, filter
+        @org_enum = org_enum
+        @filter = filter
+      end
+
+      def each &block
+        @org_enum.each do |el|
+          block.call(el) if @filter.call(el)
         end
       end
     end

data/lib/enumerable_lz.rb

@@ -13,6 +13,6 @@ end
 
 module Enumerable
   module EnumerableLz
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - antimon2
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-23 00:00:00 +09:00
+date: 2011-02-23 00:00:00 +09:00
 default_executable: 
 dependencies: []