orange 0.1.2 → 0.1.4

data/lib/orange-core/carton.rb

@@ -23,6 +23,9 @@ module Orange
   # improve scaffolding capability.
   class Carton
     SCAFFOLD_OPTIONS = [:display_name, :levels] unless defined?(SCAFFOLD_OPTIONS)
+    extend ClassInheritableAttributes
+    cattr_accessor :scaffold_properties
+    
     # Declares a ModelResource subclass that scaffolds this carton
     # The Subclass will have the name of the carton followed by "_Resource"
     def self.as_resource
@@ -41,21 +44,17 @@ module Orange
     def self.id
       include DataMapper::Resource
       property(:id, Serial)
-      @scaffold_properties = []
+      self.scaffold_properties ||= []
       init
     end
     
-    def self.scaffold_properties
-      @scaffold_properties ||= []
-    end
-    
     # Stub init method
     def self.init
     end
     
     # Return properties that should be shown for a given context
     def self.form_props(context = :live)
-      scaffold_properties.select{|p| p[:levels].include?(context)  }
+      self.scaffold_properties.select{|p| p[:levels].include?(context)  }
     end
     
     # Helper to wrap properties into admin level
@@ -80,7 +79,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 || opts.has_key?(:levels)
+      self.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
@@ -112,7 +111,7 @@ module Orange
     # Define a helper for type database stuff
     # Show in a context if wrapped in one of the helpers
     def self.expose(name, opts = {})
-      scaffold_properties << {:name => name, :type => :text, :levels => @levels, :opts => opts} if @levels
+      self.scaffold_properties << {:name => name, :type => :text, :levels => @levels, :opts => opts} if @levels
     end
     
     # Define a helper for input type="text" type database stuff

data/lib/orange-more.rb

@@ -9,6 +9,9 @@ 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', 'blog')
+require File.join(libdir, 'orange-more', 'news')
 require File.join(libdir, 'orange-more', 'disqus')
+require File.join(libdir, 'orange-more', 'testimonials')
 require File.join(libdir, 'orange-more', 'cloud')
-require File.join(libdir, 'orange-more', 'debugger')
+require File.join(libdir, 'orange-more', 'debugger')
+require File.join(libdir, 'orange-more', 'subsites')

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

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

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

@@ -6,7 +6,7 @@ module Orange
   # it is what defines the relationship)
   class SiteCarton < Carton
     def self.init
-      belongs_to :orange_site, 'Orange::Site'
+      belongs_to :orange_site
     end
   end
 end

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

@@ -1,17 +1,27 @@
 require 'orange-core/carton'
 
-module Orange
-  class User < Orange::Carton
-    id
-    admin do
-      title :name
-      text :open_id
-    end
-    
-    # Currently, all users allowed at all times.
-    # Future support for roles to be built here.
-    def allowed?(packet)
+class OrangeUser < Orange::Carton
+  id
+  admin do
+    title :name
+    text :open_id
+  end
+  
+  has n, :orange_sites, :through => Resource
+  
+  def allowed?(packet)
+    subsite_access = packet['subsite'].blank? ? false : self.orange_sites.first(:id => packet['subsite'].id)
+    site_access = self.orange_sites.first(:id => packet['site'].id)
+    if(site_access)
       true
+    elsif !packet['subsite'].blank? && subsite_access
+      true
+    else
+      false
     end
   end
+end
+
+class OrangeSite 
+  has n, :orange_users, :through => Resource
 end

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

@@ -48,7 +48,7 @@ module Orange::Middleware
     def access_allowed?(packet)
       return true unless @locked.include?(packet['route.context'])
       if packet['user.id'] || packet['orange.globals']['main_user'] == false
-        if @single && (packet['user.id'] == packet['orange.globals']['main_user'])
+        if @single && (packet['user.id'] == packet['orange.globals']['main_user'] )
           true
         elsif @single
           # Current id no good. 

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

@@ -6,11 +6,11 @@ module Orange::Middleware
   class SiteLoad < Base    
     def packet_call(packet)
       url =  packet['route.site_url']
-      site = Orange::Site.first(:url.like => url)
+      site = OrangeSite.first(:url.like => url)
       if site
         packet['site'] = site
       else
-        s = Orange::Site.new({:url => packet['route.site_url'], 
+        s = OrangeSite.new({:url => packet['route.site_url'], 
                               :name => 'An Orange Site'})
         s.save
         packet['site'] = s

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

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

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

@@ -1,6 +1,6 @@
 module Orange
   class UserResource < Orange::ModelResource
-    use Orange::User
+    use OrangeUser
     call_me :users
     def afterLoad
       orange[:admin].add_link("Settings", :resource => @my_orange_name, :text => 'Users')
@@ -15,5 +15,36 @@ module Orange
     def user_for(packet)
       model_class.first(:open_id => packet['user.id'])
     end
+    
+    def new(packet, *opts)
+      if packet.request.post?
+        params = packet.request.params[@my_orange_name.to_s]
+        sites = params.delete 'sites'
+        m = model_class.new(params)
+        m.save
+        sites.each{|k,v| s = OrangeSite.first(:id => k); m.orange_sites << s if s} if sites
+        m.save
+      end
+      packet.reroute(@my_orange_name, :orange)
+    end
+    
+    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]
+          sites = params.delete 'sites'
+          m.update(params)
+          m.orange_sites.destroy
+          sites.each{|k,v| s = OrangeSite.first(:id => k); m.orange_sites << s if s} if sites
+          m.save
+        end
+      end
+      packet.reroute(@my_orange_name, :orange)
+    end
+    
+    def find_extras(packet, mode)
+      {:sites => OrangeSite.all}
+    end
   end
 end

data/lib/orange-more/administration/views/users/create.haml

@@ -0,0 +1,10 @@
+%form{:action => "#{packet.route_to(model_name, 'new')}", :method => 'post'}
+  - for prop in props
+    %p= view_attribute(prop, model_name, :label => true)
+  %fieldset
+    %h4 Permission to Edit:
+    - for site in sites
+      %p
+        #{site.name}
+        %input{:type => 'checkbox', :name => "#{model_name}[sites][#{site.id}]", :value => site.id}
+  %input{:type => 'submit', :value => 'Save New Item'}

data/lib/orange-more/administration/views/users/edit.haml

@@ -0,0 +1,15 @@
+- if model
+  - if resource.options[:sitemappable, false] 
+    = orange[:sitemap, true].sitemap_links(packet, {:slug_me => orange[:sitemap, true].slug_for(model, props)})
+  %form{:action => packet.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]))
+    %fieldset
+      %h4 Permission to Edit:
+      - for site in sites
+        %p
+          #{site.name}
+          %input{:type => 'checkbox', :name => "#{model_name}[sites][#{site.id}]", :value => site.id, :checked => (model.orange_sites.include?(site) ? 'checked' : nil)}
+    %input{:type => 'submit', :value => 'Save Changes'}
+- else
+  %p Couldn't find the item you're looking for.

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

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

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

@@ -1,55 +1,53 @@
 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
+class OrangeBlogPost < 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, "OrangeBlog"
+  
+  def title=(t)
+    self.attribute_set('title', t)
+    self.attribute_set('slug', str.downcase.gsub(/[']+/, "").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

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

@@ -1,6 +1,6 @@
 module Orange
   class BlogResource < Orange::ModelResource
-    use Orange::BlogPost
+    use OrangeBlogPost
     call_me :blog_posts
     def afterLoad
       orange[:admin, true].add_link("Content", :resource => @my_orange_name, :text => 'Blog')      
@@ -26,7 +26,7 @@ module Orange
         params[:published] = false
         params[:author] = packet['user', false] ? packet['user'].name : "Author"
         
-        blog = Orange::Blog.first(:orange_site => packet['site'])
+        blog = OrangeBlog.first(:orange_site => (packet['subsite'].blank? ? packet['site'] : packet['subsite']))
         blog.posts.new(params)
         blog.save
       end
@@ -41,7 +41,7 @@ module Orange
         if m
           params = packet.request.params[@my_orange_name.to_s]
           m.update(params)
-          m.blog = Orange::Blog.first(:orange_site => packet['site'])
+          m.blog = OrangeBlog.first(:orange_site => (packet['subsite'].blank? ? packet['site'] : packet['subsite']))
           m.save
         end
       end
@@ -49,7 +49,7 @@ module Orange
     end
     
     def find_list(packet, mode, id =false)
-      blog = orange[:blog].blog_for_site(packet, packet['site'].id)
+      blog = orange[:blog].blog_for_site(packet)
       blog.posts
     end
     

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

@@ -1,6 +1,6 @@
 module Orange
   class BlogPostResource < Orange::ModelResource
-    use Orange::Blog
+    use OrangeBlog
     call_me :blog
     def afterLoad
       orange[:admin, true].add_link("Settings", :resource => @my_orange_name, :text => 'Blog')      
@@ -25,7 +25,7 @@ module Orange
     
     def blog_post_view(packet, opts = {})
       resource_path = packet['route.resource_path']
-      blog = Orange::Blog.first(:orange_site_id => packet['site'].id)
+      blog = blog_for_site(packet)
       opts.merge!( :blog_url => blog_url_for(packet))
       parts = resource_path.split('/')
       unless parts.size < 4
@@ -39,15 +39,15 @@ module Orange
     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 = blog_for_site(packet)
+      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, :include_subsite => true)
       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)
+      blog = blog_for_site(packet)
       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, 
@@ -67,15 +67,18 @@ module Orange
       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)
+    def blog_for_site(packet, site_id = false)
+      site_id ||= (packet['subsite'].blank? ? packet['site'].id : packet['subsite'].id)
+      blog = OrangeBlog.first(:orange_site_id => site_id)
       unless blog
-        blog = Orange::Blog.new
+        blog = OrangeBlog.new
         blog.title = 'An Orange Hosted Blog'
         blog.orange_site = packet['site']
         blog.save
+      end
+      unless OrangeRoute.first(:resource => 'blog', :orange_site_id => packet['site'].id)
         orange[:sitemap, true].add_route_for(packet,
-          :orange_site_id => packet['site'].id, 
+          :orange_site_id => site_id, 
           :resource => :blog, 
           :resource_id => blog.id,
           :resource_action => :blog_view,
@@ -87,11 +90,11 @@ module Orange
     end
     
     def find_list(packet, mode, id =false)
-      blog = orange[:blog].blog_for_site(packet, packet['site'].id)
+      blog = blog_for_site(packet)
       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
+      else OrangeBlog.all
       end
     end
     

data/lib/orange-more/news.rb

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

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

@@ -0,0 +1,12 @@
+require 'dm-timestamps'
+class OrangeNews < Orange::Carton
+  id
+  front do
+    title :title
+    text :link
+    fulltext :description
+  end
+
+  property :created_at, DateTime
+  property :updated_at, DateTime
+end

data/lib/orange-more/news/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 News < Base
+    views_dir       File.join(File.dirname(__FILE__), 'views')
+    
+    resource    Orange::NewsResource.new
+  end
+end
+
+Orange.plugin(Orange::Plugins::News.new)
+

data/lib/orange-more/news/resources/news_resource.rb

@@ -0,0 +1,73 @@
+module Orange
+  class NewsResource < Orange::ModelResource
+    use OrangeNews
+    call_me :news
+    def afterLoad
+      orange[:admin, true].add_link("Content", :resource => @my_orange_name, :text => 'News')
+      
+      orange.register(:stack_loaded) do
+        orange[:radius, true].context.define_tag "latest_news" do |tag|
+          orange[:news].latest(tag.locals.packet)
+        end
+      end
+    end
+    
+    def new(packet, opts = {})
+      news = OrangeNews.first()
+      unless OrangeRoute.first(:resource => 'news', :orange_site_id => packet['site'].id)
+        orange[:sitemap, true].add_route_for(packet,
+          :orange_site_id => packet['site'].id, 
+          :resource => :news, 
+          :resource_action => :archive,
+          :slug => 'news-archive', 
+          :link_text => 'Orange News Archive'
+        )
+      end
+      
+      super(packet, opts)
+    end
+    
+    def sitemap_row(packet, opts = {})
+      do_view(packet, :sitemap_row, opts)
+    end
+    
+    def news_view(packet, opts = {})
+      resource_path = packet['route.resource_path']
+      if resource_path.blank?
+        archive_view(packet, opts)
+      elsif resource_path =~ /^\/page/
+        archive(packet, opts)
+      else
+        archive_view(packet, opts)
+      end
+    end
+    
+    def latest(packet)
+      do_list_view(packet, :latest, {
+        :list => model_class.all(:order => :created_at.desc, :limit => 3)
+      })
+    end
+    
+    def archive(packet, opts = {})
+      opts.merge!(packet.extract_opts)
+      opts.merge!( :archive_url => archive_url(packet))
+      opts[:page] = opts[:page].blank? ? 1 : opts[:page].to_i
+      page = opts[:page].blank? ? 0 : opts[:page] - 1 
+      opts[:list] = model_class.all(:order => :created_at.desc, 
+          :limit => 5, 
+          :offset => (5*page)
+      )
+      opts[:pages] = (model_class.count / 5) + 1
+      do_list_view(packet, :archive, opts)
+    end
+    
+    def archive_view(packet, opts = {})
+      archive(packet, opts.merge!({:page => 1}))
+    end
+    
+    def archive_url(packet)
+      url = orange[:sitemap, true].url_for(packet, :resource => :news, :resource_action => :archive)
+      url.gsub!(/\/$/, '')
+    end
+  end
+end

data/lib/orange-more/news/views/news/archive.haml

@@ -0,0 +1,14 @@
+.news_items
+  - list.each do |news|
+    .news_item
+      %h2.news_title
+        %a{:href => news.link} #{news.title}
+      .news_description
+        = news.description
+      %p
+        %a{:href => news.link, :class => 'view_story'} View Story »
+.news_nav
+  - if page > 1
+    %a.newer{:href => "#{archive_url}/page/#{page-1}"} Newer Posts
+  - if page < pages
+    %a.older{:href => "#{archive_url}/page/#{page+1}"} Older Posts

data/lib/orange-more/news/views/news/edit.haml

@@ -0,0 +1,7 @@
+- 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'}
+- else
+  %p Couldn't find the item you're looking for.

data/lib/orange-more/news/views/news/latest.haml

@@ -0,0 +1,8 @@
+- list.each do |news|
+  .news_item
+    %p.news_title
+      %a{:href => news.link} #{news.title}
+    .news_description
+      = news.description
+    %p
+      %a{:href => news.link, :class => 'view_story'} View Story »

data/lib/orange-more/news/views/news/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 
+        News Archive
+        %br 
+        %a{:href => route_to(:news, 'create')} Add New News 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/pages/cartons/page_carton.rb

@@ -1,15 +1,14 @@
 require 'dm-timestamps'
 require 'orange-more/administration/cartons/site_carton'
-module Orange
-  class Page < Orange::SiteCarton
-    id
-    front do
-      title :title
-      fulltext :body
-    end
-    boolean :published, :default => false
-    
-    property :updated_at, DateTime
-    has n, :versions, "Orange::PageVersion"
+
+class OrangePage < Orange::SiteCarton
+  id
+  front do
+    title :title
+    fulltext :body
   end
+  boolean :published, :default => false
+  
+  property :updated_at, DateTime
+  has n, :versions, "OrangePageVersion"
 end

data/lib/orange-more/pages/cartons/page_version_carton.rb

@@ -1,13 +1,12 @@
 require 'dm-timestamps'
 require 'orange-more/administration/cartons/site_carton'
-module Orange
-  class PageVersion < Orange::SiteCarton
-    id
-    title :title
-    fulltext :body
-    property :updated_at, DateTime
-    boolean :published
-    property :version, Integer, :default => 0
-    belongs_to :orange_page, "Orange::Page"
-  end
+
+class OrangePageVersion < Orange::SiteCarton
+  id
+  title :title
+  fulltext :body
+  property :updated_at, DateTime
+  boolean :published
+  property :version, Integer, :default => 0
+  belongs_to :orange_page, "OrangePage"
 end

data/lib/orange-more/pages/resources/page_resource.rb

@@ -1,6 +1,6 @@
 module Orange
   class PageResource < Orange::ModelResource
-    use Orange::Page
+    use OrangePage
     call_me :pages
     def afterLoad
       orange[:admin, true].add_link("Content", :resource => @my_orange_name, :text => 'Pages')

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

@@ -1,43 +1,41 @@
 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
+class OrangeRoute < Orange::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
-  
-    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
+
+  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

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

@@ -3,7 +3,7 @@ require 'orange-core/resources/model_resource'
 module Orange
   
   class SitemapResource < ModelResource
-    use Orange::Route
+    use OrangeRoute
     call_me :sitemap
     def afterLoad
       orange[:admin, true].add_link('Content', :resource => @my_orange_name, :text => 'Sitemap')
@@ -23,10 +23,11 @@ module Orange
       packet[:content] = (orange[resource].view packet)
     end
     
-    def route?(packet, path)
+    # Path should be an array of path parts
+    def find_route_info(packet, path)
       parts = path.split('/')
       pad = parts.shift
-      matched = home(packet)
+      matched = home(packet, :subsite => true)
       extras = ''
       while (!parts.empty?)
         next_part = parts.shift
@@ -38,6 +39,11 @@ module Orange
           parts = []
         end
       end
+      [extras, matched]
+    end
+    
+    def route?(packet, path)
+      extras, matched = find_route_info(packet, path)
       return false if(extras.length > 0 && !matched.accept_args)
       packet['route.path'] = path
       packet['route.route'] = matched
@@ -54,7 +60,7 @@ module Orange
     def new(packet, *opts)
       if packet.request.post?
         params = packet.request.params[@my_orange_name.to_s]
-        params.merge!(:orange_site_id => packet['site'].id)
+        params.merge!(:orange_site_id => (packet['subsite'].blank? ? packet['site'].id : packet['subsite'].id))
         a = model_class.new(params)
         a.move(:into => home(packet))
       end
@@ -94,7 +100,11 @@ module Orange
     end
     
     def home(packet, opts = {})
-      site_id = opts[:orange_site_id] || packet['site'].id
+      if(opts[:subsite])
+        site_id = opts[:orange_site_id] || packet['subsite'].blank? ? packet['site'].id : packet['subsite'].id
+      else
+        site_id = opts[:orange_site_id] || packet['site'].id 
+      end
       model_class.home_for_site(site_id) || model_class.create_home_for_site(site_id)
     end
     
@@ -102,17 +112,18 @@ module Orange
       do_view(packet, :two_level, :model => home(packet))
     end
     
-    def routes_for(packet)
+    def routes_for(packet, opts = {})
       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?
+      keys[:resource] = opts[:resource] || packet['route.resource'] 
+      keys[:resource_id] = opts[:resource_id] || packet['route.resource_id'] 
+      keys[:orange_site_id] = opts[:orange_site_id] || packet['subsite'].blank? ? packet['site'].id : packet['subsite'].id
+      keys.delete_if{|k,v| v.blank? }
       model_class.all(keys)
     end
     
     def add_link_for(packet)
       linky = ['add_route']
-      linky << (packet['site'].blank? ? '0' : packet['site'].id)
+      linky << (packet['subsite'].blank? ? (packet['site'].blank? ? '0' : packet['site'].id) : packet['subsite'].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('/') )
@@ -127,8 +138,13 @@ module Orange
     end
     
     def url_for(packet, opts = {})
+      include_subsite = opts.delete(:include_subsite) || false
       m = model_class.first(opts)
-      m ? m.full_path : '#not_found'
+      if !packet['subsite'].blank? && include_subsite
+        return orange[:subsites].url_for(packet).gsub(/\/$/, '') + (m ? m.full_path : '#not_found')
+      else
+        return (m ? m.full_path : '#not_found')
+      end
     end
     
     def add_route(packet, opts = {})
@@ -156,7 +172,7 @@ module Orange
     end
     
     def find_list(packet, mode, *args)
-      home(packet).self_and_descendants
+      home(packet, :subsite => true).self_and_descendants
     end
     
     def table_row(packet, opts ={})

data/lib/orange-more/subsites.rb

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

data/lib/orange-more/subsites/cartons/subsite.rb

@@ -0,0 +1,8 @@
+class OrangeSite < Orange::Carton
+  property :type, Discriminator
+  has n, :subsites, 'OrangeSubsite'
+end
+
+class OrangeSubsite < OrangeSite
+  belongs_to :orange_site, :required => false
+end

data/lib/orange-more/subsites/middleware/subsite_load.rb

@@ -0,0 +1,28 @@
+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 SubsiteLoad < Base    
+    def packet_call(packet)
+      if packet['site']
+        site = packet['site']
+        path = packet['route.path'] || packet.request.path_info
+        
+        # Find the subsite in the sitemap table
+        extras, matched = orange[:sitemap].find_route_info(packet, path)
+        
+        # If matched, update the loaded site and trim the path down a bit
+        if !matched.resource.blank? && matched.resource.to_sym == :subsites
+          if(m = site.subsites.first(:id => matched.resource_id))
+            packet['route.path'] = extras
+            packet['subsite'] = m
+          end
+        end
+      end
+      pass packet
+    end
+  end
+  
+end
+

data/lib/orange-more/subsites/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 Subsites < Base
+    views_dir       File.join(File.dirname(__FILE__), 'views')
+    
+    resource    Orange::SubsiteResource.new
+    
+    prerouter   Orange::Middleware::SubsiteLoad
+    
+  end
+end
+
+Orange.plugin(Orange::Plugins::Subsites.new)
+

data/lib/orange-more/subsites/resources/subsite_resource.rb

@@ -0,0 +1,46 @@
+module Orange
+  class SubsiteResource < Orange::ModelResource
+    use OrangeSubsite
+    call_me :subsites
+    def afterLoad
+      orange[:admin, true].add_link("Settings", :resource => @my_orange_name, :text => 'Subsites')
+    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 = packet['site'].subsites.new(packet.request.params[@my_orange_name.to_s])
+        m.save
+        orange[:sitemap].add_route_for(packet,
+          :orange_site_id => packet['site'].id, 
+          :resource => :subsites, 
+          :resource_id => m.id,
+          :slug => 'subsite', 
+          :link_text => 'Orange Subsite'
+        )
+      end
+      packet.reroute(@my_orange_name, :orange)
+    end
+    
+    def url_for(packet)
+      orange[:sitemap].url_for(packet, {:resource => 'subsites', :resource_id => packet['subsite'].id})
+    end
+    
+    
+  end
+  
+  class Mapper < Resource
+    def route_to(packet, resource, *args)
+      opts = args.extract_options!
+      packet = DefaultHash.new unless packet 
+      context = opts[:context] || packet['route.context', nil]
+      site = packet['route.faked_site'] ? packet['route.site_url', nil] : nil
+      args.unshift(resource)
+      args.unshift(orange[:subsites].url_for(packet).gsub(/^\//, '').gsub(/\/$/, '')) if(packet['subsite'])
+      args.unshift(context)
+      args.unshift(site)
+      '/'+args.compact.join('/')
+    end
+  end
+end

data/lib/orange-more/subsites/views/subsites/index.haml

@@ -0,0 +1,2 @@
+%p
+  %a{:href => ''} Add new Subsite

data/lib/orange-more/testimonials.rb

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

data/lib/orange-more/testimonials/cartons/testimonials_carton.rb

@@ -0,0 +1,15 @@
+class OrangeTestimonial < Orange::Carton
+  id
+  admin do
+    title :name
+    text :position
+    text :company
+    text :tags
+    fulltext :blurb
+  end
+  
+  def self.with_tag(tag)
+    all(:tags.like => "%#{tag}%")
+  end
+
+end

data/lib/orange-more/testimonials/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 Testimonials < Base
+    views_dir   File.join(File.dirname(__FILE__), 'views')
+    
+    resource    Orange::TestimonialsResource.new
+  end
+end
+
+Orange.plugin(Orange::Plugins::Testimonials.new)
+

data/lib/orange-more/testimonials/resources/testimonials_resource.rb

@@ -0,0 +1,26 @@
+module Orange
+  class TestimonialsResource < Orange::ModelResource
+    use OrangeTestimonial
+    call_me :testimonials
+    def afterLoad
+      orange[:admin, true].add_link("Content", :resource => @my_orange_name, :text => 'Testimonials')
+      orange.register(:stack_loaded) do
+        orange[:radius].context.define_tag "testimonials" do |tag|
+	     	  if tag.attr["tag"] && model_class.all.count >0
+            m = model_class.with_tag(tag.attr["tag"]).first(:offset => rand(model_class.with_tag(tag.attr["tag"]).count)) #selects testimonial based on tag
+		      elsif model_class.all.count > 0
+        	  m = model_class.first(:offset => rand(model_class.all.count)) #selects a random testimonial
+		      end
+          unless m.nil?
+            orange[:testimonials].testimonial(tag.locals.packet, {:model => m })
+          else
+            ""
+          end
+        end
+      end
+    end
+    def testimonial(packet, opts = {})
+      do_view(packet, :testimonials, opts)
+    end
+  end
+end

data/lib/orange-more/testimonials/views/testimonials/testimonials.haml

@@ -0,0 +1,4 @@
+%h2 #{model.name} Said:
+%h4 Position: #{model.position}
+%h4 At: #{model.company}
+%p= model.blurb

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: orange
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors: 
 - David Haslem
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-26 00:00:00 -05:00
+date: 2010-03-05 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -116,6 +116,8 @@ files:
 - lib/orange-more/administration/resources/user_resource.rb
 - lib/orange-more/administration/templates/admin.haml
 - lib/orange-more/administration/views/openid_login.haml
+- lib/orange-more/administration/views/users/create.haml
+- lib/orange-more/administration/views/users/edit.haml
 - lib/orange-more/assets.rb
 - lib/orange-more/assets/cartons/asset_carton.rb
 - lib/orange-more/assets/plugin.rb
@@ -144,6 +146,14 @@ files:
 - 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/news.rb
+- lib/orange-more/news/cartons/news.rb
+- lib/orange-more/news/plugin.rb
+- lib/orange-more/news/resources/news_resource.rb
+- lib/orange-more/news/views/news/archive.haml
+- lib/orange-more/news/views/news/edit.haml
+- lib/orange-more/news/views/news/latest.haml
+- lib/orange-more/news/views/news/sitemap_row.haml
 - lib/orange-more/pages.rb
 - lib/orange-more/pages/cartons/page_carton.rb
 - lib/orange-more/pages/cartons/page_version_carton.rb
@@ -174,6 +184,17 @@ files:
 - lib/orange-more/slices/plugin.rb
 - lib/orange-more/slices/resources/radius.rb
 - lib/orange-more/slices/resources/slices.rb
+- lib/orange-more/subsites.rb
+- lib/orange-more/subsites/cartons/subsite.rb
+- lib/orange-more/subsites/middleware/subsite_load.rb
+- lib/orange-more/subsites/plugin.rb
+- lib/orange-more/subsites/resources/subsite_resource.rb
+- lib/orange-more/subsites/views/subsites/index.haml
+- lib/orange-more/testimonials.rb
+- lib/orange-more/testimonials/cartons/testimonials_carton.rb
+- lib/orange-more/testimonials/plugin.rb
+- lib/orange-more/testimonials/resources/testimonials_resource.rb
+- lib/orange-more/testimonials/views/testimonials/testimonials.haml
 - lib/orange.rb
 - README.markdown
 has_rdoc: true