publinator 0.0.22 → 0.0.23

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

@@ -18,7 +18,7 @@ body {
   background-color: #ccc;
   margin: 0;
   padding: 0;
-  
+
   #header {
     background-color: #ccc;
     margin: 0;
@@ -28,29 +28,29 @@ body {
       margin: 0;
     }
   }
-  
+
   #content {
     background-color: #fff;
     margin: 0;
     padding: 2em;
   }
-  
+
   #footer  {
     background-color: #ccc;
     margin: 0;
     padding: 1em;
   }
-  
+
   a, a:visited {
     text-decoration: none;
   }
-  
+
   h1 {
     a {
       color: #000;
     }
   }
-  
+
   .formtastic {
     fieldset {
       border: 0;
@@ -85,4 +85,4 @@ body {
       }
     }
   }
-}
+}

data/app/controllers/publinator/section_controller.rb

@@ -7,7 +7,9 @@ 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)
+      if @publication.publishable_type
+        @publishable_type = Publinator::PublishableType.find_by_name(@publication.publishable_type.classify)
+      end
       begin
         render "#{params[:section]}/index"
       rescue ActionView::MissingTemplate
@@ -18,7 +20,9 @@ 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)
+      if @publication.publishable_type
+        @publishable_type = Publinator::PublishableType.find_by_name(@publication.publishable_type.classify)
+      end
       begin
         if @publishable_type
           render "#{@publishable_type.tableize}/show"

data/app/helpers/publinator/application_helper.rb

@@ -85,5 +85,15 @@ module Publinator
       asset = pub.asset_file(asset_type)
       image_tag asset.url if asset
     end
+
+    def asset_file_tag(object, asset_type, size = 'original', img_class = nil)
+      imgs = object.asset_files(asset_type)
+      return unless imgs && imgs.first
+      if img_class
+        image_tag(imgs.first.asset.url(size.to_sym), :class => img_class)
+      else
+        image_tag(imgs.first.asset.url(size.to_sym))
+      end
+    end
   end
 end

data/app/models/publinator/asset_item.rb

@@ -5,5 +5,6 @@
     validates_presence_of :assetable
 
     has_attached_file :asset
+    default_scope order('updated_at desc')
   end
 #end

data/app/models/publinator/publication.rb

@@ -3,7 +3,8 @@ module Publinator
     # has_paper_trail
     attr_accessible :custom_slug, :parent_id, :publication_state_id,
       :publishable_id, :publishable_type, :slug, :publish_at, :hide_in_submenu,
-      :unpublish_at, :archive_at, :section, :default, :publishable, :site, :section_id
+      :unpublish_at, :archive_at, :section, :default, :publishable, :site,
+      :section_id, :collection_publishable_type_id, :collection_scope
     belongs_to :publishable, :polymorphic => true
     belongs_to :section, :class_name => "Publinator::Section"
     belongs_to :site
@@ -20,6 +21,13 @@ module Publinator
 
     delegate :title, :path, :menu_collection, :to => :publishable
 
+    def collection
+      return unless collection_publishable_type_id
+      pt = Publinator::PublishableType.find(collection_publishable_type_id)
+      return if !pt
+      pt.name.constantize.send(collection_scope.to_sym)
+    end
+
     def content
       publishable_type.constantize.find(publishable_id)
     end

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

@@ -12,6 +12,9 @@
   <% if @page.asset_types.length > 0 %>
     <%= form.semantic_fields_for :asset_items do |asset_form| %>
       <%= asset_form.inputs "Asset" do %>
+        <% if asset_form.object.asset.present? %>
+          <%= link_to(image_tag(asset_form.object.asset.url(:thumb)), asset_form.object.asset.url(:original), :target => "_new") %>
+        <% end %>
         <%= asset_form.input :asset_type, :as => :select, :collection => @page.asset_types %>
         <%= asset_form.input :asset, :as => :file %>
       <% end %>
@@ -20,6 +23,8 @@
   <%= form.semantic_fields_for :publication do |pub| %>
     <%= pub.inputs "Publication Settings" do %>
       <%= pub.input :custom_slug, :required => false %>
+      <%= pub.input :collection_publishable_type_id, :as => :select, :collection => Publinator::PublishableType.all, :required => false %>
+      <%= pub.input :collection_scope, :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 %>

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

@@ -12,6 +12,9 @@
   <% if @publishable.asset_types.length > 0 %>
     <%= form.semantic_fields_for :asset_items do |asset_form| %>
       <%= asset_form.inputs "Asset" do %>
+        <% if asset_form.object.asset.present? %>
+          <%= link_to(image_tag(asset_form.object.asset.url(:thumb)), asset_form.object.asset.url(:original), :target => "_new") %>
+        <% end %>
         <%= asset_form.input :asset_type, :as => :select, :collection => @publishable.asset_types %>
         <%= asset_form.input :asset, :as => :file %>
       <% end %>
@@ -20,6 +23,8 @@
   <%= form.semantic_fields_for :publication do |pub| %>
     <%= pub.inputs "Publication Settings" do %>
       <%= pub.input :custom_slug, :required => false %>
+      <%= pub.input :collection_publishable_type_id, :as => :select, :collection => Publinator::PublishableType.all, :required => false %>
+      <%= pub.input :collection_scope, :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 %>

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

@@ -3,3 +3,10 @@
 <% if @publishable.respond_to?(:publishables) %>
   <%= render :collection => @publishable.publishables, :partial => "summary" %>
 <% end %>
+
+<% if @publication.collection %>
+<div class="<%= @publication.collection.first.class.to_s.pluralize.underscore %>">
+  <%= render :collection => @publication.collection, :partial => "/object_blocks/#{@publication.collection.first.class.to_s.underscore}" %>
+</div>
+<% end %>
+<div class="clear_both"></div>

data/db/migrate/20121024141632_add_publication_collections.rb

@@ -0,0 +1,11 @@
+class AddPublicationCollections < ActiveRecord::Migration
+  def up
+    add_column :publinator_publications, :collection_object, :string
+    add_column :publinator_publications, :collection_scope, :string
+  end
+
+  def down
+    remove_column :publinator_publications, :collection_object
+    remove_column :publinator_publications, :collection_scope
+  end
+end

data/lib/publinator/version.rb

@@ -1,3 +1,3 @@
 module Publinator
-  VERSION = "0.0.22"
+  VERSION = "0.0.23"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: publinator
 version: !ruby/object:Gem::Version
-  version: 0.0.22
+  version: 0.0.23
   prerelease: 
 platform: ruby
 authors:
@@ -326,6 +326,7 @@ files:
 - db/migrate/20121020181204_create_publinator_asset_items.rb
 - db/migrate/20121023224457_add_show_in_nav.rb
 - db/migrate/20121024001040_add_default_position.rb
+- db/migrate/20121024141632_add_publication_collections.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
@@ -352,7 +353,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2926352825039531933
+      hash: 4163850537072496085
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -361,7 +362,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2926352825039531933
+      hash: 4163850537072496085
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24