mvcli 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6824dd7970a2422da62ebac790697827af7493b
-  data.tar.gz: e7e26c779892ddbc361db8e69d78e4c88f3a2c5f
+  metadata.gz: c8df3bbd6ac8b26f4a48b1ed2d9c67a8ef4a8616
+  data.tar.gz: caff046276e71a1e374b6f58941e5f6a25422c78
 SHA512:
-  metadata.gz: 74431de1c5cb00bc2f51d87a10fe407696b8449a1071a28f16039f8ece375ec05ab360eee2a49e819b9b40f1c26fb7af0ebfc9a9a54c7af025c5a436bc45d705
-  data.tar.gz: 82af2de453863e0f74871bb61a83db8305e5a0bb638c805e2443c42dbca506399a53e2ec9bb80f428af8dc9b0e85358f3b1c14e16f851c23f3e04239b514021e
+  metadata.gz: 72f2bfbd5958be1c910e1fe92d3259a43112e64f83563b837e76b6df153ee27f665406e8b98d336c3e737e8860dd08275d87717dd3112488774b3e04bd54289a
+  data.tar.gz: 70fd38e776ff6c3e8c3ad4b6b49efb2f96143366eadadd4416577a45ceb51d07c0cc009f4ba82141eb822b1966fc27c7d747d246080ef5ad7bd80b7bb34de4e0

data/lib/mvcli/router.rb

@@ -10,6 +10,11 @@ module MVCLI
     def initialize(actions = nil)
       @actions = actions || Map.new
       @routes = []
+      @macros = []
+    end
+
+    def macro(options)
+      @macros.push Macro.new options
     end
 
     def match(options)
@@ -19,22 +24,35 @@ module MVCLI
     end
 
     def call(command)
+      argv = @macros.reduce(command.argv) do |args, macro|
+        macro.expand args
+      end
       @routes.each do |route|
-        if match = route.match(command)
+        if match = route.match(argv)
           return match.call command
         end
       end
       fail RoutingError, "no route matches '#{command.argv.join ' '}'"
     end
 
+    class Macro
+      def initialize(options)
+        @pattern, @expansion = options.first
+      end
+
+      def expand(argv)
+        argv.join(" ").gsub(@pattern, @expansion).split /\s+/
+      end
+    end
+
     class Route
       def initialize(pattern, actions, action, options = {})
         @pattern = Pattern.new pattern.to_s
         @actions, @action, @options = actions, action, options
       end
 
-      def match(command)
-        argv = MVCLI::Argv.new command.argv
+      def match(argv)
+        argv = MVCLI::Argv.new argv
         match = @pattern.match(argv.arguments)
         if match.matches?
           proc do |command|

data/lib/mvcli/version.rb

@@ -1,3 +1,3 @@
 module MVCLI
-  VERSION = "0.0.12"
+  VERSION = "0.0.13"
 end

data/spec/mvcli/router_spec.rb

@@ -45,6 +45,13 @@ describe "MVCLI::Router" do
     And {@bindings[:id].should eql '6'}
   end
 
+  context "with macros" do
+    Given { router.macro /(-h|--help) (.*)/ => "help \\2" }
+    Given { router.match "help me" => "help#me"}
+    When { invoke "--help me" }
+    Then { @action.should eql 'help#me' }
+  end
+
   def invoke(route = '')
     router.call mock(:Command, :argv => route.split(/\s+/))
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mvcli
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Charles Lowell