metaphor 0.2.1 → 1.0.0

data/README.markdown

@@ -25,46 +25,42 @@ Programming with Metaphor
     metaphor.processors << Metaphor::Processor::PrintMessage.new
 
     # Process one message
-    metaphor.call(headers, body) # => [ new_headers, new_body ]
-                                 # => false (if halted by processor)
+    metaphor.call("Hello, Metaphor!") # => "Hello, Metaphor!"
+                                      # => false (if halted by processor)
 
     # Process messages from this class until the Ruby VM is killed or the
     # input returns nil
     metaphor.call(StdinInput.new)
 
 
-Classes used for input must respond to #get and return an array of headers
-and the message body:
+Classes used for input must respond to #gets and return a String (or at
+least something that quacks like a String):
 
     class StdinInput
-      def get
-        # return an array like this:
-        [
-          { "header" => "value", ... }, # Message headers
-          "body"                        # Message body
-        ]
+      def gets
+        line = STDIN.gets
+        line == "" ? nil : line
       end
     end
 
 Classes used as processors must respond to #call(headers, body):
 
     class PrintMessage
-      def call(headers, body)
-        puts "Headers: #{headers.inspect}"
-        puts "Body   : #{body.inspect}"
+      def call(message)
+        puts "Message : #{message.inspect}"
       end
     end
 
 The return value of #call controls what happens to the message. If the
 processor returns:
 
-  * An array of headers and the message body
-    - they are passed to the next processor
-  * Boolean false (or something that is === to it)
+  * false
     - Metaphor stops processing this message and discards it
-  * Any other value that is not false
-    - Metaphor passes the same headers and message that were passed into
-      this processor to the next processor in the chain
+  * nil
+    - Metaphor passes the same object that were passed into the processor to the
+      next processor in the chain
+  * Anything else
+    - Metaphor passes this to the next processor
 
 Contributing
 ------------
@@ -89,4 +85,4 @@ Authors
 License
 -------
 
-Released under the MIT licence. See the LICENSE file for details.
+Released under the MIT licence. See the LICENSE file for details.

data/lib/metaphor.rb

@@ -1,33 +1,32 @@
 class Metaphor
-  VERSION = '0.2.1'
+  VERSION = '1.0.0'
   attr_accessor :processors
 
   def initialize
     self.processors = []
   end
 
-  def call(*args)
-    case args.size
-    when 1
-      while message = args.first.get
-        process_message(*message)
+  def call(input)
+    if input.respond_to?(:gets)
+      while message = input.gets
+        process_message message
       end
-    when 2
-      process_message(*args)
+    else
+      process_message input
     end
   end
 
   private
-  def process_message(headers, body)
+  def process_message message
     processors.each do |processor|
-      processor_output = processor.call(headers, body)
+      processor_output = processor.call(message)
       case
       when processor_output === false
         return false
-      when processor_output.respond_to?(:size) && processor_output.size == 2
-        headers, body = processor_output
+      when processor_output != nil
+        message = processor_output
       end
     end
-    [ headers, body ]
+    message
   end
-end
+end

data/lib/metaphor/processor/detour.rb

@@ -21,8 +21,8 @@ class Metaphor
         @active
       end
 
-      def call(headers, body)
-        active_processor.call headers, body
+      def call message
+        active_processor.call message
       end
 
       private

data/lib/metaphor/processor/json_processor.rb

@@ -8,8 +8,10 @@ class Metaphor
       def call(headers, body)
         result = JSON[body]
         headers['content-type'] = case result
-        when Hash:   'application/x-ruby'
-        when String: 'application/json'
+        when Hash
+          'application/x-ruby'
+        when String
+          'application/json'
         end
         [ headers, result ]
       end

data/lib/metaphor/processor/print_message.rb

@@ -5,14 +5,9 @@ class Metaphor
         @target = target
       end
 
-      def call(headers, body)
-        headers.each_pair do |header, value|
-          @target.puts "#{header}:#{value}"
-        end
-        @target.puts
-        @target.puts body
-        @target.puts
+      def call message
+        @target.puts message
       end
     end
   end
-end
+end

data/lib/metaphor/processor/wiretap.rb

@@ -19,9 +19,9 @@ class Metaphor
         @active = false
       end
 
-      def call(headers, body)
-        @wiretap.call(headers, body) if active?
-        @default.call(headers, body)
+      def call message
+        @wiretap.call(message) if active?
+        @default.call(message)
       end
     end
   end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: metaphor
 version: !ruby/object:Gem::Version 
-  hash: 21
   prerelease: false
   segments: 
-  - 0
-  - 2
   - 1
-  version: 0.2.1
+  - 0
+  - 0
+  version: 1.0.0
 platform: ruby
 authors: 
 - Sean O'Halpin
@@ -16,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-20 00:00:00 +01:00
+date: 2010-10-07 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -48,20 +47,16 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 23
       segments: 
       - 1
       - 3
@@ -70,7 +65,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: metaphor
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Generic pipeline processing