beef-slides 0.1.1 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/app/controllers/admin/slide_shows_controller.rb

@@ -0,0 +1,83 @@
+class Admin::SlideShowsController < Admin::BaseController
+  sortable_attributes :title, :permalink 
+
+  # GET /slide_shows
+  # GET /slide_shows.xml
+  def index
+    @slide_shows = SlideShow.paginate :page => params[:page], :order => sort_order
+
+    respond_to do |format|
+      format.html # index.html.erb
+      format.xml  { render :xml => @slide_shows }
+    end
+  end
+
+  # GET /slide_shows/1
+  # GET /slide_shows/1.xml
+  def show
+    @slide_show = SlideShow.find(params[:id])
+
+    respond_to do |format|
+      format.html 
+      format.xml  { render :xml => @slide_show }
+    end
+  end
+
+  # GET /slide_shows/new
+  # GET /slide_shows/new.xml
+  def new
+    @slide_show = SlideShow.new
+
+    respond_to do |format|
+      format.html { render :action =>'show' }
+      format.xml  { render :xml => @slide_show }
+    end
+  end
+
+  # POST /slide_shows
+  # POST /slide_shows.xml
+  def create
+    @slide_show = SlideShow.new(params[:slide_show])
+
+    respond_to do |format|
+      if @slide_show.save
+        flash[:notice] = 'SlideShow was successfully created.'
+        format.html { redirect_to(admin_slide_shows_url) }
+        format.xml  { render :xml => @slide_show, :status => :created, :location => @slide_show }
+      else
+        format.html { render :action => "new" }
+        format.xml  { render :xml => @slide_show.errors, :status => :unprocessable_entity }
+      end
+    end
+  end
+
+  # PUT /slide_shows/1
+  # PUT /slide_shows/1.xml
+  def update
+    @slide_show = SlideShow.find(params[:id])
+
+    respond_to do |format|
+      if @slide_show.update_attributes(params[:slide_show])
+        flash[:notice] = 'SlideShow was successfully updated.'
+        format.html { redirect_to(admin_slide_shows_url) }
+        format.xml  { head :ok }
+      else
+        format.html { render :action => "edit" }
+        format.xml  { render :xml => @slide_show.errors, :status => :unprocessable_entity }
+      end
+    end
+  end
+
+  # DELETE /slide_shows/1
+  # DELETE /slide_shows/1.xml
+  def destroy
+    @slide_show = SlideShow.find(params[:id])
+    @slide_show.destroy
+    flash[:notice] = 'SlideShow was successfully deleted.'
+
+    respond_to do |format|
+      format.html { redirect_to(admin_slide_shows_url) }
+      format.xml  { head :ok }
+    end
+  end
+end

data/app/controllers/admin/slides_controller.rb

@@ -4,7 +4,8 @@ class Admin::SlidesController < Admin::BaseController
   # GET /slides
   # GET /slides.xml
   def index
-    @slides = Slide.paginate :page => params[:page], :order => sort_order(:default => 'asc')
+    @slide_show = SlideShow.find(params[:slide_show_id])
+    @slides = @slide_show.slides.paginate :page => params[:page], :order => sort_order(:default => 'asc')
 
     respond_to do |format|
       format.html # index.html.erb
@@ -27,7 +28,8 @@ class Admin::SlidesController < Admin::BaseController
   # GET /slides/new.xml
   def new
     @slide = Slide.new
-
+    @slide.slide_show_id = params[:slide_show_id]
+    
     respond_to do |format|
       format.html { render :action => "show" }
       format.xml  { render :xml => @slide }
@@ -42,7 +44,7 @@ class Admin::SlidesController < Admin::BaseController
     respond_to do |format|
       if @slide.save
         flash[:notice] = 'Slide was successfully created.'
-        format.html { redirect_to(admin_slides_url) }
+        format.html { redirect_to(admin_slide_show_slides_url(@slide.slide_show)) }
         format.xml  { render :xml => @slide, :status => :created, :location => @slide }
       else
         format.html { render :action => "show" }
@@ -59,7 +61,7 @@ class Admin::SlidesController < Admin::BaseController
     respond_to do |format|
       if @slide.update_attributes(params[:slide])
         flash[:notice] = 'Slide was successfully updated.'
-        format.html { redirect_to(admin_slides_url) }
+        format.html { redirect_to(admin_slide_show_slides_url(@slide.slide_show)) }
         format.xml  { head :ok }
       else
         format.html { render :action => "show" }
@@ -72,10 +74,11 @@ class Admin::SlidesController < Admin::BaseController
   # DELETE /slides/1.xml
   def destroy
     @slide = Slide.find(params[:id])
+    slide_show = @slide.slide_show
     @slide.destroy
 
     respond_to do |format|
-      format.html { redirect_to(admin_slides_url) }
+      format.html { redirect_to(admin_slide_show_slides_url(slide_show)) }
       format.xml  { head :ok }
     end
   end

data/app/controllers/slide_shows_controller.rb

@@ -0,0 +1,23 @@
+class SlideShowsController < ApplicationController
+  # GET /slide_shows
+  # GET /slide_shows.xml
+  def index
+    @slide_shows = SlideShow.all
+
+    respond_to do |format|
+      format.html # index.html.erb
+      format.xml  { render :xml => @slide_shows }
+      format.json  { render :json => @slide_shows }
+    end
+  end
+
+
+  def show
+    @slide_show = SlideShow.find_by_permalink(params[:id])
+  #raise
+    @slides = @slide_show.slides.published
+    respond_to do |format|
+      format.json  { render :json => @slides }
+    end
+  end
+end

data/app/models/slide.rb

@@ -1,6 +1,6 @@
 class Slide < ActiveRecord::Base
   acts_as_publishable
-  acts_as_list :insert_position => :top
+  acts_as_list :insert_position => :top, :scope => :slide_show_id
   has_attachment :storage => :file_system, #Should be changed to S3 for production
                  :path_prefix => 'public/assets/slides', #Should be changed to S3 for production
                  :max_size => 5.megabytes,
@@ -8,8 +8,9 @@ class Slide < ActiveRecord::Base
                    
   validates_presence_of :size, :content_type, :if => :has_file?
   validate              :attachment_attributes_valid?, :if => :has_file?
-  
-  attr_accessible :title, :date, :link, :strapline, :publish, :hide, :uploaded_data
+  belongs_to :slide_show
+
+  attr_accessible :slide_show_id, :title, :date, :link, :strapline, :publish, :hide, :uploaded_data
 
   default_scope :order => 'position ASC'
 

data/app/models/slide_show.rb

@@ -0,0 +1,11 @@
+class SlideShow < ActiveRecord::Base
+  has_many :slides
+  
+  before_save :set_url
+
+private
+
+  def set_url
+    write_attribute :permalink, title.parameterize if permalink.blank?
+  end  
+end

data/app/views/admin/slide_shows/index.html.erb

@@ -0,0 +1,32 @@
+<h1>Listing slide shows</h1>
+
+<ul class="choices">
+  <li><%= link_to 'New slide_show', new_admin_slide_show_path %></li>
+</ul>
+
+<table>
+  <thead>
+    <tr>
+      <%= sortable_table_header :name => "Title",  :sort => "title" %>
+      <th># Slides</th>
+      <th colspan="2">Actions</th>
+    </tr>
+  </thead>
+  <tbody>
+<% @slide_shows.each do |slide_show| %>
+    <tr id="slide_show-<%= slide_show.id %>">
+      <td><%= link_to slide_show.title, admin_slide_show_path(slide_show) %></td>
+      <td><%= link_to pluralize(slide_show.slides.count, "Slide"), admin_slide_show_slides_path(slide_show), :class => 'view', :title => 'Click to view these slides' %></td>
+      <td><%= link_to 'Edit', admin_slide_show_path(slide_show), :class => 'edit' %></td>
+      <td><%= link_to 'Destroy', admin_slide_show_path(slide_show), :confirm => 'Are you sure?', :method => :delete, :class => 'delete' %></td>
+    </tr>
+<% end %>
+  </tbody>
+  <tfoot>
+    <tr>
+      <%= sortable_table_header :name => "Title",  :sort => "title" %>
+      <th># Slides</th>
+      <th colspan="2">Actions</th>
+    </tr>
+  </tfoot>
+</table>

data/app/views/admin/slide_shows/show.html.erb

@@ -0,0 +1,14 @@
+<h1><%= @slide_show.new_record? ? 'New' : 'Editing' %> slide_show</h1>
+
+<% form_for([:admin, @slide_show]) do |f| %>
+  <%= f.error_messages %>
+
+  <p>
+    <%= f.label :title %><br />
+    <%= f.text_field :title %>
+  </p>
+  <p class="submission">
+    <%= f.submit @slide_show.new_record? ? 'Create' : 'Update', :disable_with => 'Submitting...' %> or <%= link_to 'Cancel', admin_slide_shows_path %>
+  </p>
+<% end %>
+

data/app/views/admin/slides/index.html.erb

@@ -1,7 +1,7 @@
-<h1>Listing slides</h1>
+<h1>Listing slides for <%= @slide_show.title %></h1>
 
 <ul class="choices">
-  <li><%= link_to 'New slide', new_admin_slide_path %></li>
+  <li><%= link_to 'New slide', new_admin_slide_show_slide_path(@slide_show) %></li>
 </ul>  
 
 <table>
@@ -11,6 +11,8 @@
       <th>Image</th>
       <%= sortable_table_header :name => "Title",  :sort => "title" %>
       <td>Status</td>
+      <%= sortable_table_header :name => "Created At",  :sort => "created_at" %>
+      <%= sortable_table_header :name => "Updated At",  :sort => "updated_at" %>
       <%= sortable_table_header :name => "Published At",  :sort => "published_at" %>
       <%= sortable_table_header :name => "Published To",  :sort => "published_to" %>
       <th>Actions</th>
@@ -24,13 +26,15 @@
       <td><%= image_tag slide.public_filename, :width => 100 unless slide.filename == 'no_file' %></td>
       <td><%=h slide.title %></td>
       <td><%= content_status(slide) %></td>
+      <td><%=h slide.created_at.strftime('%d %b') %></td>
+      <td><%=h slide.updated_at.strftime('%d %b') %></td>
       <td><%=h slide.published_at.strftime('%d %b') unless slide.published_at.blank? %></td>
       <td><%=h slide.published_to.strftime('%d %b') unless slide.published_to.blank? %></td>
       <td>
-        <%= link_to 'Move Up', move_up_admin_slide_path(slide), :class => 'move-up' unless slide.position == 0 %>
-        <%= link_to 'Move Down', move_down_admin_slide_path(slide), :class => 'move-down' unless slide.position == @slides.length-1 %>
-        <%= link_to 'Edit', [:admin, slide], :class => 'edit' %>
-        <%= link_to 'Destroy', [:admin, slide], :confirm => 'Are you sure?', :method => :delete, :class => 'delete' %>
+        <%= link_to 'Move Up', move_up_admin_slide_path(slide), :class => 'move-up' unless slide.first? %>
+        <%= link_to 'Move Down', move_down_admin_slide_path(slide), :class => 'move-down' unless slide.last? %>
+        <%= link_to 'Edit', admin_slide_path(slide), :class => 'edit' %>
+        <%= link_to 'Destroy', admin_slide_path(slide), :confirm => 'Are you sure?', :method => :delete, :class => 'delete' %>
       </td>
     </tr>
 <% end %>
@@ -42,6 +46,8 @@
       <th>Image</th>
       <%= sortable_table_header :name => "Title",  :sort => "title" %>
       <td>Status</td>
+      <%= sortable_table_header :name => "Created At",  :sort => "created_at" %>
+      <%= sortable_table_header :name => "Updated At",  :sort => "updated_at" %>
       <%= sortable_table_header :name => "Published At",  :sort => "published_at" %>
       <%= sortable_table_header :name => "Published To",  :sort => "published_to" %>
       <th>Actions</th>

data/app/views/admin/slides/show.html.erb

@@ -1,6 +1,7 @@
 <h1>Editing slide</h1>
 
 <% form_for([:admin, @slide], :html => { :multipart => true}) do |f| %>
+  <%= f.hidden_field :slide_show_id %>
   <%= f.error_messages %>
 
   <p>
@@ -26,7 +27,7 @@
   <p class="submission">
     <%= f.submit 'Publish', :name => 'slide[publish]' %>
     <%= f.submit 'Save as draft', :name => 'slide[hide]' %>
-     or <%= link_to 'Cancel', admin_slides_path %>
+     or <%= link_to 'Cancel', admin_slide_show_slides_path(@slide.slide_show_id) %>
   </p>
     </div>
 <% end %>

data/config/routes.rb

@@ -1,6 +1,10 @@
 ActionController::Routing::Routes.draw do |map|
   map.namespace(:admin) do |admin|
+    admin.resources :slide_shows do |slide_show| 
+      slide_show.resources :slides, :member => { :move_up => :get, :move_down => :get }
+    end
     admin.resources :slides, :member => { :move_up => :get, :move_down => :get }
   end
   map.resources :slides, :only => :index
+  map.resources :slide_shows, :has_many => :slides
 end

data/generators/slides_migration/templates/migration.rb

@@ -11,14 +11,21 @@ class CreateSlides < ActiveRecord::Migration
       t.string :filename, :default => 'no_file'
       t.string :content_type 
       t.integer :size, :height, :width
-      t.references :parent
+      t.references :parent, :slide_show
       t.string :thumbnail
 
+      t.timestamps
+    end
+    
+   create_table :slide_shows do |t|
+      t.string :title, :permalink
+
       t.timestamps
     end
   end
 
   def self.down
     drop_table :slides
+    drop_table :slide_shows
   end
 end

data/slides.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{slides}
-  s.version = "0.1.1"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Daniel Craig"]
-  s.date = %q{2009-07-14}
+  s.date = %q{2009-09-02}
   s.email = %q{daniel@wearebeef.co.uk}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -19,10 +19,15 @@ Gem::Specification.new do |s|
      "README.rdoc",
      "Rakefile",
      "VERSION",
+     "app/controllers/admin/slide_shows_controller.rb",
      "app/controllers/admin/slides_controller.rb",
+     "app/controllers/slide_shows_controller.rb",
      "app/controllers/slides_controller.rb",
      "app/helpers/slides_helper.rb",
      "app/models/slide.rb",
+     "app/models/slide_show.rb",
+     "app/views/admin/slide_shows/index.html.erb",
+     "app/views/admin/slide_shows/show.html.erb",
      "app/views/admin/slides/index.html.erb",
      "app/views/admin/slides/show.html.erb",
      "config/routes.rb",
@@ -31,16 +36,18 @@ Gem::Specification.new do |s|
      "lib/slides.rb",
      "public/javascripts/swfobject.js",
      "slides.gemspec",
+     "test/slide_show_test.rb",
      "test/slides_test.rb",
      "test/test_helper.rb"
   ]
   s.homepage = %q{http://github.com/dougle/slides}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.3}
+  s.rubygems_version = %q{1.3.5}
   s.summary = %q{Slide show generation}
   s.test_files = [
-    "test/slides_test.rb",
+    "test/slide_show_test.rb",
+     "test/slides_test.rb",
      "test/test_helper.rb"
   ]
 

data/test/slide_show_test.rb

@@ -0,0 +1,8 @@
+require 'test_helper'
+
+class SlideShowTest < ActiveSupport::TestCase
+  # Replace this with your real tests.
+  test "the truth" do
+    assert true
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: beef-slides
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors: 
 - Daniel Craig
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-14 00:00:00 -07:00
+date: 2009-09-02 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -29,10 +29,15 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- app/controllers/admin/slide_shows_controller.rb
 - app/controllers/admin/slides_controller.rb
+- app/controllers/slide_shows_controller.rb
 - app/controllers/slides_controller.rb
 - app/helpers/slides_helper.rb
 - app/models/slide.rb
+- app/models/slide_show.rb
+- app/views/admin/slide_shows/index.html.erb
+- app/views/admin/slide_shows/show.html.erb
 - app/views/admin/slides/index.html.erb
 - app/views/admin/slides/show.html.erb
 - config/routes.rb
@@ -41,10 +46,12 @@ files:
 - lib/slides.rb
 - public/javascripts/swfobject.js
 - slides.gemspec
+- test/slide_show_test.rb
 - test/slides_test.rb
 - test/test_helper.rb
 has_rdoc: false
 homepage: http://github.com/dougle/slides
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -65,10 +72,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Slide show generation
 test_files: 
+- test/slide_show_test.rb
 - test/slides_test.rb
 - test/test_helper.rb