publinator 0.0.16 → 0.0.18

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

@@ -88,11 +88,11 @@ module Publinator
           @publishable_type = PublishableType.find_by_name("Publinator::Page")
           @publishable_type_name = @publishable_type.name
         else
-          @publishable_class_name = params["publishable_type"].singularize.capitalize
+          @publishable_class_name = params["publishable_type"].classify
           @publishable_collection_name = params["publishable_type"]
-          @publishable_member_name = @publishable_class_name.downcase
+          @publishable_member_name =  params["publishable_type"].singularize.downcase
           @publishable_class = @publishable_class_name.constantize
-          @publishable_type = PublishableType.find_by_name(params['publishable_type'].singularize.capitalize)
+          @publishable_type = PublishableType.find_by_name(params['publishable_type'].classify)
           @publishable_type_name = @publishable_type.name
         end
 

data/app/models/publinator/publication.rb

@@ -2,7 +2,7 @@ module Publinator
   class Publication < ActiveRecord::Base
     # has_paper_trail
     attr_accessible :custom_slug, :parent_id, :publication_state_id,
-      :publishable_id, :publishable_type, :slug, :publish_at,
+      :publishable_id, :publishable_type, :slug, :publish_at, :hide_in_submenu,
       :unpublish_at, :archive_at, :section, :default, :publishable, :site, :section_id
     belongs_to :publishable, :polymorphic => true
     belongs_to :section, :class_name => "Publinator::Section"

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

@@ -23,6 +23,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 :hide_in_submenu, :as => :boolean, :required => false %>
       <%= pub.input :section, :as => :select, :required => false, :collection => current_site.sections unless current_site.sections.length == 0 %>
     <% end %>
   <% end %>

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

@@ -23,7 +23,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 :hide_in_nav, :required => false %>
+      <%= pub.input :hide_in_submenu, :as => :boolean, :required => false %>
       <%= pub.input :section, :as => :select, :required => false, :collection => current_site.sections unless current_site.sections.length == 0 %>
     <% end %>
   <% end %>

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

@@ -2,7 +2,7 @@
   <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", send("edit_manage_#{@publishable_type_name.downcase}_path", summary) %></td>
+  <td><%= link_to "edit", send("edit_manage_#{@publishable_member_name}_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

@@ -14,4 +14,4 @@
   <%= render :collection => @publishables, :partial => "summary" %>
 </table>
 
-<%= link_to "Add #{@publishable_class_name}", send("new_manage_#{@publishable_class_name.downcase}_path") %>
+<%= link_to "Add #{@publishable_class_name}", send("new_manage_#{@publishable_member_name}_path") %>

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

@@ -10,6 +10,6 @@
 
 <div id="controls">
   <%= link_to "Back",   send("manage_#{params[:publishable_type]}_path") %>
-  <%= link_to "Edit",   send("edit_manage_#{params[:publishable_type].singularize}_path", @publishable) %>
+  <%= link_to "Edit",   send("edit_manage_#{@publishable_collection_name}_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/db/migrate/20121023224457_add_show_in_nav.rb

@@ -1,9 +1,9 @@
 class AddShowInNav < ActiveRecord::Migration
   def up
-    add_column :publications, :hide_in_submenu, :boolean, :default => false
+    add_column :publinator_publications, :hide_in_submenu, :boolean, :default => false
   end
 
   def down
-    remove_column :publications, :hide_in_submenu
+    remove_column :publinator_publications, :hide_in_submenu
   end
 end

data/db/migrate/20121024001040_add_default_position.rb

@@ -0,0 +1,11 @@
+class AddDefaultPosition < ActiveRecord::Migration
+  def up
+    add_column :publinator_asset_items, :position, :integer
+    add_column :publinator_publishable_types, :position, :integer
+  end
+
+  def down
+    remove_column :publinator_asset_items, :position
+    remove_column :publinator_publishable_types, :position
+  end
+end

data/lib/publinator/version.rb

@@ -1,3 +1,3 @@
 module Publinator
-  VERSION = "0.0.16"
+  VERSION = "0.0.18"
 end

data/lib/publinator.rb

@@ -35,6 +35,7 @@ module Publinator
         attr_accessor                   :default
 
         scope :non_index, joins(:publication).where("publication.slug != 'index'")
+        default_scope order("position")
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: publinator
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.18
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-23 00:00:00.000000000 Z
+date: 2012-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -325,6 +325,7 @@ files:
 - db/migrate/20121017134533_create_publinator_pages.rb
 - db/migrate/20121020181204_create_publinator_asset_items.rb
 - db/migrate/20121023224457_add_show_in_nav.rb
+- db/migrate/20121024001040_add_default_position.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
@@ -351,7 +352,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2434480295581327704
+      hash: -3428793437559641373
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -360,7 +361,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2434480295581327704
+      hash: -3428793437559641373
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24