comprise 1.1.0 → 1.1.1

data/README.md

@@ -49,7 +49,7 @@ 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.*
+*Important note: In Ruby 2.0.x Comprise makes use of Lazy enumerators.*
 
 ## Contributing
 

data/lib/comprise/list_comprehension.rb

@@ -1,15 +1,14 @@
 module Comprise
   class ListComprehension
     def initialize(lists)
-      vars = lists.values
-      enum = init_enum(vars.shift)
-
-      @context    = Struct.new(*lists.keys)
-      @enumerator = vars.inject(enum) do |enum, var|
-        if var.respond_to? :call
-          enum.flat_map { |other| @context.new(*other).instance_exec(&var).map { |x| other + [x] } }
+      generators           = lists.values
+      @details_for_inspect = lists.keys.zip(generators.map(&:class))
+      @context_klass       = Struct.new(*lists.keys)
+      @enumerator          = generators.inject(init_enumerator(generators.shift)) do |enumerator, generator|
+        if generator.respond_to? :call
+          enumerator.flat_map { |other| new_context(other).instance_exec(&generator).map { |x| other + [x] } }
         else
-          enum.flat_map { |other| var.map { |x| other + [x] } }
+          enumerator.flat_map { |other| generator.map { |x| other + [x] } }
         end
       end
     end
@@ -19,18 +18,22 @@ module Comprise
     end
 
     def map
-      @enumerator.map { |values| @context.new(*values).instance_exec(&Proc.new) }
+      @enumerator.map { |values| new_context(values).instance_exec(&Proc.new) }
     end
 
     def inspect
-      "#<#{self.class.name}:#{self.object_id}>"
+      "#<#{self.class.name}:#{self.object_id} generators:#{ @details_for_inspect }>"
     end
 
     private
-    def init_enum(var)
-      var = var.respond_to?(:call) ? var.call : var
-      var = var.lazy if var.respond_to? :lazy
-      var.map { |x| [x] }
+    def new_context(values)
+      @context_klass.new(*values)
+    end
+
+    def init_enumerator(generator)
+      enumerator = generator.respond_to?(:call) ? generator.call : generator
+      enumerator = enumerator.lazy if enumerator.respond_to? :lazy
+      enumerator.map { |x| [x] }
     end
   end
 end

data/lib/comprise/version.rb

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

data/spec/comprise/list_comprehension_spec.rb

@@ -43,4 +43,9 @@ describe Comprise::ListComprehension do
       [3,1,4], [3,2,5], [3,3,6]
     ]
   end
+
+  it "exposes a little context via #inspect" do
+    comp = listcomp(x: [], y: 0..0, z: ->{ []})
+    comp.inspect.should == "#<Comprise::ListComprehension:#{comp.object_id} generators:[[:x, Array], [:y, Range], [:z, Proc]]>"
+  end
 end

metadata

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