publinator 0.0.19 → 0.0.20

data/app/controllers/publinator/publishable_controller.rb

@@ -4,6 +4,7 @@ module Publinator
   class PublishableController < Publinator::ApplicationController
     def index
       @publication = Publinator::Publication.find_by_publishable_type_and_slug(params[:publishable_type].classify, 'index')
+      @publishable_type = Publinator::PublishableType.find_by_name(params[:publishable_type].classify)
       if @publication
         @publishable = @publication.publishable
         begin
@@ -24,8 +25,9 @@ module Publinator
     def show
       @publication = Publinator::Publication.find_by_publishable_type_and_slug(params[:publishable_type].classify, params[:id])
       @publishable = @publication.publishable
+      @publishable_type = Publinator::PublishableType.find_by_name(params[:publishable_type].classify)
       begin
-        render "#{params[:publishable_type]}/index"
+        render "#{params[:publishable_type]}/show"
       rescue ActionView::MissingTemplate
         render "publinator/publishable/show"
       end

data/app/controllers/publinator/section_controller.rb

@@ -7,7 +7,10 @@ module Publinator
     def index
       @publication = Publinator::Publication.find_by_section_id_and_slug(@section.id, 'index')
       @publishable = @publication.publishable
+      @publishable_type = Publinator::PublishableType.find_by_name(@publication.publishable_type.classify)
       begin
+        render "#{@publishable_type.tableize}/index"
+      rescue ActionView::MissingTemplate
         render "#{params[:section]}/index"
       rescue ActionView::MissingTemplate
         render "publinator/publishable/show"
@@ -17,7 +20,14 @@ module Publinator
     def show
       @publication = Publinator::Publication.find(:first, :conditions => ["section_id = ? and slug = ?", @section.id, params[:id]])
       @publishable = @publication.publishable
+      @publishable_type = Publinator::PublishableType.find_by_name(@publication.publishable_type.classify)
       begin
+        if @publishable_type
+          render "#{@publishable_type.tableize}/show"
+        else
+          render "#{params[:section]}/#{@publication.slug}"
+        end
+      rescue ActionView::MissingTemplate
         render "#{params[:section]}/show"
       rescue ActionView::MissingTemplate
         render "publinator/publishable/show"

data/app/models/publinator/domain_name.rb

@@ -27,11 +27,11 @@ module Publinator
       end
       if request_domain.present?
         if request_subdomain.blank? || request_subdomain == 'www'
-          @domain = self.find(:first, :conditions => ["name = ? AND (subdomain is null or subdomain = '')", request_domain])
+          @domain = self.find(:first, :conditions => ["name = ? AND (subdomain is null or subdomain = '')", request_domain.downcase])
         elsif request_subdomain.present? && request_subdomain != 'www'
-          @domain = self.find(:first, :conditions => ["name = ? AND subdomain = ?", request_domain, request_subdomain])
+          @domain = self.find(:first, :conditions => ["name = ? AND subdomain = ?", request_domain.downcase, request_subdomain.downcase])
         else
-          @domain = self.find(:first, :conditions => ["name = ? AND subdomain = 'www' AND anchor = ?", request_domain, true])
+          @domain = self.find(:first, :conditions => ["name = ? AND subdomain = 'www' AND anchor = ?", request_domain.downcase, true])
         end
       else
         @domain = Site.default.domain_names.detect { |d| d.default }

data/app/models/publinator/publishable_type.rb

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

data/db/migrate/20120726234703_create_publinator_publishable_types.rb

@@ -4,6 +4,7 @@ class CreatePublinatorPublishableTypes < ActiveRecord::Migration
       t.string :name
       t.boolean :sluggable, :default => true
       t.boolean :layout, :default => false
+      t.string  :use_layout
       t.timestamps
     end
   end

data/lib/generators/publishable/publishable_generator.rb

@@ -1,12 +1,12 @@
 class PublishableGenerator < Rails::Generators::NamedBase
   source_root File.expand_path('../templates', __FILE__)
-  argument :class_name, :type => :string, :default => "article"
+  # argument :class_name, :type => :string, :default => "article"
 
   def create_publishable_initializer
     # create file for class
-    template "app/models/publishable_model.rb.erb", "app/models/#{file_name}.rb"
+    template "app/models/publishable_model.rb.erb", "app/models/#{name.underscore}.rb"
 
     # create migration
-    template "app/models/publishable_migration.rb.erb", "db/migrate/#{Time.now.utc.strftime("%Y%m%d%H%M%S").to_i}_create_#{class_name.pluralize}.rb"
+    template "app/models/publishable_migration.rb.erb", "db/migrate/#{Time.now.utc.strftime("%Y%m%d%H%M%S").to_i}_create_#{ActiveSupport::Inflector.tableize(name)}.rb"
   end
 end

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

@@ -1,10 +1,10 @@
-class Create<%= class_name.capitalize %> < ActiveRecord::Migration
+class Create<%= name.classify.pluralize %> < ActiveRecord::Migration
   def self.up
-    create_table :<%= class_name.pluralize.to_sym %> do |t|
+    create_table :<%= ActiveSupport::Inflector.tableize(name) %> do |t|
       t.string      :title
-      t.string      :teaser
       t.text        :body
       t.integer     :site_id
+      t.integer     :position
 
       # t.string      :author_name
       # t.text        :extra_body
@@ -13,10 +13,10 @@ class Create<%= class_name.capitalize %> < ActiveRecord::Migration
       t.timestamps
     end
 
-    Publinator::PublishableType.new(:name => "<%= class_name %>", :sluggable => "true")
+    Publinator::PublishableType.create!(:name => "<%= name.classify %>", :sluggable => "true")
   end
 
   def self.down
-    drop_table :<%= class_name.pluralize.to_sym %>
+    drop_table :<%= ActiveSupport::Inflector.tableize(name) %>
   end
 end

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

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

data/lib/publinator/version.rb

@@ -1,3 +1,3 @@
 module Publinator
-  VERSION = "0.0.19"
+  VERSION = "0.0.20"
 end

data/lib/publinator.rb

@@ -9,7 +9,8 @@ module Publinator
         has_one   :publication,
             :as           =>  :publishable,
             :class_name   =>  "Publinator::Publication",
-            :foreign_key  =>  :publishable_id
+            :foreign_key  =>  :publishable_id,
+            :dependent    =>  :destroy
 
         accepts_nested_attributes_for   :publication
         validates_presence_of           :publication

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: publinator
 version: !ruby/object:Gem::Version
-  version: 0.0.19
+  version: 0.0.20
   prerelease: 
 platform: ruby
 authors:
@@ -352,7 +352,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2863941966361980414
+      hash: -1771471465118943363
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -361,7 +361,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2863941966361980414
+      hash: -1771471465118943363
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24