orange 0.0.13 → 0.0.14

data/lib/{orange → orange-core}/stack.rb

@@ -1,4 +1,4 @@
-require 'orange/core'
+require 'orange-core/core'
 require 'rack/builder'
 module Orange
   # Builds an orange stack of middleware
@@ -92,6 +92,11 @@ module Orange
       stack Orange::Middleware::ShowExceptions
     end
     
+    # Alias for use_exceptions
+    def show_exceptions
+      use_exceptions
+    end
+    
     # Turn off recapture middleware, which is normally just on top of the exit
     # point
     # @see Orange::Middleware::Recapture
@@ -112,6 +117,8 @@ module Orange
     # 
     def prerouting(*args)
       opts = args.extract_options!
+      stack Orange::Middleware::Globals
+      stack Orange::Middleware::Loader
       stack Orange::Middleware::Rerouter, opts.dup
       stack Orange::Middleware::Static, opts.dup
       use Rack::AbstractFormat unless opts[:no_abstract_format] 
@@ -119,29 +126,36 @@ module Orange
           # since all orange stuff is non-destructive
       stack Orange::Middleware::RouteSite, opts.dup
       stack Orange::Middleware::RouteContext, opts.dup
+      stack Orange::Middleware::Database
+      Orange.plugins.each{|p| p.middleware(:prerouting).each{|m| stack m, opts.dup} if p.has_middleware?}
     end
     
-    # A shortcut for enabling restful routing via Orange::Middleware::RestfulRouter
+    # A shortcut for routing via Orange::Middleware::RestfulRouter and any plugins
     #
     # Any args are passed on to the middleware
-    def restful_routing(*args)
-      opts = args.extract_options!
-      stack Orange::Middleware::RestfulRouter, opts
+    def routing(opts ={})
+      stack Orange::Middleware::RestfulRouter, opts.dup
+      Orange.plugins.each{|p| p.middleware(:routing).each{|m| stack m, opts.dup} if p.has_middleware?}
+      stack Orange::Middleware::FourOhFour, opts.dup
     end
     
-    # A shortcut to enable Rack::OpenID and Orange::Middleware::AccessControl
-    # 
-    # Args will be passed on to Orange::Middleware::AccessControl
-    # @todo Make it so this is not dependent on the openid_dm_store gem (outdated)
-    def openid_access_control(*args)
-      opts = args.extract_options!
-      require 'rack/openid'
-      require 'openid_dm_store'
-
-      use Rack::OpenID, OpenIDDataMapper::DataMapperStore.new
-      stack Orange::Middleware::AccessControl, opts
+    def postrouting(opts ={})
+      Orange.plugins.each{|p| p.middleware(:postrouting).each{|m| stack m, opts.dup} if p.has_middleware?}
+      stack Orange::Middleware::Template
+    end
+    
+    def responders(opts ={})
+      Orange.plugins.each{|p| p.middleware(:responders).each{|m| stack m, opts.dup} if p.has_middleware?}
     end
     
+    # # A shortcut to enable Rack::OpenID and Orange::Middleware::AccessControl
+    #     # 
+    #     # Args will be passed on to Orange::Middleware::AccessControl
+    #     def openid_access_control(*args)
+    #       opts = args.extract_options!
+    #       
+    #     end
+    
     # Adds pulp to the core via the Orange::Core#add_pulp method
     # @param [Orange::Mixin] mod a mixin to be included in the packet
     def add_pulp(mod)

data/lib/orange-core.rb

@@ -0,0 +1,8 @@
+libdir = File.dirname(__FILE__)
+$LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
+
+require File.join(libdir, 'orange-core', 'magick.rb')
+Dir.glob(File.join(libdir, 'orange-core', '*.rb')).each {|f| require f }
+Dir.glob(File.join(libdir, 'orange-core', 'cartons', '*.rb')).each {|f| require f }
+Dir.glob(File.join(libdir, 'orange-core', 'resources', '*.rb')).each {|f| require f }
+Dir.glob(File.join(libdir, 'orange-core', 'middleware', '*.rb')).each {|f| require f }

data/lib/{orange → orange-more/administration}/assets/css/admin.css

@@ -194,7 +194,7 @@ body{
 
 
 .move_actions .up{
-	background: url(/assets/_orange_/img/sitemap_up.png);
+	background: url(/assets/_sitemap_/img/sitemap_up.png);
 }
 .move_actions .arrow{
 	display: block;
@@ -206,25 +206,25 @@ body{
 }
 .move_actions .indent{
 	margin-top: 15px;
-	background: url(/assets/_orange_/img/sitemap_indent.png);
+	background: url(/assets/_sitemap_/img/sitemap_indent.png);
 }
 .move_actions .outdent{
 	margin-top: 15px;
-	background: url(/assets/_orange_/img/sitemap_outdent.png);
+	background: url(/assets/_sitemap_/img/sitemap_outdent.png);
 }
 
 .move_actions .down{
-	background: url(/assets/_orange_/img/sitemap_down.png);
+	background: url(/assets/_sitemap_/img/sitemap_down.png);
 }
 
 .move_actions .disabled_down{
-	background: url(/assets/_orange_/img/sitemap_down_d.png);
+	background: url(/assets/_sitemap_/img/sitemap_down_d.png);
 }
 
 
 
 .move_actions .disabled_up{
-	background: url(/assets/_orange_/img/sitemap_up_d.png);
+	background: url(/assets/_sitemap_/img/sitemap_up_d.png);
 }
 
 

data/lib/orange-more/administration/cartons/site.rb

@@ -0,0 +1,9 @@
+module Orange
+  class Site < Carton
+    id
+    admin do
+      title :name
+      text :url
+    end
+  end
+end

data/lib/{orange → orange-more/administration}/cartons/site_carton.rb

@@ -1,4 +1,4 @@
-require 'orange/carton'
+require 'orange-core/carton'
 
 module Orange
   # Defines a carton that belongs to a specific site.

data/lib/{orange/cartons/user_carton.rb → orange-more/administration/cartons/user.rb}

@@ -1,3 +1,5 @@
+require 'orange-core/carton'
+
 module Orange
   class User < Orange::Carton
     id

data/lib/{orange → orange-more/administration}/middleware/access_control.rb

@@ -1,4 +1,4 @@
-require 'orange/middleware/base'
+require 'orange-core/middleware/base'
 
 
 

data/lib/{orange → orange-more/administration}/middleware/site_load.rb

@@ -1,13 +1,9 @@
-require 'orange/middleware/base'
+require 'orange-core/middleware/base'
 module Orange::Middleware
   # This will load information about the site to into the orange env
   # - packet['site'] will be an instance of the site object
   # 
-  class SiteLoad < Base
-    def init(*args)
-      orange.load Orange::SiteResource.new, :orange_sites
-    end
-    
+  class SiteLoad < Base    
     def packet_call(packet)
       url =  packet['route.site_url']
       site = Orange::Site.first(:url.like => url)
@@ -25,20 +21,3 @@ module Orange::Middleware
   
 end
 
-module Orange
-  class Site < Carton
-    id
-    admin do
-      title :name
-      text :url
-    end
-  end
-  
-  class SiteResource < ModelResource
-    use Orange::Site
-    def afterLoad
-      orange[:admin, true].add_link('Settings', :resource => @my_orange_name, 
-                                                :text => 'Site')
-    end
-  end
-end

data/lib/orange-more/administration/plugin.rb

@@ -0,0 +1,22 @@
+Dir.glob(File.join(File.dirname(__FILE__), 'cartons', '*.rb')).each {|f| require f }
+Dir.glob(File.join(File.dirname(__FILE__), 'resources', '*.rb')).each {|f| require f }
+Dir.glob(File.join(File.dirname(__FILE__), 'middleware', '*.rb')).each {|f| require f }
+
+module Orange::Plugins
+  class Administration < Base
+    assets_dir      File.join(File.dirname(__FILE__), 'assets')
+    views_dir       File.join(File.dirname(__FILE__), 'views')
+    templates_dir   File.join(File.dirname(__FILE__), 'templates')
+    
+    resource    Orange::AdminResource.new, :admin
+    resource    Orange::UserResource.new
+    resource    Orange::SiteResource.new
+    
+    prerouter   Orange::Middleware::AccessControl
+    prerouter   Orange::Middleware::SiteLoad
+    
+  end
+end
+
+Orange.plugin(Orange::Plugins::Administration.new)
+

data/lib/orange-more/administration/resources/site_resource.rb

@@ -0,0 +1,10 @@
+module Orange
+  class SiteResource < ModelResource
+    use Orange::Site
+    call_me :orange_sites
+    def afterLoad
+      orange[:admin].add_link('Settings', :resource => @my_orange_name, 
+                                                :text => 'Site')
+    end
+  end
+end

data/lib/{orange → orange-more/administration}/resources/user_resource.rb

@@ -3,7 +3,7 @@ module Orange
     use Orange::User
     call_me :users
     def afterLoad
-      orange[:admin, true].add_link("Settings", :resource => @my_orange_name, :text => 'Users')
+      orange[:admin].add_link("Settings", :resource => @my_orange_name, :text => 'Users')
     end
     
     def access_allowed?(packet, user)

data/lib/orange-more/administration.rb

@@ -0,0 +1 @@
+require File.join('orange-more', 'administration', 'plugin')

data/lib/orange-more/assets/plugin.rb

@@ -0,0 +1,13 @@
+Dir.glob(File.join(File.dirname(__FILE__), 'cartons', '*.rb')).each {|f| require f }
+Dir.glob(File.join(File.dirname(__FILE__), 'resources', '*.rb')).each {|f| require f }
+
+module Orange::Plugins
+  class Assets < Base
+    views_dir   File.join(File.dirname(__FILE__), 'views')
+    
+    resource    Orange::AssetResource.new
+  end
+end
+
+Orange.plugin(Orange::Plugins::Assets.new)
+

data/lib/orange-more/assets.rb

@@ -0,0 +1 @@
+require File.join('orange-more', 'assets', 'plugin')

data/lib/{orange → orange-more/pages}/cartons/page_carton.rb

@@ -1,5 +1,5 @@
 require 'dm-timestamps'
-require 'orange/cartons/site_carton'
+require 'orange-more/administration/cartons/site_carton'
 module Orange
   class Page < Orange::SiteCarton
     id

data/lib/{orange → orange-more/pages}/cartons/page_version_carton.rb

@@ -1,5 +1,5 @@
 require 'dm-timestamps'
-require 'orange/cartons/site_carton'
+require 'orange-more/administration/cartons/site_carton'
 module Orange
   class PageVersion < Orange::SiteCarton
     id

data/lib/orange-more/pages/plugin.rb

@@ -0,0 +1,13 @@
+Dir.glob(File.join(File.dirname(__FILE__), 'cartons', '*.rb')).each {|f| require f }
+Dir.glob(File.join(File.dirname(__FILE__), 'resources', '*.rb')).each {|f| require f }
+
+module Orange::Plugins
+  class Pages < Base
+    views_dir       File.join(File.dirname(__FILE__), 'views')
+    
+    resource    Orange::PageResource.new    
+  end
+end
+
+Orange.plugin(Orange::Plugins::Pages.new)
+

data/lib/orange-more/pages.rb

@@ -0,0 +1 @@
+require File.join('orange-more', 'pages', 'plugin')

data/lib/orange-more/sitemap/cartons/route.rb

@@ -0,0 +1,43 @@
+require 'orange-more/administration/cartons/site_carton'
+require 'dm-is-awesome_set'
+
+module Orange
+  class Route < SiteCarton
+    id
+    admin do
+      text :slug
+      text :link_text
+      boolean :show_in_nav, :default => false, :display_name => 'Show in Navigation?'
+    end
+    orange do
+      string :resource
+      string :resource_id
+      string :resource_action
+      boolean :accept_args, :default => true
+    end
+    include DataMapper::Transaction::Resource # Make sure Transactions are included (for awesome_set)
+    is :awesome_set, :scope => [:orange_site_id]
+  
+    def full_path
+      self_and_ancestors.inject('') do |path, part| 
+        if part.parent # Check if this is a child
+          path = path + part.slug + '/' 
+        else  # The root slug is just the initial '/'
+          path = path + '/' 
+        end
+      end
+    end
+  
+    def self.home_for_site(site_id)
+      root(:orange_site_id => site_id) 
+    end
+  
+  
+    def self.create_home_for_site(site_id)
+      home = self.new({:orange_site_id => site_id, :slug => '_index_', :accept_args => false, :link_text => 'Home'})
+      home.move(:root)
+      home.save
+      home
+    end
+  end
+end

data/lib/{orange → orange-more/sitemap}/middleware/flex_router.rb

@@ -1,4 +1,4 @@
-require 'orange/middleware/base'
+require 'orange-core/middleware/base'
 
 module Orange::Middleware
   # The FlexRouter middleware takes a resource that can route paths and
@@ -10,12 +10,7 @@ module Orange::Middleware
   # and "route(packet)".  
   # 
   # Pass a different routing resource using the :resource arg
-  class FlexRouter < Base
-    def init(opts = {})
-      @resource = opts[:resource] || Orange::SitemapResource
-      orange.load @resource.new, :sitemap
-    end
-    
+  class FlexRouter < Base    
     # Sets the sitemap resource as the router if the resource can accept 
     # the path.
     def packet_call(packet)

data/lib/orange-more/sitemap/plugin.rb

@@ -0,0 +1,17 @@
+Dir.glob(File.join(File.dirname(__FILE__), 'cartons', '*.rb')).each {|f| require f }
+Dir.glob(File.join(File.dirname(__FILE__), 'resources', '*.rb')).each {|f| require f }
+Dir.glob(File.join(File.dirname(__FILE__), 'middleware', '*.rb')).each {|f| require f }
+
+module Orange::Plugins
+  class Sitemap < Base
+    assets_dir      File.join(File.dirname(__FILE__), 'assets')
+    views_dir       File.join(File.dirname(__FILE__), 'views')
+    
+    resource    Orange::SitemapResource.new
+    router      Orange::Middleware::FlexRouter
+    
+  end
+end
+
+Orange.plugin(Orange::Plugins::Sitemap.new)
+

data/lib/{orange → orange-more/sitemap}/resources/sitemap_resource.rb

@@ -1,50 +1,10 @@
-require 'orange/core'
-require 'orange/resources/model_resource'
-require 'orange/cartons/site_carton'
-require 'dm-is-awesome_set'
+require 'orange-core/core'
+require 'orange-core/resources/model_resource'
 module Orange
-  class Route < SiteCarton
-    id
-    admin do
-      text :slug
-      text :link_text
-      boolean :show_in_nav, :default => false, :display_name => 'Show in Navigation?'
-    end
-    orange do
-      string :resource
-      string :resource_id
-      string :resource_action
-      boolean :accept_args, :default => true
-    end
-    include DataMapper::Transaction::Resource # Make sure Transactions are included (for awesome_set)
-    is :awesome_set, :scope => [:orange_site_id]
-    
-    def full_path
-      self_and_ancestors.inject('') do |path, part| 
-        if part.parent # Check if this is a child
-          path = path + part.slug + '/' 
-        else  # The root slug is just the initial '/'
-          path = path + '/' 
-        end
-      end
-    end
-    
-    def self.home_for_site(site_id)
-      root(:orange_site_id => site_id) 
-    end
-    
-    
-    def self.create_home_for_site(site_id)
-      home = self.new({:orange_site_id => site_id, :slug => '_index_', :accept_args => false, :link_text => 'Home'})
-      home.move(:root)
-      home.save
-      home
-    end
-  end
   
   class SitemapResource < ModelResource
     use Orange::Route
-    
+    call_me :sitemap
     def afterLoad
       orange[:admin, true].add_link('Content', :resource => @my_orange_name, :text => 'Sitemap')
       

data/lib/orange-more/sitemap.rb

@@ -0,0 +1 @@
+require File.join('orange-more', 'sitemap', 'plugin')

data/lib/{orange → orange-more/slices}/middleware/radius_parser.rb

@@ -1,4 +1,4 @@
-require 'orange/middleware/base'
+require 'orange-core/middleware/base'
 
 module Orange::Middleware
   # The RadiusParser middleware will parse all outgoing content with 

data/lib/orange-more/slices/plugin.rb

@@ -0,0 +1,15 @@
+Dir.glob(File.join(File.dirname(__FILE__), 'resources', '*.rb')).each {|f| require f }
+Dir.glob(File.join(File.dirname(__FILE__), 'middleware', '*.rb')).each {|f| require f }
+
+module Orange::Plugins
+  class Slices < Base    
+    resource    Orange::Radius.new
+    resource    Orange::Slices.new
+    
+    postrouter  Orange::Middleware::RadiusParser
+    
+  end
+end
+
+Orange.plugin(Orange::Plugins::Slices.new)
+

data/lib/orange-more/slices.rb

@@ -0,0 +1 @@
+require File.join('orange-more', 'slices', 'plugin')

data/lib/orange-more.rb

@@ -0,0 +1,10 @@
+libdir = File.dirname(__FILE__)
+$LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
+
+require File.join(libdir, 'orange-core')
+
+require File.join(libdir, 'orange-more', 'administration')
+require File.join(libdir, 'orange-more', 'assets')
+require File.join(libdir, 'orange-more', 'pages')
+require File.join(libdir, 'orange-more', 'sitemap')
+require File.join(libdir, 'orange-more', 'slices')

data/lib/orange.rb

@@ -1,9 +1,5 @@
 libdir = File.dirname(__FILE__)
 $LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
 
-require File.join(libdir, 'orange', 'magick.rb')
-Dir.glob(File.join(libdir, 'orange', '*.rb')).each {|f| require f }
-Dir.glob(File.join(libdir, 'orange', 'cartons', '*.rb')).each {|f| require f }
-require File.join(libdir, 'orange', 'resources', 'model_resource.rb')
-Dir.glob(File.join(libdir, 'orange', 'resources', '*.rb')).each {|f| require f }
-Dir.glob(File.join(libdir, 'orange', 'middleware', '*.rb')).each {|f| require f }
+require File.join(libdir, 'orange-core')
+require File.join(libdir, 'orange-more')

data/spec/{orange → orange-core}/core_spec.rb

@@ -67,7 +67,7 @@ describe Orange::Core do
   
   it "should return a directory that contains core.rb when calling core_dir" do
     c= Orange::Core.new
-    c.core_dir.should match(/orange$/)
+    c.core_dir.should match(/orange-core$/)
     File.should exist(File.join(c.core_dir, 'core.rb'))
     File.should exist(File.join(c.core_dir, 'stack.rb'))
     File.should exist(File.join(c.core_dir, 'application.rb'))
@@ -79,7 +79,7 @@ describe Orange::Core do
   
   it "should return the directory of the super class when calling core_dir on subclass" do
     c= MockCoreSubclass.new
-    c.core_dir.should match(/orange$/)
+    c.core_dir.should match(/orange-core$/)
     File.should exist(File.join(c.core_dir, 'core.rb'))
     File.should exist(File.join(c.core_dir, 'stack.rb'))
     File.should exist(File.join(c.core_dir, 'application.rb'))