message_router 0.0.1 → 0.0.2

data/Gemfile.lock

@@ -1,34 +1,26 @@
 PATH
   remote: .
   specs:
-    message_router (0.0.1)
+    message_router (0.0.2)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    configuration (1.2.0)
     diff-lcs (1.1.2)
     growl (1.0.3)
-    guard (0.3.0)
-      open_gem (~> 1.4.2)
+    guard (0.5.1)
       thor (~> 0.14.6)
-    guard-rspec (0.1.9)
-      guard (>= 0.2.2)
-    launchy (0.3.7)
-      configuration (>= 0.0.5)
-      rake (>= 0.8.1)
-    open_gem (1.4.2)
-      launchy (~> 0.3.5)
-    rake (0.8.7)
-    rb-fsevent (0.3.9)
-    rspec (2.5.0)
-      rspec-core (~> 2.5.0)
-      rspec-expectations (~> 2.5.0)
-      rspec-mocks (~> 2.5.0)
-    rspec-core (2.5.1)
-    rspec-expectations (2.5.0)
+    guard-rspec (0.4.0)
+      guard (>= 0.4.0)
+    rb-fsevent (0.4.2)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.5.0)
+    rspec-mocks (2.6.0)
     thor (0.14.6)
 
 PLATFORMS

data/Guardfile

@@ -1,7 +1,7 @@
 # A sample Guardfile
 # More info at https://github.com/guard/guard#readme
 
-guard 'rspec', :version => 2, :notification => true do
+guard 'rspec', :version => 2, :cli => '--colour', :notification => true do
   watch(%r{^spec/.+_spec\.rb})
   watch(%r{^lib/(.+)\.rb})                      { |m| "spec/message_router_spec.rb" }
   watch(/^spec\/spec_helper.rb/)                { "spec" }

data/README.rdoc

@@ -44,14 +44,14 @@ This is a contrived example for a Twitter message router, but it gives you an id
 
 And now some irb action.
 
-    >> TwitterRouter.new({:body => 'hi dude'}).dispatch
-    => "pleased to meet you"
-    >> TwitterRouter.new({:body => 'hi brad'}).dispatch
-    => "how do you do brad"
-    >> TwitterRouter.new({:body => 'HI BRAD 90'}).dispatch
-    => "STOP SHOUTING WITH NUMBERS!"
-    >> TwitterRouter.new({:body => 'HI BRAD'}).dispatch
-    => "STOP SHOUTING WITHOUT NUMBERS!"
+    >> TwitterRouter.new(:body => 'hi dude').dispatch
+    => {:body => "pleased to meet you"}
+    >> TwitterRouter.new(:body => 'hi brad').dispatch
+    => {:body => "how do you do brad"}
+    >> TwitterRouter.new(:body => 'HI BRAD 90').dispatch
+    => {:body => "STOP SHOUTING WITH NUMBERS!"}
+    >> TwitterRouter.new(:body => 'HI BRAD').dispatch
+    => {:body => "STOP SHOUTING WITHOUT NUMBERS!"}
 
 == License
 

data/Rakefile

@@ -1,27 +1,18 @@
 require 'bundler/gem_tasks'
-# require 'spec/rake/spectask'
+require 'rspec/core/rake_task'
 
-# Spec::Rake::SpecTask.new(:spec) do |spec|
-#   spec.libs << 'lib' << 'spec'
-#   spec.spec_files = FileList['spec/**/*_spec.rb']
-# end
+desc 'Default: run specs.'
+task :default => :spec
 
-# Spec::Rake::SpecTask.new(:rcov) do |spec|
-#   spec.libs << 'lib' << 'spec'
-#   spec.pattern = 'spec/**/*_spec.rb'
-#   spec.rcov = true
-# end
+desc "Run specs"
+RSpec::Core::RakeTask.new do |t|
+  t.pattern = "./spec/**/*_spec.rb" # don't need this, it's default.
+  # Put spec opts in a file named .rspec in root
+end
 
-# task :spec => :check_dependencies
-
-# task :default => :spec
-
-# require 'rake/rdoctask'
-# Rake::RDocTask.new do |rdoc|
-#   version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-#   rdoc.rdoc_dir = 'rdoc'
-#   rdoc.title = "message_router #{version}"
-#   rdoc.rdoc_files.include('README*')
-#   rdoc.rdoc_files.include('lib/**/*.rb')
-# end
+desc "Generate code coverage"
+RSpec::Core::RakeTask.new(:coverage) do |t|
+  t.pattern = "./spec/**/*_spec.rb" # don't need this, it's default.
+  t.rcov = true
+  t.rcov_opts = ['--exclude', 'spec']
+end

data/lib/message_router.rb

@@ -27,20 +27,20 @@ class MessageRouter
       routes.push proc
     end
 
-    def dispatch(message)
-      new(message).dispatch
+    def dispatch(*args)
+      new(*args).dispatch
     end
   end
 
   attr_accessor :message, :halted_value
 
-  def initialize(message)
-    @message = message
+  def initialize(*args)
+    @message = normalize_arguments(*args)
   end
 
-  def halt(val=nil)
+  def halt(val=nil, opts={})
     @halted = true
-    @halted_value = val
+    @halted_value = normalize_arguments(val, opts)
   end
 
   def halted?
@@ -59,4 +59,15 @@ class MessageRouter
     end
     return nil # If nothing is matched, we get here and we should return a nil
   end
+
+  def default_key
+    :body
+  end
+
+private
+  # Make our router accept the first argument as the default message key, then optional keys last.
+  def normalize_arguments(message=nil, opts={})
+    message = opts.merge(:body => message) unless message.is_a? Hash and opts.empty?
+    message
+  end
 end

data/lib/message_router/matcher.rb

@@ -25,11 +25,11 @@ class MessageRouter
     
     def call(router)
       if match = match(router.message)
-        router.instance_exec(*match[self.class.default_param], &block)
+        router.instance_exec(*match[self.class.default_key], &block)
       end
     end
     
-    def self.default_param
+    def self.default_key
       :body
     end
     
@@ -38,11 +38,11 @@ class MessageRouter
   
     def normalize_params(*args)
       if args.size == 2
-        args.last.merge(self.class.default_param => args.first)
+        args.last.merge(self.class.default_key => args.first)
       elsif args.size == 1 and args.first.is_a?(Hash)
         args.first
       elsif args.size == 1
-        { self.class.default_param => args.first }
+        { self.class.default_key => args.first }
       end
     end
   end

data/lib/message_router/version.rb

@@ -1,3 +1,3 @@
 class MessageRouter
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/message_router_spec.rb

@@ -30,14 +30,14 @@ describe MessageRouter::Matcher do
   end
   
   it "should default matcher param to :body" do
-    MessageRouter::Matcher.default_param.should eql(:body)
+    MessageRouter::Matcher.default_key.should eql(:body)
   end
 end
 
 describe MessageRouter do
   class CrazyTimesRouter < MessageRouter
     match /^crazy$/ do
-      "factory blow out sales are awesome"
+      halt "factory blow out sales are awesome"
     end
   end
 
@@ -45,25 +45,25 @@ describe MessageRouter do
   class TwitterRouter < MessageRouter
     context :all_caps_with_numbers do |funny_word, high_def_resolution|
       match /FUNNYWORD/i do
-        "#{funny_word}-#{high_def_resolution}"
+        halt "#{funny_word}-#{high_def_resolution}"
       end
 
       # All caps without numbers... but in a proc
       context Proc.new{|r| r.message[:body] =~ /^[A-Z\s]+$/ } do
         match /.+/ do
-          "STOP SHOUTING WITHOUT NUMBERS!"
+          halt "STOP SHOUTING WITHOUT NUMBERS!"
         end
       end
 
       match /.+/ do
-        "STOP SHOUTING WITH NUMBERS!"
+        halt "STOP SHOUTING WITH NUMBERS!"
       end
     end
 
     mount CrazyTimesRouter
 
     match /hi dude/ do
-      "pleased to meet you"
+      halt "pleased to meet you"
     end
 
     match /hi halt (\w+)/ do |word|
@@ -75,11 +75,11 @@ describe MessageRouter do
     end
     
     match /hi (\w+)/ do |name|
-      "how do you do #{name}"
+      halt "how do you do #{name}"
     end
     
     match /hola (\w+) (\w+)/, :from => 'bradgessler' do |first_name, last_name|
-      "hello #{first_name} #{last_name} in spanish"
+      halt "hello #{first_name} #{last_name} in spanish"
     end
     
   private
@@ -90,53 +90,66 @@ describe MessageRouter do
     end
   end
 
+  def dispatch(*args)
+    reply = TwitterRouter.dispatch(*args)
+    reply ? reply[:body] : nil
+  end
+
   it "should return nil if there are no matches" do
-    TwitterRouter.dispatch(:body => "bums").should be_nil
+    dispatch("bums").should be_nil
+  end
+
+  it "should have default key" do
+    TwitterRouter.new.default_key.should eql(:body)
   end
 
   context "mounted router" do
     it "should process message" do
-      TwitterRouter.dispatch(:body => "crazy").should eql("factory blow out sales are awesome")
+      dispatch("crazy").should eql("factory blow out sales are awesome")
     end
   end
 
   context "should halt" do
     it "without value" do
-      TwitterRouter.dispatch(:body => "hi halt").should be_nil
+      dispatch("hi halt").should be_nil
     end
 
     it "with value" do
-      TwitterRouter.dispatch(:body => "hi halt narf").should eql("narf")
+      dispatch("hi halt narf").should eql("narf")
     end
   end
   
   context "default matcher" do
     it "should capture regexps" do
-      TwitterRouter.dispatch(:body => 'hi dude').should eql('pleased to meet you')
+      dispatch('hi dude').should eql('pleased to meet you')
     end
     
     it "should pass regexp captures through blocks" do
-      TwitterRouter.dispatch(:body => 'hi brad').should eql("how do you do brad")
+      dispatch('hi brad').should eql("how do you do brad")
     end
   end
   
   context "hash matcher" do
     it "should capture with default matcher" do
-      TwitterRouter.dispatch(:from => 'bradgessler', :body => 'hola jeannette gessler').should eql("hello jeannette gessler in spanish")
+      dispatch('hola jeannette gessler', :from => 'bradgessler').should eql("hello jeannette gessler in spanish")
+    end
+
+    it "should capture with an explicit hash" do
+      dispatch(:body => 'hola jeannette gessler', :from => 'bradgessler').should eql("hello jeannette gessler in spanish")
     end
   end
   
   context "context" do
     it "should handle contexts and non-proc conditions" do
-      TwitterRouter.dispatch(:body => 'HI BRAD 90').should eql("STOP SHOUTING WITH NUMBERS!")
+      dispatch('HI BRAD 90').should eql("STOP SHOUTING WITH NUMBERS!")
     end
     
     it "should handle nested contexts and proc conditions" do
-      TwitterRouter.dispatch(:body => 'HI BRAD').should eql("STOP SHOUTING WITHOUT NUMBERS!")
+      dispatch('HI BRAD').should eql("STOP SHOUTING WITHOUT NUMBERS!")
     end
     
     it "should pass arguments into contexts" do
-      TwitterRouter.dispatch(:body => 'FUNNYWORD').should eql("Zeldzamar-1080")
+      dispatch('FUNNYWORD').should eql("Zeldzamar-1080")
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: message_router
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Brad Gessler
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-29 00:00:00 -07:00
+date: 2011-08-02 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -29,7 +29,6 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- .document
 - .gitignore
 - .rvmrc
 - Gemfile

data/.document

@@ -1,5 +0,0 @@
-README.rdoc
-lib/**/*.rb
-bin/*
-features/**/*.feature
-LICENSE