dust-generators 0.1.9 → 0.2.0

data/lib/dust/version.rb

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

data/rails_generators/dust_albums/dust_albums_generator.rb

@@ -1,5 +1,13 @@
 class DustAlbumsGenerator < Rails::Generator::Base
   
+	attr_accessor :parent, :child
+
+	def initialize(runtime_args, runtime_options = {})
+    super
+    @parent = @args.first || 'album'
+		@child = @args.last || 'photo'
+  end
+
   def manifest
 		record do |m|
 			app(m)
@@ -15,40 +23,57 @@ class DustAlbumsGenerator < Rails::Generator::Base
   end
 
 	def app(m)
-		m.template "app/controllers/albums_controller.rb", "app/controllers/albums_controller.rb"
-		m.template "app/controllers/photos_controller.rb", "app/controllers/photos_controller.rb"
-		m.template "app/controllers/view_albums_controller.rb", "app/controllers/view_albums_controller.rb"
+		m.template "app/controllers/albums_controller.rb", "app/controllers/#{parent_plural_name}_controller.rb"
+		m.template "app/controllers/photos_controller.rb", "app/controllers/#{child_plural_name}_controller.rb"
+		m.template "app/controllers/view_albums_controller.rb", "app/controllers/view_#{parent_plural_name}_controller.rb"
 
-		m.template "app/helpers/albums_helper.rb", "app/helpers/albums_helper.rb"
-		m.template "app/helpers/photos_helper.rb", "app/helpers/photos_helper.rb"
-		m.template "app/helpers/view_albums_helper.rb", "app/helpers/view_albums_helper.rb"
+		m.template "app/helpers/albums_helper.rb", "app/helpers/#{parent_plural_name}_helper.rb"
+		m.template "app/helpers/photos_helper.rb", "app/helpers/#{child_plural_name}_helper.rb"
+		m.template "app/helpers/view_albums_helper.rb", "app/helpers/view_#{parent_plural_name}_helper.rb"
 
-		m.template "app/models/album.rb", "app/models/album.rb"
-		m.template "app/models/photo.rb", "app/models/photo.rb"
+		m.template "app/models/album.rb", "app/models/#{parent_singular_name}.rb"
+		m.template "app/models/photo.rb", "app/models/#{child_singular_name}.rb"
 		
-		photos_dir = File.join(@source_root, 'app', 'views', 'photos')
-		albums_dir = File.join(@source_root, 'app', 'views', 'albums')
-		view_albums_dir = File.join(@source_root, 'app', 'views', 'view_albums')
-    dst_dir = File.join(RAILS_ROOT, 'app', 'views')
-
-    FileUtils.cp_r photos_dir, dst_dir, :verbose => true
-    FileUtils.cp_r albums_dir, dst_dir, :verbose => true
-    FileUtils.cp_r view_albums_dir, dst_dir, :verbose => true
+		m.directory "app/views/#{parent_plural_name}"
+		m.template "app/views/albums/_form.html.erb", "app/views/#{parent_plural_name}/_form.html.erb"
+		m.template "app/views/albums/_search.html.erb", "app/views/#{parent_plural_name}/_search.html.erb"
+		m.template "app/views/albums/_upload_script.html.erb", "app/views/#{parent_plural_name}/_upload_script.html.erb"
+		m.template "app/views/albums/edit.html.erb", "app/views/#{parent_plural_name}/edit.html.erb"
+		m.template "app/views/albums/index.html.erb", "app/views/#{parent_plural_name}/index.html.erb"
+		m.template "app/views/albums/manage.html.erb", "app/views/#{parent_plural_name}/manage.html.erb"
+		m.template "app/views/albums/new.html.erb", "app/views/#{parent_plural_name}/new.html.erb"
+		m.template "app/views/albums/show.html.erb", "app/views/#{parent_plural_name}/show.html.erb"
+		m.template "app/views/albums/show.js.erb", "app/views/#{parent_plural_name}/show.js.erb"
+
+		m.directory "app/views/#{child_plural_name}"		
+		m.template "app/views/photos/_form.html.erb", "app/views/#{child_plural_name}/_form.html.erb"
+		m.template "app/views/photos/_search.html.erb", "app/views/#{child_plural_name}/_search.html.erb"
+		m.template "app/views/photos/_photo.html.erb", "app/views/#{child_plural_name}/_#{child_singular_name}.html.erb"
+		m.template "app/views/photos/array.js.erb", "app/views/#{child_plural_name}/array.js.erb"
+		m.template "app/views/photos/edit.html.erb", "app/views/#{child_plural_name}/edit.html.erb"
+		m.template "app/views/photos/index.html.erb", "app/views/#{child_plural_name}/index.html.erb"
+		m.template "app/views/photos/new.html.erb", "app/views/#{child_plural_name}/new.html.erb"
+		m.template "app/views/photos/show.html.erb", "app/views/#{child_plural_name}/show.html.erb"
+		m.template "app/views/photos/show.js.erb", "app/views/#{child_plural_name}/show.js.erb"
+		
+		m.directory "app/views/view_#{parent_plural_name}"
+		m.template "app/views/view_albums/index.html.erb", "app/views/view_#{parent_plural_name}/index.html.erb"
+		m.template "app/views/view_albums/show.html.erb", "app/views/view_#{parent_plural_name}/show.html.erb"		
 	end
 	
 	def migrations(m)
-		m.migration_template "migration/albums_migration.rb", "db/migrate", :migration_file_name => "create_albums"
+		m.migration_template "migration/albums_migration.rb", "db/migrate", :migration_file_name => "create_#{parent_plural_name}"
 	end
 	
 	def css(m)
-		m.template "stylesheets/dust_album.css", "public/stylesheets/dust_album.css"  
+		m.template "stylesheets/dust_album.css", "public/stylesheets/dust_#{parent_singular_name}.css"  
     m.template "stylesheets/uploadify.css", "public/stylesheets/uploadify.css"
-		m.template "stylesheets/dust_album_app.css", "public/stylesheets/dust_album_app.css"
+		m.template "stylesheets/dust_album_app.css", "public/stylesheets/dust_#{parent_singular_name}_app.css"
 	end
 	
 	def javascript(m)
 		m.template "javascript/dragsort.js", "public/javascripts/dragsort.js"
-		m.template "javascript/dust_album.js", "public/javascripts/dust_album.js"
+		m.template "javascript/dust_album.js", "public/javascripts/dust_#{parent_singular_name}.js"
 		
 		src_dir = File.join(@source_root, 'javascript', 'uploadify')
     dst_dir = File.join(RAILS_ROOT, 'public', 'javascripts')
@@ -69,23 +94,64 @@ class DustAlbumsGenerator < Rails::Generator::Base
 	end
 	
 	def routes(m)
-		m.route :name => 'view_albums',
-		        			:url => 'all/albums',
-		      				:controller => 'view_albums',
+		m.route :name => "view_#{parent_plural_name}",
+		        			:url => "all/#{parent_plural_name}",
+		      				:controller => "view_#{parent_plural_name}",
 		              :action => 'index'
-		m.route :name => 'view_album',
-		        			:url => 'photos-for/:filename',
-		              :controller => 'view_albums',
+		m.route :name => "view_#{parent_singular_name}",
+		        			:url => "#{child_plural_name}-for/:filename",
+		              :controller => "view_#{parent_plural_name}",
 		              :action => 'show'
-		m.route :name => 'manage_photos',
-									:url => 'manage-photos/:id',
-		              :controller => 'albums',
+		m.route :name => "manage_#{child_plural_name}",
+									:url => "manage-#{child_plural_name}/:id",
+		              :controller => "#{parent_plural_name}",
 		              :action => 'manage'
 		
-		m.route_resources 'photos'
-		m.route_resources 'albums'
+		m.route_resources "#{child_plural_name}"
+		m.route_resources "#{parent_plural_name}"
+	end
+  
+	#NAMING METHODS
+	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
+	
+  def banner
+    <<-EOS
+Creates two albums and photos with any given naming convention.
+
+USAGE: #{$0} #{spec.name} parent_name (i.e. albums) child_name (i.e. photos) 
+EOS
+  end
+
 end
 
 module Rails
@@ -101,7 +167,7 @@ module Rails
 				# Here's a readable version of the long string used above in route_code;
 				# but it should be kept on one line to avoid inserting extra whitespace
 				# into routes.rb when the generator is run:
-				# "map.#{route_options[:name]} '#{route_options[:name]}',
+				# "map.#{route_options[:name]} '#{route_options[:url]}',
 				#     :controller => '#{route_options[:controller]}',
 				#     :action => '#{route_options[:action]}'"
 

data/rails_generators/dust_albums/templates/app/controllers/albums_controller.rb

@@ -1,56 +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 view_album_path(@album.filename)
+    @<%=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
-		@album = Album.find(params[:id], :include => :photos)
-		@photos = @album.photos
+		@<%=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/rails_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,28 +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})
-		@album = @photo.album
+    @<%=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'
@@ -35,19 +35,19 @@ 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."
-      redirect_to album_url(@photo.album)
+    @<%=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
@@ -55,31 +55,31 @@ class PhotosController < ApplicationController
   
   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
-			redirect_to(album_path(@photo.album))
+			redirect_to(<%=parent_singular_name%>_path(@<%=child_singular_name%>.<%=parent_singular_name%>))
 		end
   end
 
 	def array
 		menu_sort(params[:ul])
-    flash[:notice] = "Successfully Sorted Photos."
+    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/rails_generators/dust_albums/templates/app/controllers/view_albums_controller.rb

@@ -1,16 +1,16 @@
-class ViewAlbumsController < ApplicationController
+class View<%=parent_plural_class_name%>Controller < ApplicationController
 
   def index
-		@albums = Album.page(params[:search], params[:page])
+		@<%=parent_plural_name%> = <%=parent_class_name%>.page(params[:search], 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.album_page(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/rails_generators/dust_albums/templates/app/helpers/albums_helper.rb

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

data/rails_generators/dust_albums/templates/app/helpers/photos_helper.rb

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

data/rails_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/rails_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
@@ -24,7 +24,7 @@ class Album < ActiveRecord::Base
 		else
 		@menu_item.update_attributes(	
 				:title => self.nav,
-				:url => "/photos-for/#{self.filename}",
+				:url => "/<%=child_plural_name%>-for/#{self.filename}",
 				:active => self.active
 		)
 		end
@@ -33,7 +33,7 @@ class Album < ActiveRecord::Base
 	def create_menu_item
 		@menu_item = self.build_menu_item(
 			:title => self.nav,
-			:url => "/photos-for/#{self.filename}",
+			:url => "/<%=child_plural_name%>-for/#{self.filename}",
 			:active => self.active
 		)
 		@menu_item.save

data/rails_generators/dust_albums/templates/app/models/photo.rb

@@ -1,10 +1,10 @@
-class Photo < ActiveRecord::Base
+class <%=child_class_name%> < ActiveRecord::Base
 	
 	acts_as_nested_set
 	
-	belongs_to :album
+	belongs_to :<%=parent_singular_name%>
 	has_attached_file :file, :styles => {:large => '800>', :medium => "300x300>", :thumb => "100x100#" }
-	validates_presence_of :album
+	validates_presence_of :<%=parent_singular_name%>
 	
 	def self.page(search, page)
 			paginate :per_page => 24, :page => page,
@@ -12,7 +12,7 @@ class Photo < ActiveRecord::Base
                :conditions => ["title LIKE ?", "%#{search}%"]
   end
 
-	def self.album_page(page)
+	def self.<%=parent_singular_name%>_page(page)
 		roots.paginate :per_page => 24, :page => page
 	end
 end