comprise 1.0.1 → 1.1.0

data/README.md

@@ -41,6 +41,14 @@ listcomp(y: -> { (1..5).map { |i| i * 2 } }, x: 1..2) { x * y }.to_a
 => [2, 4, 4, 8, 6, 12, 8, 16, 10, 20]
 ```
 
+Comprehensions can also be self referential; provided that your using a lambda or a Proc & your
+referencing lists that have already been evaluated.
+
+```ruby
+listcomp(x: 1..3, y: -> { 1..x }, z: -> { [x + y] }).to_a
+# => [[1, 1, 2], [2, 1, 3], [2, 2, 4], [3, 1, 4], [3, 2, 5], [3, 3, 6]]
+```
+
 *Important note: In Ruby 2.0.x Comprise makes use of Lazy emuerators.*
 
 ## Contributing

data/lib/comprise/list_comprehension.rb

@@ -7,7 +7,7 @@ module Comprise
       @context    = Struct.new(*lists.keys)
       @enumerator = vars.inject(enum) do |enum, var|
         if var.respond_to? :call
-          enum.flat_map { |other| var.call.map { |x| other + [x] } }
+          enum.flat_map { |other| @context.new(*other).instance_exec(&var).map { |x| other + [x] } }
         else
           enum.flat_map { |other| var.map { |x| other + [x] } }
         end
@@ -19,7 +19,7 @@ module Comprise
     end
 
     def map
-      @enumerator.map { |values| @context.new(*values).instance_eval(&Proc.new) }
+      @enumerator.map { |values| @context.new(*values).instance_exec(&Proc.new) }
     end
 
     def inspect

data/lib/comprise/version.rb

@@ -1,3 +1,3 @@
 module Comprise
-  VERSION = "1.0.1"
+  VERSION = "1.1.0"
 end

data/spec/comprise/list_comprehension_spec.rb

@@ -35,4 +35,12 @@ describe Comprise::ListComprehension do
       end.to_a
     }.not_to raise_error
   end
+
+  it "allow lists to reference earlier lists, requires lambda or Proc (i.e. deferred execution)" do
+    listcomp(x: 1..3, y: -> { 1..x }, z: -> { [x + y] }).to_a.should == [
+      [1,1,2],
+      [2,1,3], [2,2,4],
+      [3,1,4], [3,2,5], [3,3,6]
+    ]
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comprise
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors: