lab42_core 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8604c795cdfac60ef4c57d18e1fd7df61817540
-  data.tar.gz: 5f238687507445c9b448e66eeeaad3e75a37e7fd
+  metadata.gz: 6c1c6148c550240fac9cbd4b175be6f44986fd3e
+  data.tar.gz: 630f25d0a92570a4c1c23c46f963520ac7e3f5b1
 SHA512:
-  metadata.gz: e95293ca068e18547faf0892b75512fa55382a54d62cfd989066dd9c6276ad4d4043a717701fb5da782018122e801141691bce9afb0b0ebf98435d46e52c972f
-  data.tar.gz: afbe49cb75fc522ad820ab333a468325767bfd505eda6630480d87f0deb41c233e7f256964507ce67ce5e160295c3662857a194cec658b18e51a6980138bfe56
+  metadata.gz: c971f1782da35b2c340b275e0d195b99e7506ed9a85fa240110e847b1a9bcc63f4a081e97514ceb6a3f39e711ffb171447eb4f6d1baa3b94eaf9a411091ecf82
+  data.tar.gz: 242a5a8b5c2f6866b0be0a62698b39a887309a71ce82781bba43e3001c2318ae2ac060408d8162b88d6e38353d8f321ce8a5a26ca01cf57e4acec6044c882908

data/README.md

@@ -68,7 +68,7 @@ If you hesitate to use this all, have a look into Kernel#const_lambda
 
 ```ruby
   f = Array.fm.push :next
-  [[],[1].map( f ) # ---> [[:next], [1, :next]]
+  [[],[1]].map( f ) # ---> [[:next], [1, :next]]
 
   a=[]
   f = a.fn.push :first

data/lib/lab42/core/fn/iterator_reimpl.rb

@@ -1,8 +1,20 @@
 module Lab42
   module Core
     module IteratorReimpl
+
+      
+      def self.decompose_args args, block
+        raise ArgumentError, 'too many arguments' if args.size + ( block ? 1 : 0 ) > 2
+        return [args,block] if block 
+        b, a = args.partition{|x| behavior? x}
+        behave = b.pop
+        a = b if a.empty?
+        raise ArgumentError, "No behavior specified" unless behave
+        return [a,behave]
+      end
+
       def self.included into
-        # TODO: Try to DRY
+        _self = self
         into.module_eval do
           alias_method :__lab42_core_iterator_map__, :map
           def map behavior=nil, &blk
@@ -14,29 +26,21 @@ module Lab42
           end
           alias_method :filter, :select
 
-          alias_method :__lab42_core_iterator_reduce__, :reduce
-          def reduce behavior=nil, &blk
-            if Symbol === behavior
-              __lab42_core_iterator_reduce__ behavior
-            else
-              __lab42_core_iterator_reduce__(&(behavior||blk))
-            end
-          end
-
           alias_method :__lab42_core_iterator_inject__, :inject
-          def inject *args, &blk
-            return reduce(&blk) if args.empty?
-            value, behavior = args
-            if Symbol === behavior
-              __lab42_core_iterator_inject__ value, behavior
-            else
-              __lab42_core_iterator_inject__(value, &(behavior||blk))
-            end
+          define_method :inject  do |*args, &blk|
+            args, behavior = _self.decompose_args args, blk
+            __lab42_core_iterator_inject__( *args, &behavior )
           end
+          alias_method :reduce, :inject
 
           def filter *args, &blk
           end
         end
+
+        private
+        def self.behavior? x
+          Symbol === x || Proc === x || Method === x
+        end
       end
     end
   end # module Core

data/lib/lab42/core/version.rb

@@ -1,5 +1,5 @@
 module Lab42
   module Core
-    VERSION = "0.0.6"
+    VERSION = "0.0.7"
   end # module Core
 end # module Lab42

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lab42_core
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Robert Dober
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-01 00:00:00.000000000 Z
+date: 2014-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -44,22 +44,22 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE
+- README.md
 - lib/lab42/core.rb
+- lib/lab42/core/dir.rb
+- lib/lab42/core/enumerable.rb
+- lib/lab42/core/fn.rb
 - lib/lab42/core/fn/array.rb
 - lib/lab42/core/fn/basic_object.rb
+- lib/lab42/core/fn/enumerable.rb
 - lib/lab42/core/fn/enumerator/lazy.rb
 - lib/lab42/core/fn/iterator_reimpl.rb
-- lib/lab42/core/fn/enumerable.rb
-- lib/lab42/core/dir.rb
-- lib/lab42/core/module.rb
-- lib/lab42/core/version.rb
-- lib/lab42/core/fn.rb
 - lib/lab42/core/hash.rb
-- lib/lab42/core/object.rb
 - lib/lab42/core/kernel.rb
-- lib/lab42/core/enumerable.rb
-- LICENSE
-- README.md
+- lib/lab42/core/module.rb
+- lib/lab42/core/object.rb
+- lib/lab42/core/version.rb
 homepage: https://github.com/RobertDober/lab42_core
 licenses:
 - MIT
@@ -80,7 +80,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.5
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: What I am missing in Ruby