orange 0.1.0 → 0.1.2

data/README.markdown

@@ -6,7 +6,7 @@ and the power of Rails. Orange is being developed by Orange Sparkle Ball, inc
 for our own use. Our main focus is on creating a super-extensible CMS
 with Orange, but we're trying to make the components as reusable as possible. Our
 intention is to be ready to use Orange for most client website builds by
-March 2010. 
+May 2010. 
 
 **Note**: Orange is still in the alpha stage. Test coverage is lack-luster at best. 
 Tread carefully.

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

@@ -2,12 +2,23 @@ require 'orange-core/middleware/base'
 module Orange::Middleware
   
   class Database < Base
-    def init(*args)
+    def init(opts = {})
+      opts = opts.with_defaults(:migration_url => (orange.options[:development_mode] ? '/__ORANGE_DB__/migrate' : false))
       orange.mixin Orange::Mixins::DBLoader
+      orange.register(:stack_loaded) do |stack|
+        db = orange.options['database'] || 'sqlite3::memory:'
+        orange.load_db!(db)
+        orange.upgrade_db!
+      end
+      @options = opts
     end
     def packet_call(packet)
-      db = packet['orange.globals']['database'] || 'sqlite3::memory:'
-      orange.load_db!(db)
+      path = packet['route.path'] || packet.request.path_info
+      if @options[:migration_url] && @options[:migration_url] == path
+        orange.migrate_db!
+        after = packet.session['flash.redirect_to'] ? packet.session['flash.redirect_to'] : '/'
+        packet.reroute(after)
+      end
       pass packet
     end
   end
@@ -17,6 +28,14 @@ end
 module Orange::Mixins::DBLoader
   def load_db!(url)
     DataMapper.setup(:default, url)
+  end
+  
+  def migrate_db!
+    DataMapper.auto_migrate!
+  end
+  
+  def upgrade_db!
     DataMapper.auto_upgrade!
   end
+  
 end

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

@@ -6,11 +6,10 @@ module Orange::Middleware
       opts = args.extract_options!.with_defaults(:file => "__ORANGE__/config.yml")
       @file = opts[:file].gsub('__ORANGE__', orange.app_dir)
       @globals = orange[:parser].yaml(@file)
+      @globals.each{|k,v| orange.options[k] = v }
     end
     def packet_call(packet)
-      globs = packet['orange.globals'] || {}
-      globs.merge! orange.options
-      packet['orange.globals'] = globs.merge @globals
+      packet['orange.globals'] ||= orange.options
       pass packet
     end
     

data/lib/orange-core/packet.rb

@@ -167,6 +167,40 @@ module Orange
       router.route(self)
     end
     
+    # Pulls options set out of the packet and places them into
+    # a hash. Options are retrieved from POST, GET, and route.resource_path
+    # and take that order of precedence (POST overrides GET, etc)
+    # @param [Array] key_list an array of keys to retrieve and merge together
+    #   in order of precedence. :GET and :POST for request vars, the rest
+    #   are keys directly available on packet
+    # @return [Hash] A hash of options set in the packet
+    def extract_opts(key_list = [:POST, :GET, 'route.resource_path'])
+      opts = {}
+      key_list.reverse.each do |key|
+        case key
+        when :GET then opts.merge! packet.request.GET
+        when :POST then opts.merge! packet.request.POST
+        else 
+          opts.merge!(packet[key, {}].kind_of?(String) ? url_to_hash(packet[key]) : packet[key, {}])
+        end
+      end
+      opts
+    end
+    
+    # Converts a url path to a hash with symbol keys. URL must
+    # be in /key/val/key/val/etc format
+    def url_to_hash(url)
+      parts = url.split('/')
+      hash = {}
+      while !parts.blank?
+        key = parts.shift
+        key = parts.shift if key.blank?
+        val = parts.shift
+        hash[key.to_sym] = val unless key.blank? or val.blank?
+      end
+      hash
+    end
+    
     # Method Missing allows defining custom methods
     def method_missing(id, *args)
       matched = false

data/lib/orange-core/resources/page_parts.rb

@@ -27,7 +27,7 @@ module Orange
           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
+        packet[:css_files].insert((opts[:position] ? opts[:position] : -1), file)
       end
     end
     
@@ -43,7 +43,7 @@ module Orange
           part(packet)[:js] = part(packet)[:js] + "<script src=\"#{file}\" type=\"text/javascript\"></script>"
         end
         packet[:js_files] ||= []
-        packet[:js_files] << file
+        packet[:js_files].insert((opts[:position] ? opts[:position] : -1), file)
       end
     end
   end

data/lib/orange-more.rb

@@ -7,4 +7,8 @@ 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')
+require File.join(libdir, 'orange-more', 'slices')
+require File.join(libdir, 'orange-more', 'blog')
+require File.join(libdir, 'orange-more', 'disqus')
+require File.join(libdir, 'orange-more', 'cloud')
+require File.join(libdir, 'orange-more', 'debugger')

data/lib/orange-more/administration/middleware/access_control.rb

@@ -32,6 +32,7 @@ module Orange::Middleware
       
     def packet_call(packet)
       packet['user.id'] ||= (packet.session['user.id'] || false)
+      packet['user'] = orange[:users].user_for(packet) unless packet['user.id'].blank?
       if @openid && need_to_handle?(packet)
         ret = handle_openid(packet)
         return ret unless ret.blank? # unless handle_openid returns false, exit immediately
@@ -46,7 +47,7 @@ module Orange::Middleware
     
     def access_allowed?(packet)
       return true unless @locked.include?(packet['route.context'])
-      if packet['user.id']
+      if packet['user.id'] || packet['orange.globals']['main_user'] == false
         if @single && (packet['user.id'] == packet['orange.globals']['main_user'])
           true
         elsif @single

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

@@ -11,5 +11,9 @@ module Orange
       return false unless u
       u.allowed?(packet)
     end
+    
+    def user_for(packet)
+      model_class.first(:open_id => packet['user.id'])
+    end
   end
 end

data/lib/orange-more/assets/resources/asset_resource.rb

@@ -6,7 +6,7 @@ module Orange
     def afterLoad
       orange[:admin, true].add_link("Content", :resource => @my_orange_name, :text => 'Assets')
       orange.register(:stack_loaded) do
-        orange[:radius].context.define_tag "asset" do |tag|
+        orange[:radius, true].context.define_tag "asset" do |tag|
           if tag.attr['id']
             (m = model_class.first(:id => tag.attr['id'])) ? m.to_asset_tag : 'Invalid Asset'
           else

data/lib/orange-more/blog.rb

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

data/lib/orange-more/blog/cartons/blog.rb

@@ -0,0 +1,10 @@
+require 'orange-more/administration/cartons/site_carton'
+module Orange
+  class Blog < Orange::SiteCarton
+    id
+    front do
+      title :title
+    end
+    has n, :posts, "Orange::BlogPost"
+  end
+end

data/lib/orange-more/blog/cartons/blog_post.rb

@@ -0,0 +1,55 @@
+require 'dm-timestamps'
+module Orange
+  class BlogPost < Orange::Carton
+    id
+    front do
+      title :title
+      fulltext :body
+    end
+    admin do
+      fulltext :summary
+    end
+    orange do
+      boolean :published, :default => false
+      text :slug
+      text :author
+    end
+    
+    property :created_at, DateTime
+    property :published_at, DateTime
+    property :updated_at, DateTime
+    belongs_to :blog, "Orange::Blog"
+    
+    def title=(t)
+      self.attribute_set('title', t)
+      self.attribute_set('slug', t.downcase.gsub(/[^a-z0-9-]+$/, ''))
+    end
+    
+    def publish
+      self.published_at = Time.now
+      self.published = true
+    end
+    
+    def publish!
+      self.published_at = Time.now
+      self.published = true
+      self.save
+    end
+    
+    def self.year_and_month(yr, mnth)
+      all(:published_at.gte => DateTime.new(yr, mnth, 1), :published_at.lt => DateTime.new(yr, mnth + 1, 1))
+    end
+    
+    def self.slug(slug)
+      first(:slug => slug)
+    end
+    
+    def self.published
+      all(:published => true)
+    end
+    
+    def self.draft
+      all(:published => false)
+    end
+  end
+end

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

@@ -0,0 +1,14 @@
+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 Blog < Base
+    views_dir       File.join(File.dirname(__FILE__), 'views')
+    
+    resource    Orange::BlogResource.new
+    resource    Orange::BlogPostResource.new
+  end
+end
+
+Orange.plugin(Orange::Plugins::Blog.new)
+

data/lib/orange-more/blog/resources/blog_post_resource.rb

@@ -0,0 +1,57 @@
+module Orange
+  class BlogResource < Orange::ModelResource
+    use Orange::BlogPost
+    call_me :blog_posts
+    def afterLoad
+      orange[:admin, true].add_link("Content", :resource => @my_orange_name, :text => 'Blog')      
+    end
+    
+    
+    def publish(packet, *opts)
+      if packet.request.post?
+        m = model_class.get(packet['route.resource_id'])
+        if m
+          # orange[:cloud, true].microblog(packet, "I just posted a test blog post.")
+          m.publish!
+        end
+      end
+      packet.reroute(@my_orange_name, :orange)
+    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?
+        params = packet.request.params[@my_orange_name.to_s]
+        params[:published] = false
+        params[:author] = packet['user', false] ? packet['user'].name : "Author"
+        
+        blog = Orange::Blog.first(:orange_site => packet['site'])
+        blog.posts.new(params)
+        blog.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
+          params = packet.request.params[@my_orange_name.to_s]
+          m.update(params)
+          m.blog = Orange::Blog.first(:orange_site => packet['site'])
+          m.save
+        end
+      end
+      packet.reroute(@my_orange_name, :orange)
+    end
+    
+    def find_list(packet, mode, id =false)
+      blog = orange[:blog].blog_for_site(packet, packet['site'].id)
+      blog.posts
+    end
+    
+  end
+end

data/lib/orange-more/blog/resources/blog_resource.rb

@@ -0,0 +1,99 @@
+module Orange
+  class BlogPostResource < Orange::ModelResource
+    use Orange::Blog
+    call_me :blog
+    def afterLoad
+      orange[:admin, true].add_link("Settings", :resource => @my_orange_name, :text => 'Blog')      
+    end
+    
+    def sitemap_row(packet, opts = {})
+      do_view(packet, :sitemap_row, opts)
+    end
+    
+    def blog_view(packet, opts = {})
+      resource_path = packet['route.resource_path']
+      if resource_path.blank?
+        blog_list_view(packet, opts)
+      elsif resource_path =~ /^\/page/
+        blog_offset_list_view(packet, opts)
+      elsif resource_path =~ /^\/archives?/
+        blog_archive_view(packet, opts)
+      else
+        blog_post_view(packet, opts)
+      end
+    end
+    
+    def blog_post_view(packet, opts = {})
+      resource_path = packet['route.resource_path']
+      blog = Orange::Blog.first(:orange_site_id => packet['site'].id)
+      opts.merge!( :blog_url => blog_url_for(packet))
+      parts = resource_path.split('/')
+      unless parts.size < 4
+        post = blog.posts.year_and_month(parts[1].to_i, parts[2].to_i).slug(parts[3]) 
+      end
+      if post
+        do_view(packet, :blog_post_view, opts.merge({:model => post}))
+      else
+        "Not found"
+      end
+    end
+    
+    def blog_url_for(packet)
+      blog = Orange::Blog.first(:orange_site_id => packet['site'].id)      
+      blog_url = orange[:sitemap, true].url_for(packet, :orange_site_id => blog.orange_site_id, :resource => :blog, :resource_id => blog.id, :resource_action => :blog_view)
+      blog_url.gsub!(/\/$/, '')
+    end
+    
+    def blog_offset_list_view(packet, opts = {})
+      opts.merge!(packet.extract_opts)
+      opts.merge!( :blog_url => blog_url_for(packet))
+      blog = Orange::Blog.first(:orange_site_id => packet['site'].id)
+      opts[:page] = opts[:page].to_i unless opts[:page].blank?
+      page = opts[:page].blank? ? 0 : opts[:page] - 1 
+      opts[:list] = blog.posts.published.all(:order => :published_at.desc, 
+          :limit => 5, 
+          :offset => (5*page)
+      )
+      opts[:pages] = (blog.posts.published.count / 5) + 1
+      do_list_view(packet, :blog_offset_list_view, opts)
+    end
+    
+    def blog_list_view(packet, opts = {})
+      blog_offset_list_view(packet, opts.merge!({:page => 1}))
+    end
+    
+    def blog_archive_view(packet, opts = {})
+      opts.merge!( :blog_url => blog_url_for(packet))
+      do_list_view(packet, :blog_archive_view, opts)
+    end
+    
+    def blog_for_site(packet, site_id)
+      blog = Orange::Blog.first(:orange_site_id => packet['site'].id)
+      unless blog
+        blog = Orange::Blog.new
+        blog.title = 'An Orange Hosted Blog'
+        blog.orange_site = packet['site']
+        blog.save
+        orange[:sitemap, true].add_route_for(packet,
+          :orange_site_id => packet['site'].id, 
+          :resource => :blog, 
+          :resource_id => blog.id,
+          :resource_action => :blog_view,
+          :slug => 'blog', 
+          :link_text => 'Orange Blog'
+        )
+      end
+      blog
+    end
+    
+    def find_list(packet, mode, id =false)
+      blog = orange[:blog].blog_for_site(packet, packet['site'].id)
+      case mode
+      when :blog_list_view then blog.posts.published.all(:order => :published_at.desc, :limit => 5)
+      when :blog_archive_view then blog.posts.published
+      else Orange::Blog.all
+      end
+    end
+    
+  end
+end

data/lib/orange-more/blog/views/blog/blog_archive_view.haml

@@ -0,0 +1,6 @@
+.blog_posts
+  - for post in list
+    .blog_post
+      %h2
+        %span #{post.created_at.strftime("%B %d, %Y")}
+        %a{:href => "#{blog_url}/#{post.created_at.year}/#{post.created_at.month}/#{post.slug}"}= post.title

data/lib/orange-more/blog/views/blog/blog_offset_list_view.haml

@@ -0,0 +1,12 @@
+.blog_posts
+  - for post in list
+    .blog_post
+      %h2
+        %a{:href => "#{blog_url}/#{post.created_at.year}/#{post.created_at.month}/#{post.slug}"}= post.title
+      %h3.posted_by Posted by #{post.author}
+      .blog_post_body= post.summary.blank? ? post.body : post.summary
+.blog_nav
+  - if page > 1
+    %a.newer{:href => "#{blog_url}/page/#{page-1}"} Newer Posts
+  - if page < pages
+    %a.older{:href => "#{blog_url}/page/#{page+1}"} Older Posts

data/lib/orange-more/blog/views/blog/blog_post_view.haml

@@ -0,0 +1,4 @@
+.blog_post
+  %h2= model.title
+  .blog_post_body= model.body 
+= orange[:disqus, true].comment_thread(packet) 

data/lib/orange-more/blog/views/blog/sitemap_row.haml

@@ -0,0 +1,14 @@
+- if route
+  .sitemap_item{:class => "sitemap_level_#{route.level}"}
+    - if route.level > 0
+      = orange[:sitemap].route_actions(packet, :model => route)
+    %h4 #{route.link_text} <span>(#{route.full_path})</span>
+    .linked_to
+      %p 
+        Blog titled "#{model.title}"
+        %br 
+        %a{:href => route_to(:blog_posts, 'create')} Add New Blog Post
+    .actions
+      = form_link('Delete', route_to(:sitemap, route.id, 'delete'), 'Are you sure you want to delete this?', {:method => 'delete'})
+      %a{:href => route_to(:sitemap, route.id, 'edit')} Edit
+    %br.clear

data/lib/orange-more/blog/views/blog_posts/edit.haml

@@ -0,0 +1,8 @@
+- if model
+  %form{:action => route_to(model_name, model[:id], 'save'), :method => 'post'}
+    - for prop in props
+      %p~ view_attribute(prop, model_name, :label => true, :value => model.attribute_get(prop[:name]))
+    %input{:type => 'submit', :value => 'Save Changes'}
+  = form_link('Publish', packet.route_to(model_name, model[:id], 'publish'))
+- else
+  %p Couldn't find the item you're looking for.

data/lib/orange-more/cloud.rb

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

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

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

data/lib/orange-more/cloud/resources/cloud_resource.rb

@@ -0,0 +1,22 @@
+require 'rest_client'
+
+module Orange
+  class CloudResource < Orange::Resource
+    ORANGE_PING_KEY = "c99550a0430eb9054eb4b7ee290664cf"
+    call_me :cloud
+    def afterLoad
+      orange.register(:stack_loaded) do |stack|
+        options[:ping_fm_key] = orange.options[:ping_fm_key] || false
+      end
+    end
+    
+    def microblog(packet, status, opts = {})
+      params = {    :api_key => ORANGE_PING_KEY, 
+                    :user_app_key => options[:ping_fm_key], 
+                    :post_method => "microblog",
+                    :body => status}.merge(opts)
+      # Thread.new {
+      xml_result = RestClient.post("http://api.ping.fm/v1/user.post", params) if params[:user_app_key]
+    end
+  end
+end

data/lib/orange-more/debugger.rb

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

data/lib/orange-more/debugger/assets/css/debug_bar.css

@@ -0,0 +1,46 @@
+/* @override http://localhost:4321/assets/_debugger_/css/debug_bar.css */
+
+body{
+	margin: 0;
+	margin-bottom: 500px;
+}
+#debug_bar{
+	position: fixed;
+	bottom: 0;
+	background-color: #333;
+	width: 100%;
+	font: medium "Lucida Grande", Lucida, Verdana, sans-serif;
+}
+#debug_bar h1{
+	margin-left: 1em;
+	font-size: 1em;
+	display: inline-block;
+	color: #eb8336;
+}
+
+#debug_bar ul{
+	display: inline-block;
+	list-style: none;
+	margin: 0;
+}
+
+#debug_bar ul li{
+	display: inline-block;
+	margin: 1em;
+}
+
+#debug_bar ul li a{
+	color: white;
+}
+#debug_bar #requestinfo{
+	display: none;
+	height: 300px;
+	overflow: auto;
+	background: white;
+	margin: 2em 3em;
+	padding: 1em 3em;
+}
+
+#debug_bar #requestinfo.show{
+	display: block;
+}

data/lib/orange-more/debugger/middleware/debugger.rb

@@ -0,0 +1,35 @@
+require 'orange-core/middleware/base'
+
+module Orange::Middleware
+  class Debugger < Base
+    def init(opts = {})
+      orange.add_pulp Orange::Pulp::DebuggerHelpers if orange.options[:development_mode]
+    end
+    
+    # Passes packet then parses the return
+    def packet_call(packet)
+      if orange.options[:development_mode]
+        packet.session['flash.redirect_to'] = packet.request.path
+        packet.add_css('debug_bar.css', :module => '_debugger_')
+      end
+      pass packet
+      if orange.options[:development_mode]
+        bar = orange[:parser].haml('debug_bar.haml', packet)
+        packet[:content] = packet[:content].gsub('</body>', bar + '</body>')
+      end
+      packet.finish
+    end
+    
+  end
+end
+
+module Orange::Pulp::DebuggerHelpers
+  def h(obj)                  # :nodoc:
+    case obj
+    when String
+      Rack::Utils.escape_html(obj)
+    else
+      Rack::Utils.escape_html(obj.inspect)
+    end
+  end
+end

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

@@ -0,0 +1,12 @@
+Dir.glob(File.join(File.dirname(__FILE__), 'middleware', '*.rb')).each {|f| require f }
+
+module Orange::Plugins
+  class Debugger < Base
+    views_dir  File.join(File.dirname(__FILE__), 'views')
+    assets_dir  File.join(File.dirname(__FILE__), 'assets')
+    prerouter  Orange::Middleware::Debugger
+  end
+end
+
+Orange.plugin(Orange::Plugins::Debugger.new)
+

data/lib/orange-more/debugger/views/debug_bar.haml

@@ -0,0 +1,64 @@
+#debug_bar
+  %h1 Debugger
+  %ul
+    %li
+      %a.requestinfo{:href => '#', :onclick => 'jQuery("#debug_bar #requestinfo").toggleClass("show"); return false'} Request Info
+    %li
+      %a{:href => '/__ORANGE_DB__/migrate'} Reinitialize Database
+  #requestinfo
+    %h2 Request information
+    - for var in [:GET, :POST, :cookies]
+      %h3{:id => "#{var.to_s.downcase}-info"}= "#{var.to_s}"
+      - unless packet.request.__send__(var).empty?
+        %table.req
+          %thead
+            %tr
+              %th Variable
+              %th Value
+          %tbody
+            - packet.request.__send__(var).sort_by { |k, v| k.to_s }.each do |key, val|
+              %tr
+                %td #{key}
+                %td.code
+                  %div #{val.inspect}
+      - else
+        %p No #{var.to_s} data.
+    %h3#env-info Rack ENV
+    %table.req
+      %thead
+        %tr
+          %th Variable
+          %th Value
+      %tbody
+        - packet.env.sort_by { |k, v| k.to_s }.each do |key, val|
+          - unless key =~ /^orange\./ 
+            %tr
+              %td #{h key}
+              %td.code
+                %div #{h val}
+    %h3#orange-info Orange ENV
+    %table.req
+      %thead
+        %tr
+          %th Variable
+          %th Value
+      %tbody
+        - packet.env['orange.env'].sort_by { |k, v| k.to_s }.each do |key, val|
+          - if(![:request, :headers, :content].include?(key)) 
+            %tr
+              %td #{h key}
+              %td.code
+                %div #{h val}
+    %h3#orange-info= 'Orange<br /> Response'
+    %table.req
+      %thead
+        %tr
+          %th Variable
+          %th Value
+      %tbody
+        - packet.env['orange.env'].sort_by { |k, v| k.to_s }.each do |key, val|
+          - if([:headers, :content].include?(key)) 
+            %tr
+              %td #{h key}
+              %td.code
+                %div #{h val}

data/lib/orange-more/disqus.rb

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

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

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

data/lib/orange-more/disqus/resources/disqus_resource.rb

@@ -0,0 +1,9 @@
+module Orange
+  class DisqusResource < Orange::Resource
+    call_me :disqus
+    def comment_thread(packet, opts = {})
+      opts.merge!(:resource => self)
+      orange[:parser].haml("comment_thread.haml", packet, opts)
+    end
+  end
+end

data/lib/orange-more/disqus/views/disqus/comment_thread.haml

@@ -0,0 +1,7 @@
+.disqus_comments
+  - if packet['orange.globals'][:development_mode]
+    %script{:type => 'text/javascript'} var disqus_developer = 1;
+  #disqus_thread
+  %script{:type => 'text/javascript', :src => 'http://disqus.com/forums/orangesparkleball/embed.js'}
+  %noscript
+    %a{:href => 'http://disqus.com/forums/orangesparkleball/?url=ref'} View the discussion thread

data/lib/orange-more/sitemap/resources/sitemap_resource.rb

@@ -9,6 +9,9 @@ module Orange
       orange[:admin, true].add_link('Content', :resource => @my_orange_name, :text => 'Sitemap')
       
     end
+    def route_actions(packet, opts = {})
+      do_view(packet, :route_actions, opts)
+    end
     
     def route(packet)
       resource = packet['route.resource']
@@ -90,8 +93,8 @@ module Orange
       packet.reroute(@my_orange_name, :orange)
     end
     
-    def home(packet)
-      site_id = packet['site'].id
+    def home(packet, opts = {})
+      site_id = opts[:orange_site_id] || packet['site'].id
       model_class.home_for_site(site_id) || model_class.create_home_for_site(site_id)
     end
     
@@ -115,6 +118,19 @@ module Orange
       packet.route_to(:sitemap, linky.join('/') )
     end
     
+    def add_route_for(packet, opts = {})
+      unless opts.blank?
+        me = model_class.new(opts)
+        me.save
+        me.move(:into => home(packet, opts))
+      end
+    end
+    
+    def url_for(packet, opts = {})
+      m = model_class.first(opts)
+      m ? m.full_path : '#not_found'
+    end
+    
     def add_route(packet, opts = {})
       args = packet['route.resource_path'].split('/')
       args.shift
@@ -143,6 +159,18 @@ module Orange
       home(packet).self_and_descendants
     end
     
+    def table_row(packet, opts ={})
+      opts[:route] = opts[:model] || find_one(packet, :table_row, opts[:id])
+      resource = opts[:route].resource
+      resource = resource.to_sym if resource
+      if resource && orange[resource].respond_to?(:sitemap_row)
+        opts.delete(:model)
+        orange[resource].sitemap_row(packet, opts.merge(:resource_name => resource, :id => opts[:route].resource_id))
+      else
+        do_view(packet, :table_row, opts)
+      end
+    end
+    
     def sitemap_links(packet, opts = {})
       packet.add_js('sitemap.js', :module => '_orange_')
       opts.with_defaults!({:list => routes_for(packet) })

data/lib/orange-more/sitemap/views/sitemap/route_actions.haml

@@ -0,0 +1,15 @@
+.move_actions.dent_actions
+  = form_link('Outdent', route_to(:sitemap, model.id, 'outdent'), false, {:method => 'post', :class => 'outdent arrow'}) if model.level > 1
+  %p= ' '
+.move_actions
+  - if model.previous_sibling
+    = form_link('Up', route_to(:sitemap, model.id, 'higher'), false, {:method => 'post', :class => 'up arrow'}) 
+  - else
+    %p.disabled_up.arrow= ' '
+  - if model.next_sibling
+    = form_link('Down', route_to(:sitemap, model.id, 'lower'), false, {:method => 'post', :class => 'down arrow'}) 
+  - else
+    %p.disabled_down.arrow= ' '
+.move_actions.dent_actions
+  = form_link('Indent', route_to(:sitemap, model.id, 'indent'), false, {:method => 'post', :class => 'indent arrow'}) if model.previous_sibling && model.previous_sibling.level == model.level
+  %p= ' '

data/lib/orange-more/sitemap/views/sitemap/two_level.haml

@@ -1,11 +1,12 @@
 %ul.nav
   %li.first
     %a{:href => model.full_path} Home
-  - for item in model.descendants
+  - for item in model.children
+    - next unless item.show_in_nav
     %li
       %a{:href => item.full_path}= item.link_text
       - unless item.descendants.empty?
         %ul.subnav
-          - for x in item.descendants
+          - for x in item.children
             %li
               %a{:href => x.full_path}= x.link_text

data/lib/orange-more/slices/resources/radius.rb

@@ -6,6 +6,7 @@ module Orange
   class Radius < Resource
     def afterLoad
       @context = ::Radius::Context.new
+      orange.fire(:radius_loaded, self)
     end
     
     def context

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: orange
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors: 
 - David Haslem
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-22 00:00:00 -05:00
+date: 2010-02-26 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -121,6 +121,29 @@ files:
 - lib/orange-more/assets/plugin.rb
 - lib/orange-more/assets/resources/asset_resource.rb
 - lib/orange-more/assets/views/assets/create.haml
+- lib/orange-more/blog.rb
+- lib/orange-more/blog/cartons/blog.rb
+- lib/orange-more/blog/cartons/blog_post.rb
+- lib/orange-more/blog/plugin.rb
+- lib/orange-more/blog/resources/blog_post_resource.rb
+- lib/orange-more/blog/resources/blog_resource.rb
+- lib/orange-more/blog/views/blog/blog_archive_view.haml
+- lib/orange-more/blog/views/blog/blog_offset_list_view.haml
+- lib/orange-more/blog/views/blog/blog_post_view.haml
+- lib/orange-more/blog/views/blog/sitemap_row.haml
+- lib/orange-more/blog/views/blog_posts/edit.haml
+- lib/orange-more/cloud.rb
+- lib/orange-more/cloud/plugin.rb
+- lib/orange-more/cloud/resources/cloud_resource.rb
+- lib/orange-more/debugger.rb
+- lib/orange-more/debugger/assets/css/debug_bar.css
+- lib/orange-more/debugger/middleware/debugger.rb
+- lib/orange-more/debugger/plugin.rb
+- lib/orange-more/debugger/views/debug_bar.haml
+- lib/orange-more/disqus.rb
+- lib/orange-more/disqus/plugin.rb
+- lib/orange-more/disqus/resources/disqus_resource.rb
+- lib/orange-more/disqus/views/disqus/comment_thread.haml
 - lib/orange-more/pages.rb
 - lib/orange-more/pages/cartons/page_carton.rb
 - lib/orange-more/pages/cartons/page_version_carton.rb
@@ -142,6 +165,7 @@ files:
 - lib/orange-more/sitemap/plugin.rb
 - lib/orange-more/sitemap/resources/sitemap_resource.rb
 - lib/orange-more/sitemap/views/sitemap/list.haml
+- lib/orange-more/sitemap/views/sitemap/route_actions.haml
 - lib/orange-more/sitemap/views/sitemap/sitemap_links.haml
 - lib/orange-more/sitemap/views/sitemap/table_row.haml
 - lib/orange-more/sitemap/views/sitemap/two_level.haml