junior 0.0.0 → 0.1.0

data/{README → README.md}

@@ -1,12 +1,20 @@
-= Junior
+Junior
+======
 
 An MVC Web Framework
 
-== Installation
+Installation
+------------
 
 sudo gem install junior
 
-== Note on Patches/Pull Requests
+Example App
+-----------
+
+http://github.com/eddanger/junior-app
+
+Note on Patches/Pull Requests
+-----------------------------
  
 * Fork the project.
 * Make your feature addition or bug fix.
@@ -16,6 +24,7 @@ sudo gem install junior
   (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
 * Send me a pull request. Bonus points for topic branches.
 
-== Copyright
+Copyright
+---------
 
-Copyright (c) 2010 Michael Wood. See LICENSE for details.
+Copyright (c) 2010 Michael Wood. See LICENSE for details.

data/Rakefile

@@ -11,8 +11,8 @@ begin
     gem.homepage = 'http://github.com/eddanger/junior'
     gem.authors = ["Michael Wood"]
 
-    gem.add_dependency 'rack',       "~> 1.0.1"
-    gem.add_dependency 'rack-mount', "~> 0.4.0"
+    gem.add_dependency 'rack',       "~> 1.1.0"
+    gem.add_dependency 'usher',      "~> 0.6.2"
     gem.add_dependency 'tilt',       "~> 0.4.0"
 
     gem.add_development_dependency 'rspec', '~> 1.2.9'

data/VERSION

@@ -1 +1 @@
-0.0.0
+0.1.0

data/junior.gemspec

@@ -5,21 +5,21 @@
 
 Gem::Specification.new do |s|
   s.name = %q{junior}
-  s.version = "0.0.0"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Wood"]
-  s.date = %q{2009-12-31}
+  s.date = %q{2010-01-05}
   s.description = %q{A Mini MVC Web Framework for Ruby built on Rack and a lot of inspiration from Sinatra}
   s.email = %q{mike@michaelwood.com}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README"
+     "README.md"
   ]
   s.files = [
     ".gitignore",
      "LICENSE",
-     "README",
+     "README.md",
      "Rakefile",
      "VERSION",
      "junior.gemspec",
@@ -28,7 +28,6 @@ Gem::Specification.new do |s|
      "lib/junior/controller.rb",
      "lib/junior/dispatcher.rb",
      "lib/junior/helpers.rb",
-     "lib/junior/request.rb",
      "lib/junior/router.rb",
      "lib/junior/support.rb",
      "spec/junior_spec.rb",
@@ -52,21 +51,21 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rack>, ["~> 1.0.1"])
-      s.add_runtime_dependency(%q<rack-mount>, ["~> 0.4.0"])
+      s.add_runtime_dependency(%q<rack>, ["~> 1.1.0"])
+      s.add_runtime_dependency(%q<usher>, ["~> 0.6.2"])
       s.add_runtime_dependency(%q<tilt>, ["~> 0.4.0"])
       s.add_development_dependency(%q<rspec>, ["~> 1.2.9"])
       s.add_development_dependency(%q<yard>, ["~> 0.5.2"])
     else
-      s.add_dependency(%q<rack>, ["~> 1.0.1"])
-      s.add_dependency(%q<rack-mount>, ["~> 0.4.0"])
+      s.add_dependency(%q<rack>, ["~> 1.1.0"])
+      s.add_dependency(%q<usher>, ["~> 0.6.2"])
       s.add_dependency(%q<tilt>, ["~> 0.4.0"])
       s.add_dependency(%q<rspec>, ["~> 1.2.9"])
       s.add_dependency(%q<yard>, ["~> 0.5.2"])
     end
   else
-    s.add_dependency(%q<rack>, ["~> 1.0.1"])
-    s.add_dependency(%q<rack-mount>, ["~> 0.4.0"])
+    s.add_dependency(%q<rack>, ["~> 1.1.0"])
+    s.add_dependency(%q<usher>, ["~> 0.6.2"])
     s.add_dependency(%q<tilt>, ["~> 0.4.0"])
     s.add_dependency(%q<rspec>, ["~> 1.2.9"])
     s.add_dependency(%q<yard>, ["~> 0.5.2"])

data/lib/junior/application.rb

@@ -14,10 +14,11 @@ module Junior
     
     def call!(env)
       @env        = env
-      #@request    = Rack::Request.new(env)
-      @request    = Junior::Request.new(env)
+      @request    = Rack::Request.new(env)
       @response   = Rack::Response.new
       
+      #puts env.inspect
+      
       Dispatcher.dispatch!(self)
       
       status, header, body = @response.finish
@@ -29,20 +30,14 @@ module Junior
 
       def reset!
         @middleware = []
-        @resources = []
-        @routes = []
         @prototype  = nil
       end
       
-      def router
-        Router.router(self)
-      end
-
       def prototype
         @prototype ||= new
       end
 
-      def new(*args, &bk)
+      def new(*args, &block)
         builder = Rack::Builder.new
 
         middleware.each { |middleware, args, block| builder.use(middleware, *args, &block) }
@@ -67,26 +62,10 @@ module Junior
         end
       end
     
-      def resources
-        @resources || []
-      end
-    
-      def routes
-        @routes || []
-      end
-    
       def use(middleware, *args, &block)
         @middleware << [ middleware, args, block ]
       end
 
-      def resource(resource)
-        @resources << resource
-      end
-
-      def route(path, to = {}, method = 'GET')
-        @routes << { :path => path, :to => to, :method => method }
-      end
-
       def set(option, value=self)
         if value.kind_of?(Proc)
           metadef(option, &value)

data/lib/junior/controller.rb

@@ -15,14 +15,17 @@ module Junior
       @resource_id = id
     end
 
-    def render(path)
+    def render(path, *args)
+      
+      layout_path = ( args.first && ( args.first[ :layout_path ] || args.first[ :layout_path ].nil? ) ) ? args.first[ :layout_path ] : self.class.layout_path
+      
       begin
         template = Tilt.new(path)
         
         output = template.render(self)
         
-        if self.class.layout_path
-          layout_template = Tilt.new(self.class.layout_path)
+        if layout_path
+          layout_template = Tilt.new(layout_path)
           output = layout_template.render(self) { output }
         end
         
@@ -35,6 +38,10 @@ module Junior
       output
     end
 
+    def partial(path, *args)
+      render path, :layout_path => nil
+    end
+
     class << self
       
       attr_reader :layout_path

data/lib/junior/dispatcher.rb

@@ -14,16 +14,22 @@ module Junior
         
           #puts app.env['rack.input'].read
           
-          controller = app.env[ 'rack.routing_args' ][ :controller ].to_s
-          action     = app.env[ 'rack.routing_args' ][ :action ].to_s
-          id         = app.env[ 'rack.routing_args' ][ :id ].to_s
+          controller = app.env[ 'usher.response' ].last.destination[ :controller ].to_s
+          
+          if controller[ '/' ] # a nested route
+            controller = controller[(controller.rindex( '/' ) + 1)..controller.length]
+            puts controller
+          end
+          
+          action     = app.env[ 'usher.response' ].last.destination[ :action ].to_s
+          id         = app.env[ 'usher.params' ][ :id ].to_s
         
           controller_instance = controller.camelize.to_class.new(app, id)
 
           if controller_instance.respond_to?(action)
             controller_instance.send(action)
           else
-            not_found('Not found')
+            controller_instance.not_found('Not found')
           end
         end
       end

data/lib/junior/router.rb

@@ -2,33 +2,76 @@ module Junior
 
   class Router
 
+    attr_reader :app, :router
+
+    def initialize(app, router)
+      @app, @router = app, router
+    end
+
+    def call(env)
+      @router.call(env)
+      @app.call(env)
+    end
+    
+  end
+end
+
+
+module Junior
+  
+  class Usher
+    
+    attr_reader :router
+    
+    def initialize
+      @router = ::Usher::Interface.for(:rack, nil, :use_destinations => false)
+    end
+        
     class << self
       
-      def router( app )
-        router = Rack::Mount::RouteSet.new do |set|
-          app.resources.each do |resource|
-            set.add_route app, { :path_info => %r{^/#{resource}(\.(?:<format>[a-z]+))?$},                      :request_method => 'GET' },    { :controller => resource, :action => 'index' }
-            set.add_route app, { :path_info => %r{^/#{resource}(\.(?:<format>[a-z]+))?$},                      :request_method => 'POST' },   { :controller => resource, :action => 'create' }
-            set.add_route app, { :path_info => %r{^/#{resource}/new(\.(?:<format>[a-z]+))?$},                  :request_method => 'GET' },    { :controller => resource, :action => 'new' }
-            set.add_route app, { :path_info => %r{^/#{resource}/(?:<id>[^/]+)/edit(\.(?:<format>[a-z]+))?$},   :request_method => 'GET' },    { :controller => resource, :action => 'edit' }
-            set.add_route app, { :path_info => %r{^/#{resource}/(?:<id>[^/]+)/delete(\.(?:<format>[a-z]+))?$}, :request_method => 'GET' },    { :controller => resource, :action => 'delete' }
-            set.add_route app, { :path_info => %r{^/#{resource}/(?:<id>[^/]+)(\.(?:<format>[a-z]+))?$},        :request_method => 'GET' },    { :controller => resource, :action => 'show' }
-            set.add_route app, { :path_info => %r{^/#{resource}/(?:<id>[^/]+)(\.(?:<format>[a-z]+))?$},        :request_method => 'PUT' },    { :controller => resource, :action => 'update' }
-            set.add_route app, { :path_info => %r{^/#{resource}/(?:<id>[^/]+)(\.(?:<format>[a-z]+))?$},        :request_method => 'DELETE' }, { :controller => resource, :action => 'destroy' }
-          end
-          
-          app.routes.each do |route|
-            set.add_route app, { :path_info => %r{^#{route[ :path ]}$}, :request_method => route[ :method ] }, route[ :to ]
-          end
-
-          # default
-          #set.add_route app, { :path_info => %r{^/$} }, { :controller => app.default_controller, :action => app.default_action }
-          #set.add_route app, { :path_info => %r{^/(?:<controller>[a-z0-9]+)(/(?:<action>[a-z0-9]+)(/(?:<id>[a-z0-9]+)(\.(?:<format>[a-z]+))?)?)?$} }, { :controller => app.default_controller, :action => app.default_action }
-        end
-
-        router
+      def routes( &block )
+        usher = self.new
+        
+        usher.instance_eval( &block )
+        
+        usher.router
       end
+    end
+      
+    def resources( resource, &block )
+      resource = "#{@parent_resource}/:#{@parent_resource}_id/#{resource}" if @parent_resource
       
+      self.router.get(    "/#{resource}(.:format)"            ).to( :controller => resource, :action => 'index'   ).name( :"#{resource}_index" )
+      self.router.post(   "/#{resource}(.:format)"            ).to( :controller => resource, :action => 'create'  ).name( :"#{resource}_create" )
+      self.router.get(    "/#{resource}/new(.:format)"        ).to( :controller => resource, :action => 'new'     ).name( :"#{resource}_new" )
+      self.router.get(    "/#{resource}/:id/edit(.:format)"   ).to( :controller => resource, :action => 'edit'    ).name( :"#{resource}_edit" )
+      self.router.get(    "/#{resource}/:id/delete(.:format)" ).to( :controller => resource, :action => 'delete'  ).name( :"#{resource}_delete" )
+      self.router.get(    "/#{resource}/:id(.:format)"        ).to( :controller => resource, :action => 'show'    ).name( :"#{resource}_show" )
+      self.router.put(    "/#{resource}/:id(.:format)"        ).to( :controller => resource, :action => 'update'  ).name( :"#{resource}_update" )
+      self.router.delete( "/#{resource}/:id(.:format)"        ).to( :controller => resource, :action => 'destroy' ).name( :"#{resource}_destroy" )
+      
+      if block_given?
+        @parent_resource = resource
+        block.call
+      end
+      
+      @parent_resource = nil
+    end
+    
+    def get( path, route )
+      self.router.get( path ).to( route )
+    end
+
+    def put( path, route )
+      self.router.put( path ).to( route )
+    end
+
+    def post( path, route )
+      self.router.post( path ).to( route )
+    end
+
+    def delete( path, route )
+      self.router.delete( path ).to( route )
     end
 
   end

data/lib/junior.rb

@@ -1,14 +1,11 @@
 module Junior
-  VERSION = '0.0.0'
-
   require 'rack'
   require 'rack/builder'
-  require 'rack/mount'
+  require 'usher'
   require 'tilt'
 
   require 'junior/helpers'
   require 'junior/router'
-  require 'junior/request'
   require 'junior/dispatcher'
   require 'junior/controller'
   require 'junior/application'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: junior
 version: !ruby/object:Gem::Version 
-  version: 0.0.0
+  version: 0.1.0
 platform: ruby
 authors: 
 - Michael Wood
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-31 00:00:00 -08:00
+date: 2010-01-05 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,17 +20,17 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.0.1
+        version: 1.1.0
     version: 
 - !ruby/object:Gem::Dependency 
-  name: rack-mount
+  name: usher
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.4.0
+        version: 0.6.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: tilt
@@ -70,11 +70,11 @@ extensions: []
 
 extra_rdoc_files: 
 - LICENSE
-- README
+- README.md
 files: 
 - .gitignore
 - LICENSE
-- README
+- README.md
 - Rakefile
 - VERSION
 - junior.gemspec
@@ -83,7 +83,6 @@ files:
 - lib/junior/controller.rb
 - lib/junior/dispatcher.rb
 - lib/junior/helpers.rb
-- lib/junior/request.rb
 - lib/junior/router.rb
 - lib/junior/support.rb
 - spec/junior_spec.rb

data/lib/junior/request.rb

@@ -1,12 +0,0 @@
-module Junior
-
-  class Request < Rack::Request
-    # Make the methodoverride middleware work with rack 1.0.x
-    def params
-      self.GET.update(self.POST)
-    rescue EOFError, Errno::ESPIPE
-      self.GET
-    end
-  end
-
-end