orange 0.0.13 → 0.0.14

data/README.markdown

@@ -93,21 +93,22 @@ is a bit overkill. We designed this to replace ModX in our web builds for client
 Required Gems
 -------------
 
-Make sure github gems can be downloaded:
-
-    $ gem sources -a http://gems.github.com
-
 * dm-core (+ do_[sqlite3|mysql|...] )
 * dm-more
 * dm-is-awesome_set
 * rack
 * haml
-* mynyml-rack-abstract-format (github)
+* rack-abstract-format (github)
 * ruby-openid
 * rack-openid
-* meekish-openid_dm_store
+* openid_dm_store
 * radius
 
+All dependencies should be loaded if you install the gem except for the datamapper
+adapter relevant to your set up. If, for example, you want to use a mysql database,
+you'll need to install do_mysql, and for an sqlite3 database, you'll need do_sqlite3
+
+
 Also, you'll need a web server of some kind and need to set it up for rack.
 
 **Testing** 

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

@@ -6,6 +6,19 @@ module Orange
   # Declare submodules for later use
   module Pulp; end
   module Mixins; end
+  module Plugins; end
+  
+  attr_accessor :plugins
+  
+  # Support for plugins
+  def self.plugins
+    @plugins ||= []
+  end
+  
+  # Allows adding plugins
+  def self.plugin(plugin)
+    self.plugins << plugin if plugin.kind_of?(Orange::Plugins::Base)
+  end
   
   # Allow mixins directly from Orange
   def self.mixin(inc)
@@ -57,7 +70,8 @@ module Orange
       load(Orange::Parser.new, :parser)
       load(Orange::Mapper.new, :mapper)
       load(Orange::PageParts.new, :page_parts)
-      load(Orange::AdminResource.new, :admin)
+      Orange.plugins.each{|p| p.resources.each{|args| load(*args)} if p.has_resources?}
+      # load(Orange::AdminResource.new, :admin)
       afterLoad
       self
     end

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

@@ -37,25 +37,86 @@ module Enumerable #:nodoc:
   end 
 end
 
+# Borrowed from Roman2k: 
+# http://github.com/Roman2K/class-inheritable-attributes/
 # @private
-module ClassInheritableAttributes #:nodoc:
-  def cattr_inheritable(*args)
-    @cattr_inheritable_attrs ||= [:cattr_inheritable_attrs]
-    @cattr_inheritable_attrs += args
-    args.each do |arg|
-      class_eval %(
-        class << self; attr_accessor :#{arg} end
-      )
+module ClassInheritableAttributes
+  class << self
+    def eval_in_accessor_module(klass, code)
+      mod = klass.instance_eval { @_inheritable_attribute_accessors ||= Module.new }
+      klass.extend(mod)
+      mod.module_eval(code)
+    end
+    
+    def fetch_value(klass, attribute)
+      each_parent(klass) do |parent|
+        if values = registry[parent] and values.key?(attribute)
+          return values[attribute]
+        elsif parent.instance_variable_defined?("@#{attribute}")
+          return parent.instance_variable_get("@#{attribute}")
+        end
+      end
+      return nil
+    end
+    
+    def store_value(klass, attribute, value)
+      if Thread.current == Thread.main
+        if value.nil?
+          klass.instance_eval do
+            remove_instance_variable("@#{attribute}") if instance_variable_defined?("@#{attribute}")
+          end
+        else
+          klass.instance_variable_set("@#{attribute}", value)
+        end
+      else
+        registry[klass] ||= {}
+        if value.nil?
+          registry[klass].delete(attribute)
+          registry.delete(klass) if registry[klass].empty?
+        else
+          registry[klass][attribute] = value
+        end
+      end
+    end
+    
+  private
+    
+    def each_parent(klass)
+      while klass < Object
+        yield klass
+        klass = klass.superclass
+      end
+    end
+    
+    def registry
+      Thread.current[ClassInheritableAttributes.name] ||= {}
     end
-    @cattr_inheritable_attrs
   end
-
-  def inherited(subclass)
-    @cattr_inheritable_attrs.each do |inheritable_attribute|
-      instance_var = "@#{inheritable_attribute}" 
-      subclass.instance_variable_set(instance_var, instance_variable_get(instance_var))
+  
+  def cattr_reader(*attributes)
+    attributes.each do |attribute|
+      ClassInheritableAttributes.eval_in_accessor_module(self, <<-EOS)
+        def #{attribute}
+          #{ClassInheritableAttributes}.fetch_value(self, :#{attribute})
+        end
+      EOS
     end
   end
+  
+  def cattr_writer(*attributes)
+    attributes.each do |attribute|
+      ClassInheritableAttributes.eval_in_accessor_module(self, <<-EOS)
+        def #{attribute}=(value)
+          #{ClassInheritableAttributes}.store_value(self, :#{attribute}, value)
+        end
+      EOS
+    end
+  end
+  
+  def cattr_accessor(*attributes)
+    cattr_reader(*attributes)
+    cattr_writer(*attributes)
+  end
 end
 
 module Orange

data/lib/{orange → orange-core}/middleware/base.rb

@@ -1,4 +1,4 @@
-require 'orange/packet'
+require 'orange-core/packet'
 
 # Orange Middleware is a bit more complex than Rack middleware. 
 # Initializing it requires both a link to the downstream app and 

data/lib/{orange → orange-core}/middleware/database.rb

@@ -1,4 +1,4 @@
-require 'orange/middleware/base'
+require 'orange-core/middleware/base'
 module Orange::Middleware
   
   class Database < Base

data/lib/{orange → orange-core}/middleware/four_oh_four.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

data/lib/{orange → orange-core}/middleware/globals.rb

@@ -1,4 +1,4 @@
-require 'orange/middleware/base'
+require 'orange-core/middleware/base'
 module Orange::Middleware
   
   class Globals < Base

data/lib/{orange → orange-core}/middleware/loader.rb

@@ -1,4 +1,4 @@
-require 'orange/middleware/base'
+require 'orange-core/middleware/base'
 module Orange::Middleware
   class Loader < Base
     def init(*args)

data/lib/orange-core/middleware/rerouter.rb

@@ -0,0 +1,53 @@
+require 'orange-core/middleware/base'
+module Orange::Middleware
+  
+  class Rerouter < Base
+    def init(*args)
+      orange.add_pulp Orange::Pulp::Packet_Reroute
+    end
+    
+    def packet_call(packet)
+      begin
+        pass packet
+      rescue Orange::Reroute
+        packet.finish
+      end
+    end
+  end
+end
+
+module Orange
+  
+  module Pulp::Packet_Reroute
+    def reroute(url, type = :real, *args)
+      packet['reroute.to'] = url
+      packet['reroute.type'] = type
+      packet['reroute.args'] = *args if args
+      raise Reroute.new(self), 'Unhandled reroute'
+    end
+  end
+  
+  class Reroute < Exception
+    def initialize(packet)
+      @packet = packet
+      @packet[:headers] = {"Content-Type" => 'text/html', "Location" => self.url}
+      @packet[:status] = 302
+    end
+    
+    def url
+      case packet['reroute.type']
+      when :real
+        packet['reroute.to']
+      # Parsing for orange urls or something
+      when :orange
+        packet.route_to(packet['reroute.to'], packet['reroute.args', []])
+      else
+        packet['reroute.to']
+      end
+    end
+    
+    def packet
+      @packet
+    end
+  end
+end

data/lib/{orange → orange-core}/middleware/restful_router.rb

@@ -1,4 +1,4 @@
-require 'orange/middleware/base'
+require 'orange-core/middleware/base'
 
 module Orange::Middleware
   class RestfulRouter < Base

data/lib/{orange → orange-core}/middleware/route_context.rb

@@ -1,4 +1,4 @@
-require 'orange/middleware/base'
+require 'orange-core/middleware/base'
 
 module Orange::Middleware
   # This middleware handles setting orange.env['route.context'] 

data/lib/{orange → orange-core}/middleware/route_site.rb

@@ -1,4 +1,4 @@
-require 'orange/middleware/base'
+require 'orange-core/middleware/base'
 
 module Orange::Middleware
   # This middleware handles setting orange.env['route.site_url'] 

data/lib/{orange → orange-core}/middleware/show_exceptions.rb

@@ -1,7 +1,7 @@
 require 'ostruct'
 require 'rack/request'
 require 'rack/utils'
-require 'orange/middleware/base'
+require 'orange-core/middleware/base'
 
 module Orange::Middleware
   # Rack::ShowExceptions catches all exceptions raised from the app it

data/lib/{orange → orange-core}/middleware/static.rb

@@ -1,5 +1,5 @@
-require 'orange/middleware/base'
-require 'orange/middleware/static_file'
+require 'orange-core/middleware/base'
+require 'orange-core/middleware/static_file'
 
 module Orange::Middleware
   # The Orange::Middleware::Static middleware intercepts requests for static files
@@ -34,21 +34,21 @@ module Orange::Middleware
   class Static < Base
 
     def initialize(app, core, options={})
-      core.mixin Orange::Mixins::Static
-      core.add_static('_orange_', File.join(core.core_dir, 'assets'))
-      @app = app
-      @core = core
-      @libs = options[:libs] || [Orange::Core]
+      @lib_urls = {'_orange_' => File.join(core.core_dir, 'assets') }
+      Orange.plugins.each{|p| @lib_urls[p.assets_name] = p.assets if p.has_assets?}
       
+      @app = app
+      @core = core      
       @urls = options[:urls] || ["/favicon.ico", "/assets/public", "/assets/uploaded"]
       @root = options[:root] || File.join(orange.app_dir, 'assets')
-      @lib_urls = core.statics
       @file_server = Orange::Middleware::StaticFile.new(@root)
     end
 
     def packet_call(packet)
       path = packet.env["PATH_INFO"]
-      can_serve_lib = @lib_urls.select{ |url, server| path.index(url) == 0 }.first
+      can_serve_lib = @lib_urls.select { |url, server| 
+        path.index(File.join('', 'assets', url)) == 0 
+      }.first
       can_serve = @urls.any?{|url| path.index(url) == 0 }
       if can_serve_lib
         lib_url = can_serve_lib.first
@@ -64,16 +64,4 @@ module Orange::Middleware
     end
 
   end
-end
-
-module Orange::Mixins::Static
-  def add_static(lib_name, path)
-    @statics ||= {}
-    key = File.join('', 'assets', lib_name)
-    @statics.merge!(key => path)
-  end
-  
-  def statics
-    @statics ||= {}
-  end
 end

data/lib/{orange → orange-core}/middleware/template.rb

@@ -1,5 +1,5 @@
-require 'orange/core'
-require 'orange/middleware/base'
+require 'orange-core/core'
+require 'orange-core/middleware/base'
 
 module Orange::Middleware
   
@@ -10,14 +10,7 @@ module Orange::Middleware
       
       # Establish a default template chooser
       @core.template_chooser do |packet|
-        if packet['route.context'] == :admin
-          packet.add_css('admin.css', :module => '_orange_')
-          packet.add_js('jquery.js', :module => '_orange_')
-          packet.add_js('admin.js', :module => '_orange_')
-          'admin.haml'
-        else
-          false
-        end
+        false
       end
     end
     

data/lib/orange-core/plugin.rb

@@ -0,0 +1,172 @@
+require 'orange-core/magick'
+require 'orange-core/core'
+module Orange::Plugins
+  # This class defines a basic Orange plugin. A plugin simply defines
+  # a bunch of possible classes/files that can be called up by the main
+  # orange system.
+  # 
+  # The plugins are used in several places. When the core is initialized,
+  # it will ask all plugins if they have any resources that should be added,
+  # and load those resources if they exist.
+  # 
+  # The stack will call the list of plugins several times in building a stack
+  # once for each possible middleware location. 
+  class Base
+    extend ClassInheritableAttributes
+    cattr_accessor  :prerouting_middleware, :routing_middleware, 
+                    :responder_middleware, :postrouting_middleware, :has_middleware
+    cattr_accessor :assets, :assets_name
+    cattr_accessor :resources
+    cattr_accessor :views
+    cattr_accessor :templates
+    
+    # Adds a single prerouting middleware class to list of prerouting middleware
+    def self.prerouter(r)
+      prerouters(r)
+    end
+    
+    # Adds several prerouting middleware classes to list of prerouting middleware
+    def self.prerouters(*routers)
+      self.has_middleware = true
+      routers.each do |prerouter|
+        self.prerouting_middleware << prerouter
+      end
+    end
+    
+    # Adds a single postrouting middleware class to list of postrouting middleware
+    def self.postrouter(r)
+      postrouters(r)
+    end
+    
+    # Adds several postrouting middleware classes to list of postrouting middleware
+    def self.postrouters(*routers)
+      self.has_middleware = true
+      routers.each do |postrouter|
+        self.postrouting_middleware << postrouter
+      end
+    end
+    
+    # Adds a router middleware class to the list of routing middleware
+    def self.router(r)
+      routers(r)
+    end
+    # Adds several router middleware classes
+    def self.routers(*routers)
+      self.has_middleware = true
+      routers.each do |router|
+        self.routing_middleware << router
+      end
+    end
+    # Adds a responder middleware class 
+    def self.responder(r)
+      responders(r)
+    end
+    # Adds several responder middleware classes
+    def self.responders(*respones)
+      self.has_middleware = true
+      respones.each do |response|
+        self.responder_middleware << response
+      end
+    end
+    
+    # Returns the list of prerouting_middleware defined or
+    # an empty array if none defined
+    def self.prerouting_middleware
+      super || self.prerouting_middleware = []
+    end
+    
+    # Returns the list of prerouting_middleware defined or
+    # an empty array if none defined
+    def self.postrouting_middleware
+      super || self.postrouting_middleware = []
+    end
+    
+    # Returns the list of routing_middleware defined or
+    # an empty array if none defined
+    def self.routing_middleware
+      super || self.routing_middleware = []
+    end
+    
+    # Returns the list of responder_middleware defined or
+    # an empty array if none defined
+    def self.responder_middleware
+      super || self.responder_middleware = []
+    end
+    
+    def self.templates_dir(arg)
+      self.templates = arg
+    end
+    
+    def self.views_dir(arg)
+      self.views = arg
+    end
+    
+    def self.assets_dir(arg)
+      self.assets = arg
+    end
+    
+    def self.resource(instance, name = false)
+      self.resources << [instance, name]
+    end
+    
+    def self.resources
+      super || self.resources = []
+    end
+    
+    # Returns the assigned asset dir name,
+    # or Plugin class name formatted like this: PluginClass -> _pluginclass_
+    def assets_name
+      self.class.assets_name || '_'+self.class.to_s.gsub(/Orange::Plugins::/, '').gsub(/::/, '_').downcase+'_'
+    end
+    
+    # Returns the assets directory for this plugin
+    def assets
+      self.class.assets
+    end
+    
+    # Whether this plugin has assets for the static middleware to worry
+    # about
+    def has_assets?
+      !assets.blank?
+    end
+    
+    def resources
+      self.class.resources
+    end
+    
+    def has_resources?
+      !resources.blank?
+    end
+    
+    def views
+      self.class.views
+    end
+    
+    def has_views?
+      !views.blank?
+    end
+    
+    def templates
+      self.class.templates
+    end
+    
+    def has_templates?
+      !templates.blank?
+    end
+    
+    def middleware(type = :has)
+      case type
+      when :responders then self.class.responder_middleware
+      when :routing then self.class.routing_middleware
+      when :prerouting then self.class.prerouting_middleware
+      when :postrouting then self.class.postrouting_middleware
+      when :has then self.class.has_middleware
+      else nil
+      end
+    end
+    
+    def has_middleware?
+      !middleware.blank?
+    end
+  end
+end

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

@@ -1,4 +1,4 @@
-require 'orange/core'
+require 'orange-core/core'
 
 module Orange
   # Orange Resource for being subclassed
@@ -6,7 +6,7 @@ module Orange
     extend ClassInheritableAttributes
     # Defines a model class as an inheritable class attribute and also an instance
     # attribute
-    cattr_inheritable :called
+    cattr_accessor :called
     
     def initialize(*args, &block)
       @options = DefaultHash.new.merge!(Options.new(*args, &block).hash)

data/lib/{orange → orange-core}/resources/mapper.rb

@@ -1,4 +1,4 @@
-require 'orange/core'
+require 'orange-core/core'
 
 module Orange
   class Mapper < Resource
@@ -30,31 +30,6 @@ module Orange
       packet['reroute.args'] = *args if args
       raise Reroute.new(self), 'Unhandled reroute'
     end
-    
-  end
-  
-  class Reroute < Exception
-    def initialize(packet)
-      @packet = packet
-      @packet[:headers] = {"Content-Type" => 'text/html', "Location" => self.url}
-      @packet[:status] = 302
-    end
-    
-    def url
-      case packet['reroute.type']
-      when :real
-        packet['reroute.to']
-      # Parsing for orange urls or something
-      when :orange
-        packet.route_to(packet['reroute.to'], packet['reroute.args', []])
-      else
-        packet['reroute.to']
-      end
-    end
-    
-    def packet
-      @packet
-    end
   end
   
 end

data/lib/{orange → orange-core}/resources/model_resource.rb

@@ -1,10 +1,10 @@
-require 'orange/resources/routable_resource'
+require 'orange-core/resources/routable_resource'
 
 module Orange
   class ModelResource < RoutableResource
     # Defines a model class as an inheritable class attribute and also an instance
     # attribute
-    cattr_inheritable :model_class
+    cattr_accessor :model_class
     attr_accessor :model_class
     
     # Tells the Model resource which Carton class to scaffold

data/lib/{orange → orange-core}/resources/not_found.rb

@@ -1,3 +1,4 @@
+require 'orange-core/resource'
 module Orange
   class NotFound < Orange::Resource
     call_me :not_found

data/lib/{orange → orange-core}/resources/page_parts.rb

@@ -1,3 +1,4 @@
+require 'orange-core/resource'
 module Orange
   class PageParts < Resource
     def afterLoad

data/lib/{orange → orange-core}/resources/parser.rb

@@ -1,4 +1,4 @@
-require 'orange/core'
+require 'orange-core/core'
 require 'haml'
 require 'yaml'
 
@@ -6,6 +6,10 @@ module Orange
   class Parser < Resource
     def afterLoad
       orange.add_pulp Orange::Pulp::ParserPulp
+      @template_dirs = [File.join(orange.core_dir, 'templates')]
+      @view_dirs = [File.join(orange.core_dir, 'views')]
+      Orange.plugins.each{|p| @template_dirs << p.templates if p.has_templates? }
+      Orange.plugins.each{|p| @view_dirs << p.views if p.has_views? }
     end
     
     def yaml(file)
@@ -22,16 +26,20 @@ module Orange
       resource = (opts[:resource_name] || '').downcase
       opts.merge :orange => orange
       
-      templates_dir = File.join(orange.core_dir, 'templates')
-      views_dir = File.join(orange.core_dir, 'views')
       string = false
-      string ||= read_if_exists('templates', file) if temp
-      string ||= read_if_exists(templates_dir, file) if temp
+      if temp
+        string ||= read_if_exists('templates', file) 
+        @template_dirs.each do |templates_dir|
+          string ||= read_if_exists(templates_dir, file)
+        end
+      end
       string ||= read_if_exists('views', resource, file) if resource
       string ||= read_if_exists('views', file)
-      string ||= read_if_exists(views_dir, resource, file) if resource
-      string ||= read_if_exists(views_dir, 'default_resource', file)
-      string ||= read_if_exists(views_dir, file)
+      @view_dirs.each do |views_dir|
+        string ||= read_if_exists(views_dir, resource, file) if resource
+        string ||= read_if_exists(views_dir, file)
+      end
+      string ||= read_if_exists(@view_dirs.first, 'default_resource', file)
       raise LoadError, "Couldn't find haml file '#{file}'" unless string
       
       haml_engine = Haml::Engine.new(string)

data/lib/{orange → orange-core}/resources/routable_resource.rb

@@ -1,4 +1,4 @@
-require 'orange/resource'
+require 'orange-core/resource'
 
 module Orange
   class RoutableResource < Resource