mvcli 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 843f2e9a35f848c28d8fdf547f31234e1ee1ebd9
-  data.tar.gz: 0505a91108a5c2ea656d6c0b2d06307a812fa04b
+  metadata.gz: 79165f026197eb88758309a18703c91449f6849b
+  data.tar.gz: b2b3e3ee52b717fb962e3675e97cf16595fdc101
 SHA512:
-  metadata.gz: fdbb170f92c985159aff0be98f9111e5bc38fb13bf71ce66a0cd23bc1e4b83bda7839d41fa51fe0545875469264c1c755343fcc659fd283a7e6ad4bacf16130c
-  data.tar.gz: bb7efd8d702ac6d6d1b798c2659b5c7f09fb915bd11c4a320a84a285ca6b309204b3215171ab4714c6515efcdca92ce33683b1060cf2107d369ed95f33ebdd6b
+  metadata.gz: 3f48d494fbada3facb993260ceffeff544a16d0853ae3cdb73ffffd6af815f43ce5199058d525592885e553db16c60353ae1ba78845abdf1c2a5b4037a6067a7
+  data.tar.gz: 6c374042c711e0802bcfa3e287835a25b0471e4f56a2ac61d722f66aeb8cc58302369e9b5b2650921d727a075d6c9fdd8a715dc13cae5494cb3ccc55bef98030

data/lib/mvcli/actions.rb

@@ -1,10 +1,11 @@
+require "map"
 require_relative "loader"
 require_relative "renderer"
 
 module MVCLI
   class Actions
-    def initialize(root, loader = nil, renderer = nil)
-      @loader = loader || Loader.new(root)
+    def initialize(root, loader = Loader.new, renderer = nil)
+      @loader = loader
       @renderer = renderer || Renderer.new(root)
     end
 
@@ -21,8 +22,8 @@ module MVCLI
         @method = method
       end
 
-      def call(command)
-        controller = @loader.load :controller, @controller
+      def call(command, bindings = Map.new)
+        controller = @loader.load :controller, @controller, bindings
         context = controller.send @method
         path = [@controller, @method].join('/')
         @renderer.render command.output, path, context

data/lib/mvcli/app.rb

@@ -1,3 +1,4 @@
+require "mvcli"
 require_relative "middleware"
 require_relative "command"
 require_relative "actions"
@@ -10,6 +11,7 @@ module MVCLI
       @router = Router.new Actions.new root
       @router.instance_eval route_file.read, route_file.to_s, 1
       ActiveSupport::Dependencies.autoload_paths << root.join('app/providers')
+      ActiveSupport::Dependencies.autoload_paths << root.join('app/controllers')
       @middleware = Middleware.new
       @middleware << Provisioning::Middleware.new
       @middleware << @router

data/lib/mvcli/controller.rb

@@ -0,0 +1,7 @@
+class MVCLI::Controller
+  attr_reader :params
+
+  def initialize(params = {})
+    @params = params
+  end
+end

data/lib/mvcli/loader.rb

@@ -1,15 +1,11 @@
+require "active_support/inflector/methods"
+
 module MVCLI
   class Loader
-    def initialize(path)
-      @path = path
-    end
+    include ActiveSupport::Inflector
 
-    def load(type, name)
-      pathname = "#{name}_#{type}"
-      filename = File.join(@path, "app/#{type}s", pathname)
-      require filename
-      classname = pathname.capitalize.gsub(/_(\w)/) {|m| m[1].upcase}
-      Object.const_get(classname).new
+    def load(type, name, *args, &block)
+      constantize(camelize("#{name}_#{type}")).new(*args, &block)
     end
   end
 end

data/lib/mvcli/provisioning.rb

@@ -1,6 +1,7 @@
 require "map"
 require "active_support/concern"
 require "active_support/dependencies"
+require "mvcli/loader"
 
 module MVCLI
   module Provisioning
@@ -51,8 +52,11 @@ module MVCLI
     end
 
     class Provisioner
+      def initialize
+        @loader = Loader.new
+      end
       def [](name)
-        provider = "#{name.capitalize}Provider".constantize.new
+        provider = @loader.load :provider, name
         provider.value
       end
     end

data/lib/mvcli/router/pattern.rb

@@ -0,0 +1,90 @@
+require "map"
+
+module MVCLI
+  class Router
+    class Pattern
+      def initialize(pattern)
+        @matchers = compile pattern
+      end
+
+      def match(input, consumed = [], matchers = @matchers, satisfied = [], bindings = Map.new)
+        matcher, *unsatisfied = *matchers
+        value, *rest = *input
+        unless matcher && value && matcher.matches?(value)
+          Match.new input, consumed, matchers, satisfied, bindings
+        else
+          match rest, consumed + [value], unsatisfied, satisfied + [matcher], bindings.merge(matcher.bind(value))
+        end
+      end
+
+      private
+
+      def compile(pattern)
+        pattern.strip.split(/\s+/).map {|segment| Matcher[segment]}
+      end
+
+      class Matcher
+
+        def self.[](segment)
+          case segment
+          when /^:(\w+)/ then Variable.new($1)
+          else
+            Literal.new(segment)
+          end
+        end
+
+        def initialize(name)
+          @name = name
+        end
+
+        def bind(input)
+          {}
+        end
+
+        class Variable < Matcher
+          def matches?(input)
+            true
+          end
+
+          def bind(input)
+            {@name => input}
+          end
+        end
+
+        class Literal < Matcher
+          def matches?(input)
+            input == @name
+          end
+        end
+      end
+
+      class Match
+        attr_reader :bindings
+
+        def initialize(input, consumed, unsatisfied, satisfied, bindings)
+          @unsatisfied = unsatisfied
+          @satisfied = satisfied
+          @input = input
+          @consumed = consumed
+          @bindings = bindings
+        end
+
+        def satisfied?
+          @unsatisfied.empty?
+        end
+
+        def exhaustive?
+          @input.empty?
+        end
+
+        def matches?
+          satisfied? && exhaustive?
+        end
+
+        def partial?
+          !@consumed.empty?
+        end
+      end
+    end
+  end
+end

data/lib/mvcli/router.rb

@@ -1,4 +1,5 @@
 require "map"
+require_relative "router/pattern"
 
 module MVCLI
   class Router
@@ -17,29 +18,33 @@ module MVCLI
     end
 
     def call(command)
-      if route = @routes.find {|r| r.matches? command}
-        return route.call command
+      @routes.each do |route|
+        if match = route.match(command)
+          return match.call command
+        end
       end
       fail RoutingError, "no route matches '#{command.argv.join ' '}'"
     end
 
     class Route
       def initialize(pattern, actions, action, options = {})
-        @pattern, @actions, @action, @options = pattern.to_s, actions, action, options
+        @pattern = Pattern.new pattern.to_s
+        @actions, @action, @options = actions, action, options
       end
 
-      def matches?(command)
-        segments = @pattern.split /\s+/
-        segments.each_with_index do |s, i|
-          return false unless command.argv[i] && s.to_s == command.argv[i]
+      def match(command)
+        match = @pattern.match(command.argv)
+        if match.matches?
+          proc do |command|
+            action = @actions[@action] or fail "no action found for #{@action}"
+            action.call command, match.bindings
+          end
         end
-        return true
       end
+    end
+
+    class Match
 
-      def call(command)
-        action = @actions[@action] or fail "no action found for #{@action}"
-        action.call command
-      end
     end
   end
 end

data/lib/mvcli/version.rb

@@ -1,3 +1,3 @@
 module MVCLI
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/mvcli.rb

@@ -1,5 +1,4 @@
-require "mvcli/version"
-
 module MVCLI
-  # Your code goes here...
+  require "mvcli/version"
+  require "mvcli/controller"
 end

data/spec/mvcli/actions_spec.rb

@@ -20,9 +20,9 @@ describe "MVCLI::Actions" do
   context "when the class exists" do
     Given(:output) {mock(:Output)}
     Given(:controller) {mock(:Controller)}
-    Given {loader.stub(:load).with(:controller, 'foo') {controller}}
+    Given {loader.stub(:load).with(:controller, 'foo', {}) {controller}}
     Given {controller.stub(:bar) {"the context"}}
-    When {actions['foo#bar'].call(mock(:Command, :output => output))}
+    When {actions['foo#bar'].call(mock(:Command, :output => output), {})}
     Then {controller.should have_received(:bar)}
     And {renderer.should have_received(:render).with(output, 'foo/bar', 'the context')}
   end

data/spec/mvcli/loader_spec.rb

@@ -2,12 +2,22 @@ require "spec_helper"
 require "mvcli/loader"
 
 describe "MVCLI::Loader" do
+  Given do
+    class ::TotallyAwesomeController
+      attr_reader :params
+      attr_reader :block
+      def initialize(params, &block)
+        @params = params
+        @block = block
+      end
+    end
+  end
+  Given(:loader) {MVCLI::Loader.new}
 
-  Given {class ::TotallyAwesomeController; end}
-  Given(:loader) {MVCLI::Loader.new '/path/to/app'}
-  Given {loader.stub(:require) {true}}
-  context "loading a controller in the global namespace" do
-    When(:controller){loader.load :controller, 'totally_awesome'}
+  context "when a controller load is requested in the global  namespace" do
+    When(:controller){loader.load(:controller, 'totally_awesome', {:foo => :bar}) {'whee!'}}
     Then {controller.should be_instance_of TotallyAwesomeController}
+    And {controller.params.should eql ({:foo => :bar})}
+    And {controller.block.call.should eql "whee!"}
   end
 end

data/spec/mvcli/router/pattern_spec.rb

@@ -0,0 +1,54 @@
+require "spec_helper"
+require "mvcli/router/pattern"
+
+describe "MVCLI::Router::Pattern" do
+  use_natural_assertions
+  describe "with a simple input" do
+    Given(:pattern) {compile "one two three"}
+    context "when matched against unrelated content" do
+      When(:match) {pattern.match %w(five six seven)}
+      Then {!match.matches?}
+      And {!match.exhaustive?}
+      And {!match.partial?}
+      And {!match.satisfied?}
+    end
+    context "when matched against the same content" do
+      When(:match) {pattern.match %w(one two three)}
+      Then {match.matches?}
+      And {match.exhaustive?}
+      And {match.partial?}
+      And {match.satisfied?}
+
+    end
+    context "when matched against partially matching content" do
+      When(:match) {pattern.match %w(one two)}
+      Then {match.partial?}
+      And {match.exhaustive?}
+    end
+    context "on an unexhausted sequence" do
+      When(:match) {pattern.match %w(one two three four)}
+      Then {!match.exhaustive?}
+      And {match.partial?}
+    end
+  end
+  describe "with variables" do
+    Given(:pattern) {compile "one :one :two two "}
+    context "on a matching sequence" do
+      When(:match) {pattern.match %w(one 1 2 two)}
+      Then {match.matches?}
+      And {match.bindings[:one] == '1'}
+      And {match.bindings[:two] = '2'}
+    end
+    context "on a partially matching sequence" do
+      When(:match) {pattern.match %w(one 1)}
+      Then {match.partial?}
+      And {!match.matches?}
+      And {match.bindings[:one] == "1"}
+      And {match.bindings[:two] == nil}
+    end
+  end
+
+  def compile(*args)
+    MVCLI::Router::Pattern.new(*args)
+  end
+end

data/spec/mvcli/router_spec.rb

@@ -5,8 +5,12 @@ describe "MVCLI::Router" do
   Given(:Router) {MVCLI::Router}
   Given(:actions) {mock(:Actions)}
   Given(:router) {self.Router.new actions}
-  Given {actions.stub(:[]) {|action| @action = action; ->(command) {@command = command}}}
-
+  Given do
+    actions.stub(:[]) do |action|
+      @action = action
+      ->(command, bindings) {@command = command; @bindings = bindings}
+    end
+  end
 
   context "without any routes" do
     When(:result) {invoke}
@@ -27,12 +31,15 @@ describe "MVCLI::Router" do
     Then {@command.argv.should eql ['bam']}
   end
 
-  context "with a route with dynamic segments" do
-    Given {router.match 'show loadbalancer :name' => 'loadbalancers#show'}
-    When(:result) {invoke 'show loadbalancer 6'}
+  context "with a route with captures" do
+    Given {router.match 'show loadbalancer :id' => 'loadbalancers#show'}
+    When {invoke 'show loadbalancer 6'}
+    Then {@action.should eql 'loadbalancers#show'}
+    And {@command.argv == ['show' 'loadbalancer' '6']}
+    And {@bindings[:id].should eql '6'}
   end
 
-  def invoke(*args)
-    router.call mock(:Command, :argv => args)
+  def invoke(route = '')
+    router.call mock(:Command, :argv => route.split(/\s+/))
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mvcli
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Charles Lowell
@@ -29,7 +29,7 @@ cert_chain:
   UgImJlChAzCoDP9zi9tdm6jAr7ttF25R9PPYr11ILb7dYe3qUzlNlM6zJx/nb31b
   IhdyRVup4qLcqYSTPsm6u7VA
   -----END CERTIFICATE-----
-date: 2013-05-25 00:00:00.000000000 Z
+date: 2013-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: map
@@ -77,12 +77,14 @@ files:
 - lib/mvcli/actions.rb
 - lib/mvcli/app.rb
 - lib/mvcli/command.rb
+- lib/mvcli/controller.rb
 - lib/mvcli/erb.rb
 - lib/mvcli/loader.rb
 - lib/mvcli/middleware.rb
 - lib/mvcli/provisioning.rb
 - lib/mvcli/renderer.rb
 - lib/mvcli/router.rb
+- lib/mvcli/router/pattern.rb
 - lib/mvcli/version.rb
 - mvcli.gemspec
 - spec/mvcli/actions_spec.rb
@@ -91,6 +93,7 @@ files:
 - spec/mvcli/loader_spec.rb
 - spec/mvcli/middleware_spec.rb
 - spec/mvcli/provisioning_spec.rb
+- spec/mvcli/router/pattern_spec.rb
 - spec/mvcli/router_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/cowboyd/mvcli
@@ -124,5 +127,6 @@ test_files:
 - spec/mvcli/loader_spec.rb
 - spec/mvcli/middleware_spec.rb
 - spec/mvcli/provisioning_spec.rb
+- spec/mvcli/router/pattern_spec.rb
 - spec/mvcli/router_spec.rb
 - spec/spec_helper.rb