orange-more 0.7.2 → 0.7.3

data/lib/orange-more.rb

@@ -8,7 +8,6 @@ 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', 'blog')
 require File.join(libdir, 'orange-more', 'news')
 require File.join(libdir, 'orange-more', 'disqus')
 require File.join(libdir, 'orange-more', 'contactforms')

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

@@ -162,12 +162,14 @@ module Orange
     end
     
     def create_home_for_site(packet, site_id)
-      page = orange[:pages, true].new(packet, :title => 'Homepage', :body => 'this is an orange webpage', :no_reroute => true)
+      page = orange[:pages, true].new(packet, :title => 'Homepage', :body => 'this is an orange webpage', :no_reroute => true, :published => true)
       if page
-        model_class.create_home_for_site(site_id, :resource => 'pages', :resource_id => page.id)
+        ret = model_class.create_home_for_site(site_id, :resource => 'pages', :resource_id => page.id)
       else
-        model_class.create_home_for_site(site_id)
+        ret = model_class.create_home_for_site(site_id)
       end
+      orange.fire(:sitemap_created, {:packet => packet, :site_id => site_id})
+      ret
     end
     
     def one_level(packet, opts = {})

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 7
-  - 2
-  version: 0.7.2
+  - 3
+  version: 0.7.3
 platform: ruby
 authors: 
 - David Haslem
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-08 00:00:00 -04:00
+date: 2010-10-27 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -120,7 +120,7 @@ dependencies:
   type: :runtime
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: gattica
+  name: i18n
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
     requirements: 
@@ -132,7 +132,7 @@ dependencies:
   type: :runtime
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: gattica
   prerelease: false
   requirement: &id010 !ruby/object:Gem::Requirement 
     requirements: 
@@ -141,10 +141,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
+  type: :runtime
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
-  name: rack-test
+  name: rspec
   prerelease: false
   requirement: &id011 !ruby/object:Gem::Requirement 
     requirements: 
@@ -155,6 +155,18 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id011
+- !ruby/object:Gem::Dependency 
+  name: rack-test
+  prerelease: false
+  requirement: &id012 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id012
 description: Orange is a Ruby framework for building managed websites with code as simple as Sinatra
 email: therabidbanana@gmail.com
 executables: []
@@ -198,19 +210,6 @@ files:
 - lib/orange-more/assets/views/assets/change.haml
 - lib/orange-more/assets/views/assets/create.haml
 - lib/orange-more/assets/views/assets/insert.haml
-- lib/orange-more/blog.rb
-- lib/orange-more/blog/base.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/blog/views/blog_posts/show.haml
 - lib/orange-more/cloud.rb
 - lib/orange-more/cloud/base.rb
 - lib/orange-more/cloud/plugin.rb

data/lib/orange-more/blog.rb

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

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

@@ -1,4 +0,0 @@
-require 'orange-more/blog/cartons/blog'
-require 'orange-more/blog/cartons/blog_post'
-require 'orange-more/blog/resources/blog_resource'
-require 'orange-more/blog/resources/blog_post_resource'

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

@@ -1,8 +0,0 @@
-require 'orange-more/administration/cartons/site_carton'
-class OrangeBlog < Orange::SiteCarton
-  id
-  front do
-    title :title
-  end
-  has n, :posts, "OrangeBlogPost", :child_key => [:blog_id]
-end

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

@@ -1,60 +0,0 @@
-require 'dm-timestamps'
-class OrangeBlogPost < Orange::Carton
-  id
-  front do
-    title :title, :length => 255
-    fulltext :body
-  end
-  admin do
-    fulltext :summary
-  end
-  orange do
-    boolean :published, :default => false
-    text :slug, :length => 255
-    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', t.downcase.gsub(/<\/?[^>]*>/, "").gsub(/[']+/, "").gsub(/[^a-z0-9]+/, "_"))
-  end
-  
-  def published=(val)
-    if val == '1' || val === true
-      self.publish
-    else
-      self.attribute_set('published', false)
-    end
-  end
-  
-  def publish
-    self.published_at = Time.now if self.published_at.blank?
-    self.attribute_set('published', true)
-  end
-  
-  def publish!
-    self.publish
-    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/plugin.rb

@@ -1,13 +0,0 @@
-require 'orange-more/blog/base'
-
-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

@@ -1,54 +0,0 @@
-module Orange
-  class BlogResource < Orange::ModelResource
-    use OrangeBlogPost
-    call_me :blog_posts
-    def stack_init
-      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
-          m.publish!
-          cloud_publish(packet, m)
-        end
-      end
-      packet.reroute(@my_orange_name, :orange)
-    end
-    
-    def cloud_publish(packet, post)
-      orange[:cloud].microblog(packet, "New post on our blog: #{post.title} - http://#{packet['site'].url}#{orange[:blog].blog_url_for(packet)}/#{post.published_at.year}/#{post.published_at.month}/#{post.slug}") if post.published && !post.published_at.blank?
-    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 onNew(packet, params)
-      params[:published] = false unless params.has_key?(:published) || params.has_key?("published")
-      params[:author] = packet['user', false] ? packet['user'].name : "Author" unless params.has_key?(:author) || params.has_key?("author")
-      
-      blog = orange[:blog].blog_for_site(packet)
-      post = blog.posts.new(params)
-      post
-    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 onSave(packet, m, params = {})
-      m.update(params)
-      m.blog = orange[:blog].blog_for_site(packet) unless m.blog #ensure blog exists
-      
-      m.save
-      cloud_publish(packet, m)
-      m
-    end
-    
-    def find_list(packet, mode, opts = {})
-      blog = orange[:blog].blog_for_site(packet)
-      opts[:order] = [:updated_at.desc]
-      blog ? blog.posts.all(opts) : [] 
-    end
-    
-  end
-end

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

@@ -1,105 +0,0 @@
-module Orange
-  class BlogPostResource < Orange::ModelResource
-    use OrangeBlog
-    call_me :blog
-    def stack_init
-      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 = blog_for_site(packet)
-      opts.merge!( :blog_url => blog_url_for(packet))
-      parts = resource_path.split('/')
-      if parts.size == 2
-        post = blog.posts.first(:id => parts[1].to_i)
-      elsif parts.size == 4
-        post = blog.posts.year_and_month(parts[1].to_i, parts[2].to_i).slug(parts[3]) 
-      end
-      if post
-        orange[:blog_posts].do_view(packet, :show, opts.merge({:model => post}))
-      else
-        "Not found"
-      end
-    end
-    
-    def blog_url_for(packet)
-      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 = 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, 
-          :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 = false)
-      site_id ||= (packet['subsite'].blank? ? packet['site'] : packet['subsite'])
-      site_id = OrangeSite.get(site_id) unless site_id.is_a? OrangeSite
-      blog = OrangeBlog.first(:orange_site => site_id)
-      if !blog && packet.request.post? # Only create a new blog if this is a post
-        blog = OrangeBlog.new
-        blog.title = 'An Orange Hosted Blog'
-        blog.orange_site = packet['site']
-        blog.save
-      end
-      if packet.request.post? && !OrangeRoute.first(:resource => 'blog', :orange_site => packet['site'])
-        orange[:sitemap, true].add_route_for(packet,
-          :orange_site => 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 = 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 OrangeBlog.all
-      end
-    end
-    
-  end
-end

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

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

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

@@ -1,12 +0,0 @@
-.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

@@ -1,4 +0,0 @@
-.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

@@ -1,14 +0,0 @@
-- 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

@@ -1,8 +0,0 @@
-- 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/blog/views/blog_posts/show.haml

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