publinator 0.0.4 → 0.0.6

data/app/controllers/publinator/section_controller.rb

@@ -3,18 +3,21 @@ require_dependency "publinator/application_controller"
 module Publinator
   class SectionController < ApplicationController
     before_filter :get_section
-    
+
     def index
+      logger.info "#{@section.id}"
       @publication = Publinator::Publication.find_by_section_id_and_slug(@section.id, 'index')
-      @publishable = @publication.publishable
+      logger.info Publication.all.collect{ |p| "/#{@section.section_slug}/#{p.slug}" }
+      logger.info @publication.to_yaml
+      @publishable = @publication.content
       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?
+    # rescue Exception => e
+    #       logger.info e.to_yaml
+    #       redirect_to root_url, :notice => "Page not found." if @publication.nil?
     end
 
     def show
@@ -26,11 +29,11 @@ module Publinator
         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]])
+        @section = Publinator::Section.find(:first, :conditions => ["site_id = ? AND section_slug = ?", current_site.id, params[:section]])
       end
   end
 end

data/app/helpers/publinator/application_helper.rb

@@ -1,4 +1,54 @@
 module Publinator
+  require 'rdiscount'
+
   module ApplicationHelper
+    def link_to_page(link_text, section, slug)
+      link_to link_text, "/#{section}/#{slug}"
+    end
+
+    def m(markdown_text)
+      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)
+        end
+        menu_content.html_safe
+      end
+      menu.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
+    end
   end
 end

data/app/models/publinator/domain_name.rb

@@ -2,22 +2,15 @@ module Publinator
   # Ideas:
   #   * after_create adds link in ~/.pow in development
   class DomainName < ActiveRecord::Base
-    attr_accessible :default, :name, :shared, :site_id, :subdomain
+    attr_accessible :default, :name, :shared, :site, :subdomain
     belongs_to :site
-    
+
     # lookup site based on the request
-    # 
+    #
     # @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
@@ -29,26 +22,20 @@ 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

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

data/app/models/publinator/publication.rb

@@ -2,34 +2,40 @@ module Publinator
   class Publication < ActiveRecord::Base
     # has_paper_trail
     attr_accessible :custom_slug, :parent_id, :publication_state_id,
-      :publishable_id, :publishable_type, :site_id, :slug, :publish_at,
-      :unpublish_at, :archive_at, :section_id, :default, :publishable
+      :publishable_id, :publishable_type, :slug, :publish_at,
+      :unpublish_at, :archive_at, :section, :default, :publishable, :site
     belongs_to :publishable, :polymorphic => true
-    belongs_to :section
+    belongs_to :section, :class_name => "Publinator::Section"
     belongs_to :site
 
-    validates_uniqueness_of :custom_slug, :scope => :site_id, :allow_blank => true
-    validates_presence_of   :slug
-    validates_uniqueness_of :slug, :scope => [:site_id, :publishable_type, :section_id]
-    validates_presence_of   :site_id
-    
+    validates_uniqueness_of :custom_slug, :scope => [:site_id, :section_id, :publishable_type], :allow_blank => true
+    validates_uniqueness_of :slug, :scope => [:site_id, :section_id, :publishable_type]
+    validates_presence_of   :site
+
     before_validation :generate_slug
+    before_save       :generate_slug
 
     scope :published, where(:publication_state_id => 1)
     scope :for_site, lambda { |site_id| where("site_id = ?", site_id) }
 
+    def content
+      publishable_type.constantize.find(publishable_id)
+    end
+
     def generate_slug
-      if slug.blank? || slug == "temporary_slug"
-        if custom_slug.present?
+      logger.info "generating slug"
+      if self.slug.blank? || slug =~ /temporary_slug\d?/
+        if default
+          self.slug = 'index'
+        elsif 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'
+          self.slug = self.publishable.title.strip.downcase.gsub(/[^a-zA-Z0-9\-\_]/, '_')
         else
-          self.slug = "temporary_slug"
+          self.slug = "temporary_slug_#{rand(100000)}"
         end
       end
+      logger.info "slug is #{ slug }"
     end
 
     def self.get_by_slug(slug)

data/app/models/publinator/section.rb

@@ -1,25 +1,36 @@
 # 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
+    attr_accessible :layout, :name, :parent_id, :site, :section_slug
+    belongs_to :site, :class_name => "Publinator::Site"
+    has_many :publications, :class_name => "Publinator::Publication"
+    before_create :generate_section_slug
+    alias_attribute :title, :name
 
     def self.matches?(request)
-      pt = self.find(:first, :conditions => ["slug = ?", request.path_parameters[:section]])
+      pt = self.find(:first, :conditions => ["section_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
+    def index_item
+      Publinator::Publication.find_by_section_id_and_slug(id, 'index')
+    end
+
+    def path
+      "/#{section_slug}"
+    end
+
+    def publishable
+      self
+    end
+
+    def generate_section_slug
+      self.section_slug = name.strip.downcase.gsub(/[^a-zA-Z0-9\-\_]/, '_') if section_slug.blank?
+    end
   end
 end

data/app/models/publinator/site.rb

@@ -3,6 +3,7 @@ module Publinator
     attr_accessible :abbr, :description, :name, :parent_id, :state, :title, :default
     has_many :domain_names
     has_many :sections
+    has_many :publications
 
     # get the layout for the site
     #

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

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

data/db/migrate/20120725201842_create_publinator_publications.rb

@@ -1,21 +1,21 @@
 class CreatePublinatorPublications < ActiveRecord::Migration
   def change
     create_table :publinator_publications do |t|
-      t.integer :site_id
-      t.integer :publication_state_id
-      t.integer :parent_id
-      t.string :custom_slug
-      t.string :slug
-      t.datetime :publish_at
-      t.datetime :unpublish_at
-      t.datetime :archive_at
-      t.string :publishable_type
-      t.integer :publishable_id
+      t.integer     :site_id
+      t.integer     :publication_state_id
+      t.integer     :parent_id
+      t.integer     :section_id
+      t.string      :custom_slug
+      t.string      :slug
+      t.datetime    :publish_at
+      t.datetime    :unpublish_at
+      t.datetime    :archive_at
+      t.references  :publishable, :polymorphic => true
+      t.boolean     :default
 
       t.timestamps
     end
     add_index :publinator_publications, :site_id
     add_index :publinator_publications, :publication_state_id
-    add_index :publinator_publications, :publishable_id
   end
 end

data/db/migrate/20121011191348_create_publinator_sections.rb

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

data/db/migrate/20121017134533_create_publinator_pages.rb

@@ -1,12 +1,13 @@
 class CreatePublinatorPages < ActiveRecord::Migration
   def change
     create_table :publinator_pages do |t|
-      t.string :title
-      t.string :subtitle
-      t.string :kicker
-      t.string :teaser
-      t.text :body
-      t.integer :section_id
+      t.integer :site_id
+      t.string  :title
+      t.string  :subtitle
+      t.string  :kicker
+      t.string  :teaser
+      t.string  :custom_slug
+      t.text    :body
 
       t.timestamps
     end

data/lib/publinator/version.rb

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

data/lib/publinator.rb

@@ -1,4 +1,58 @@
 require "publinator/engine"
 
 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
+
+        accepts_nested_attributes_for   :publication
+        validates_presence_of           :publication
+        validates_associated            :publication
+
+        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_accessor                   :default
+
+        scope :non_index, joins(:publication).where("publication.slug != 'index'")
+      end
+    end
+
+    def editable_fields
+      attribute_names - ["id", "created_at", "updated_at"]
+    end
+
+    def path
+      raise "publication not found" if !self.publication
+      if self.publication.section
+        "/#{self.publication.section.section_slug}/#{self.publication.slug}"
+      else
+        "/#{self.class.to_s.pluralize}/#{self.publication.slug}"
+      end
+    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.section  = section unless !section
+      self.publication.default  = default
+    end
+  end
 end
+
+ActiveRecord::Base.send :include, Publinator::ActsAsPublishable
+

data/lib/tasks/publinator_tasks.rake

@@ -1,9 +1,9 @@
 namespace :publinator do
   desc "Dump DB, then repopulate it."
   task :repopulate => :environment do
-    ["db:drop", "db:create", "db:migrate", "publinator:install:migrations", "db:seed"].each do |t|
+    ["db:drop", "publinator:install:migrations", "db:create", "db:migrate", "db:seed"].each do |t|
       Rake::Task[t].execute
       `touch tmp/restart.txt`
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: publinator
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-17 00:00:00.000000000 Z
+date: 2012-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -250,7 +250,6 @@ files:
 - app/models/publinator/page.rb
 - app/models/publinator/publication.rb
 - app/models/publinator/publication_state.rb
-- app/models/publinator/publishable.rb
 - app/models/publinator/publishable_type.rb
 - app/models/publinator/section.rb
 - app/models/publinator/site.rb
@@ -288,7 +287,6 @@ files:
 - db/migrate/20120725202127_create_publinator_workflows.rb
 - db/migrate/20120725202425_create_publinator_workflow_steps.rb
 - db/migrate/20120725202718_create_publinator_site_workflows.rb
-- db/migrate/20120725204133_create_publinator_publishables.rb
 - db/migrate/20120726234227_create_versions.rb
 - db/migrate/20120726234703_create_publinator_publishable_types.rb
 - db/migrate/20121011191348_create_publinator_sections.rb
@@ -319,7 +317,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 150634555584711764
+      hash: -1778146319537863038
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -328,7 +326,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 150634555584711764
+      hash: -1778146319537863038
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24

data/app/models/publinator/publishable.rb

@@ -1,64 +0,0 @@
-module Publinator
-  class Publishable < ActiveRecord::Base
-    has_one :publication, :as => :publishable, :class_name => "Publinator::Publication"
-
-    accepts_nested_attributes_for :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"]
-    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 add_publication
-        logger.info "creating publication"
-        self.publication = Publinator::Publication.new(:publishable => self)
-      end
-  end
-end

data/db/migrate/20120725204133_create_publinator_publishables.rb

@@ -1,9 +0,0 @@
-class CreatePublinatorPublishables < ActiveRecord::Migration
-  def change
-    create_table :publinator_publishables do |t|
-      t.integer :publication_id
-
-      t.timestamps
-    end
-  end
-end