publinator 0.0.7 → 0.0.8

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

@@ -0,0 +1,68 @@
+module Publinator
+  class Manage::PublishableTypesController < ManageController
+    def index
+      @publishable_types = Publinator::PublishableType.all
+      respond_to do |format|
+        format.html # index.html.erb
+        format.json { render json: @manage_publishable_types }
+      end
+    end
+
+    def show
+      @manage_publishable_type = Manage::PublishableType.find(params[:id])
+
+      respond_to do |format|
+        format.html # show.html.erb
+        format.json { render json: @manage_publishable_type }
+      end
+    end
+
+    def new
+      @manage_publishable_type = Manage::PublishableType.new
+
+      respond_to do |format|
+        format.html # new.html.erb
+        format.json { render json: @manage_publishable_type }
+      end
+    end
+
+    def edit
+      @publishable_type = PublishableType.find(params[:id])
+    end
+
+    def create
+      @manage_publishable_type = Manage::PublishableType.new(params[:manage_publishable_type])
+      respond_to do |format|
+        if @manage_publishable_type.save
+          format.html { redirect_to manage_publishable_types_path, notice: 'Publishable type was successfully created.' }
+          format.json { render json: @manage_publishable_type, status: :created, location: @manage_publishable_type }
+        else
+          format.html { render action: "new" }
+          format.json { render json: @manage_publishable_type.errors, status: :unprocessable_entity }
+        end
+      end
+    end
+
+    def update
+      @manage_publishable_type = Publinator::PublishableType.find(params[:id])
+      respond_to do |format|
+        if @manage_publishable_type.update_attributes(params[:manage_publishable_type])
+          format.html { redirect_to manage_publishable_types_path, notice: 'Publishable type was successfully updated.' }
+          format.json { head :no_content }
+        else
+          format.html { render action: "edit" }
+          format.json { render json: @manage_publishable_type.errors, status: :unprocessable_entity }
+        end
+      end
+    end
+
+    def destroy
+      @manage_publishable_type = Publinator::PublishableType.find(params[:id])
+      @manage_publishable_type.destroy
+      respond_to do |format|
+        format.html { redirect_to manage_publishable_types_url }
+        format.json { head :no_content }
+      end
+    end
+  end
+end

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

@@ -1,7 +1,7 @@
 require_dependency "publinator/application_controller"
 
 module Publinator
-  class Manage::SectionsController < ApplicationController
+  class Manage::SectionsController < Publinator::ManageController
 
     before_filter :get_section, :except => [:index, :new]
 

data/app/controllers/publinator/publishable_controller.rb

@@ -3,11 +3,24 @@ require_dependency "publinator/application_controller"
 module Publinator
   class PublishableController < Publinator::ApplicationController
     def index
-      @publishables = current_site.publications('published', 'updated_at desc', params["publishable_type"].singularize.capitalize)
-      begin
-        render "#{params[:publishable_type]}/index"
-      rescue ActionView::MissingTemplate
-        render "publinator/publishable/index"
+      @publication = Publinator::Publication.find_by_publishable_type_and_slug(params[:publishable_type].singularize.capitalize, 'index')
+      if @publication.nil?
+        logger.info "looking for publication with slug #{params[:publishable_type]}"
+        @publication = Publinator::Publication.find_by_slug(params[:publishable_type])
+        @publishable = @publication.publishable
+        logger.info @publication.to_yaml
+        begin
+          render "#{params[:publishable_type]}/show"
+        rescue ActionView::MissingTemplate
+          render "publinator/publishable/show"
+        end
+      else
+        @publishables = current_site.publications('published', 'updated_at desc', params["publishable_type"].singularize.capitalize)
+        begin
+          render "#{params[:publishable_type]}/index"
+        rescue ActionView::MissingTemplate
+          render "publinator/publishable/index"
+        end
       end
     end
 

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

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

data/app/models/publinator/asset_item.rb

@@ -1,6 +1,6 @@
 #module Publinator
   class Publinator::AssetItem < ActiveRecord::Base
-    attr_accessible :asset, :assetable
+    attr_accessible :asset, :assetable, :asset_type
     belongs_to :assetable, :polymorphic => true
     validates_presence_of :assetable
 

data/app/models/publinator/publishable_type.rb

@@ -1,6 +1,6 @@
 module Publinator
   class PublishableType < ActiveRecord::Base
-    attr_accessible :name, :sluggable
+    attr_accessible :name, :sluggable, :layout
 
     def self.matches?(request)
       logger.info request.path_parameters

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

@@ -6,3 +6,8 @@
     <%= link_to pt.name.pluralize, send("manage_#{pt.name.downcase.pluralize}_path") %><br>
   <% end %>
 <% end %>
+
+<h3>Site Settings</h3>
+
+<%= link_to "Publishable Types", "/manage/publishable_types" %><br>
+

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

@@ -14,7 +14,7 @@
     <%= form.semantic_fields_for :asset_items do |asset_form| %>
       <%= asset_form.inputs "Asset" do %>
         <%= asset_form.input :asset_type, :as => :select, :collection => @publishable.asset_types %>
-        <%= asset_form.input :asset_file, :as => :file %>
+        <%= asset_form.input :asset, :as => :file %>
       <% end %>
     <% end %>
   <% end %>

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

@@ -1,7 +1,7 @@
 <h1><%= @publishable.title %></h1>
 
-<% @publishable.asset_types.each do |ai| %>
-  <%= publishable_asset(@publishable, ai) %>
+<% @publishable.asset_items.each do |ai| %>
+  <%= link_to(image_tag(ai.asset.url(:thumb)), ai.asset.url(:original), :target => "_new") %>
 <% end %>
 
 <p>

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

@@ -0,0 +1,19 @@
+<%= semantic_form_for [:manage, @publishable_type] do |f| %>
+  <% if @publishable_type.errors.any? %>
+    <div id="error_explanation">
+      <h2><%= pluralize(@manage_publishable_type.errors.count, "error") %> prohibited this manage_publishable_type from being saved:</h2>
+
+      <ul>
+      <% @manage_publishable_type.errors.full_messages.each do |msg| %>
+        <li><%= msg %></li>
+      <% end %>
+      </ul>
+    </div>
+  <% end %>
+
+
+  <%= f.inputs %>
+  <div class="actions">
+    <%= f.actions %>
+  </div>
+<% end %>

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

@@ -0,0 +1,6 @@
+<h1>Editing Publishable Type</h1>
+
+<%= render 'form' %>
+
+<%= link_to 'Show', manage_publishable_type_path(@publishable_type) %> |
+<%= link_to 'Back', manage_publishable_types_path %>

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

@@ -0,0 +1,22 @@
+<h1>Listing manage_publishable_types</h1>
+
+<table>
+  <tr>
+    <th></th>
+    <th></th>
+    <th></th>
+  </tr>
+
+<% @publishable_types.each do |publishable_type| %>
+  <tr>
+    <td><%= publishable_type.name %></td>
+    <td><%= link_to 'Show', manage_publishable_type_path(publishable_type) %></td>
+    <td><%= link_to 'Edit', edit_manage_publishable_type_path(publishable_type) %></td>
+    <td><%= link_to 'Destroy', manage_publishable_type_path(publishable_type), method: :delete, data: { confirm: 'Are you sure?' } %></td>
+  </tr>
+<% end %>
+</table>
+
+<br />
+
+<%= link_to 'New Publishable type', new_manage_publishable_type_path %>

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

@@ -0,0 +1,5 @@
+<h1>New manage_publishable_type</h1>
+
+<%= render 'form' %>
+
+<%= link_to 'Back', manage_publishable_types_path %>

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

@@ -0,0 +1,5 @@
+<p id="notice"><%= notice %></p>
+
+
+<%= link_to 'Edit', edit_manage_publishable_type_path(@manage_publishable_type) %> |
+<%= link_to 'Back', manage_publishable_types_path %>

data/config/routes.rb

@@ -36,6 +36,7 @@ Publinator::Engine.routes.draw do
     resources :pages
     resources :sites
     resources :sections
+    resources :publishable_types
   end
 
   #constraints(Publinator::PublishableType) do
@@ -48,6 +49,12 @@ Publinator::Engine.routes.draw do
       #:publishable_type => /\A([a-zA-Z]+[a-zA-Z_]*)\z/i
       #}, :as => "publishable"
   #end
+  #
+
+  Publinator::PublishableType.all.each do |pt|
+    resources pt.name.pluralize.downcase.to_sym, :controller => "publishable", :only => [:index, :show], :publishable_type => pt.name.pluralize.downcase
+  end
+
 
   constraints(Publinator::Section) do
     match '/:section/' => "section#index", :requirements => {
@@ -64,11 +71,6 @@ Publinator::Engine.routes.draw do
     :slug => /\A([a-zA-Z]+[a-zA-Z\-_]*)\z/i
   }, :as => 'publishable'
 
-  Publinator::PublishableType.all.each do |pt|
-    resources pt.name.pluralize.downcase.to_sym, :controller => "publishable", :only => [:index, :show]
-  end
-
-
   root :to  => "home#index"
   match '/' => 'home#index'
 

data/db/migrate/20120726234703_create_publinator_publishable_types.rb

@@ -2,7 +2,8 @@ class CreatePublinatorPublishableTypes < ActiveRecord::Migration
   def change
     create_table :publinator_publishable_types do |t|
       t.string :name
-      t.string :sluggable, :default => true
+      t.boolean :sluggable, :default => true
+      t.boolean :layout, :default => false
       t.timestamps
     end
   end

data/lib/publinator/version.rb

@@ -1,3 +1,3 @@
 module Publinator
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/lib/publinator.rb

@@ -42,17 +42,17 @@ module Publinator
       []
     end
 
-    def asset_file(asset_type_text)
-      publishable_asset = get_asset_by_type(asset_type_text)
-      publishable_asset.asset_file if publishable_asset
+    def asset_files(asset_type_text = nil)
+      return asset_items if !asset_type_text
+      asset_items.where(:asset_type => asset_type_text)
     end
 
     def my_slug
       publication.slug
     end
 
-    def asset_files
-      asset_types.collect{ |atype| asset_file(atype) }
+    def related_items(scope)
+      []
     end
 
     def editable_fields
@@ -81,14 +81,6 @@ module Publinator
       self.publication.section  = section unless !section
       self.publication.default  = default
     end
-
-    private
-
-      def get_asset_by_type(asset_type_text)
-        all_of_asset_type = asset_items.where(:asset_type => asset_type_text)
-        all_of_asset_type.first if all_of_asset_type && all_of_asset_type.length
-      end
-
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: publinator
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -255,6 +255,7 @@ files:
 - app/controllers/publinator/home_controller.rb
 - app/controllers/publinator/manage/pages_controller.rb
 - app/controllers/publinator/manage/publishable_controller.rb
+- app/controllers/publinator/manage/publishable_types_controller.rb
 - app/controllers/publinator/manage/sections_controller.rb
 - app/controllers/publinator/manage/sites_controller.rb
 - app/controllers/publinator/manage_controller.rb
@@ -262,6 +263,7 @@ files:
 - app/controllers/publinator/section_controller.rb
 - app/helpers/publinator/application_helper.rb
 - app/helpers/publinator/home_helper.rb
+- app/helpers/publinator/manage/publishable_types_helper.rb
 - app/helpers/publinator/manage/sections_helper.rb
 - app/models/publinator/asset_item.rb
 - app/models/publinator/domain_name.rb
@@ -292,6 +294,11 @@ files:
 - app/views/publinator/manage/publishable/index.html.erb
 - app/views/publinator/manage/publishable/new.html.erb
 - app/views/publinator/manage/publishable/show.html.erb
+- app/views/publinator/manage/publishable_types/_form.html.erb
+- app/views/publinator/manage/publishable_types/edit.html.erb
+- app/views/publinator/manage/publishable_types/index.html.erb
+- app/views/publinator/manage/publishable_types/new.html.erb
+- app/views/publinator/manage/publishable_types/show.html.erb
 - app/views/publinator/manage/sections/_form.html.erb
 - app/views/publinator/manage/sections/edit.html.erb
 - app/views/publinator/manage/sections/index.html.erb
@@ -343,7 +350,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 611779132086481296
+      hash: 3405866272499408844
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -352,7 +359,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 611779132086481296
+      hash: 3405866272499408844
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24