orange 0.0.12 → 0.0.13

data/lib/orange/cartons/page_carton.rb

@@ -1,12 +1,14 @@
 require 'dm-timestamps'
-
+require 'orange/cartons/site_carton'
 module Orange
-  class Page < Orange::Carton
+  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"
   end

data/lib/orange/cartons/page_version_carton.rb

@@ -1,10 +1,12 @@
 require 'dm-timestamps'
+require 'orange/cartons/site_carton'
 module Orange
-  class PageVersion < Orange::Carton
+  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

data/lib/orange/middleware/access_control.rb

@@ -76,7 +76,7 @@ module Orange::Middleware
         after = packet.session['user.after_login'].blank? ? 
                 '/' : packet.session['user.after_login'] 
         packet.reroute(after)
-        false
+        return false
       end
       packet.reroute('/') if packet['user.id'] # Reroute to index if we're logged in.
       
@@ -135,12 +135,12 @@ module Orange::Middleware
                 ) 
           )
           packet[:content] = 'Got openID?'
-          packet.finish
+          return packet.finish
         end
       # Show login form, if necessary
       else
         packet[:content] = orange[:parser].haml('openid_login.haml', packet)
-        packet.finish
+        return packet.finish
       end
     end # end handle_openid
   end

data/lib/orange/resources/not_found.rb

@@ -3,6 +3,7 @@ module Orange
     call_me :not_found
     def route(packet)
       packet[:content] = orange[:parser].haml("404.haml", packet, :resource => self)
+      packet[:status] = 404
     end
   end
 end

data/lib/orange/resources/page_resource.rb

@@ -7,12 +7,33 @@ module Orange
       options[:sitemappable] = true
       
     end
+    
+    def publish(packet, *opts)
+      if packet.request.post?
+        m = model_class.get(packet['route.resource_id'])
+        if m
+          params = {}
+          params[:published] = true
+          m.update(params)
+          params = m.attributes.merge(params)
+          params.delete(:id)
+          max = m.versions.max(:version) || 0
+          m.versions.new(params.merge(:version => max + 1))
+          m.save
+        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?
-        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))
+        params = packet.request.params[@my_orange_name.to_s]
+        params[:published] = false
+        m = model_class.new(params)
+        m.orange_site = packet['site']
+        # m.versions.new(params.merge(:version => 1))
         m.save
       end
       packet.reroute(@my_orange_name, :orange)
@@ -24,9 +45,10 @@ module Orange
       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))
+          params = packet.request.params[@my_orange_name.to_s]
+          params[:published] = false
+          m.update(params)
+          m.orange_site = packet['site']
           m.save
         end
       end

data/lib/orange/views/pages/edit.haml

@@ -3,17 +3,21 @@
     = orange[:sitemap, true].sitemap_links(packet, {:slug_me => orange[:sitemap, true].slug_for(model, props)})
   %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]))
+      %p~ view_attribute(prop, model_name, :label => true, :value => model.attribute_get(prop[:name]))
     %input{:type => 'submit', :value => 'Save Changes'}
+    = route_to(model_name, model[:id], 'publish')
+  = form_link('Publish', packet.route_to(model_name, model[:id], 'publish'))
   %h3 Versions
-  - for version in model.versions
-    %li 
-      %div.version_container
-        %span.version_info
-          %strong Version #{version.version} 
-        %span.version_info  
-          Last Updated: #{version.updated_at}
-        %span.version_info
-          %a{:href => route_to(model_name, model[:id], 'edit', "version", version.version)}Edit
+  %ul
+    %li (Current Draft)
+    - for version in model.versions.all(:order => :version.desc, :limit=> 3)
+      %li 
+        .version_container
+          %span.version_info
+            %strong Version #{version.version} 
+          %span.version_info  
+            Last Updated: #{version.updated_at}
+          %span.version_info
+            %a{:href => route_to(model_name, model[:id], 'edit', "version", version.version)}Edit
 - else
   %p Couldn't find the item you're looking for.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: orange
 version: !ruby/object:Gem::Version 
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors: 
 - David Haslem