orange 0.0.4 → 0.0.5

data/README.markdown

@@ -99,12 +99,14 @@ Make sure github gems can be downloaded:
 
 * dm-core (+ do_[sqlite3|mysql|...] )
 * dm-more
+* dm-is-awesome_set
 * rack
 * haml
 * mynyml-rack-abstract-format (github)
 * ruby-openid
 * rack-openid
 * meekish-openid_dm_store
+* radius
 
 Also, you'll need a web server of some kind and need to set it up for rack.
 
@@ -124,6 +126,10 @@ The following are useful rake tasks for testing purposes:
     * rake doc    =>  runs yardoc (no, not really necessary)
     * rake clean  =>  clear out the temporary files not included in the repo
     * rake rcov   =>  runs rspec with rcov
+
+For my own reference - jeweler rake task for deploying the new gem:
+
+    * rake version:bump:patch release
     
 Programming Info
 ================

data/lib/orange/carton.rb

@@ -22,7 +22,7 @@ module Orange
   # class and just include DataMapper::Resource. All carton methods are to
   # improve scaffolding capability.
   class Carton
-    SCAFFOLD_OPTIONS = [:display_name] unless defined?(SCAFFOLD_OPTIONS)
+    SCAFFOLD_OPTIONS = [:display_name, :levels] unless defined?(SCAFFOLD_OPTIONS)
     # Declares a ModelResource subclass that scaffolds this carton
     # The Subclass will have the name of the carton followed by "_Resource"
     def self.as_resource
@@ -80,7 +80,7 @@ module Orange
     end
     
     def self.add_scaffold(name, type, dm_type, opts)
-      scaffold_properties << {:name => name, :type => type, :levels => @levels}.merge(opts) if @levels
+      scaffold_properties << {:name => name, :type => type, :levels => @levels}.merge(opts) if @levels || opts.has_key?(:levels)
       opts = opts.delete_if{|k,v| SCAFFOLD_OPTIONS.include?(k)} # DataMapper doesn't like arbitrary opts
       self.property(name, dm_type, opts)
     end

data/lib/orange/cartons/page_carton.rb

@@ -0,0 +1,13 @@
+require 'dm-timestamps'
+
+module Orange
+  class Page < Orange::Carton
+    id
+    front do
+      title :title
+      fulltext :body
+    end
+    property :updated_at, DateTime
+    has n, :versions, "Orange::PageVersion"
+  end
+end

data/lib/orange/cartons/page_version_carton.rb

@@ -0,0 +1,11 @@
+require 'dm-timestamps'
+module Orange
+  class PageVersion < Orange::Carton
+    id
+    title :title
+    fulltext :body
+    property :updated_at, DateTime
+    property :version, Integer, :default => 0
+    belongs_to :orange_page, "Orange::Page"
+  end
+end

data/lib/orange/core.rb

@@ -106,6 +106,7 @@ module Orange
     #   Doesn't necessarily need to be a symbol, but generally is.
     #   Set to the class name lowercase as a symbol by default.
     def load(resource, name = false)
+      name = resource.orange_name if(!name)
       name = resource.class.to_s.gsub(/::/, '_').downcase.to_sym if(!name) 
       @resources[name] = resource.set_orange(self, name)
     end

data/lib/orange/magick.rb

@@ -1,19 +1,21 @@
 # Monkey Patch the extract_options! stolen from ActiveSupport
-class ::Array
-  def extract_options!
+# @private
+class ::Array #:nodoc:
+  def extract_options! 
     last.is_a?(::Hash) ? pop : {}
   end
-  def extract_with_defaults(defaults)
+  def extract_with_defaults(defaults) 
     extract_options!.with_defaults(defaults)
   end
 end
 
 # Monkey Patch for merging defaults into a hash 
-class ::Hash
-  def with_defaults(defaults)
+# @private
+class ::Hash #:nodoc:
+  def with_defaults(defaults) 
     self.merge(defaults){ |key, old, new| old.nil? ? new : old } 
   end
-  def with_defaults!(defaults)
+  def with_defaults!(defaults) 
     self.merge!(defaults){ |key, old, new| old.nil? ? new : old } 
   end
 end
@@ -28,13 +30,15 @@ end
 #   end
 #
 #   # => {:x => 32, :y => 63, :z => 91}
-module Enumerable
+# @private
+module Enumerable #:nodoc:
   def inject_hash(hash = {}) 
     inject(hash) {|(h,item)| yield(h,item); h}
   end 
 end
 
-module ClassInheritableAttributes
+# @private
+module ClassInheritableAttributes #:nodoc:
   def cattr_inheritable(*args)
     @cattr_inheritable_attrs ||= [:cattr_inheritable_attrs]
     @cattr_inheritable_attrs += args
@@ -99,4 +103,106 @@ module Orange
       end
     end
   end
-end
+  
+  # @private
+  module Inflector
+    extend self
+    # @private
+    def camelize(lower_case_and_underscored_word, first_letter_in_uppercase = true)
+      if first_letter_in_uppercase
+        lower_case_and_underscored_word.to_s.gsub(/\/(.?)/) { "::#{$1.upcase}" }.gsub(/(?:^|_)(.)/) { $1.upcase }
+      else
+        lower_case_and_underscored_word.to_s[0].chr.downcase + camelize(lower_case_and_underscored_word)[1..-1]
+      end
+    end
+    
+    if Module.method(:const_get).arity == 1
+      def constantize(camel_cased_word)
+        names = camel_cased_word.split('::')
+        names.shift if names.empty? || names.first.empty?
+ 
+        constant = Object
+        names.each do |name|
+          constant = constant.const_defined?(name) ? constant.const_get(name) : constant.const_missing(name)
+        end
+        constant
+      end
+    else
+      def constantize(camel_cased_word) #:nodoc:
+        names = camel_cased_word.split('::')
+        names.shift if names.empty? || names.first.empty?
+ 
+        constant = Object
+        names.each do |name|
+          constant = constant.const_get(name, false) || constant.const_missing(name)
+        end
+        constant
+      end
+    end
+    
+  end
+  
+end
+
+# @private
+class Object #:nodoc:
+  # An object is blank if it's false, empty, or a whitespace string.
+  # For example, "", "   ", +nil+, [], and {} are blank.
+  #
+  # This simplifies
+  #
+  #   if !address.nil? && !address.empty?
+  #
+  # to
+  #
+  #   if !address.blank?
+  def blank?
+    respond_to?(:empty?) ? empty? : !self
+  end
+end
+
+# @private
+class NilClass #:nodoc:
+  def blank?
+    true
+  end
+end
+
+# @private
+class FalseClass #:nodoc:
+  def blank?
+    true
+  end
+end
+
+# @private
+class TrueClass #:nodoc:
+  def blank?
+    false
+  end
+end
+
+# @private
+class Array #:nodoc:
+  alias_method :blank?, :empty?
+end
+
+# @private
+class Hash #:nodoc:
+  alias_method :blank?, :empty?
+end
+
+# @private
+class String #:nodoc:
+  def blank?
+    self !~ /\S/
+  end
+end
+
+# @private
+class Numeric #:nodoc:
+  def blank?
+    false
+  end
+end
+

data/lib/orange/middleware/access_control.rb

@@ -16,12 +16,13 @@ module Orange::Middleware
     # @option opts [Boolean] :config_id Whether to use the id set in a config file
     
     def init(opts = {})
-      defs = {:locked => [:admin, :orange], :login => '/login', 
+      defs = {:locked => [:admin, :orange], :login => '/login', :logout => '/logout',
               :handle_login => true, :openid => true, :config_id => true}
       opts = opts.with_defaults!(defs)
       @openid = opts[:openid]
       @locked = opts[:locked]
       @login = opts[:login]
+      @logout = opts[:logout]
       @handle = opts[:handle_login]
       @single = opts[:config_id]
     end
@@ -59,11 +60,20 @@ module Orange::Middleware
     end
     
     def need_to_handle?(packet)
-      @handle && (packet.env['REQUEST_PATH'] == @login)
+      @handle && ([@login, @logout].include? packet.env['REQUEST_PATH'])
     end
     
     def handle_openid(packet)
+      if packet.env['REQUEST_PATH'] == @logout
+        packet.session['user.id'] = nil
+        packet['user.id'] = nil
+        after = packet.session['user.after_login'].blank? ? 
+                '/' : packet.session['user.after_login'] 
+        packet.reroute(after)
+        false
+      end
       packet.reroute('/') if packet['user.id'] # Reroute to index if we're logged in.
+      
       # If login set
       if packet.request.post?
         packet['template.disable'] = true
@@ -71,8 +81,28 @@ module Orange::Middleware
         if resp = packet.env["rack.openid.response"]
           if resp.status == :success
             packet['user.id'] = resp.identity_url
+            
             packet['user.openid.url'] = resp.identity_url
             packet['user.openid.response'] = resp
+            # Load in any registration data gathered
+            profile_data = {}
+            # merge the SReg data and the AX data into a single hash of profile data
+            [ OpenID::SReg::Response, OpenID::AX::FetchResponse ].each do |data_response|
+              if data_response.from_success_response( resp )
+                profile_data.merge! data_response.from_success_response( resp ).data
+              end
+            end
+            
+            if packet['user.id'] =~ /^https?:\/\/(www.)?google.com\/accounts/
+              packet['user.id'] = profile_data["http://axschema.org/contact/email"]
+              packet['user.id'] = packet['user.id'].first if packet['user.id'].kind_of?(Array)
+            end
+            
+            if packet['user.id'] =~ /^https?:\/\/(www.)?yahoo.com/
+              packet['user.id'] = profile_data["http://axschema.org/contact/email"]
+              packet['user.id'] = packet['user.id'].first if packet['user.id'].kind_of?(Array)
+            end
+            
             
             after = packet.session.has_key?('user.after_login') ?
                         packet.session['user.after_login'] : '/'
@@ -94,8 +124,10 @@ module Orange::Middleware
           packet[:status] = 401
           packet[:headers] = {}
           packet.add_header('WWW-Authenticate', Rack::OpenID.build_header(
-                :identifier => packet.request.params["openid_identifier"]
-              ))
+                :identifier => packet.request.params["openid_identifier"],
+                :required => [:email, "http://axschema.org/contact/email"]
+                ) 
+          )
           packet[:content] = 'Got openID?'
           packet.finish
         end

data/lib/orange/middleware/base.rb

@@ -63,10 +63,22 @@ module Orange::Middleware
       if @app.respond_to?(:packet_call)
         @app.packet_call(packet)
       else
-        @app.call(packet.env) 
+        recapture(@app.call(packet.env), packet)
       end
     end
     
+    # After the pass has been completed, we should recapture the contents and make
+    # sure they are placed in the packet, in case the downstream app is not Orange aware.
+    # @param [Array] the standard Rack striplet of status, headers and content
+    # @param [Orange::Packet] packet the packet to pass to downstream apps
+    # @return [Array] the standard Rack striplet of status, headers and content
+    def recapture(response, packet)
+      packet[:status]  = response[0]
+      packet[:headers] = response[1]
+      packet[:content] = response[2].first
+      response
+    end
+    
     # Accessor for @core, which is the stack's instance of Orange::Core
     # @return [Orange::Core] the stack's instance of Orange::Core
     def orange;     @core;    end

data/lib/orange/middleware/flex_router.rb

@@ -1,59 +1,30 @@
 require 'orange/middleware/base'
 
 module Orange::Middleware
+  # The FlexRouter middleware takes a resource that can route paths and
+  # then intercepts routes for that resource. By default,
+  # it uses the Orange::SitemapResource. 
+  # 
+  # The resource is automatically loaded into the core as 
+  # :sitemap. The resource must respond to "route?(path)" 
+  # and "route(packet)".  
+  # 
+  # Pass a different routing resource using the :resource arg
   class FlexRouter < Base
-    def init(*args)
-      opts = args.extract_options!.with_defaults(:contexts => [:admin, :orange], :root_resource => :not_found)
-      @contexts = opts[:contexts]
-      @root_resource = opts[:root_resource]
+    def init(opts = {})
+      @resource = opts[:resource] || Orange::SitemapResource
+      orange.load @resource.new, :sitemap
     end
     
-    # sets resource, resource_id, resource_action and resource_path
-    # /resource/id/action/[resource/path/if/any]
-    # /resource/action/[resource/path/if/any]
-    # 
-    # In future - support for nested resources
+    # Sets the sitemap resource as the router if the resource can accept 
+    # the path.
     def packet_call(packet)
       return (pass packet) if packet['route.router']  # Don't route if other middleware
                                                       # already has
-      if(@contexts.include?(packet['route.context']))
-        path = packet['route.path'] || packet.request.path_info
-        parts = path.split('/')
-        pad = parts.shift
-        if !parts.empty?
-          resource = parts.shift
-          if orange.loaded?(resource.to_sym)
-            packet['route.resource'] = resource.to_sym
-            if !parts.empty?
-              second = parts.shift
-              if second =~ /^\d+$/
-                packet['route.resource_id'] = second
-                if !parts.empty?
-                  packet['route.resource_action'] = parts.shift.to_sym
-                end
-              else
-                packet['route.resource_action'] = second.to_sym
-              end 
-            end # end check for second part
-          else
-            parts.unshift(resource)
-          end # end check for loaded resource
-        end # end check for nonempty route
-        
-        packet['route.resource'] ||= @root_resource
-        packet['route.resource_path'] = parts.unshift(pad).join('/')
-        packet['route.router'] = self
-      end # End context match if
-      
+      path = packet['route.path'] || packet.request.path_info
+      packet['route.router'] = orange[:sitemap] if orange[:sitemap].route?(packet, path)
       pass packet
     end
     
-    def route(packet)
-      resource = packet['route.resource']
-      raise 'resource not found' unless orange.loaded? resource
-      mode = packet['route.resource_action'] || 
-        (packet['route.resource_id'] ? :show : :list)
-      packet[:content] = orange[resource].view packet
-    end
   end
 end

data/lib/orange/middleware/loader.rb

@@ -0,0 +1,13 @@
+require 'orange/middleware/base'
+module Orange::Middleware
+  class Loader < Base
+    def init(*args)
+      Dir.glob(File.join(orange.app_dir, 'resources', '*.rb')).each do |f| 
+        require f 
+        orange.load Orange::Inflector.constantize(Orange::Inflector.camelize(File.basename(f, '.rb'))).new
+      end
+      Dir.glob(File.join(orange.app_dir, 'cartons', '*.rb')).each { |f|  require f }
+      Dir.glob(File.join(orange.app_dir, 'middleware', '*.rb')).each { |f|  require f }
+    end
+  end  
+end

data/lib/orange/middleware/radius.rb

@@ -0,0 +1,24 @@
+require 'orange/middleware/base'
+
+module Orange::Middleware
+  # The RadiusParser middleware will parse all outgoing content with 
+  # Radius.
+  #
+  # For more details on how Radius works, see http://radius.rubyforge.org/
+  # This middleware also loads a resource: "Orange::Radius", for the
+  # purpose of exposing the context object.
+  class RadiusParser < Base
+    def init(opts = {})
+      @contexts = opts[:contexts] || [:live]
+      orange.load Orange::Radius.new, :radius
+    end
+    
+    # Passes packet then parses the return
+    def packet_call(packet)
+      pass packet
+      orange[:radius].parse packet if @contexts.include? packet['route.context']
+      packet.finish
+    end
+    
+  end
+end

data/lib/orange/middleware/restful_router.rb

@@ -3,9 +3,9 @@ require 'orange/middleware/base'
 module Orange::Middleware
   class RestfulRouter < Base
     def init(*args)
-      opts = args.extract_options!.with_defaults(:contexts => [:admin, :orange], :root_resource => :not_found)
+      opts = args.extract_options!.with_defaults(:contexts => [:admin, :orange], :not_found => false)
       @contexts = opts[:contexts]
-      @root_resource = opts[:root_resource]
+      @not_found = opts[:not_found]
     end
     
     # sets resource, resource_id, resource_action and resource_path
@@ -40,9 +40,14 @@ module Orange::Middleware
           end # end check for loaded resource
         end # end check for nonempty route
         
-        packet['route.resource'] ||= @root_resource
-        packet['route.resource_path'] = parts.unshift(pad).join('/')
-        packet['route.router'] = self
+        if(packet['route.resource', false]) 
+          packet['route.resource_path'] = parts.unshift(pad).join('/')
+          packet['route.router'] = self
+        elsif(@not_found)
+          packet['route.resource'] = @not_found
+          packet['route.resource_path'] = parts.unshift(pad).join('/')
+          packet['route.router'] = self
+        end
       end # End context match if
       
       pass packet

data/lib/orange/middleware/site_load.rb

@@ -13,8 +13,6 @@ module Orange::Middleware
       site = Orange::Site.first(:url.like => url)
       if site
         packet['site'] = site
-      elsif
-        nil
       else
         s = Orange::Site.new({:url => packet['route.site_url'], 
                               :name => 'An Orange Site'})

data/lib/orange/middleware/template.rb

@@ -12,6 +12,8 @@ module Orange::Middleware
       @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
@@ -25,9 +27,10 @@ module Orange::Middleware
       if needs_wrapped?(packet)
         content = wrap(packet, content)
         packet[:content] = content.first
-      end
-      orange.fire(:wrapped, packet)
-      [status, headers, packet.content]
+        orange.fire(:wrapped, packet)
+      end  
+      orange.fire(:after_wrap, packet)
+      packet.finish
     end
     
     def needs_wrapped?(packet)

data/lib/orange/resource.rb

@@ -3,8 +3,13 @@ require 'orange/core'
 module Orange
   # Orange Resource for being subclassed
   class Resource
+    extend ClassInheritableAttributes
+    # Defines a model class as an inheritable class attribute and also an instance
+    # attribute
+    cattr_inheritable :called
+    
     def initialize(*args, &block)
-      @options = Options.new(*args, &block).hash
+      @options = DefaultHash.new.merge!(Options.new(*args, &block).hash)
     end
     
     def set_orange(orange, name)
@@ -22,6 +27,10 @@ module Orange
       true
     end
     
+    def self.call_me(name)
+      self.called = name
+    end
+    
     def orange
       @orange
     end
@@ -35,7 +44,7 @@ module Orange
     end
     
     def orange_name
-      @my_orange_name
+      @my_orange_name || self.class.called || false
     end
     
     def options

data/lib/orange/resources/admin_resource.rb

@@ -9,6 +9,8 @@ module Orange
     def add_link(section, *args)
       opts = args.extract_with_defaults(:position => 0)
       @links[section] = [] unless @links.has_key?(section)
+      matches = @links[section].select{|i| i[:resource] == opts[:resource] && i[:text] == opts[:text]}
+      return @links[section] unless matches.empty?
       @links[section].insert(opts.delete(:position), opts)
       @links[section].compact!
       @links[section].uniq!

data/lib/orange/resources/mapper.rb

@@ -23,9 +23,10 @@ module Orange
       orange[:mapper].route_to(self, resource, *args)
     end
     
-    def reroute(url, type = :real)
+    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
     
@@ -44,7 +45,7 @@ module Orange
         packet['reroute.to']
       # Parsing for orange urls or something
       when :orange
-        packet.route_to(packet['reroute.to'])
+        packet.route_to(packet['reroute.to'], packet['reroute.args', []])
       else
         packet['reroute.to']
       end

data/lib/orange/resources/model_resource.rb

@@ -2,7 +2,6 @@ require 'orange/resources/routable_resource'
 
 module Orange
   class ModelResource < RoutableResource
-    extend ClassInheritableAttributes
     # Defines a model class as an inheritable class attribute and also an instance
     # attribute
     cattr_inheritable :model_class
@@ -29,12 +28,11 @@ module Orange
     # Calling view is equivalent to calling a viewable method directly, view just
     # sets up safe defaults so method missing errors are less likely.
     # @param [Orange::Packet] packet the packet calling view on this resource
-    def view(packet, *args)
-      opts = args.last || {}
+    def view(packet, opts = {})
       resource_id = opts[:id] || packet['route.resource_id', false]
       mode = opts[:mode] || packet['route.resource_action'] || 
         (resource_id ? :show : :index)
-      self.__send__(mode, packet, *args)
+      self.__send__(mode, packet, opts)
     end
     
     # Renders a view, with all options set for haml to access.
@@ -215,7 +213,7 @@ module Orange
     # Returns a scaffolded attribute
     def view_attribute(prop, model_name, *args)
       args = args.extract_options!
-      val = args[:value] || ''
+      val = (args[:value] || '')
       label = args[:label] || false
       show = args[:show] || false
       name = prop[:name]
@@ -223,16 +221,19 @@ module Orange
       unless show
         case prop[:type]
         when :title
-          ret = "<input class='title' type='text' value='#{val}' name='#{model_name}[#{name}]' />"
+          val.gsub!('"', '&quot;')
+          ret = "<input class=\"title\" type=\"text\" value=\"#{val}\" name=\"#{model_name}[#{name}]\" />"
         when :text
-          ret = "<input type='text' value='#{val}' name='#{model_name}[#{name}]' />"
+          val.gsub!('"', '&quot;')
+          ret = "<input type=\"text\" value=\"#{val}\" name=\"#{model_name}[#{name}]\" />"
         when :fulltext
           ret = "<textarea name='#{model_name}[#{name}]'>#{val}</textarea>"
         when :boolean
           human_readable_name = human_readable_name + '?'
           ret = "<input type='hidden' name='#{model_name}[#{name}]' value='0' /><input type='checkbox' name='#{model_name}[#{name}]' value='1' #{'checked="checked"' if (val && val != '')}/>"
         else
-          ret = "<input type='text' value='#{val}' name='#{model_name}[#{name}]' />"
+          val.gsub!('"', '&quot;')
+          ret = "<input type=\"text\" value=\"#{val}\" name=\"#{model_name}[#{name}]\" />"
         end
         display_name = prop[:display_name] || human_readable_name
         ret = "<label for=''>#{display_name}</label><br />" + ret if label
@@ -248,7 +249,7 @@ module Orange
           ret = "<div class='#{model_name}-#{name}'>#{val}</div>"
         end
       end
-      ret
+      return ret
     end
   end
 end

data/lib/orange/resources/page_parts.rb

@@ -3,11 +3,8 @@ module Orange
     def afterLoad
       orange.add_pulp Orange::Pulp::PageParts
     end
-  end
-  
-  module Pulp::PageParts
     
-    def part
+    def part(packet)
       unless packet[:page_parts, false]
         packet[:page_parts] = DefaultHash.new 
         packet[:page_parts].default = ''
@@ -15,33 +12,56 @@ module Orange
       packet[:page_parts]
     end
     
-    # Feels like part should be plural, no?
-    def parts;    part;     end
-    
     
-    def add_css(file, opts = {})
+    def add_css(packet, file, opts = {})
       ie = opts[:ie] || false
       mod = opts[:module] || 'public'
         # module set to false gives the root assets dir
       assets = File.join('assets', mod)
       file = File.join('', assets, 'css', file)
-      if ie
-        part[:ie_css] = part[:ie_css] + "<link rel=\"stylesheet\" href=\"#{file}\" type=\"text/css\" media=\"screen\" charset=\"utf-8\" />"
-      else 
-        part[:css] = part[:css] + "<link rel=\"stylesheet\" href=\"#{file}\" type=\"text/css\" media=\"screen\" charset=\"utf-8\" />"
+      unless packet[:css_files, []].include?(file)
+        if ie
+          part(packet)[:ie_css] = part(packet)[:ie_css] + "<link rel=\"stylesheet\" href=\"#{file}\" type=\"text/css\" media=\"screen\" charset=\"utf-8\" />"
+        else 
+          part(packet)[:css] = part(packet)[:css] + "<link rel=\"stylesheet\" href=\"#{file}\" type=\"text/css\" media=\"screen\" charset=\"utf-8\" />"
+        end
+        packet[:css_files] ||= []
+        packet[:css_files] << file
       end
     end
     
-    def add_js(file, opts = {})
+    def add_js(packet, file, opts = {})
       ie = opts[:ie] || false
       mod = opts[:module] || 'public'
       assets = File.join('assets', mod)
       file = File.join('', assets, 'js', file)
-      if ie
-        part[:ie_js] = part[:ie_js] + "<script src=\"#{file}\" type=\"text/javascript\"></script>"
-      else 
-        part[:js] = part[:js] + "<script src=\"#{file}\" type=\"text/javascript\"></script>"
+      unless packet[:js_files, []].include?(file)
+        if ie
+          part(packet)[:ie_js] = part(packet)[:ie_js] + "<script src=\"#{file}\" type=\"text/javascript\"></script>"
+        else 
+          part(packet)[:js] = part(packet)[:js] + "<script src=\"#{file}\" type=\"text/javascript\"></script>"
+        end
+        packet[:js_files] ||= []
+        packet[:js_files] << file
       end
     end
   end
+  
+  module Pulp::PageParts
+    def part
+      orange[:page_parts].part(packet)
+    end
+    
+    # Feels like part should be plural, no?
+    def parts;    part;     end
+    
+    
+    def add_css(file, opts = {})
+      orange[:page_parts].add_css(packet, file, opts)
+    end
+    
+    def add_js(file, opts = {})
+      orange[:page_parts].add_js(packet, file, opts)
+    end
+  end
 end

data/lib/orange/resources/page_resource.rb

@@ -0,0 +1,58 @@
+module Orange
+  class PageResource < Orange::ModelResource
+    use Orange::Page
+    call_me :pages
+    def afterLoad
+      orange[:admin, true].add_link("Content", :resource => @my_orange_name, :text => 'Pages')
+      options[:sitemappable] = true
+      
+    end
+    # Creates a new model object and saves it (if a post), then reroutes to the main page
+    # @param [Orange::Packet] packet the packet being routed
+    def new(packet, *opts)
+      if packet.request.post?
+        m = model_class.new(packet.request.params[@my_orange_name.to_s])
+        m.versions.new(packet.request.params[@my_orange_name.to_s].merge(:version => 1))
+        m.save
+      end
+      packet.reroute(@my_orange_name, :orange)
+    end
+    
+    # Saves updates to an object specified by packet['route.resource_id'], then reroutes to main
+    # @param [Orange::Packet] packet the packet being routed
+    def save(packet, *opts)
+      if packet.request.post?
+        m = model_class.get(packet['route.resource_id'])
+        if m
+          m.update(packet.request.params[@my_orange_name.to_s])
+          max = m.versions.max(:version)
+          m.versions.new(packet.request.params[@my_orange_name.to_s].merge(:version => max + 1))
+          m.save
+        end
+      end
+      packet.reroute(@my_orange_name, :orange)
+    end
+    
+    # Returns a single object found by the model class, given an id. 
+    # If id isn't given, we return false.
+    # @param [Orange::Packet] packet the packet we are returning a view for
+    # @param [Symbol] mode the mode we are trying to view (used to find template name)
+    # @param [Numeric] id the id to lookup on the model class
+    # @return [Object] returns an object of type set by #use, if one found with same id
+    def find_one(packet, mode, id = false)
+      return false unless id
+      m = model_class.get(id)
+      if packet['route.resource_path',''] =~ /version\//
+        parts = packet['route.resource_path'].split('/')
+        version = parts[2]
+        v = m.versions.first(:version => version)
+        if v
+          attrs = v.attributes
+          [:version, :orange_page_id, :page_id, :id].each { |i| attrs.delete(i) }
+          m.attributes = attrs
+        end
+      end
+      m
+    end
+  end
+end

data/lib/orange/resources/parser.rb

@@ -52,9 +52,11 @@ module Orange
   module Pulp::ParserPulp
     def html(&block)
       if block_given?
-        doc = orange[:parser].hpricot(packet[:content])
-        yield doc
-        packet[:content] = doc.to_s
+        unless(packet[:content].blank?)
+          doc = orange[:parser].hpricot(packet[:content])
+          yield doc
+          packet[:content] = doc.to_s
+        end
       end
     end
   end

data/lib/orange/resources/radius.rb

@@ -0,0 +1,23 @@
+require 'radius'
+
+module Orange
+  # Radius resource is for exposing the Radius context
+  # and allowing parsing.
+  class Radius < Resource
+    def afterLoad
+      @context = ::Radius::Context.new
+    end
+    
+    def context
+      @context
+    end
+    
+    def parse(packet)
+      content = packet[:content, false]
+      unless content.blank? 
+        parser = ::Radius::Parser.new(context, :tag_prefix => 'o')
+        packet[:content] = parser.parse(content)
+      end
+    end
+  end
+end

data/lib/orange/resources/sitemap_resource.rb

@@ -8,21 +8,82 @@ module Orange
     admin do
       text :slug
       text :link_text
-      boolean :show_in_nav, :default => false, :display_name => 'Show?'
+      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
+    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
+    
     def afterLoad
       orange[:admin, true].add_link('Content', :resource => @my_orange_name, :text => 'Sitemap')
+      
+    end
+    
+    def route(packet)
+      resource = packet['route.resource']
+      raise 'resource not found' unless orange.loaded? resource
+      unless (packet['route.resource_action'])
+        packet['route.resource_action'] = (packet['route.resource_id'] ? :show : :index)
+      end
+      
+      packet[:content] = (orange[resource].view packet)
+    end
+    
+    def route?(packet, path)
+      parts = path.split('/')
+      pad = parts.shift
+      matched = home(packet)
+      extras = ''
+      while (!parts.empty?)
+        next_part = parts.shift
+        matches = matched.children.first(:slug => next_part)
+        if(matches) 
+          matched = matches
+        else
+          extras = parts.unshift(next_part).unshift(pad).join('/')
+          parts = []
+        end
+      end
+      return false if(extras.length > 0 && !matched.accept_args)
+      packet['route.path'] = path
+      packet['route.route'] = matched
+      packet['route.resource'] = matched.resource.to_sym unless matched.resource.blank?
+      packet['route.resource_id'] = matched.resource_id.to_i unless matched.resource_id.blank?
+      packet['route.resource_action'] = matched.resource_action.to_sym unless  matched.resource_action.blank?
+      # allow "resource_paths" - extra arguments added as path parts
+      packet['route.resource_path'] = extras
+      return true
     end
     
     # Creates a new model object and saves it (if a post), then reroutes to the main page
@@ -75,22 +136,58 @@ module Orange
     
     def home(packet)
       site_id = packet['site'].id
-      home_for_site(site_id) || create_home_for_site(site_id)
+      model_class.home_for_site(site_id) || model_class.create_home_for_site(site_id)
     end
     
-    def home_for_site(site_id)
-      model_class.first(:slug => '_index_', :orange_site_id => site_id, :order => :lft.asc) 
+    def routes_for(packet)
+      keys = {}
+      keys[:resource] = packet['route.resource'] unless packet['route.resource'].blank?
+      keys[:resource_id] = packet['route.resource_id'] unless packet['route.resource_id'].blank?
+      keys[:orange_site_id] = packet['site'].id unless packet['site'].blank?
+      model_class.all(keys)
     end
     
-    def create_home_for_site(site_id)
-      home = model_class.new({:orange_site_id => site_id, :slug => '_index_'})
-      home.move(:root)
-      home.save
-      home
+    def add_link_for(packet)
+      linky = ['add_route']
+      linky << (packet['site'].blank? ? '0' : packet['site'].id)
+      linky << (packet['route.resource'].blank? ? '0' : packet['route.resource'])
+      linky << (packet['route.resource_id'].blank? ? '0' : packet['route.resource_id'])
+      packet.route_to(:sitemap, linky.join('/') )
+    end
+    
+    def add_route(packet, opts = {})
+      args = packet['route.resource_path'].split('/')
+      args.shift
+      args = [:orange_site_id, :resource, :resource_id, :slug].inject_hash{|results, key|
+        results[key] = args.shift
+      }
+      me = model_class.new(args)
+      me.save
+      me.move(:into => home(packet))
+      packet.reroute(@my_orange_name, :orange,  me.id, 'edit')
+      do_view(packet, :add_route, {})
+    end
+    
+    def slug_for(model, props)
+      hash = model.attributes
+      return slug(model.title) if hash.has_key?(:title)
+      return slug(model.name) if hash.has_key?(:name)
+      return 'route-'+model.id
+    end
+    
+    def slug(str)
+      str.downcase.gsub(/[']+/, "").gsub(/[^a-z0-9]+/, "_")
+    end
+    
+    def find_list(packet, mode, *args)
+      home(packet).self_and_descendants
     end
     
-    def find_list(packet, mode)
-      Orange::Route.all(:order => :lft) || []
+    def sitemap_links(packet, opts = {})
+      packet.add_js('sitemap.js', :module => '_orange_')
+      opts.with_defaults!({:list => routes_for(packet) })
+      opts.merge!({:add_route_link => add_link_for(packet)})
+      do_list_view(packet, :sitemap_links, opts)
     end
   end
 end

data/lib/orange/stack.rb

@@ -46,10 +46,8 @@ module Orange
     def prebuild(choice)
       case choice
       when :none
-        no_recapture
         run @main_app
       else
-        no_recapture
         run @main_app
       end
     end
@@ -150,15 +148,10 @@ module Orange
       orange.add_pulp(mod)
     end
     
-    # The exit point for the middleware stack, 
-    # this method will add the Orange::Middleware::Recapture if applicable
+    # The exit point for the middleware stack,
     # add the app to @main_app and then call Rack::Builder#run with the main app
     def run(app, *args)
       opts = args.extract_options!
-      if @recapture
-        stack Orange::Middleware::Recapture
-        @recapture = false
-      end
       @main_app = app
       @build.run(app)
     end

data/spec/orange/middleware/base_spec.rb

@@ -21,7 +21,7 @@ describe Orange::Middleware::Base do
     app = mock("downstream")
     app2 = mock("downstream_orange")
     my_hash = {:foo => :bar}
-    app.should_receive(:call).with(my_hash)
+    app.should_receive(:call).with(my_hash).and_return([{},200,[]])
     app2.should_receive(:packet_call).with(an_instance_of(Orange::Packet))
     mid = MockOrangeBasedMiddlewareTwo.new(app, nil)
     mid2 = MockOrangeBasedMiddlewareTwo.new(app2, nil)
@@ -34,4 +34,5 @@ describe Orange::Middleware::Base do
     mid = MockOrangeBasedMiddlewareTwo.new(nil, c)
     mid.orange.should equal c
   end
+
 end

data/spec/orange/middleware/site_load_spec.rb

@@ -10,8 +10,8 @@ describe Orange::Middleware::SiteLoad do
     Orange::Site.should_receive(:first).with(an_instance_of(Hash)).and_return('foo')
     app = Orange::Middleware::SiteLoad.new(return_env_app, Orange::Core.new)
     ret = app.call({})
-    ret['orange.env'].should have_key('site')
-    ret['orange.env']['site'].should == 'foo'
+    ret[0]['orange.env'].should have_key('site')
+    ret[0]['orange.env']['site'].should == 'foo'
   end
   
   it "should create a new site object, if one doesn't exist" do
@@ -21,6 +21,6 @@ describe Orange::Middleware::SiteLoad do
     m.should_receive(:save).and_return(true)
     app = Orange::Middleware::SiteLoad.new(return_env_app, Orange::Core.new)
     ret = app.call({})
-    ret['orange.env'].should have_key('site')
+    ret[0]['orange.env'].should have_key('site')
   end
 end

data/spec/orange/resources/model_resource_spec.rb

@@ -170,7 +170,7 @@ describe Orange::ModelResource do
   it "should call carton's destroy! on DELETE delete and reroute" do
     a= MockModelResourceTwo.new
     m= mock("carton", :null_object => true)
-    m.should_receive(:destroy!)
+    m.should_receive(:destroy)
     a.stub!(:model_class).and_return(m)
     p2 = mock("packet", :null_object => true)
     p2.should_receive(:reroute)

data/spec/orange/spec_helper.rb

@@ -46,6 +46,6 @@ end
 
 def return_env_app
   lambda { |env|
-    env
+    [env, 200, ["ok"]]
   }
 end

data/spec/orange/stack_spec.rb

@@ -104,6 +104,7 @@ describe Orange::Stack do
   it "should rebuild stack if auto_reload! set" do
     x= Orange::Stack.new do
       auto_reload!
+      use MockMiddleware
       run MockExitware.new
     end
     x.app.should_not eql(x.app)
@@ -157,18 +158,11 @@ describe Orange::Stack do
     restfuls.should have(1).items
   end
   
-  it "should have not have recapture middleware for a default stack" do
+  it "should have not have extra middleware for a default stack" do
     x= Orange::Stack.new MockApplication
     x.middlewarez.should have(1).middlewares
   end
-  
-  it "should have recapture middleware by default if stack created with block" do
-    x= Orange::Stack.new do
-      run MockExitware.new
-    end
-    x.middlewarez.should have(2).middlewares
-  end
-  
+    
   it "should not include Rack::OpenID unless openid_access_control enabled" do
     defined?(Rack::OpenID).should be_nil
     x= Orange::Stack.new do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: orange
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - David Haslem
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-25 00:00:00 -05:00
+date: 2010-02-16 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -70,7 +70,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.2.0
+        version: 0.2.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: meekish-openid_dm_store
@@ -82,6 +82,26 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.1.2
     version: 
+- !ruby/object:Gem::Dependency 
+  name: dm-is-awesome_set
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.11.0
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: radius
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.6.1
+    version: 
 - !ruby/object:Gem::Dependency 
   name: rspec
   type: :development
@@ -114,6 +134,8 @@ files:
 - lib/orange.rb
 - lib/orange/application.rb
 - lib/orange/carton.rb
+- lib/orange/cartons/page_carton.rb
+- lib/orange/cartons/page_version_carton.rb
 - lib/orange/cartons/site_carton.rb
 - lib/orange/core.rb
 - lib/orange/magick.rb
@@ -122,7 +144,8 @@ files:
 - lib/orange/middleware/database.rb
 - lib/orange/middleware/flex_router.rb
 - lib/orange/middleware/globals.rb
-- lib/orange/middleware/recapture.rb
+- lib/orange/middleware/loader.rb
+- lib/orange/middleware/radius.rb
 - lib/orange/middleware/rerouter.rb
 - lib/orange/middleware/restful_router.rb
 - lib/orange/middleware/route_context.rb
@@ -138,7 +161,9 @@ files:
 - lib/orange/resources/mapper.rb
 - lib/orange/resources/model_resource.rb
 - lib/orange/resources/page_parts.rb
+- lib/orange/resources/page_resource.rb
 - lib/orange/resources/parser.rb
+- lib/orange/resources/radius.rb
 - lib/orange/resources/routable_resource.rb
 - lib/orange/resources/singleton_model_resource.rb
 - lib/orange/resources/sitemap_resource.rb
@@ -181,7 +206,6 @@ test_files:
 - spec/orange/middleware/base_spec.rb
 - spec/orange/middleware/database_spec.rb
 - spec/orange/middleware/globals_spec.rb
-- spec/orange/middleware/recapture_spec.rb
 - spec/orange/middleware/rerouter_spec.rb
 - spec/orange/middleware/restful_router_spec.rb
 - spec/orange/middleware/route_context_spec.rb

data/lib/orange/middleware/recapture.rb

@@ -1,19 +0,0 @@
-require 'orange/middleware/base'
-module Orange::Middleware
-  
-  # Middleware to recapture return info and put it back into the
-  # packet. Since the Orange::Stack is all middleware, this is
-  # important for adding after filters into the orange stack
-  # that can interact with the returns of external apps
-  class Recapture < Base
-    
-    def packet_call(packet)
-      ret = pass packet
-      packet[:status]  = ret[0]
-      packet[:headers] = ret[1]
-      packet[:content] = ret[2].first
-      ret
-    end
-    
-  end
-end

data/spec/orange/middleware/recapture_spec.rb

@@ -1,3 +0,0 @@
-describe Orange::Middleware::Recapture do
-  it "should be spec'ed"
-end