dust-generators 0.2.3 → 0.2.4

data/lib/dust/version.rb

@@ -2,7 +2,7 @@ class Dust
   module Version
     MAJOR = 0
     MINOR = 2
-    PATCH = 3
+    PATCH = 4
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

data/lib/generators/dust/albums/albums_generator.rb

@@ -1,58 +1,153 @@
-require 'rails/generators/active_record'
+require 'generators/dust'
+require 'rails/generators/migration'
+require 'rails/generators/generated_attribute'
 
 module Dust
   module Generators
-    class AlbumsGenerator < ActiveRecord::Generators::Base
+    class AlbumsGenerator < Base
+			include Rails::Generators::Migration
 			desc "Create all migrations and copy all files for Dust Albums."
-
-			def self.source_root
+			
+			argument :parent_model_name, :type => :string, :required => true, :banner => 'ParentModelName'
+			argument :child_model_name, :type => :string, :required => true, :banner => 'ChildModelName'
+			
+			def source_root
 		    @source_root ||= File.expand_path('../templates', __FILE__)
 		  end
 
 		  def create_migration
-				route("resources :albums")
-				route("resources :photos")
-		    migration_template "albums_migration.rb", "db/migrate/create_albums.rb"
-		    migration_template "photos_migration.rb", "db/migrate/create_photos.rb"
+		    migration_template "migration/albums_migration.rb", "db/migrate/create_#{parent_plural_name}.rb"
 		  end
+		
+			def routes
+				route("match \"all/#{parent_plural_name}\" => \"view_#{parent_plural_name}#index\", :as => :view_#{parent_plural_name}")
+				route("match \"#{child_plural_name}-for/:filename\" => \"view_#{parent_plural_name}#show\", :as => :view_#{parent_singular_name}")
+				route("match \"manage-#{child_plural_name}/:id\" => \"#{parent_plural_name}#manage\", :as => :manage_#{child_plural_name}")
+				route("match \"#{child_plural_name}/array\" => \"#{child_plural_name}#array\", :as => :#{child_plural_name}_sort")
+				route("match \"destroy-#{child_plural_name}\" => \"#{child_plural_name}#destroy\", :as => :#{child_plural_name}_bulk_delete")
+				
+				route("resources :#{parent_plural_name}")
+				route("resources :#{child_plural_name}")
+			end
 
-			def generate_static_files  
-				copy_file "app/controllers/albums_controller.rb", "app/controllers/albums_controller.rb"
-				copy_file "app/controllers/photos_controller.rb", "app/controllers/photos_controller.rb"
-				copy_file "app/controllers/view_albums_controller.rb", "app/controllers/view_albums_controller.rb"
+			def app
+				template "app/controllers/albums_controller.rb", "app/controllers/#{parent_plural_name}_controller.rb"
+				template "app/controllers/photos_controller.rb", "app/controllers/#{child_plural_name}_controller.rb"
+				template "app/controllers/view_albums_controller.rb", "app/controllers/view_#{parent_plural_name}_controller.rb"
 
-				copy_file "app/helpers/albums_helper.rb", "app/helpers/albums_helper.rb"
-				copy_file "app/helpers/photos_helper.rb", "app/helpers/photos_helper.rb"
-				copy_file "app/helpers/view_albums_helper.rb", "app/helpers/view_albums_helper.rb"
+				template "app/helpers/albums_helper.rb", "app/helpers/#{parent_plural_name}_helper.rb"
+				template "app/helpers/photos_helper.rb", "app/helpers/#{child_plural_name}_helper.rb"
+				template "app/helpers/view_albums_helper.rb", "app/helpers/view_#{parent_plural_name}_helper.rb"
 
-				copy_file "app/models/album.rb", "app/models/album.rb"
-				copy_file "app/models/photo.rb", "app/models/photo.rb"
+				template "app/models/album.rb", "app/models/#{parent_singular_name}.rb"
+				template "app/models/photo.rb", "app/models/#{child_singular_name}.rb"
 
-				directory "app/views/albums", "app/views/albums"
-				directory "app/views/photos", "app/views/photos"
-				directory "app/views/view_albums", "app/views/view_albums"
-				
-				copy_file "dust_album.css", "public/stylesheets/dust_album.css"  
-		    copy_file "uploadify.css", "public/stylesheets/uploadify.css"  
+				template "app/views/albums/_form.html.erb", "app/views/#{parent_plural_name}/_form.html.erb"
+				template "app/views/albums/_search.html.erb", "app/views/#{parent_plural_name}/_search.html.erb"
+				template "app/views/albums/_upload_script.html.erb", "app/views/#{parent_plural_name}/_upload_script.html.erb"
+				template "app/views/albums/edit.html.erb", "app/views/#{parent_plural_name}/edit.html.erb"
+				template "app/views/albums/index.html.erb", "app/views/#{parent_plural_name}/index.html.erb"
+				template "app/views/albums/manage.html.erb", "app/views/#{parent_plural_name}/manage.html.erb"
+				template "app/views/albums/new.html.erb", "app/views/#{parent_plural_name}/new.html.erb"
+				template "app/views/albums/show.html.erb", "app/views/#{parent_plural_name}/show.html.erb"
+				template "app/views/albums/show.js.erb", "app/views/#{parent_plural_name}/show.js.erb"
 
-				copy_file "initializers/flash_session_cookie_middleware.rb", "config/initializers/flash_session_cookie_middleware.rb"
-				copy_file "initializers/session_store_middleware.rb", "config/initializers/session_store_middleware.rb"
+				template "app/views/photos/_form.html.erb", "app/views/#{child_plural_name}/_form.html.erb"
+				template "app/views/photos/_search.html.erb", "app/views/#{child_plural_name}/_search.html.erb"
+				template "app/views/photos/_photo.html.erb", "app/views/#{child_plural_name}/_#{child_singular_name}.html.erb"
+				template "app/views/photos/array.js.erb", "app/views/#{child_plural_name}/array.js.erb"
+				template "app/views/photos/edit.html.erb", "app/views/#{child_plural_name}/edit.html.erb"
+				template "app/views/photos/index.html.erb", "app/views/#{child_plural_name}/index.html.erb"
+				template "app/views/photos/new.html.erb", "app/views/#{child_plural_name}/new.html.erb"
+				template "app/views/photos/show.html.erb", "app/views/#{child_plural_name}/show.html.erb"
+				template "app/views/photos/show.js.erb", "app/views/#{child_plural_name}/show.js.erb"
 
-				copy_file "jquery-1.4.2.js", "public/javascripts/jquery-1.4.2.js"
-	
-				copy_file "images/cancel.png", "public/images/cancel.png"
-				copy_file "images/browse.png", "public/images/browse.png"
-				copy_file "images/upload.png", "public/images/upload.png"
+				template "app/views/view_albums/index.html.erb", "app/views/view_#{parent_plural_name}/index.html.erb"
+				template "app/views/view_albums/show.html.erb", "app/views/view_#{parent_plural_name}/show.html.erb"		
+			end
+
+			def css
+				template "stylesheets/dust_album.css", "public/stylesheets/dust_#{parent_singular_name}.css"  
+		    template "stylesheets/uploadify.css", "public/stylesheets/#{parent_singular_name}_uploadify.css"
+				template "stylesheets/dust_album_app.css", "public/stylesheets/dust_#{parent_singular_name}_app.css"
+			end
 
-				copy_file "dust_album.css", "public/stylesheets/dust_album.css"
-				copy_file "uploadify.css", "public/stylesheets/uploadify.css"
+			def javascript
+				template "javascripts/dragsort.js", "public/javascripts/dragsort.js"
+				template "javascripts/dust_album.js", "public/javascripts/dust_#{parent_singular_name}.js"
 
-		    directory "uploadify", "public/javascripts/uploadify"
-		  end
+				src_dir = File.join(source_root, 'javascripts', 'uploadify')
+		    dst_dir = File.join(RAILS_ROOT, 'public', 'javascripts')
 
+		    FileUtils.cp_r src_dir, dst_dir, :verbose => true
+			end
+
+			def images
+				template "images/cancel.png", "public/images/cancel.png"
+				template "images/browse.png", "public/images/browse.png"
+				template "images/upload.png", "public/images/upload.png"
+				template "images/save_position.png", "public/images/save_position.png"		
+			end
+
+			def initializers
+				template "initializers/flash_session_cookie_middleware.rb", "config/initializers/flash_session_cookie_middleware.rb"
+				template "initializers/session_store_middleware.rb", "config/initializers/session_store_middleware.rb"
+			end
+			
 			def rake_migrations
 				rake("db:migrate")
 			end
+			
+			#NAMING METHODS
+			def parent
+				parent_model_name.downcase.singularize
+			end
+			
+			def child
+				child_model_name.downcase.singularize
+			end
+			
+			def parent_singular_name
+				parent.underscore
+			end
+
+			def child_singular_name
+		    child.underscore
+		  end
+
+		  def parent_plural_name
+		    parent.underscore.pluralize
+		  end
+
+			def child_plural_name
+		    child.underscore.pluralize
+		  end
+
+		  def parent_class_name
+		    parent.camelize
+		  end
+
+			def child_class_name
+		    child.camelize
+		  end
+
+			def parent_plural_class_name
+		    parent_plural_name.camelize
+		  end
+
+		  def child_plural_class_name
+		    child_plural_name.camelize
+		  end
+			
+			# FIXME: Should be proxied to ActiveRecord::Generators::Base
+      # Implement the required interface for Rails::Generators::Migration.
+      def self.next_migration_number(dirname) #:nodoc:
+        if ActiveRecord::Base.timestamped_migrations
+          Time.now.utc.strftime("%Y%m%d%H%M%S")
+        else
+          "%.3d" % (current_migration_number(dirname) + 1)
+        end
+      end
 		end
 	end
 end

data/lib/generators/dust/albums/templates/app/controllers/albums_controller.rb

@@ -1,50 +1,56 @@
-class AlbumsController < ApplicationController
+class <%=parent_plural_class_name%>Controller < ApplicationController
 	
 	filter_resource_access
 	
 	layout 'cms'
 	
   def index
-    @albums = Album.page(params[:search], params[:page])
+    @<%=parent_plural_name%> = <%=parent_class_name%>.page(params[:search], params[:page])
   end
   
   def show
-    @album = Album.find(params[:id], :include => :photos)
-		@new_photo =	Photo.new(:album_id => @album.id)
+    @<%=parent_singular_name%> = <%=parent_class_name%>.find(params[:id], :include => :<%=child_plural_name%>)
+		@new_<%=child_singular_name%> =	<%=child_class_name%>.new(:<%=parent_singular_name%>_id => @<%=parent_singular_name%>.id)
   end
   
   def new
-    @album = Album.new
+    @<%=parent_singular_name%> = <%=parent_class_name%>.new
   end
   
   def create
-    @album = Album.new(params[:album])
-    if @album.save
-      flash[:notice] = "Successfully created album."
-      redirect_to @album
+    @<%=parent_singular_name%> = <%=parent_class_name%>.new(params[:<%=parent_singular_name%>])
+    if @<%=parent_singular_name%>.save
+      flash[:notice] = "Successfully created <%=parent_singular_name%>."
+      redirect_to @<%=parent_singular_name%>
     else
       render :action => 'new'
     end
   end
   
   def edit
-    @album = Album.find(params[:id])
+    @<%=parent_singular_name%> = <%=parent_class_name%>.find(params[:id])
   end
   
   def update
-    @album = Album.find(params[:id])
-    if @album.update_attributes(params[:album])
-      flash[:notice] = "Successfully updated album."
-      redirect_to @album
+    @<%=parent_singular_name%> = <%=parent_class_name%>.find(params[:id])
+    if @<%=parent_singular_name%>.update_attributes(params[:<%=parent_singular_name%>])
+      flash[:notice] = "Successfully updated <%=parent_singular_name%>."
+      redirect_to view_<%=parent_singular_name%>_path(@<%=parent_singular_name%>.filename)
     else
       render :action => 'edit'
     end
   end
   
   def destroy
-    @album = Album.find(params[:id])
-    @album.destroy
-    flash[:notice] = "Successfully destroyed album."
-    redirect_to albums_url
+    @<%=parent_singular_name%> = <%=parent_class_name%>.find(params[:id])
+    @<%=parent_singular_name%>.destroy
+    flash[:notice] = "Successfully destroyed <%=parent_singular_name%>."
+    redirect_to <%=parent_plural_name%>_url
   end
+
+	def manage
+		@<%=parent_singular_name%> = <%=parent_class_name%>.find(params[:id], :include => :<%=child_plural_name%>)
+		@<%=child_plural_name%> = @<%=parent_singular_name%>.<%=child_plural_name%>
+		render :layout => false
+	end
 end

data/lib/generators/dust/albums/templates/app/controllers/photos_controller.rb

@@ -1,4 +1,4 @@
-class PhotosController < ApplicationController
+class <%=child_plural_class_name%>Controller < ApplicationController
 	
 	filter_access_to :index, :new, :create, :destroy
 	filter_access_to :edit, :update, :attribute_check => true
@@ -6,27 +6,28 @@ class PhotosController < ApplicationController
 	layout 'cms'
 	
   def index
-    @photos = Photo.page(params[:search], params[:page])
-	 	@photo_albums = @photos.group_by { |photo| photo.album.title }
+    @<%=child_plural_name%> = <%=child_class_name%>.page(params[:search], params[:page])
+	 	@<%=child_singular_name%>_<%=parent_plural_name%> = @<%=child_plural_name%>.group_by { |<%=child_singular_name%>| <%=child_singular_name%>.<%=parent_singular_name%>.title }
   end
   
   def show
-    @photo = Photo.find(params[:id], :include => :album)
-		@total_uploads = Photo.find(:all, :conditions => { :album_id => @photo.album.id})
+    @<%=child_singular_name%> = <%=child_class_name%>.find(params[:id], :include => :<%=parent_singular_name%>)
+		@total_uploads = <%=child_class_name%>.find(:all, :conditions => { :<%=parent_singular_name%>_id => @<%=child_singular_name%>.<%=parent_singular_name%>.id})
+		@<%=parent_singular_name%> = @<%=child_singular_name%>.<%=parent_singular_name%>
   end
   
   def new
-    @photo = Photo.new
+    @<%=child_singular_name%> = <%=child_class_name%>.new
   end
   
   def create
 		newparams = coerce(params)
-    @photo = Photo.new(newparams[:photo])
-    if @photo.save
-      flash[:notice] = "Successfully created photo."
+    @<%=child_singular_name%> = <%=child_class_name%>.new(newparams[:<%=child_singular_name%>])
+    if @<%=child_singular_name%>.save
+      flash[:notice] = "Successfully created <%=child_singular_name%>."
       respond_to do |format|
-        format.html { redirect_to @photo.album }
-        format.json { render :json => { :result => 'success', :photo => photo_url(@photo) } }
+        format.html { redirect_to @<%=child_singular_name%>.<%=parent_singular_name%> }
+        format.json { render :json => { :result => 'success', :<%=child_singular_name%> => <%=child_singular_name%>_url(@<%=child_singular_name%>) } }
       end
     else
       render :action => 'new'
@@ -34,55 +35,51 @@ class PhotosController < ApplicationController
   end
   
   def edit
-		if params[:edit] == 'photo'
+		if params[:edit] == '<%=child_singular_name%>'
 			render :layout => false
-			@photo = Photo.find(params[:id])
+			@<%=child_singular_name%> = <%=child_class_name%>.find(params[:id])
 		else
-			@photo = Photo.find(params[:id])
+			@<%=child_singular_name%> = <%=child_class_name%>.find(params[:id])
 		end
   end
   
   def update
-    @photo = Photo.find(params[:id])
-    if @photo.update_attributes(params[:photo])
-      flash[:notice] = "Successfully updated photo."
-      respond_to do |format|
-        format.html { redirect_to album_url(@photo.album)}
-        format.js { render :json => { :result => 'success', :album => album_url(@photo.album) } }
-      end
+    @<%=child_singular_name%> = <%=child_class_name%>.find(params[:id])
+    if @<%=child_singular_name%>.update_attributes(params[:<%=child_singular_name%>])
+      flash[:notice] = "Successfully updated <%=child_singular_name%>."
+      redirect_to <%=parent_singular_name%>_url(@<%=child_singular_name%>.<%=parent_singular_name%>)
     else
       render :action => 'edit'
     end
   end
   
-  def destroy
+ 	def destroy
     if request.post?
-   		if params[:photo_ids]
-				params[:photo_ids].each do |photo|
-	      	@photo = Photo.find photo
-	      	@photo.destroy
+   		if params[:<%=child_singular_name%>_ids]
+				params[:<%=child_singular_name%>_ids].each do |<%=child_singular_name%>|
+	      	@<%=child_singular_name%> = <%=child_class_name%>.find <%=child_singular_name%>
+	      	@<%=child_singular_name%>.destroy
 				end 
-	    	flash[:notice] = "Photos Successfully deleted!"
+	    	flash[:notice] = "<%=child_plural_class_name%> Successfully deleted!"
 	   	end
-	   	respond_to do |format|
-		   	if Photo.all.blank?
-					format.html { redirect_to(albums_url) }
-				else
-		   		format.html { redirect_to(:back) }
-				end
-		  end
+			redirect_to(<%=parent_singular_name%>_path(@<%=child_singular_name%>.<%=parent_singular_name%>))
 		end
   end
 
+	def array
+		menu_sort(params[:ul])
+    flash[:notice] = "Successfully Sorted <%=child_plural_class_name%>."
+	end
+
 	private
   def coerce(params)
-    if params[:photo].nil?
+    if params[:<%=child_singular_name%>].nil?
       h = Hash.new
-      h[:photo] = Hash.new
-      h[:photo][:album_id] = params[:album_id]
-			h[:photo][:title] = params[:title]
-      h[:photo][:file] = params[:Filedata]
-      h[:photo][:file].content_type = MIME::Types.type_for(h[:photo][:file].original_filename).to_s
+      h[:<%=child_singular_name%>] = Hash.new
+      h[:<%=child_singular_name%>][:<%=parent_singular_name%>_id] = params[:<%=parent_singular_name%>_id]
+			h[:<%=child_singular_name%>][:title] = params[:title]
+      h[:<%=child_singular_name%>][:file] = params[:Filedata]
+      h[:<%=child_singular_name%>][:file].content_type = MIME::Types.type_for(h[:<%=child_singular_name%>][:file].original_filename).to_s
       h
     else
       params

data/lib/generators/dust/albums/templates/app/controllers/view_albums_controller.rb

@@ -1,17 +1,16 @@
-class ViewAlbumsController < ApplicationController
-	unloadable
+class View<%=parent_plural_class_name%>Controller < ApplicationController
 	
   def index
-		@albums = Album.page(params[:search], params[:page])
+		@<%=parent_plural_name%> = <%=parent_class_name%>.view(params[:page])
   end
 
   def show
-		if Album.find_by_filename(params[:filename]) == nil
-			@album = Album.find(:first)
+		if <%=parent_class_name%>.find_by_filename(params[:filename]) == nil
+			@<%=parent_singular_name%> = <%=parent_class_name%>.find(:first)
 			render :file => "#{RAILS_ROOT}/public/404.html", :layout => false, :status => 404
 		else
-			@album = Album.find_by_filename(params[:filename])
-			@photos = @album.photos.page(params[:search], params[:page])
+			@<%=parent_singular_name%> = <%=parent_class_name%>.find_by_filename(params[:filename])
+			@<%=child_plural_name%> = @<%=parent_singular_name%>.<%=child_plural_name%>.<%=parent_singular_name%>_page(params[:page])
 		end
   end
 

data/lib/generators/dust/albums/templates/app/helpers/albums_helper.rb

@@ -1,2 +1,2 @@
-module AlbumsHelper
+module <%=parent_plural_class_name%>Helper
 end

data/lib/generators/dust/albums/templates/app/helpers/photos_helper.rb

@@ -1,2 +1,2 @@
-module PhotosHelper
+module <%=child_plural_class_name%>Helper
 end

data/lib/generators/dust/albums/templates/app/helpers/view_albums_helper.rb

@@ -1,2 +1,2 @@
-module ViewAlbumsHelper
+module View<%=parent_plural_class_name%>Helper
 end

data/lib/generators/dust/albums/templates/app/models/album.rb

@@ -1,6 +1,6 @@
-class Album < ActiveRecord::Base
+class <%=parent_class_name%> < ActiveRecord::Base
 	
-	has_many :photos, :dependent => :destroy
+	has_many :<%=child_plural_name%>, :dependent => :destroy
 	
 	validates_presence_of :title
 	validates_presence_of :filename
@@ -10,6 +10,10 @@ class Album < ActiveRecord::Base
 		with_permissions_to(:manage).search(search).order("title").paginate(:per_page => 10, :page => page)
   end
 
+	def self.view(page)
+		order("position").paginate(:per_page => 10, :page => page)
+	end
+
 	def self.search(search)
 	  if search
 	    where("title LIKE ?", "%#{search}%")
@@ -30,7 +34,7 @@ class Album < ActiveRecord::Base
 		else
 		@menu_item.update_attributes(	
 				:title => self.title,
-				:url => "/photos-for/#{self.filename}",
+				:url => "/<%=child_plural_name%>-for/#{self.filename}",
 				:active => self.active
 		)
 		end
@@ -39,7 +43,7 @@ class Album < ActiveRecord::Base
 	def create_menu_item
 		@menu_item = self.build_menu_item(
 			:title => self.title,
-			:url => "/photos-for/#{self.filename}",
+			:url => "/<%=child_plural_name%>-for/#{self.filename}",
 			:active => self.active
 		)
 		@menu_item.save