publinator 0.0.2 → 0.0.4

data/README.rdoc

@@ -1,3 +1,9 @@
 = Publinator
 
-This project rocks and uses MIT-LICENSE.
+Changes Pending:
+
+* downcase classname as needed in generator
+
+Recent changes:
+
+* create page model inside publinator

data/app/assets/javascripts/publinator/manage/sections.js

@@ -0,0 +1,2 @@
+// Place all the behaviors and hooks related to the matching controller here.
+// All this logic will automatically be available in application.js.

data/app/assets/stylesheets/publinator/manage/sections.css

@@ -0,0 +1,4 @@
+/*
+  Place all the styles related to the matching controller here.
+  They will automatically be included in application.css.
+*/

data/app/controllers/publinator/application_controller.rb

@@ -1,23 +1,23 @@
 module Publinator
   class ApplicationController < ActionController::Base
     layout :current_layout
-    
+
     helper_method :current_site, :current_domain, :current_layout, :current_site_name
-    
+
     def current_site_name
       return "Publinator" if current_site.nil?
       @current_site_name ||= current_site.name
     end
-    
+
     def current_site
       return nil if current_domain.nil?
       @current_site ||= current_domain.site
     end
-    
+
     def current_domain
       @current_domain ||= DomainName.get_by_domain_name(request)
     end
-    
+
     def current_layout
       if current_site.nil?
         "publinator/publinator"

data/app/controllers/publinator/home_controller.rb

@@ -1,15 +1,15 @@
 require_dependency "publinator/application_controller"
 
 module Publinator
-  class HomeController < ApplicationController
+  class HomeController < Publinator::ApplicationController
     def index
       begin
         render "home/index"
       rescue ActionView::MissingTemplate
-        render "publinator/home/index"
-      end  
+        render "publinator/home/index", :layout => current_layout
+      end
     end
-    
+
     def page
       @publication = Publinator::Publication.get_by_slug(params[:slug])
       if @publication.nil?

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

@@ -3,16 +3,16 @@ require_dependency "publinator/application_controller"
 module Publinator
   class Manage::PublishableController < ApplicationController
     layout "publinator/manage"
-    
+
     def index
       @publishables = Publinator::Publication.for_site(current_site.id).where(:publishable_type => params["publishable_type"].singularize.capitalize).order("updated_at desc")
       begin
-        render "#{params[:publishable_type]}/index"
+        render "manage/#{params[:publishable_type]}/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)
@@ -22,23 +22,26 @@ module Publinator
         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 = params['publishable_type'].singularize.capitalize.constantize.send(:new, { 
+      @publishable = publishable_class.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_id    => current_site.id
+          :site_id    => current_site.id,
+          :publishable_type => params['publishable_type'].singularize.capitalize
         )
       })
+      @field_names = (publishable_class.attribute_names - ["id", "created_at", "updated_at"]).collect{ |an| an.to_sym }
       begin
         render "#{params[:publishable_type]}/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)
@@ -46,18 +49,19 @@ module Publinator
         render "#{params[:publishable_type]}/edit"
       rescue ActionView::MissingTemplate
         render "publinator/manage/publishable/edit"
-      end      
+      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)
 
-      if @publishable.save 
+      if @publishable.save
         @publication.publishable_id = @publishable.id
         @publication.save
         redirect_to "/manage/#{params[:publishable_type]}", :notice => "#{@publishable_type.name} created."

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

@@ -0,0 +1,29 @@
+require_dependency "publinator/application_controller"
+
+module Publinator
+  class Manage::SectionsController < ApplicationController
+
+    before_filter :get_section, :except => [:index, :new]
+
+    def index
+      @sections = current_site.sections
+    end
+
+    def show
+    end
+
+    def edit
+    end
+
+    def new
+      @section = Section.new(:site_id => current_site.id)
+    end
+
+    private
+
+      def get_section
+        @section = current_site.sections.find_by_id(params[:id])
+      end
+  end
+end
+

data/app/controllers/publinator/publishable_controller.rb

@@ -1,7 +1,7 @@
 require_dependency "publinator/application_controller"
 
 module Publinator
-  class PublishableController < ApplicationController
+  class PublishableController < Publinator::ApplicationController
     def index
       @publishables = current_site.publications('published', 'updated_at desc', params["publishable_type"].singularize.capitalize)
       begin
@@ -10,9 +10,9 @@ module Publinator
         render "publinator/publishable/index"
       end
     end
-    
+
     def show
-      @publication = Publinator::Publication.find_by_publishable_type_and_publishable_id(params[:publishable_type].singularize.capitalize, params[:id])
+      @publication = Publinator::Publication.find_by_publishable_type_and_slug(params[:publishable_type].singularize.capitalize, params[:id])
       @publishable = @publication.publishable
       begin
         render "#{params[:publishable_type]}/index"

data/app/controllers/publinator/section_controller.rb

@@ -0,0 +1,36 @@
+require_dependency "publinator/application_controller"
+
+module Publinator
+  class SectionController < ApplicationController
+    before_filter :get_section
+    
+    def index
+      @publication = Publinator::Publication.find_by_section_id_and_slug(@section.id, 'index')
+      @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
+      @publication = Publinator::Publication.find(:first, :conditions => ["section_id = ? and slug = ?", @section.id, params[:id]])
+      @publishable = @publication.publishable
+      begin
+        render "#{params[:section]}/show"
+      rescue ActionView::MissingTemplate
+        render "publinator/publishable/show"
+      end
+    end
+    
+    private
+    
+      def get_section
+        @section = Publinator::Section.find(:first, :conditions => ["site_id = ? AND name = ?", current_site.id, params[:section]])
+      end
+  end
+end

data/app/helpers/publinator/manage/sections_helper.rb

@@ -0,0 +1,4 @@
+module Publinator
+  module Manage::SectionsHelper
+  end
+end

data/app/models/publinator/domain_name.rb

@@ -10,7 +10,14 @@ module Publinator
     # @param [Request]
     # @return [Domain]
     def self.get_by_domain_name(request)
+      @sites = Site.all.collect{ |s| s.name }
+      logger.info "Sites (#{Site.count}) -- #{@sites}"
+      
+      @domain_names = DomainName.all.collect{ |dn| "#{dn.subdomain}.#{dn.name}"}
+      logger.info "DomainNames (#{DomainName.count}) -- #{@domain_names}"
+      
       if request.env['x-forwarded-for']
+        logger.info "processing forwarded request..."
         origin = request.env['x-forwarded-for'].to_s
         domain_array = origin.split('.')
         domain_array_length = origin.length
@@ -22,20 +29,26 @@ module Publinator
           request_domain = "#{domain_array[domain_array_length - 2]}.#{domain_array[domain_array_length - 1]}"
         end
       else
+        logger.info "processing direct request..."
         request_subdomain = request.subdomain
         request_domain = request.domain
       end
       if request_domain.present?
+        logger.info "request_domain is #{request_domain}..."
         if request_subdomain.blank? || request_subdomain == 'www'
+          logger.info "request_subdomain is #{request_subdomain}..."
           @domain = self.find(:first, :conditions => ["name = ? AND (subdomain is null or subdomain = '')", request_domain])
         elsif request_subdomain.present? && request_subdomain != 'www'
+          logger.info "non-www request_subdomain is #{request_subdomain}..."
           @domain = self.find(:first, :conditions => ["name = ? AND subdomain = ?", request_domain, request_subdomain])
         else
           @domain = self.find(:first, :conditions => ["name = ? AND subdomain = 'www' AND anchor = ?", request_domain, true])
         end
       else
+        logger.info "request_domain was not found. finding default site..."
         @domain = Site.default.domain_names.detect { |d| d.default }
       end
+      logger.info @domain.to_yaml
       return @domain
     end
   end

data/app/models/publinator/page.rb

@@ -0,0 +1,7 @@
+module Publinator
+  class Page < Publishable
+    self.table_name = 'publinator_pages'
+    attr_accessible :body, :kicker, :section_id, :subtitle, :teaser, :title
+    belongs_to :section, :class_name => "Publinator::Section"
+  end
+end

data/app/models/publinator/publication.rb

@@ -1,34 +1,37 @@
 module Publinator
   class Publication < ActiveRecord::Base
     # has_paper_trail
-    attr_accessible :custom_slug, :parent_id, :publication_state_id, 
+    attr_accessible :custom_slug, :parent_id, :publication_state_id,
       :publishable_id, :publishable_type, :site_id, :slug, :publish_at,
-      :unpublish_at, :archive_at
+      :unpublish_at, :archive_at, :section_id, :default, :publishable
     belongs_to :publishable, :polymorphic => true
+    belongs_to :section
     belongs_to :site
-    
+
     validates_uniqueness_of :custom_slug, :scope => :site_id, :allow_blank => true
-    validates_uniqueness_of :slug, :scope => [:site_id, :publishable_type]
-    validates_presence_of :slug, :site_id
-    #, :publishable_type, :publishable_id
+    validates_presence_of   :slug
+    validates_uniqueness_of :slug, :scope => [:site_id, :publishable_type, :section_id]
+    validates_presence_of   :site_id
     
+    before_validation :generate_slug
+
     scope :published, where(:publication_state_id => 1)
     scope :for_site, lambda { |site_id| where("site_id = ?", site_id) }
-    
-    before_validation :generate_slug
-    
+
     def generate_slug
-      if self.slug.blank? || self.slug == "Temporary Title"
-        if self.custom_slug.present?
-          self.slug = self.custom_slug
-        elsif publishable.present?
-          self.slug = title.trim.gsub(" ", "-")
+      if slug.blank? || slug == "temporary_slug"
+        if custom_slug.present?
+          self.slug = custom_slug
+        elsif publishable.present? && publishable.title.present?
+          self.slug = publishable.title.strip.downcase.gsub(" ", "-")
+        elsif publishable.present? && publishable.section_id.present?
+          self.slug = 'index'
         else
-          self.slug = "Temporary Title"
+          self.slug = "temporary_slug"
         end
       end
     end
-    
+
     def self.get_by_slug(slug)
       self.published.where(:slug => slug)
     end

data/app/models/publinator/publishable.rb

@@ -1,23 +1,64 @@
 module Publinator
   class Publishable < ActiveRecord::Base
-    
-    # has_paper_trail
-    has_one :publication, :class_name => 'Publinator::Publication'
+    has_one :publication, :as => :publishable, :class_name => "Publinator::Publication"
+
     accepts_nested_attributes_for :publication
-    #validates_associated :publication
+    attr_accessible :site_id, :section_id, :custom_slug
+    attr_accessor :site_id, :section_id, :custom_slug
+    
+    validates_presence_of :publication
+    validates_associated :publication
     
+    before_validation :prepare_publication
+
     def editable_fields
-      attribute_names - ["id", "created_at", "updated_at"] 
+      attribute_names - ["id", "created_at", "updated_at"]
+    end
+    
+    def section_id=(section_int)
+      @section = Section.find(section_int)
+      add_publication if publication.nil?
+      self.publication.section_id = @section.id if @section
+      self.publication.site_id = @section.site.id if @section.site
+    end
+    
+    def section_id
+      publication.section_id if publication
+    end
+    
+    def site_id=(site_int)
+      @site = Site.find(site_int)
+      add_publication if publication.nil?
+      self.publication.site_id = @site.id if @site
+    end
+    
+    def site_id
+      publication.site_id if publication
     end
     
+    def prepare_publication
+      logger.info "preparing publication"
+      my_name = self.class.to_s
+      logger.info "My name is #{my_name}"
+      add_publication if publication.nil?
+      publication.generate_slug
+      publication.publishable_type = my_name
+    end
     
+    def custom_slug=(slug_string)
+      add_publication if publication.nil?
+      publication.custom_slug = slug_string
+    end
+    
+    def custom_slug
+      publication.custom_slug unless publication.nil?
+    end
     
+    private
     
-    # def self.publishable_classes
-    #       PublishableType.all.each do |pt|
-    #         class_name = pt.name.capitalize!
-    #         
-    #       end
-    #     end
+      def add_publication
+        logger.info "creating publication"
+        self.publication = Publinator::Publication.new(:publishable => self)
+      end
   end
 end

data/app/models/publinator/publishable_type.rb

@@ -1,7 +1,7 @@
 module Publinator
   class PublishableType < ActiveRecord::Base
     attr_accessible :name, :sluggable
-    
+
     def self.matches?(request)
       pt = self.find_by_name(request.path_parameters[:publishable_type].singularize.capitalize)
       return pt.present?

data/app/models/publinator/section.rb

@@ -0,0 +1,25 @@
+# TODO Validate new sections - can't conflict with publishable_types
+module Publinator
+  class Section < ActiveRecord::Base
+    attr_accessible :layout, :name, :parent_id, :site_id
+    belongs_to :site
+    has_many :publications
+    before_create :generate_slug
+
+    def self.matches?(request)
+      pt = self.find(:first, :conditions => ["slug = ?", request.path_parameters[:section]])
+      return pt.present?
+    end
+    
+    # current_site.id, params[:section]
+    def self.get_by_site_id_and_slug(site_id, section_name)
+      Section.find(:first, :conditions => ["site_id = ? and name = ?", site_id, section_name])
+    end
+
+    private
+    
+      def generate_slug
+        self.slug = name.downcase.gsub(" ", "_")
+      end
+  end
+end

data/app/models/publinator/site.rb

@@ -2,9 +2,10 @@ module Publinator
   class Site < ActiveRecord::Base
     attr_accessible :abbr, :description, :name, :parent_id, :state, :title, :default
     has_many :domain_names
-    
+    has_many :sections
+
     # get the layout for the site
-    # 
+    #
     # @todo add ability to use a custom layout
     def layout
       begin
@@ -13,12 +14,12 @@ module Publinator
         "publinator/site"
       end
     end
-    
+
     def parent
       return nil unless parent_id.present?
       Site.find(self.parent_id)
     end
-    
+
     def publications(scope = 'published', sort = 'updated_at desc', publishable_type)
       if publishable_type.nil?
         pubs = Publication.for_site(self.id).send(scope).order(sort)

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

@@ -1,2 +1,2 @@
 <h1>Home Page</h1>
-<p>Welcome to our Site!</p>
+<p>Welcome to <%= current_site.name %>!</p>

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

@@ -6,7 +6,9 @@
     <% end %>
   <% end %>
   <%= form.inputs @publishable.class.to_s do %>
-    <%= form.inputs :title, :body %>
+    <% @field_names.each do |field| %>
+      <%= form.input field %>
+    <% end %>
   <% end %>
   <%= form.semantic_fields_for @publishable.publication do |pub| %>
     <%= pub.inputs "Publication Settings" do %>
@@ -14,6 +16,7 @@
       <%= 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 %>
     <% end %>
   <% end %>
   <%= form.actions do %>

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

@@ -0,0 +1,10 @@
+<%= semantic_form_for [:manage, @section], :method => :post do |form| %>
+  <%= form.inputs do %>
+    <%= form.input :name %>
+    <%= form.input :layout %>
+  <% end %>
+  <%= form.actions do %>
+    <%= form.action :submit, :as => :button %>
+    <%= form.action :cancel, :as => :link %>
+  <% end %>
+<% end %>

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

@@ -0,0 +1,3 @@
+<h1>Manage Sections :: Edit <%= @section.name  %></h1>
+
+<%= render :partial => "form" %>

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

@@ -0,0 +1,16 @@
+<h1>Manage Sections </h1>
+
+<table>
+  <% @sections.each do |section|  %>
+    <tr>
+      <td>
+        <%= section.name %>
+      </td>
+      <td>
+        <%= link_to 'edit', edit_manage_section_path(section) %>
+      </td>
+    </tr>
+  <% end %>
+</table>
+
+<%= link_to "Add Section", new_manage_section_path %>

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

@@ -0,0 +1,3 @@
+<h1>Manage Sections :: Create New Section</h1>
+
+<%= render :partial => "form" %>

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

@@ -0,0 +1,2 @@
+<h1>Manage::Sections#show</h1>
+<p>Find me in app/views/publinator/manage/sections/show.html.erb</p>

data/config/routes.rb

@@ -1,52 +1,68 @@
 Publinator::Engine.routes.draw do
-  
-  
-  root :to => "home#index"
 
-  match '/'	=> 'home#index'
-  
+  root :to  => "home#index"
+  match '/' => 'home#index'
+
   namespace :manage do
     match "/" => 'manage#index'
     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 
+        :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 
+        :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 
+        :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 
+          :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 
+        :id => /\A\d*\z/i,
+        :publishable_type => /\A([a-zA-Z]+[a-zA-Z_]*)\z/i
         }, :as => "publishable"
     end
   end
-  
+
+  constraints(Publinator::Section) do
+    match '/:section/' => "section#index", :requirements => {
+       :section =>  /\A([a-zA-Z0-9]+[a-zA-Z0-9\-_]*)\z/i
+    }
+
+    match '/:section/:id' => "section#show", :requirements => {
+      :id => /\A\d*\z/i,
+      :section =>  /\A([a-zA-Z0-9]+[a-zA-Z0-9\-_]*)\z/i
+      }, :as => "publishable"
+  end
+
+
   constraints(Publinator::PublishableType) do
     match '/:publishable_type/' => "publishable#index", :requirements => {
-       :publishable_type => /\A([a-zA-Z]+[a-zA-Z_]*)\z/i 
+       :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 
+      :id => /\A\d*\z/i,
+      :publishable_type => /\A([a-zA-Z]+[a-zA-Z_]*)\z/i
       }, :as => "publishable"
-    
   end
-  
-  match "/:slug", :controller => :home, :action => :page, :requirements => { 
-    :slug => /\A([a-zA-Z]+[a-zA-Z\-_]*)\z/i 
+
+  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
   }
 
 end