mvcli 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2af39b708e5b71d002d6734923412e067411c115
-  data.tar.gz: dcdf57432aeb3712a27878088ae4a527728b9ac2
+  metadata.gz: d38bca7cf98c3cad670fe5df941fd17c8d8cd267
+  data.tar.gz: a1438f4ab557e0f083b9eca8875b67a2b9b12a27
 SHA512:
-  metadata.gz: dceaaf28dae8821938e47b2c528330e6cacf7abe51bfddadf0ef94c0b4d201659e55bcf52188280d88fe3f92d01728adb1e2014bc048e78aae49d795f61e3e83
-  data.tar.gz: 4b6586b4eb3b18213257b23122114d66800419d1a1940b79c4c39512ffa33e87800a04feb7610315815f7d6e1187c591e1dc3f54ada6d70c80ac0aa3fecd1a86
+  metadata.gz: b707863564e785f0fe67fe47712a2ba416214708a4ae6fce7d9500e5d5347b6c2bc0b2112186bade3fda1baf1b7f1426c2eb0199189615e59d2b90e3b3969dd4
+  data.tar.gz: 1add93e30613c13ba50b798543e76975df840a4f4b563cb83af8988118848994fdedfdd8e08c2772cc39e3f2e95f2a6864e074212bd02c5e7033fc9f30ded21d

data/lib/mvcli/actions.rb

@@ -1,8 +1,11 @@
+require_relative "loader"
+require_relative "renderer"
+
 module MVCLI
   class Actions
-    def initialize(loader, renderer)
-      @loader = loader
-      @renderer = renderer
+    def initialize(root, loader = nil, renderer = nil)
+      @loader = loader || Loader.new(root)
+      @renderer = renderer || Renderer.new(root)
     end
 
     def [](key)
@@ -20,10 +23,10 @@ module MVCLI
 
       def call(command)
         controller = @loader.load :controller, @controller
-        fail LoadError, "no such controller: #{@controller}" unless controller
         context = controller.send @method
         path = [@controller, @method].join('/')
         @renderer.render command.output, path, context
+        return 0
       end
     end
   end

data/lib/mvcli/app.rb

@@ -1,23 +1,27 @@
 require_relative "middleware"
 require_relative "command"
+require_relative "actions"
 require_relative "router"
 
 module MVCLI
   class App
-
     def initialize
-      @middleware = Middleware.new
-      @middleware << Router.new
+      @router = Router.new Actions.new root
+      @router.instance_eval route_file.read, route_file.to_s, 1
     end
 
     def call(command)
-      @middleware.call command
+      @router.call command
     end
 
     def root
       self.class.root or fail "Invalid App: undefined application root directory"
     end
 
+    def route_file
+      root.join 'app/routes.rb'
+    end
+
     class << self
       attr_accessor :root
     end

data/lib/mvcli/erb.rb

@@ -0,0 +1,40 @@
+require "erb"
+
+module MVCLI
+  class ERB
+    def initialize
+      @compiler = ::ERB::Compiler.new("<>")
+      @compiler.pre_cmd = [""]
+      @compiler.put_cmd = "@_erbout <<"
+      @compiler.insert_cmd = "@_erbout <<"
+      @compiler.post_cmd = ["nil"]
+    end
+
+    def compile(string, filename = '(erb)')
+      code, enc = @compiler.compile string
+      Template.new code, enc, filename
+    end
+
+    class Template
+      def initialize(code, enc, filename)
+        @code, @enc, @filename = code, enc, filename
+      end
+
+      def call(context, output)
+        binding = context.instance_eval do
+          @_erbout = output
+          Kernel.binding
+        end
+        eval @code, binding, @filename, 1
+      ensure
+        context.remove_instance_variable(:@_erbout)
+      end
+
+      def to_proc
+        proc do |context, output|
+          call context, output
+        end
+      end
+    end
+  end
+end

data/lib/mvcli/loader.rb

@@ -0,0 +1,15 @@
+module MVCLI
+  class Loader
+    def initialize(path)
+      @path = path
+    end
+
+    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
+    end
+  end
+end

data/lib/mvcli/renderer.rb

@@ -0,0 +1,16 @@
+require 'mvcli/erb'
+
+module MVCLI
+  class Renderer
+    def initialize(root)
+      @root = root
+    end
+
+    def render(output, path, context)
+      filename = @root.join('app/views', path + '.txt.erb').to_s
+      compiler = MVCLI::ERB.new
+      template = compiler.compile File.read(filename), filename
+      template.call(context, output)
+    end
+  end
+end

data/lib/mvcli/router.rb

@@ -7,28 +7,39 @@ module MVCLI
 
     def initialize(actions = nil)
       @actions = actions || Map.new
-      @root = Map.new
+      @routes = []
     end
 
-    def root(options = {})
-      action = options[:to] or fail InvalidRoute, "root routes must specify an action with ':to =>' E.g. root :to => 'foo#bar'"
-      verbs = [options[:via] || :help].flatten
-      verbs.each do |verb|
-        @root[verb] = action
-      end
+    def match(options)
+      pattern, action = options.first
+      options.delete pattern
+      @routes << Route.new(pattern, @actions, action, options)
     end
 
     def call(command)
-      verb = command.argv.first || 'help'
-      path = command.argv.slice(1..-1) || []
-      if path.empty?
-        if action_name = @root[verb]
-          if action = @actions[action_name]
-            return action.call command
-          end
+      if route = @routes.find {|r| r.matches? command}
+        return route.call command
+      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
+      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]
         end
+        return true
+      end
+
+      def call(command)
+        action = @actions[@action] or fail "no action found for #{@action}"
+        action.call command
       end
-      fail RoutingError, "#{path.join(':')} does not respond to #{verb}"
     end
   end
 end

data/lib/mvcli/version.rb

@@ -1,3 +1,3 @@
 module MVCLI
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/mvcli/actions_spec.rb

@@ -4,11 +4,10 @@ require "mvcli/actions"
 describe "MVCLI::Actions" do
   Given(:loader) {mock(:Loader)}
   Given(:renderer) {mock(:Renderer, :render => true)}
-  Given(:actions) {MVCLI::Actions.new loader, renderer}
+  Given(:actions) {MVCLI::Actions.new '/root', loader, renderer}
 
   context "when the loader cannot find an appropriate controller" do
-    Given {loader.stub(:load)}
-
+    Given {loader.stub(:load) {fail LoadError}}
     When(:action) {actions['foo']}
     Then {action.should_not be_nil}
 

data/spec/mvcli/erb_spec.rb

@@ -0,0 +1,14 @@
+require "spec_helper"
+require "mvcli/erb"
+
+describe "MVCLI::ERB" do
+  Given(:erb) {MVCLI::ERB.new}
+  context "when I compile a template" do
+    Given(:output) {""}
+    Given(:template) {erb.compile "name: <%= name %>"}
+    context "and call it with a context" do
+      When {template.call mock(:Context, :name => 'Charles'), output}
+      Then {output.should eql "name: Charles"}
+    end
+  end
+end

data/spec/mvcli/loader_spec.rb

@@ -0,0 +1,13 @@
+require "spec_helper"
+require "mvcli/loader"
+
+describe "MVCLI::Loader" do
+
+  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'}
+    Then {controller.should be_instance_of TotallyAwesomeController}
+  end
+end

data/spec/mvcli/router_spec.rb

@@ -5,53 +5,31 @@ 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}}}
+
 
   context "without any routes" do
     When(:result) {invoke}
     Then {result.should have_failed self.Router::RoutingError}
   end
 
-  context "when an invalid root is mapped" do
-    When(:result) {router.root :wat => :tf?}
-    Then {result.should have_failed}
-  end
-
-  context "with its root mapped to a single verb" do
-    Given do
-      actions.stub(:[]).with('logins#create') do
-        proc do |command|
-          @login = command
-        end
-      end
-    end
-    Given {router.root :to => 'logins#create', :via => :login}
+  context "with a route matched to an action" do
+    Given {router.match 'login' => 'logins#create'}
     When {invoke 'login'}
-    Then {@login.argv.should eql ['login']}
+    Then {@action.should eql 'logins#create'}
+    And {@command.should_not be_nil}
+    Then {@command.argv.should eql ['login']}
+  end
 
-    context "when a command comes in for an unmapped verb" do
-      When(:result) {invoke 'fwiff'}
-      Then {result.should have_failed self.Router::RoutingError}
-    end
-    context "and a second verb is mapped to the the root" do
-      Given do
-        actions.stub(:[]).with('logins#destroy') {proc {|c| @logout = c}}
-      end
-      Given {router.root :to => 'logins#destroy', :via => :logout}
-      context "when I access via the original verb" do
-        Given {invoke 'logout' }
-        Then {@logout.should_not be_nil}
-        And {@logout.argv.should eql ['logout']}
-      end
-    end
+  context "with a route matched to a block" do
+    Given {router.match bam: ->(command) {@command = command}}
+    When {invoke 'bam'}
+    Then {@command.argv.should eql ['bam']}
   end
 
-  context "with its root mapped without a specific verb" do
-    Given do
-      actions.stub(:[]).with('something#show') {proc {|c|@something = c}}
-    end
-    Given {router.root :to => 'something#show'}
-    When {invoke 'help'}
-    Then {@something.argv.should eql ['help']}
+  context "with a route with dynamic segments" do
+    Given {router.match 'show loadbalancer :name' => 'loadbalancers#show'}
+    When(:result) {invoke 'show loadbalancer 6'}
   end
 
   def invoke(*args)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mvcli
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Charles Lowell
@@ -29,7 +29,7 @@ cert_chain:
   UgImJlChAzCoDP9zi9tdm6jAr7ttF25R9PPYr11ILb7dYe3qUzlNlM6zJx/nb31b
   IhdyRVup4qLcqYSTPsm6u7VA
   -----END CERTIFICATE-----
-date: 2013-05-20 00:00:00.000000000 Z
+date: 2013-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: map
@@ -63,11 +63,16 @@ files:
 - lib/mvcli/actions.rb
 - lib/mvcli/app.rb
 - lib/mvcli/command.rb
+- lib/mvcli/erb.rb
+- lib/mvcli/loader.rb
 - lib/mvcli/middleware.rb
+- lib/mvcli/renderer.rb
 - lib/mvcli/router.rb
 - lib/mvcli/version.rb
 - mvcli.gemspec
 - spec/mvcli/actions_spec.rb
+- spec/mvcli/erb_spec.rb
+- spec/mvcli/loader_spec.rb
 - spec/mvcli/middleware_spec.rb
 - spec/mvcli/router_spec.rb
 - spec/spec_helper.rb
@@ -97,6 +102,8 @@ specification_version: 4
 summary: Local Apps. Remote Apps. They're all at your fingertips
 test_files:
 - spec/mvcli/actions_spec.rb
+- spec/mvcli/erb_spec.rb
+- spec/mvcli/loader_spec.rb
 - spec/mvcli/middleware_spec.rb
 - spec/mvcli/router_spec.rb
 - spec/spec_helper.rb