pure 0.2.0 → 0.2.1

data/CHANGES.rdoc

@@ -1,6 +1,10 @@
 
 = Pure ChangeLog
 
+== Version 0.2.1
+
+* add fun_spec
+
 == Version 0.2.0
 
 * more docs

data/MANIFEST

@@ -41,6 +41,7 @@ spec/pure_combine_spec.rb
 spec/pure_def_spec.rb
 spec/pure_define_method_spec.rb
 spec/pure_eval_spec.rb
+spec/pure_fun_map_spec.rb
 spec/pure_fun_spec.rb
 spec/pure_nested_spec.rb
 spec/pure_parser_spec.rb

data/README.rdoc

@@ -218,7 +218,7 @@ Or more realistically,
 
   require 'pure/dsl'
   
-  stats = pure do
+  file_stats = pure do
     files = Dir["*"]
   
     files.each { |file|
@@ -227,12 +227,12 @@ Or more realistically,
       end
     }
   
-    fun :total_size => files do |*values|
-      values.inject(0) { |acc, stat| acc + stat.size }
+    fun :total_size => files do |*stats|
+      stats.inject(0) { |acc, stat| acc + stat.size }
     end
   end
 
-  stats.compute { |result|
+  file_stats.compute { |result|
     puts result["Rakefile"].size  # => 505
     puts result.total_size        # => 39355
   }
@@ -265,6 +265,38 @@ function definition.
 The above is strictly not necessary when the default worker (explained
 later) is used, however the best strategy is to ignore this detail.
 
+== Mapping an Enumerable in Parallel
+
+The convenience method +fun_map+ defines an anonymous pure function
+which is applied to each element of a given enumerable.
+
+  require 'pure/dsl'
+
+  numbers = pure do
+    fun_map :squares => [3, 4, 5] do |n|
+      n*n
+    end
+  end
+
+  p numbers.compute.squares  # => [9, 16, 25]
+
+The example from the "Dynamic Names" section is more easily written
+with +fun_map+,
+
+  require 'pure/dsl'
+  
+  file_stats = pure do
+    fun_map :stats => Dir["*"] do |file|
+      File.stat(file)
+    end
+  
+    def total_size(stats)
+      stats.inject(0) { |acc, stat| acc + stat.size }
+    end
+  end
+
+  puts file_stats.compute(3).total_size  # => 39355
+
 == Restrictions
 
 Since the grand scheme of Pure rests upon all functions and function
@@ -289,7 +321,7 @@ of course).
 A pure function cannot have default arguments.
 
 A pure function should not reference variables declared outside the
-function definition (see example in previous section).
+function definition.
 
 == Background
 

data/lib/pure/driver.rb

@@ -9,6 +9,9 @@ module Pure
           driver.define(name.to_sym) { value }
         }
         mod.each_function { |name, spec|
+          if elems = spec[:elems]
+            build_fun_map(driver, name, elems)
+          end
           node = driver.nodes[name]
           unless node and node.function
             function = @worker.define_function(spec)
@@ -29,5 +32,11 @@ module Pure
     def each_function_name(&block)
       @driver.nodes.each_key(&block)
     end
+
+    def build_fun_map(driver, name, elems)
+      elems.each_with_index { |(elem_name, elem), i|
+        driver.define(elem_name) { elem }
+      }
+    end
   end
 end

data/lib/pure/extractor.rb

@@ -37,8 +37,7 @@ module Pure
           # Use the __fun flag to verify the parser's discovery of a
           # `fun' call.
           #
-          extract(mod, :__fun, backtrace).
-          merge(:name => name, :args => args)
+          extract(mod, :__fun, backtrace).merge(:name => name, :args => args)
         end
       ).merge(
         :origin => origin,

data/lib/pure/parser/impl/ripper.rb

@@ -55,18 +55,20 @@ module Pure
           end
         end
 
+        FUN_RE = %r!\Afun(_map)?\Z!
+
         def process_fun(sexp)
           if sexp[0] == :method_add_block and sexp[1].is_a?(Array)
             line = (
               if sexp[1][0] == :command and
                   sexp[1][1].is_a?(Array) and
-                  sexp[1][1][1] == "fun"
+                  sexp[1][1][1] =~ FUN_RE
                 sexp[1][1][2][0]
               elsif sexp[1][0] == :method_add_arg and
                   sexp[1][1].is_a?(Array) and
                   sexp[1][1][0] == :fcall and
                   sexp[1][1][1].is_a?(Array) and
-                  sexp[1][1][1][1] == "fun"
+                  sexp[1][1][1][1] =~ FUN_RE
                 sexp[1][1][1][2][0]
               else
                 nil

data/lib/pure/parser/impl/ruby_parser.rb

@@ -63,7 +63,7 @@ module Pure
           elsif sexp[0] == :iter and
               sexp[1][0] == :call and
               sexp[1][1] == nil and
-              sexp[1][2] == :fun
+              (sexp[1][2] == :fun || sexp[1][2] == :fun_map)
             @defs[sexp[1].line] = {
               :name => :__fun,
               :code => dup_sexp(sexp)

data/lib/pure/pure_module.rb

@@ -67,22 +67,8 @@ module Pure
     #
     # See README.rdoc for examples.
     #
-    def fun(*args, &block)
-      function_str, arg_data = (
-        if args.size == 1
-          arg = args.first
-          if arg.is_a? Hash
-            unless arg.size == 1
-              raise ArgumentError, "`fun' given hash of size != 1"
-            end
-            arg.to_a.first
-          else
-            [arg, []]
-          end
-        else
-          raise ArgumentError, "wrong number of arguments (#{args.size} for 1)"
-        end
-      )
+    def fun(arg, &block)
+      function_str, arg_data = parse_fun_arg(arg)
       arg_names = (
         if arg_data.is_a? Enumerable
           arg_data.map { |t| t.to_sym }
@@ -98,6 +84,47 @@ module Pure
       nil
     end
 
+    #
+    # call-seq: fun_map name => enumerable do |elem|
+    #             ...
+    #           end
+    #
+    # Define an anonymous pure function which is applied to each
+    # element of the given enumerable.  The pure function _name_
+    # returns the result array.
+    #
+    # See README.rdoc for examples.
+    #
+    def fun_map(arg, &block)
+      function_name, elems = parse_fun_arg(arg)
+
+      function_name = function_name.to_sym
+      elems = elems.to_a
+
+      input_elem_names, output_elem_names = [:input, :output].map { |which|
+        (0...elems.size).map { |index|
+          "__elem_#{which}_#{index}_#{function_name}".to_sym
+        }
+      }
+
+      entry = ExtractedFunctions[parser][self]
+      code = Extractor.record_function(self, :fun, :__tmp, [], caller)[:code]
+      entry.delete(:__tmp)
+      
+      fun function_name => output_elem_names do |*result|
+        result
+      end
+      entry[function_name][:elems] = input_elem_names.zip(elems)
+
+      output_elem_names.zip(input_elem_names) { |output, input|
+        fun output => input do |*args|
+          block.call(*args)
+        end
+        entry[output][:code] = code
+      }
+      nil
+    end
+
     def method_added(function_name)  #:nodoc:
       super
       if @parsing_active
@@ -134,6 +161,17 @@ module Pure
       }
     end
 
+    def parse_fun_arg(arg)  #:nodoc:
+      if arg.is_a? Hash
+        unless arg.size == 1
+          raise ArgumentError, "`fun' given hash of size != 1"
+        end
+        arg.to_a.first
+      else
+        [arg, []]
+      end
+    end
+
     # want 'fun' both documented and private; rdoc --all is bad
     rdoc_fun = :fun
     private rdoc_fun

data/lib/pure/version.rb

@@ -1,4 +1,4 @@
 
 module Pure
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/spec/fstat_example.rb

@@ -1,26 +1,49 @@
 require File.dirname(__FILE__) + '/pure_spec_base'
 
 describe "fstat example" do
-  it "should succeed" do
+  it "should succeed with manual style" do
     files = Dir["*"]
       
-    stats = pure do
+    file_stats = pure do
       files.each { |file|
         fun file do
           File.stat(fun_name.to_s)
         end
       }
       
-      fun :total_size => files do |*values|
-        values.inject(0) { |acc, stat| acc + stat.size }
+      fun :total_size => files do |*stats|
+        stats.inject(0) { |acc, stat| acc + stat.size }
       end
     end
     
-    stats.compute { |result|
+    file_stats.compute(3) { |result|
       result["Rakefile"].size.should eql(File.stat("Rakefile").size)
       total = files.inject(0) { |acc, file| acc + File.stat(file).size }
       result.total_size.should == total
     }
   end
-end
 
+  it "should succeed with fun_map" do
+    file_stats = pure do
+      fun_map :stats_array => Dir["*"] do |file|
+        [file, File.stat(file)]
+      end
+
+      fun :stats => :stats_array do |array|
+        array.inject(Hash.new) { |acc, (name, value)|
+          acc.merge!(name => value)
+        }
+      end
+
+      def total_size(stats)
+        stats.values.inject(0) { |acc, stat| acc + stat.size }
+      end
+    end
+
+    file_stats.compute(3) { |result|
+      result.stats["Rakefile"].size.should eql(File.stat("Rakefile").size)
+      total = Dir["*"].inject(0) { |acc, file| acc + File.stat(file).size }
+      result.total_size.should == total
+    }
+  end
+end

data/spec/pure_fun_map_spec.rb

@@ -0,0 +1,75 @@
+require File.dirname(__FILE__) + '/pure_spec_base'
+
+require 'thread'
+require 'benchmark'
+
+describe "pure" do
+  describe "fun_map" do
+    it "should map the given array" do
+      pure do
+        fun_map :squares => 3..5 do |n|
+          n**2
+        end
+      end.compute(3).squares.should == [9, 16, 25]
+    end
+
+    it "should map in parallel" do
+      mod = pure do
+        fun_map :sleeper => (1..3).to_a do |n|
+          sleep(0.2)
+        end
+      end
+      epsilon = 0.05 + (RUBY_PLATFORM == "java" ? 99 : 0)
+      mod.compute(1) { |result|
+        Benchmark.measure { result.sleeper }.real.should be_close(0.6, epsilon)
+      }
+      mod.compute(2) { |result|
+        Benchmark.measure { result.sleeper }.real.should be_close(0.4, epsilon)
+      }
+      mod.compute(3) { |result|
+        Benchmark.measure { result.sleeper }.real.should be_close(0.2, epsilon)
+      }
+      mod.compute(4) { |result|
+        Benchmark.measure { result.sleeper }.real.should be_close(0.2, epsilon)
+      }
+      mod.compute(5) { |result|
+        Benchmark.measure { result.sleeper }.real.should be_close(0.2, epsilon)
+      }
+    end
+
+    it "should accept empty array" do
+      pure do
+        fun_map :squares => [] do |n|
+          n**2
+        end
+      end.compute(3).squares.should == []
+    end
+
+    it "should accept empty enum" do
+      pure do
+        fun_map :squares => 9...9 do |n|
+          n**2
+        end
+      end.compute(3).squares.should == []
+    end
+
+    it "should raise error when given hash of size != 1" do
+      lambda {
+        pure do
+          fun_map :x => 1, :y => 2 do
+          end
+        end
+      }.should raise_error(ArgumentError)
+    end
+
+    it "should raise error given more than 1 argument" do
+      lambda {
+        pure do
+          fun_map :x, :y do
+          end
+        end
+      }.should raise_error(ArgumentError)
+    end
+  end
+end
+

data/spec/pure_spec_base.rb

@@ -38,8 +38,8 @@ module CompilerWorker
     names = name.split("::")
     worker = Class.new Base do
       require path
-      @compiler = names.inject(Object) { |mod, name|
-        mod.const_get(name)
+      @compiler = names.inject(Object) { |mod, name0|
+        mod.const_get(name0)
       }
     end
     const_set(names.last, worker)

data/spec/readme_spec.rb

@@ -15,10 +15,15 @@ simple_sections = [
 
 Jumpstart.doc_to_spec(readme, *simple_sections)
 
-Jumpstart.doc_to_spec(readme, "Dynamic Names") { |expected, actual, index|
-  [expected, actual].each { |expr|
-    expr.should match(%r!\A[\d\s]+\Z!)
-  }
+sections = ["Dynamic Names", "Mapping an Enumerable in Parallel"]
+Jumpstart.doc_to_spec(readme, *sections) { |expected, actual, index|
+  if index == 1
+    [expected, actual].each { |expr|
+      expr.should match(%r!\A[\d\s]+\Z!)
+    }
+  else
+    expected.should == actual
+  end
 }
 
 Jumpstart.doc_to_spec(readme, "Worker Plugins") { |expected, actual, index|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pure
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - James M. Lawrence
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-22 00:00:00 -04:00
+date: 2009-10-30 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -63,6 +63,7 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - CHANGES.rdoc
+- MANIFEST
 - README.rdoc
 - Rakefile
 - devel/jumpstart.rb
@@ -104,6 +105,7 @@ files:
 - spec/pure_def_spec.rb
 - spec/pure_define_method_spec.rb
 - spec/pure_eval_spec.rb
+- spec/pure_fun_map_spec.rb
 - spec/pure_fun_spec.rb
 - spec/pure_nested_spec.rb
 - spec/pure_parser_spec.rb
@@ -115,7 +117,6 @@ files:
 - spec/readme_spec.rb
 - spec/splat_spec.rb
 - spec/worker_spec.rb
-- MANIFEST
 has_rdoc: true
 homepage: http://purefunctional.rubyforge.org
 licenses: []
@@ -129,6 +130,8 @@ rdoc_options:
 - --exclude
 - CHANGES.rdoc
 - --exclude
+- MANIFEST
+- --exclude
 - README.rdoc
 - --exclude
 - Rakefile
@@ -203,6 +206,8 @@ rdoc_options:
 - --exclude
 - spec/pure_eval_spec.rb
 - --exclude
+- spec/pure_fun_map_spec.rb
+- --exclude
 - spec/pure_fun_spec.rb
 - --exclude
 - spec/pure_nested_spec.rb
@@ -224,8 +229,6 @@ rdoc_options:
 - spec/splat_spec.rb
 - --exclude
 - spec/worker_spec.rb
-- --exclude
-- MANIFEST
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement