mandy 0.3.6 → 0.3.7

data/lib/job.rb

@@ -17,8 +17,6 @@ module Mandy
       @name = name
       @settings = {}
       @modules = []
-      @mapper_class = Mandy::Mappers::PassThroughMapper
-      @reducer_class = Mandy::Reducers::PassThroughReducer
       set('mapred.job.name', name)
       instance_eval(&blk) if blk
     end
@@ -57,35 +55,67 @@ module Mandy
       end
     end
     
+    def setup(&blk)
+      @setup = blk
+    end
+    
+    def teardown(&blk)
+      @teardown = blk
+    end
+    
     def map(klass=nil, &blk)
-      @mapper_class = klass || Mandy::Mappers::Base.compile(&blk)
-      @modules.each {|m| @mapper_class.send(:include, m) }
-      @mapper_class
+      @map = klass || blk
     end
     
     def reduce(klass=nil, &blk)
-      @reducer_class = klass || Mandy::Reducers::Base.compile(&blk)
-      @modules.each {|m| @reducer_class.send(:include, m) }
-      @reducer_class
+      @reduce = klass || blk
     end
     
     def run_map(input=STDIN, output=STDOUT, &blk)
-      @mapper_class.send(:include, Mandy::IO::OutputFormatting) unless reducer_defined?
-      mapper = @mapper_class.new(input, output, @input_format, @output_format)
+      mapper_class.send(:include, Mandy::IO::OutputFormatting) unless reducer_defined?
+      mapper = mapper_class.new(input, output, @input_format, @output_format)
       yield(mapper) if blk
       mapper.execute
     end
     
     def run_reduce(input=STDIN, output=STDOUT, &blk)
-      reducer = @reducer_class.new(input, output, @input_format, @output_format)
+      reducer = reducer_class.new(input, output, @input_format, @output_format)
       yield(reducer) if blk
       reducer.execute
     end
     
     private
+
+    def mapper_class
+      return Mandy::Mappers::PassThroughMapper unless @map
+      @mapper_class ||= compile_map
+    end
     
+    def reducer_class
+      return Mandy::Reducers::PassThroughReducer unless @reduce
+      @reducer_class ||= compile_reduce
+    end
+    
+    def compile_map
+      args = {}
+      args[:setup] = @setup if @setup
+      args[:teardown] = @teardown if @teardown
+      @mapper_class = @map.is_a?(Proc) ? Mandy::Mappers::Base.compile(args, &@map) : @map
+      @modules.each {|m| @mapper_class.send(:include, m) }
+      @mapper_class
+    end
+    
+    def compile_reduce
+      args = {}
+      args[:setup] = @setup if @setup
+      args[:teardown] = @teardown if @teardown
+      @reducer_class = @reduce.is_a?(Proc) ? Mandy::Reducers::Base.compile(args, &@reduce) : @reduce
+      @modules.each {|m| @reducer_class.send(:include, m) }
+      @reducer_class
+    end
+            
     def reducer_defined?
-      @reducer_class != Mandy::Reducers::PassThroughReducer
+      reducer_class != Mandy::Reducers::PassThroughReducer
     end
     
   end

data/lib/mappers/base_mapper.rb

@@ -3,15 +3,18 @@ module Mandy
     class Base < Mandy::Task
       include Mandy::IO::InputFormatting
 
-      def self.compile(&blk)
+      def self.compile(opts={}, &blk)
         Class.new(Mandy::Mappers::Base) do 
           self.class_eval do
             define_method(:mapper, blk) if blk
+            define_method(:setup, opts[:setup]) if opts[:setup]
+            define_method(:teardown, opts[:teardown]) if opts[:teardown]
           end
         end
       end
       
       def execute
+        setup if self.respond_to?(:setup)
         @input.each_line do |line|
            key, value = line.split(KEY_VALUE_SEPERATOR, 2)
            key, value = nil, key if value.nil?
@@ -19,6 +22,7 @@ module Mandy
            args = [input_deserialize_key(key), input_deserialize_value(value)].compact
            mapper(*args)
         end
+        teardown if self.respond_to?(:teardown)
       end
 
       private

data/lib/reducers/base_reducer.rb

@@ -3,15 +3,18 @@ module Mandy
     class Base < Mandy::Task
       include Mandy::IO::OutputFormatting
 
-      def self.compile(&blk)
+      def self.compile(opts={}, &blk)
         Class.new(Mandy::Reducers::Base) do 
           self.class_eval do
             define_method(:reducer, blk) if blk
+            define_method(:setup, opts[:setup]) if opts[:setup]
+            define_method(:teardown, opts[:teardown]) if opts[:teardown]
           end
         end
       end
     
       def execute
+        setup if self.respond_to?(:setup)
         last_key, values = nil, []
         @input.each_line do |line|
            key, value = line.split(KEY_VALUE_SEPERATOR)
@@ -24,6 +27,7 @@ module Mandy
            values << value
         end
         reducer(deserialize_key(last_key), values.map {|v| deserialize_value(v) })
+        teardown if self.respond_to?(:teardown)
       end
     
       private

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mandy
 version: !ruby/object:Gem::Version 
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors: 
 - Andy Kent