orange 0.3.5 → 0.3.6

data/lib/orange-core/packet.rb

@@ -128,6 +128,8 @@ module Orange
     # Returns the content ready to be used by Rack (wrapped in an array)
     # @return [Array] array of strings to be rendered
     def content
+      # Stringify content if it isn't a string for some weird reason.
+      packet[:content] = packet[:content].to_s unless packet[:content].is_a? String
       return [packet[:content]] if packet[:content]
       return ['']
     end

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

@@ -172,6 +172,7 @@ module Orange
         end
       end
       packet.reroute(@my_orange_name, :orange) unless (packet.request.xhr? || no_reroute)
+      m || false
     end
     
     def beforeSave(packet, obj, opts = {})

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

@@ -24,14 +24,21 @@ class OrangeBlogPost < Orange::Carton
     self.attribute_set('slug', t.downcase.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
-    self.published = true
+    self.published_at = Time.now if self.published_at.blank?
+    self.attribute_set('published', true)
   end
   
   def publish!
-    self.published_at = Time.now
-    self.published = true
+    self.publish
     self.save
   end
   

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

@@ -11,22 +11,26 @@ module Orange
       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!
+          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
-      params[:author] = packet['user', false] ? packet['user'].name : "Author"
+      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)
-      blog.posts.new(params)
-      blog
+      post = blog.posts.new(params)
+      post
     end
     
     # Saves updates to an object specified by packet['route.resource_id'], then reroutes to main
@@ -34,7 +38,10 @@ module Orange
     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, id =false)

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

@@ -29,7 +29,7 @@ module Orange
       opts.merge!( :blog_url => blog_url_for(packet))
       parts = resource_path.split('/')
       if parts.size == 2
-        post = blog.posts.all(:id => parts[1].to_i)
+        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

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

@@ -3,4 +3,4 @@
     .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
+        %a{:href => "#{blog_url}/#{post.published_at.year}/#{post.published_at.month}/#{post.slug}"}= post.title

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 5
-  version: 0.3.5
+  - 6
+  version: 0.3.6
 platform: ruby
 authors: 
 - David Haslem
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-01 00:00:00 -04:00
+date: 2010-06-02 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency