publinator 0.0.6 → 0.0.7

data/app/controllers/publinator/application_controller.rb

@@ -1,7 +1,7 @@
 module Publinator
   class ApplicationController < ActionController::Base
     layout :current_layout
-
+    before_filter :in_a_site
     helper_method :current_site, :current_domain, :current_layout, :current_site_name
 
     def current_site_name
@@ -25,5 +25,11 @@ module Publinator
         @current_layout ||= current_site.layout
       end
     end
+
+    private
+
+      def in_a_site
+        raise "No site found" unless current_site.present?
+      end
   end
 end

data/app/controllers/publinator/manage/pages_controller.rb

@@ -0,0 +1,92 @@
+require_dependency "publinator/application_controller"
+
+module Publinator
+  class Manage::PagesController < Publinator::ManageController
+    layout "publinator/manage"
+
+    before_filter :get_pages
+    before_filter :get_page, :only => [:show, :edit, :update, :destroy]
+
+    def index
+      begin
+        render "manage/pages/index"
+      rescue ActionView::MissingTemplate
+        render "publinator/manage/pages/index"
+      end
+    end
+
+    def show
+      begin
+        render "manage/pages/show"
+      rescue ActionView::MissingTemplate
+        render "publinator/manage/pages/show"
+      end
+    end
+
+    def new
+      @page = Publinator::Page.send(:new, {
+        :publication => Publinator::Publication.new(
+          :publish_at       => 1.day.from_now.beginning_of_day + 8.hours,
+          :archive_at       => 31.days.from_now.beginning_of_day,
+          :site             => current_site,
+          :publishable_type => "Publinator::Page"
+        )
+      })
+      @page.asset_items.build
+      @field_names = @page.editable_fields.collect{ |an| an.to_sym }
+      begin
+        render "manage/pages/new"
+      rescue ActionView::MissingTemplate
+        render "publinator/manage/pages/new"
+      end
+    end
+
+    def edit
+      @field_names = @page.editable_fields.collect{ |an| an.to_sym }
+      @page.asset_items.build
+      begin
+        render "manage/pages/edit"
+      rescue ActionView::MissingTemplate
+        render "publinator/manage/pages/edit"
+      end
+    end
+
+    def create
+      @page = Publinator::Page.new(params[:page])
+      @page.site = current_site
+      if @page.save
+        redirect_to "/manage/pages", :notice => "Page created."
+      else
+        begin
+          render "manage/pages/new", :notice => "Page could not be created."
+        rescue ActionView::MissingTemplate
+          render "publinator/manage/pages/new", :notice => "Page could not be created."
+        end
+      end
+    end
+
+    def update
+      @page.update_attributes(params[:page])
+      @page.site = current_site
+      if @page.save
+        redirect_to "/manage/pages", :notice => "Page updated."
+      else
+        begin
+          render "manage/page/edit", :notice => "Page could not be updated."
+        rescue ActionView::MissingTemplate
+          render "publinator/manage/pages/edit", :notice => "Page could not be updated."
+        end
+      end
+    end
+
+    private
+
+      def get_pages
+        @pages = Publinator::Page.where(:site_id => current_site.id).order("updated_at desc")
+      end
+
+      def get_page
+        @page = @pages.find(params[:id])
+      end
+  end
+end

data/app/controllers/publinator/manage/publishable_controller.rb

@@ -4,74 +4,110 @@ module Publinator
   class Manage::PublishableController < ApplicationController
     layout "publinator/manage"
 
+    before_filter :get_publishable
+
     def index
-      @publishables = Publinator::Publication.for_site(current_site.id).where(:publishable_type => params["publishable_type"].singularize.capitalize).order("updated_at desc")
       begin
-        render "manage/#{params[:publishable_type]}/index"
+        render "manage/#{@publishable_collection_name}/index"
       rescue ActionView::MissingTemplate
         render "publinator/manage/publishable/index"
       end
     end
 
     def show
-      @publication = Publinator::Publication.find_by_publishable_type_and_slug(params[:publishable_type].singularize.capitalize, params[:id])
-      @publishable = @publication.publishable_type.singularize.capitalize.constantize.send(:find, @publication.publishable_id)
       begin
-        render "#{params[:publishable_type]}/show"
+        render "manage/#{@publishable_collection_name}/show"
       rescue ActionView::MissingTemplate
         render "publinator/manage/publishable/show"
       end
     end
 
     def new
-      publishable_class = params['publishable_type'].singularize.capitalize.constantize
-      #@publication = Publinator::Publication.find_by_publishable_type_and_publishable_id(params[:publishable_type].singularize.capitalize, params[:id])
-      @publishable = publishable_class.send(:new, {
+      @publishable = @publishable_class.new(
         :publication => Publinator::Publication.new(
-          :publish_at => 1.day.from_now.beginning_of_day + 8.hours,
-          :archive_at => 31.days.from_now.beginning_of_day,
-          :site_id    => current_site.id,
-          :publishable_type => params['publishable_type'].singularize.capitalize
+          :publish_at       => 1.day.from_now.beginning_of_day + 8.hours,
+          :archive_at       => 31.days.from_now.beginning_of_day,
+          :site             => current_site,
+          :publishable_type => @publishable_type.name
         )
-      })
-      @field_names = (publishable_class.attribute_names - ["id", "created_at", "updated_at"]).collect{ |an| an.to_sym }
+      )
+      @publishable.asset_items.build
+      @field_names = @publishable.editable_fields.collect{ |an| an.to_sym }
       begin
-        render "#{params[:publishable_type]}/new"
+        render "manage/#{@publishable_collection_name}/new"
       rescue ActionView::MissingTemplate
         render "publinator/manage/publishable/new"
       end
     end
 
     def edit
-      @publication = Publinator::Publication.find_by_publishable_type_and_slug(params[:publishable_type].singularize.capitalize, params[:id])
-      @publishable = @publication.publishable_type.singularize.capitalize.constantize.send(:find, @publication.publishable_id)
+      @publishable.asset_items.build
+
       begin
-        render "#{params[:publishable_type]}/edit"
+        render "manage/#{@publishable_collection_name}/edit"
       rescue ActionView::MissingTemplate
         render "publinator/manage/publishable/edit"
       end
     end
 
     def create
-      @publishable_type = PublishableType.find_by_name(params['publishable_type'].singularize.capitalize)
-      @publishable_class = @publishable_type.name.capitalize.constantize
-      publishable_params = params[@publishable_type.name.downcase.to_sym]
-      publication_params = publishable_params.delete('publication').merge({ :site_id => current_site.id, :publishable_type => @publishable_type.name.capitalize })
-      publication_params.merge({:section_id => publishable_params[:section_id]}) if publishable_params[:section_id]
-      @publication = Publinator::Publication.create!(publication_params)
-      @publishable = @publishable_type.name.capitalize.constantize.send(:new, publishable_params, :publication => @publication)
+      @publishable = @publishable_class.new(params[@publishable_member_name.to_sym])
+      logger.info current_site.to_yaml
+      @publishable.publication.site = current_site
 
       if @publishable.save
-        @publication.publishable_id = @publishable.id
-        @publication.save
-        redirect_to "/manage/#{params[:publishable_type]}", :notice => "#{@publishable_type.name} created."
+        redirect_to "/manage/#{@publishable_collection_name}", :notice => "#{@publishable_type.name} created."
       else
         begin
-          render "#{params[:publishable_type]}/new", :notice => "#{@publishable_type.name} could not be created."
+          render "#{@publishable_collection_name}/new", :notice => "#{@publishable_type.name} could not be created."
         rescue ActionView::MissingTemplate
           render "publinator/manage/publishable/new", :notice => "#{@publishable_type.name} could not be created."
         end
       end
     end
+
+    def update
+      if @publishable_class.send(:update, @publishable.id, params[@publishable_class_name.downcase.to_sym])
+        redirect_to "/manage/#{@publishable_collection_name}", :notice => "#{@publishable_type.name} updated."
+      else
+        begin
+          render "#{@publishable_collection_name}/edit", :notice => "#{@publishable_type.name} could not be updated."
+        rescue ActionView::MissingTemplate
+          render "publinator/manage/publishable/edit", :notice => "#{@publishable_type.name} could not be updated."
+        end
+      end
+    end
+
+    private
+
+      def get_publishable
+        if params["publishable_type"].nil?
+          @publishable_class_name = "Page"
+          @publishable_collection_name = "pages"
+          @publishable_class = Publinator::Page
+          @publishable_type = PublishableType.find_by_name("Publinator::Page")
+          @publishable_type_name = @publishable_type.name
+        else
+          @publishable_class_name = params["publishable_type"].singularize.capitalize
+          @publishable_collection_name = params["publishable_type"]
+          @publishable_member_name = @publishable_class_name.downcase
+          @publishable_class = @publishable_class_name.constantize
+          @publishable_type = PublishableType.find_by_name(params['publishable_type'].singularize.capitalize)
+          @publishable_type_name = @publishable_type.name
+        end
+
+        @publications = Publinator::Publication.for_site(current_site.id).where(:publishable_type => @publishable_type.name).order("updated_at desc")
+        @publishables = @publications.collect{ |pub| pub.publishable }
+        if params[:id]
+          original_id = params[:id]
+          if original_id.to_i.to_s == params[:id]
+            @publishable = @publishable_class.send(:find, params[:id])
+            @publication = @publishable.publication
+          else
+            @publication = @publications.find(:first, :conditions => ["slug = ?", params[:id]])
+            @publishable = @publication.publishable
+          end
+        end
+      end
   end
 end

data/app/controllers/publinator/manage/sites_controller.rb

@@ -3,15 +3,15 @@ require_dependency "publinator/application_controller"
 module Publinator
   class Manage::SitesController < ApplicationController
     layout "publinator/manage"
-    
+
     def index
       @sites = Publinator::Site.all
     end
-    
+
     def new
       @site = Publinator::Site.new
     end
-    
+
     def create
       @site = Publinator::Site.new(params[:site])
       if @site.save
@@ -21,4 +21,4 @@ module Publinator
       end
     end
   end
-end
+end

data/app/controllers/publinator/manage_controller.rb

@@ -1,13 +1,13 @@
 class Publinator::ManageController < Publinator::ApplicationController
   layout 'publinator/manage'
   #before_filter :managers_only
-  
+
   # def managers
-  #   if 
+  #   if
   # end
-  
+
   def index
     @publishable_types = Publinator::PublishableType.all
     render "publinator/manage/index"
   end
-end
+end

data/app/controllers/publinator/section_controller.rb

@@ -5,19 +5,13 @@ module Publinator
     before_filter :get_section
 
     def index
-      logger.info "#{@section.id}"
       @publication = Publinator::Publication.find_by_section_id_and_slug(@section.id, 'index')
-      logger.info Publication.all.collect{ |p| "/#{@section.section_slug}/#{p.slug}" }
-      logger.info @publication.to_yaml
-      @publishable = @publication.content
+      @publishable = @publication.publishable
       begin
         render "#{params[:section]}/index"
       rescue ActionView::MissingTemplate
         render "publinator/publishable/show"
       end
-    # rescue Exception => e
-    #       logger.info e.to_yaml
-    #       redirect_to root_url, :notice => "Page not found." if @publication.nil?
     end
 
     def show

data/app/helpers/publinator/application_helper.rb

@@ -10,45 +10,31 @@ module Publinator
       RDiscount.new(markdown_text).to_html.html_safe
     end
 
-    def menu(array)
-      menu = content_tag(:ul, :class => 'nav_menu') do
-        menu_content = ""
-        array.each do |obj|
-          menu_content += menu_item(obj)
+    def menu_section(title, path = "", collection)
+      if path.blank?
+        ct = "<li>#{title}<br>"
+      else
+        ct = "<li><a href='#{path}'>#{title}</a><br>"
+      end
+      if collection && collection.length && collection.length > 0
+        ct += "<div class='submenu'><ul>"
+        collection.each do |c|
+          ct += menu_section(c.title, c.path, c.menu_collection)
         end
-        menu_content.html_safe
+        ct += "</ul></div>"
       end
-      menu.html_safe
+      ct += "</li>"
+      ct.html_safe
     end
 
     def menu_item(obj)
-      logger.info "ready to create entry for #{obj.class} #{obj.id}"
-      if obj.class == Publinator::Publication
-        logger.info "publication's publishable is #{obj.publishable.class} #{obj.publishable.id}"
-      end
-      raise "No publishable found for #{obj.class} #{obj.id}" if !obj.publishable
-      tag_content = content_tag(:li) do
-        li_content = link_to obj.publishable.title, obj.publishable.path
-        if obj.respond_to? :publications
-          li_content += content_tag(:div, :class => "submenu") do
-            if obj.publications && obj.publications.length && obj.publications.length > 0
-              submenu_content = content_tag(:ul) do
-                sub_content = ""
-                obj.publications.each do |pub|
-                  logger.info "ready to create entry for #{pub.publishable_type} #{pub.publishable_id} #{pub.slug}"
-                  unless pub.slug == 'index'
-                    sub_content += menu_item(pub)
-                  end
-                end
-                sub_content.html_safe
-              end
-              li_content += submenu_content
-            end
-          end
-        end
-        li_content.html_safe
-      end
-      tag_content
+      menu_section(obj.title, obj.path, obj.menu_collection)
+    end
+
+    def publishable_asset(pub, asset_type)
+      return if !pub
+      asset = pub.asset_file(asset_type)
+      image_tag asset.url if asset
     end
   end
 end

data/app/models/publinator/asset_item.rb

@@ -0,0 +1,9 @@
+#module Publinator
+  class Publinator::AssetItem < ActiveRecord::Base
+    attr_accessible :asset, :assetable
+    belongs_to :assetable, :polymorphic => true
+    validates_presence_of :assetable
+
+    has_attached_file :asset
+  end
+#end

data/app/models/publinator/page.rb

@@ -2,6 +2,10 @@ module Publinator
   class Page < ActiveRecord::Base
     self.table_name = 'publinator_pages'
     acts_as_publishable
-    attr_accessible :body, :kicker, :subtitle, :teaser, :title, :section
+    attr_accessible :body, :kicker, :subtitle, :teaser, :title, :section, :asset_items
+
+    def asset_types
+      ['header']
+    end
   end
 end

data/app/models/publinator/publication.rb

@@ -3,7 +3,7 @@ module Publinator
     # has_paper_trail
     attr_accessible :custom_slug, :parent_id, :publication_state_id,
       :publishable_id, :publishable_type, :slug, :publish_at,
-      :unpublish_at, :archive_at, :section, :default, :publishable, :site
+      :unpublish_at, :archive_at, :section, :default, :publishable, :site, :section_id
     belongs_to :publishable, :polymorphic => true
     belongs_to :section, :class_name => "Publinator::Section"
     belongs_to :site
@@ -18,6 +18,8 @@ module Publinator
     scope :published, where(:publication_state_id => 1)
     scope :for_site, lambda { |site_id| where("site_id = ?", site_id) }
 
+    delegate :title, :path, :menu_collection, :to => :publishable
+
     def content
       publishable_type.constantize.find(publishable_id)
     end
@@ -31,6 +33,11 @@ module Publinator
           self.slug = custom_slug
         elsif publishable.present? && publishable.title.present?
           self.slug = self.publishable.title.strip.downcase.gsub(/[^a-zA-Z0-9\-\_]/, '_')
+          self.slug = self.slug.gsub("___", "_")
+          self.slug = self.slug.gsub("__", "_")
+          if slug.end_with?("_")
+            self.slug = self.slug.chop
+          end
         else
           self.slug = "temporary_slug_#{rand(100000)}"
         end

data/app/models/publinator/publishable_type.rb

@@ -3,6 +3,8 @@ module Publinator
     attr_accessible :name, :sluggable
 
     def self.matches?(request)
+      logger.info request.path_parameters
+      logger.info request.path_parameters[:publishable_type]
       pt = self.find_by_name(request.path_parameters[:publishable_type].singularize.capitalize)
       return pt.present?
     end

data/app/models/publinator/section.rb

@@ -1,7 +1,7 @@
 # TODO Validate new sections - can't conflict with publishable_types
 module Publinator
   class Section < ActiveRecord::Base
-    attr_accessible :layout, :name, :parent_id, :site, :section_slug
+    attr_accessible :layout, :name, :parent_id, :site, :section_slug, :position
     belongs_to :site, :class_name => "Publinator::Site"
     has_many :publications, :class_name => "Publinator::Publication"
     before_create :generate_section_slug
@@ -25,6 +25,10 @@ module Publinator
       "/#{section_slug}"
     end
 
+    def menu_collection
+      publications
+    end
+
     def publishable
       self
     end

data/app/models/publinator/site.rb

@@ -1,9 +1,9 @@
 module Publinator
   class Site < ActiveRecord::Base
     attr_accessible :abbr, :description, :name, :parent_id, :state, :title, :default
-    has_many :domain_names
-    has_many :sections
-    has_many :publications
+    has_many :domain_names, :class_name => "Publinator::DomainName"
+    has_many :sections,     :class_name => "Publinator::Section"
+    has_many :publications, :class_name => "Publinator::Publication"
 
     # get the layout for the site
     #

data/app/views/layouts/publinator/manage.html.erb

@@ -10,7 +10,9 @@
   <div id="header">
     <h3><%= link_to "Managing", manage_path %> <%= link_to (current_site_name || "Publinator"), root_url, :target => "_new" %></h3>
   </div>
-  <div id="content">  
+  <div id="content">
+    <%= alert if alert %>
+    <%= notice if notice %>
     <%= yield %>
   </div>
   <div id="footer">

data/app/views/publinator/manage/index.html.erb

@@ -1,5 +1,8 @@
 <h2>Content Manager Home Page</h2>
 
+<%= link_to "Pages", "/manage/pages" %><br>
 <% @publishable_types.each do |pt| %>
-<%= link_to pt.name.pluralize, "/manage/#{pt.name.downcase.pluralize}" %>
-<% end %>
+  <% unless pt.name == "Page" %>
+    <%= link_to pt.name.pluralize, send("manage_#{pt.name.downcase.pluralize}_path") %><br>
+  <% end %>
+<% end %>

data/app/views/publinator/manage/pages/_form.html.erb

@@ -0,0 +1,33 @@
+<%= semantic_form_for [:manage, @page], :html => { :multipart => true } do |form| %>
+  <% if @page.errors && @page.errors.count > 0 %>
+    <% @page.errors.full_messages.each do |e| %>
+      <%= e %><br>
+    <% end %>
+  <% end %>
+  <%= form.inputs "Page" do %>
+    <% @field_names.each do |field| %>
+      <%= form.input field %>
+    <% end %>
+  <% end %>
+  <% if @page.asset_types.length > 0 %>
+    <%= form.semantic_fields_for :asset_items do |asset_form| %>
+      <%= asset_form.inputs "Asset" do %>
+        <%= asset_form.input :asset_type, :as => :select, :collection => @page.asset_types %>
+        <%= asset_form.input :asset_file, :as => :file %>
+      <% end %>
+    <% end %>
+  <% end %>
+  <%= form.semantic_fields_for :publication do |pub| %>
+    <%= pub.inputs "Publication Settings" do %>
+      <%= pub.input :custom_slug, :required => false %>
+      <%= pub.input :publish_at, :as => :datetime_select, :required => false %>
+      <%= pub.input :unpublish_at, :as => :datetime_select, :required => false %>
+      <%= pub.input :archive_at, :as => :datetime_select, :required => false %>
+      <%= pub.input :section, :as => :select, :required => false, :collection => current_site.sections unless current_site.sections.length == 0 %>
+    <% end %>
+  <% end %>
+  <%= form.actions do %>
+    <%= form.action :submit, :as => :button %>
+    <%= form.action :cancel, :as => :link %>
+  <% end %>
+<% end %>

data/app/views/publinator/manage/pages/_summary.html.erb

@@ -0,0 +1,8 @@
+<tr>
+  <td><%= link_to summary.publication.slug, manage_page_path(summary) %></td>
+  <td><%= link_to summary.section.name if summary.section %></td>
+  <td><%= summary.updated_at %></td>
+  <td><%= link_to "edit", edit_manage_page_path(summary) %></td>
+  <td><%= link_to "show", manage_page_path(summary) %></td>
+  <td><%= link_to "public", summary.path %></td>
+</tr>

data/app/views/publinator/manage/pages/edit.html.erb

@@ -0,0 +1,4 @@
+<h2>Edit Page <%= @page.publication.slug %></h2>
+
+<%= render :partial => "form" %>
+

data/app/views/publinator/manage/pages/index.html.erb

@@ -0,0 +1,17 @@
+<h2>Pages</h2>
+
+<table id="publishables">
+  <thead>
+    <tr>
+      <th>Page Title</th>
+      <th>Section</th>
+      <th>Last Updated At</th>
+      <th>Edit</th>
+      <th>Show</th>
+      <th>Public Link</th>
+    </tr>
+  </thead>
+  <%= render :collection => @pages, :partial => "summary" %>
+</table>
+
+<%= link_to "Add Page", "/manage/pages/new" %>

data/app/views/publinator/manage/pages/new.html.erb

@@ -0,0 +1,4 @@
+<h2>Add a new <%= @publishable.class.to_s %></h2>
+
+<%= render :partial => "form" %>
+

data/app/views/publinator/manage/pages/show.html.erb

@@ -0,0 +1,16 @@
+
+<h1><%= @page.title %></h1>
+
+<% @page.asset_types.each do |ai| %>
+  <%= image_tag @page.asset_items.where(:asset_type => ai).first.asset_file.url %>
+<% end %>
+
+<p>
+<%= m(@page.body) %>
+</p>
+
+<div id="controls">
+  <%= link_to "Back", manage_pages_path %>
+  <%= link_to "Edit", edit_manage_page_path(@page) %>
+  <%= link_to "Delete", manage_page_path(@page), :method => :delete, :class => "danger", :confirm => "Delete this #{@publishable.class.to_s}?" %>
+</div>

data/app/views/publinator/manage/publishable/_form.html.erb

@@ -1,22 +1,30 @@
-<%= semantic_form_for @publishable, :url => manage_create_publishable_path do |form| %>
+<%= semantic_form_for [:manage, @publishable], :html => { :multipart => true } do |form| %>
   <% if @publishable.errors && @publishable.errors.count > 0 %>
   <% logger.info @publishable_errors.to_yaml %>
-    <% @publishable.errors.each do |e| %>
-    <%= e %>
+    <% @publishable.errors.full_messages.each do |e| %>
+      <%= e %><br>
     <% end %>
   <% end %>
-  <%= form.inputs @publishable.class.to_s do %>
-    <% @field_names.each do |field| %>
+  <%= form.inputs @publishable_class.to_s do %>
+    <% @publishable.editable_fields.collect{ |an| an.to_sym }.each do |field| %>
       <%= form.input field %>
     <% end %>
   <% end %>
-  <%= form.semantic_fields_for @publishable.publication do |pub| %>
+  <% if @publishable.asset_types.length > 0 %>
+    <%= form.semantic_fields_for :asset_items do |asset_form| %>
+      <%= asset_form.inputs "Asset" do %>
+        <%= asset_form.input :asset_type, :as => :select, :collection => @publishable.asset_types %>
+        <%= asset_form.input :asset_file, :as => :file %>
+      <% end %>
+    <% end %>
+  <% end %>
+  <%= form.semantic_fields_for :publication do |pub| %>
     <%= pub.inputs "Publication Settings" do %>
       <%= pub.input :custom_slug, :required => false %>
       <%= pub.input :publish_at, :as => :datetime_select, :required => false %>
       <%= pub.input :unpublish_at, :as => :datetime_select, :required => false %>
       <%= pub.input :archive_at, :as => :datetime_select, :required => false %>
-      <%= pub.input :section_id, :as => :select, :required => false, :collection => current_site.sections unless current_site.sections.length == 0 %>
+      <%= pub.input :section, :as => :select, :required => false, :collection => current_site.sections unless current_site.sections.length == 0 %>
     <% end %>
   <% end %>
   <%= form.actions do %>

data/app/views/publinator/manage/publishable/_summary.html.erb

@@ -1,7 +1,8 @@
 <tr>
-  <td><%= link_to summary.slug, manage_publishable_path(summary.publishable.class.to_s.downcase.pluralize, summary.slug) %></td>
+  <td><%= link_to summary.my_slug, [:manage, summary] %></td>
+  <td><%= link_to summary.publication.section.name if summary.publication.section %></td>
   <td><%= summary.updated_at %></td>
-  <td><%= link_to "edit", manage_edit_publishable_path(summary.publishable.class.to_s.downcase.pluralize, summary.slug) %></td>
-  <td><%= link_to "show", manage_publishable_path(summary.publishable.class.to_s.downcase.pluralize, summary.slug) %></td>
-  <td><%= link_to "public", publishable_path(summary.publishable.class.to_s.downcase.pluralize, summary.slug) %></td>
-</tr>
+  <td><%= link_to "edit", send("edit_manage_#{@publishable_type_name.downcase}_path", summary) %></td>
+  <td><%= link_to "show", [:manage, summary] %></td>
+  <td><%= link_to "public", summary.path %></td>
+</tr>

data/app/views/publinator/manage/publishable/index.html.erb

@@ -1,9 +1,10 @@
-<h2><%= params["publishable_type"].capitalize %></h2>
+<h2><%= @publishable_class_name.capitalize.pluralize %></h2>
 
 <table id="publishables">
   <thead>
     <tr>
-      <th><%= params["publishable_type"].capitalize.singularize %> Title</th>
+      <th><%= @publishable_class_name %> Slug</th>
+      <th>Section</th>
       <th>Last Updated At</th>
       <th>Edit</th>
       <th>Show</th>
@@ -13,4 +14,4 @@
   <%= render :collection => @publishables, :partial => "summary" %>
 </table>
 
-<%= link_to "Add #{params["publishable_type"].singularize.capitalize}", "/manage/#{params["publishable_type"]}/new" %>
+<%= link_to "Add #{@publishable_class_name}", send("new_manage_#{@publishable_class_name.downcase}_path") %>

data/app/views/publinator/manage/publishable/show.html.erb

@@ -1,10 +1,15 @@
-
 <h1><%= @publishable.title %></h1>
 
-<%= @publishable.body %>
+<% @publishable.asset_types.each do |ai| %>
+  <%= publishable_asset(@publishable, ai) %>
+<% end %>
+
+<p>
+<%= m(@publishable.body) %>
+</p>
 
 <div id="controls">
-  <%= link_to "Back", manage_publishables_path(@publishable.class.to_s.downcase.pluralize) %>
-  <%= link_to "Edit", manage_edit_publishable_path(@publishable.class.to_s.downcase.pluralize, @publishable) %>
-  <%= link_to "Delete", manage_publishable_path(@publishable.class.to_s.downcase.pluralize, @publishable.id), :method => :delete, :class => "danger", :confirm => "Delete this #{@publishable.class.to_s}?" %>
-</div>
+  <%= link_to "Back",   send("manage_#{params[:publishable_type]}_path") %>
+  <%= link_to "Edit",   send("edit_manage_#{params[:publishable_type].singularize}_path", @publishable) %>
+  <%= link_to "Delete", send("manage_#{params[:publishable_type].singularize}_path", @publishable), :method => :delete, :class => "danger", :confirm => "Delete this #{@publishable.class.to_s}?" %>
+</div>

data/app/views/publinator/publishable/show.html.erb

@@ -1,5 +1 @@
-<h1>
-  <%= @publishable.title %>
-</h1>
-
-<%= m(@publishable.body) %>
+<%= m(@publishable.body) %>

data/config/initializers/paperclip.rb

@@ -0,0 +1,4 @@
+Paperclip::Attachment.default_options.merge!(
+  :storage        => :s3,
+  :path           => ":attachment/#{Rails.env}/:id/:style.:extension")
+

data/config/routes.rb

@@ -1,37 +1,54 @@
 Publinator::Engine.routes.draw do
 
-  root :to  => "home#index"
-  match '/' => 'home#index'
+  match "/manage" => 'manage#index'
 
   namespace :manage do
-    match "/" => 'manage#index'
+
+    Publinator::PublishableType.all.each do |pt|
+      resources pt.name.pluralize.downcase.to_sym, :controller => "publishable", :publishable_type => pt.name.pluralize.downcase
+      #match "/#{pt.name.pluralize.downcase}" => "publishable#index", :as => pt.name.pluralize.downcase, :publishable_type => pt.name
+    end
+
+    #constraints(Publinator::PublishableType) do
+      #match '/:publishable_type/' => "publishable#index", :requirements => {
+        #:publishable_type => /\A([a-zA-Z]+[a-zA-Z_]*)\z/i
+        #}, :as => "publishables"
+
+      #match '/:publishable_type/new' => "publishable#new", :requirements => {
+        #:publishable_type => /\A([a-zA-Z]+[a-zA-Z_]*)\z/i
+      #}
+
+      #match '/:publishable_type/create' => "publishable#create", :requirements => {
+        #:publishable_type => /\A([a-zA-Z]+[a-zA-Z_]*)\z/i
+        #}, :as => "create_publishable"
+
+      #match '/:publishable_type/:id/edit' => "publishable#edit", :requirements => {
+          #:id => /\A\d*\z/i,
+          #:publishable_type => /\A([a-zA-Z]+[a-zA-Z_]*)\z/i
+      #}, :as => "edit_publishable"
+
+      #match '/:publishable_type/:id' => "publishable#show", :requirements => {
+        #:id => /\A\d*\z/i,
+        #:publishable_type => /\A([a-zA-Z]+[a-zA-Z_]*)\z/i
+        #}, :as => "publishable"
+    #end
+
+    resources :pages
     resources :sites
     resources :sections
-    constraints(Publinator::PublishableType) do
-      match '/:publishable_type/' => "publishable#index", :requirements => {
-        :publishable_type => /\A([a-zA-Z]+[a-zA-Z_]*)\z/i
-        }, :as => "publishables"
-
-      match '/:publishable_type/new' => "publishable#new", :requirements => {
-        :publishable_type => /\A([a-zA-Z]+[a-zA-Z_]*)\z/i
-      }
-
-      match '/:publishable_type/create' => "publishable#create", :requirements => {
-        :publishable_type => /\A([a-zA-Z]+[a-zA-Z_]*)\z/i
-        }, :as => "create_publishable"
-
-      match '/:publishable_type/:id/edit' => "publishable#edit", :requirements => {
-          :id => /\A\d*\z/i,
-          :publishable_type => /\A([a-zA-Z]+[a-zA-Z_]*)\z/i
-      }, :as => "edit_publishable"
-
-      match '/:publishable_type/:id' => "publishable#show", :requirements => {
-        :id => /\A\d*\z/i,
-        :publishable_type => /\A([a-zA-Z]+[a-zA-Z_]*)\z/i
-        }, :as => "publishable"
-    end
   end
 
+  #constraints(Publinator::PublishableType) do
+    #match '/:publishable_type/' => "publishable#index", :requirements => {
+       #:publishable_type => /\A([a-zA-Z]+[a-zA-Z_]*)\z/i
+    #}
+
+    #match '/:publishable_type/:id' => "publishable#show", :requirements => {
+      #:id => /\A\d*\z/i,
+      #:publishable_type => /\A([a-zA-Z]+[a-zA-Z_]*)\z/i
+      #}, :as => "publishable"
+  #end
+
   constraints(Publinator::Section) do
     match '/:section/' => "section#index", :requirements => {
        :section =>  /\A([a-zA-Z0-9]+[a-zA-Z0-9\-_]*)\z/i
@@ -43,26 +60,16 @@ Publinator::Engine.routes.draw do
       }, :as => "publishable"
   end
 
+  match "/:slug", :controller => :home, :action => :page, :requirements => {
+    :slug => /\A([a-zA-Z]+[a-zA-Z\-_]*)\z/i
+  }, :as => 'publishable'
 
-  constraints(Publinator::PublishableType) do
-    match '/:publishable_type/' => "publishable#index", :requirements => {
-       :publishable_type => /\A([a-zA-Z]+[a-zA-Z_]*)\z/i
-    }
-
-    match '/:publishable_type/:id' => "publishable#show", :requirements => {
-      :id => /\A\d*\z/i,
-      :publishable_type => /\A([a-zA-Z]+[a-zA-Z_]*)\z/i
-      }, :as => "publishable"
+  Publinator::PublishableType.all.each do |pt|
+    resources pt.name.pluralize.downcase.to_sym, :controller => "publishable", :only => [:index, :show]
   end
 
-  match "/:section/:slug", :controller => :sections, :action => :page, :requirements => {
-    :section => /\A([a-zA-Z0-9]+[a-zA-Z0-9\-_]*)\z/i,
-    :slug => /\A([a-zA-Z]+[a-zA-Z\-_]*)\z/i
-  }
-
 
-  match "/:slug", :controller => :home, :action => :page, :requirements => {
-    :slug => /\A([a-zA-Z]+[a-zA-Z\-_]*)\z/i
-  }
+  root :to  => "home#index"
+  match '/' => 'home#index'
 
 end

data/db/migrate/20120725202042_create_publinator_publication_states.rb

@@ -3,7 +3,6 @@ class CreatePublinatorPublicationStates < ActiveRecord::Migration
     create_table :publinator_publication_states do |t|
       t.string :name, :null => false
       t.boolean :system, :default => false
-      
       t.timestamps
     end
     Publinator::PublicationState.create(:name => "new", :system => true)

data/db/migrate/20121011191348_create_publinator_sections.rb

@@ -6,6 +6,7 @@ class CreatePublinatorSections < ActiveRecord::Migration
       t.boolean :layout
       t.integer :site_id
       t.string :section_slug
+      t.integer :position
 
       t.timestamps
     end

data/db/migrate/20121017134533_create_publinator_pages.rb

@@ -8,6 +8,7 @@ class CreatePublinatorPages < ActiveRecord::Migration
       t.string  :teaser
       t.string  :custom_slug
       t.text    :body
+      t.integer :position
 
       t.timestamps
     end

data/db/migrate/20121020181204_create_publinator_asset_items.rb

@@ -0,0 +1,13 @@
+class CreatePublinatorAssetItems < ActiveRecord::Migration
+  def change
+    create_table :publinator_asset_items do |t|
+      t.string      :asset_type
+      t.references  :assetable, :polymorphic => true
+      t.string      :asset_file_name
+      t.string      :asset_content_type
+      t.datetime    :asset_updated_at
+      t.integer     :asset_file_size
+      t.timestamps
+    end
+  end
+end

data/lib/generators/publishable/templates/app/models/publishable_migration.rb.erb

@@ -4,6 +4,7 @@ class Create<%= class_name.capitalize %> < ActiveRecord::Migration
       t.string      :title
       t.string      :teaser
       t.text        :body
+      t.integer     :site_id
 
       # t.string      :author_name
       # t.text        :extra_body

data/lib/generators/publishable/templates/app/models/publishable_model.rb.erb

@@ -1,5 +1,5 @@
-class <%= class_name.capitalize %> < Publinator::Publishable
-
+class <%= class_name.capitalize %> < ActiveRecord::Base
   self.table_name = '<%= class_name.downcase.pluralize %>'
-
+  acts_as_publishable
+  attr_accessible :title, :body, :section
 end

data/lib/publinator/version.rb

@@ -1,3 +1,3 @@
 module Publinator
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/lib/publinator.rb

@@ -4,33 +4,59 @@ module Publinator
   module ActsAsPublishable
     extend ActiveSupport::Concern
 
-    included do
-    end
-
     module ClassMethods
       def acts_as_publishable(options = {})
-        has_one                     :publication,
-            :as           =>            :publishable,
-            :class_name   =>            "Publinator::Publication",
-            :foreign_key  =>            :publishable_id
+        has_one   :publication,
+            :as           =>  :publishable,
+            :class_name   =>  "Publinator::Publication",
+            :foreign_key  =>  :publishable_id
 
         accepts_nested_attributes_for   :publication
         validates_presence_of           :publication
         validates_associated            :publication
 
+        has_many  :asset_items,
+            :as           =>  :assetable,
+            :class_name   =>  "Publinator::AssetItem",
+            :foreign_key  =>  :assetable_id
+
+
+        accepts_nested_attributes_for   :asset_items, :reject_if => :all_blank
+
         before_validation               :verify_publication
         belongs_to                      :site,    :class_name => "Publinator::Site"
         belongs_to                      :section, :class_name => "Publinator::Section"
 
-        attr_accessible                 :site, :publication, :section, :default
+        attr_accessible                 :site, :publication, :section, :default,
+                                        :position, :asset_items_attributes,
+                                        :custom_slug,
+                                        :publication_attributes
+
         attr_accessor                   :default
 
         scope :non_index, joins(:publication).where("publication.slug != 'index'")
       end
     end
 
+    def asset_types
+      []
+    end
+
+    def asset_file(asset_type_text)
+      publishable_asset = get_asset_by_type(asset_type_text)
+      publishable_asset.asset_file if publishable_asset
+    end
+
+    def my_slug
+      publication.slug
+    end
+
+    def asset_files
+      asset_types.collect{ |atype| asset_file(atype) }
+    end
+
     def editable_fields
-      attribute_names - ["id", "created_at", "updated_at"]
+      attribute_names - ["id", "created_at", "updated_at", "section_id", "site_id"]
     end
 
     def path
@@ -42,15 +68,27 @@ module Publinator
       end
     end
 
+    def menu_collection
+      nil
+    end
+
     def verify_publication
       logger.info "verifying publication"
       if publication.nil?
         self.publication = Publinator::Publication.new(:publishable => self)
       end
-      self.publication.site     = site
+      self.publication.site     = site unless publication.site.present?
       self.publication.section  = section unless !section
       self.publication.default  = default
     end
+
+    private
+
+      def get_asset_by_type(asset_type_text)
+        all_of_asset_type = asset_items.where(:asset_type => asset_type_text)
+        all_of_asset_type.first if all_of_asset_type && all_of_asset_type.length
+      end
+
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: publinator
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-19 00:00:00.000000000 Z
+date: 2012-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.1
+        version: 3.2.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.1
+        version: 3.2.8
 - !ruby/object:Gem::Dependency
   name: transitions
   requirement: !ruby/object:Gem::Requirement
@@ -123,6 +123,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: paperclip
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -237,6 +253,7 @@ files:
 - app/assets/stylesheets/publinator/site.css.scss
 - app/controllers/publinator/application_controller.rb
 - app/controllers/publinator/home_controller.rb
+- app/controllers/publinator/manage/pages_controller.rb
 - app/controllers/publinator/manage/publishable_controller.rb
 - app/controllers/publinator/manage/sections_controller.rb
 - app/controllers/publinator/manage/sites_controller.rb
@@ -246,6 +263,7 @@ files:
 - app/helpers/publinator/application_helper.rb
 - app/helpers/publinator/home_helper.rb
 - app/helpers/publinator/manage/sections_helper.rb
+- app/models/publinator/asset_item.rb
 - app/models/publinator/domain_name.rb
 - app/models/publinator/page.rb
 - app/models/publinator/publication.rb
@@ -262,6 +280,12 @@ files:
 - app/views/publinator/home/index.html.erb
 - app/views/publinator/home/page.html.erb
 - app/views/publinator/manage/index.html.erb
+- app/views/publinator/manage/pages/_form.html.erb
+- app/views/publinator/manage/pages/_summary.html.erb
+- app/views/publinator/manage/pages/edit.html.erb
+- app/views/publinator/manage/pages/index.html.erb
+- app/views/publinator/manage/pages/new.html.erb
+- app/views/publinator/manage/pages/show.html.erb
 - app/views/publinator/manage/publishable/_form.html.erb
 - app/views/publinator/manage/publishable/_summary.html.erb
 - app/views/publinator/manage/publishable/edit.html.erb
@@ -279,6 +303,7 @@ files:
 - app/views/publinator/publishable/_summary.html.erb
 - app/views/publinator/publishable/index.html.erb
 - app/views/publinator/publishable/show.html.erb
+- config/initializers/paperclip.rb
 - config/routes.rb
 - db/migrate/20120725194854_create_publinator_sites.rb
 - db/migrate/20120725200404_create_publinator_domain_names.rb
@@ -291,6 +316,7 @@ files:
 - db/migrate/20120726234703_create_publinator_publishable_types.rb
 - db/migrate/20121011191348_create_publinator_sections.rb
 - db/migrate/20121017134533_create_publinator_pages.rb
+- db/migrate/20121020181204_create_publinator_asset_items.rb
 - lib/generators/publishable/publishable_generator.rb
 - lib/generators/publishable/templates/app/models/publishable.html.erb
 - lib/generators/publishable/templates/app/models/publishable_migration.rb.erb
@@ -317,7 +343,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1778146319537863038
+      hash: 611779132086481296
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -326,7 +352,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1778146319537863038
+      hash: 611779132086481296
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24