comfy_gallery 0.1.0 → 0.1.1

data/README.md

@@ -11,7 +11,7 @@ Add gem definition to your Gemfile:
 Then from the Rails project's root run:
     
     bundle install
-    rails generate comfy_gallery
+    rails generate comfy:gallery
     rake db:migrate
 
 ## Usage

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/app/assets/stylesheets/comfy_gallery/jquery.jcrop.css

@@ -4,7 +4,7 @@
 .jcrop-vline, .jcrop-hline {
   font-size: 0px;
   position: absolute;
-  background: white url('/assets/sofa_gallery/jcrop.gif') top left repeat;
+  background: white url('/assets/comfy_gallery/jcrop.gif') top left repeat;
 }
 .jcrop-vline { height: 100%; width: 1px !important; }
 .jcrop-hline { width: 100%; height: 1px !important; }

data/app/controllers/admin/gallery/photos_controller.rb

@@ -24,13 +24,7 @@ class Admin::Gallery::PhotosController < Admin::Gallery::BaseController
       )
       title = title + " #{i + 1}" if file_params[:title] == title && file_array.size > 1
       
-      slug = (file_params[:slug].blank? && file_params[:image] ? 
-        file_params[:image].original_filename.parameterize : 
-        file_params[:slug]
-      )
-      slug = (slug + "-#{i + 1}") if file_params[:slug] == slug && file_array.size > 1
-      
-      @photo = Gallery::Photo.new({:gallery => @gallery}.merge(file_params.merge(:title => title, :slug => slug) || {}))
+      @photo = Gallery::Photo.new({:gallery => @gallery}.merge(file_params.merge(:title => title) || {}))
       @photo.save!
     end
     

data/app/models/gallery/gallery.rb

@@ -11,7 +11,7 @@ class Gallery::Gallery < ActiveRecord::Base
   validates :title,
     :presence => true
     
-  validates :slug,
+  validates :identifier,
     :presence   => true,
     :uniqueness => true,
     :format     => { :with =>  /^\w[a-z0-9_-]*$/i }

data/app/models/gallery/photo.rb

@@ -30,10 +30,6 @@ class Gallery::Photo < ActiveRecord::Base
   # -- Validations ----------------------------------------------------------
   validates :gallery_id,
     :presence => true
-  validates :slug,
-    :presence   => true,
-    :uniqueness => true,
-    :format     => { :with =>  /^\w[a-z0-9_-]*$/i }
   validates_attachment_presence :image,
     :message      => 'There was no file uploaded!'
   validates_attachment_content_type :image,

data/app/views/admin/gallery/_html_head.html.erb

@@ -1 +1 @@
-<%= stylesheet_link_tag 'sofa_gallery/admin' %>
+<%= stylesheet_link_tag 'comfy_gallery/admin' %>

data/app/views/admin/gallery/_navigation.html.erb

@@ -2,4 +2,4 @@
   <%= stylesheet_link_tag "sofa_gallery/sofa_gallery_admin.css" %>
 <% end %>
 
-<li><%= active_link_to 'Galleries', sofa_gallery_admin_galleries_path %></li>
+<li><%= active_link_to 'Galleries', admin_gallery_galleries_path %></li>

data/app/views/admin/gallery/galleries/_form.html.erb

@@ -1,5 +1,5 @@
 <%= form.text_field :title, :id => (@gallery.new_record?? 'slugify' : nil)%>
-<%= form.text_field :slug, :id => 'slug' %>
+<%= form.text_field :identifier, :id => 'slug' %>
 <%= form.text_area  :description%>
 
 <%= form.text_field :full_width %>
@@ -11,8 +11,4 @@
 
 <%= render :partial => 'cms_admin/categories/form', :object => form if defined?(ComfortableMexicanSofa) %>
 
-<%= form.simple_field nil, nil, :class => 'submit_element' do %>
-  <%= link_to "Cancel", admin_gallery_galleries_path, :id => 'cancel_btn' %>
-  <span>or</span>
-  <%= form.submit "Save", :disable_builder => true%>
-<% end %>
+<%= form.submit 'Save' %>

data/app/views/admin/gallery/galleries/index.html.erb

@@ -28,7 +28,7 @@
         <%= link_to gallery_path(gallery), gallery_path(gallery), :target => '_blank' %>
       </td>
       <td class='embed'>
-        {{ cms:helper:render_gallery:<%= gallery.slug  %> }}
+        {{ cms:helper:render_gallery:<%= gallery.identifier  %> }}
       </td>
       <td class='action_links'>
         <%= link_to 'Show Photos', admin_gallery_gallery_photos_path(gallery) %>

data/app/views/admin/gallery/photos/_form.html.erb

@@ -1,5 +1,4 @@
-<%= form.text_field :title, :id => (@photo.new_record?? 'slugify' : nil) %>
-<%= form.text_field :slug, :id => 'slug' %>
+<%= form.text_field :title %>
 <% if @photo.image? && @photo.id.present? %>
   <%= form.simple_field 'Current Image' do %>
     <%= image_tag(@photo.image.url(:thumb)) %>
@@ -9,8 +8,5 @@
 <% end %>
 <%= form.file_field :image, :multiple => true %>
 <%= form.text_area :description %>
-<%= form.simple_field nil, nil, :class => 'submit_element' do %>
-  <%= link_to "Cancel", admin_gallery_gallery_photos_path(@photo.gallery), :id => 'cancel_btn' %>
-  <span>or</span>
-  <%= form.submit "Save", :disable_builder => true%>
-<% end %>
+
+<%= form.submit 'Save' %>

data/app/views/admin/gallery/photos/index.html.erb

@@ -11,7 +11,6 @@
         </td>
         <td class='main'>
           <div class='title'><%= photo.title %></div>
-          <div class='sublabel'><%= photo.slug %></div>
         </td>
         <td class='action_links'>
           <%= link_to 'Crop', crop_admin_gallery_gallery_photo_path(@gallery, photo) if photo.force_aspect? %>

data/comfy_gallery.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "comfy_gallery"
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Oleg Khabarov", "Stephen McLeod", "The Working Group Inc."]
-  s.date = "2012-01-20"
+  s.date = "2012-02-10"
   s.description = ""
   s.email = "oleg@twg.ca"
   s.extra_rdoc_files = [
@@ -24,58 +24,58 @@ Gem::Specification.new do |s|
     "README.md",
     "Rakefile",
     "VERSION",
-    "app/assets/images/sofa_gallery/jcrop.gif",
-    "app/assets/images/sofa_gallery/orbit/bullets.jpg",
-    "app/assets/images/sofa_gallery/orbit/left-arrow.png",
-    "app/assets/images/sofa_gallery/orbit/loading.gif",
-    "app/assets/images/sofa_gallery/orbit/mask-black.png",
-    "app/assets/images/sofa_gallery/orbit/pause-black.png",
-    "app/assets/images/sofa_gallery/orbit/right-arrow.png",
-    "app/assets/images/sofa_gallery/orbit/rotator-black.png",
-    "app/assets/images/sofa_gallery/orbit/timer-black.png",
-    "app/assets/images/sofa_gallery/prettyPhoto/dark_rounded/btnNext.png",
-    "app/assets/images/sofa_gallery/prettyPhoto/dark_rounded/btnPrevious.png",
-    "app/assets/images/sofa_gallery/prettyPhoto/dark_rounded/contentPattern.png",
-    "app/assets/images/sofa_gallery/prettyPhoto/dark_rounded/default_thumbnail.gif",
-    "app/assets/images/sofa_gallery/prettyPhoto/dark_rounded/loader.gif",
-    "app/assets/images/sofa_gallery/prettyPhoto/dark_rounded/sprite.png",
-    "app/assets/images/sofa_gallery/prettyPhoto/dark_square/btnNext.png",
-    "app/assets/images/sofa_gallery/prettyPhoto/dark_square/btnPrevious.png",
-    "app/assets/images/sofa_gallery/prettyPhoto/dark_square/contentPattern.png",
-    "app/assets/images/sofa_gallery/prettyPhoto/dark_square/default_thumbnail.gif",
-    "app/assets/images/sofa_gallery/prettyPhoto/dark_square/loader.gif",
-    "app/assets/images/sofa_gallery/prettyPhoto/dark_square/sprite.png",
-    "app/assets/images/sofa_gallery/prettyPhoto/default/default_thumb.png",
-    "app/assets/images/sofa_gallery/prettyPhoto/default/loader.gif",
-    "app/assets/images/sofa_gallery/prettyPhoto/default/sprite.png",
-    "app/assets/images/sofa_gallery/prettyPhoto/default/sprite_next.png",
-    "app/assets/images/sofa_gallery/prettyPhoto/default/sprite_prev.png",
-    "app/assets/images/sofa_gallery/prettyPhoto/default/sprite_x.png",
-    "app/assets/images/sofa_gallery/prettyPhoto/default/sprite_y.png",
-    "app/assets/images/sofa_gallery/prettyPhoto/facebook/btnNext.png",
-    "app/assets/images/sofa_gallery/prettyPhoto/facebook/btnPrevious.png",
-    "app/assets/images/sofa_gallery/prettyPhoto/facebook/contentPatternBottom.png",
-    "app/assets/images/sofa_gallery/prettyPhoto/facebook/contentPatternLeft.png",
-    "app/assets/images/sofa_gallery/prettyPhoto/facebook/contentPatternRight.png",
-    "app/assets/images/sofa_gallery/prettyPhoto/facebook/contentPatternTop.png",
-    "app/assets/images/sofa_gallery/prettyPhoto/facebook/default_thumbnail.gif",
-    "app/assets/images/sofa_gallery/prettyPhoto/facebook/loader.gif",
-    "app/assets/images/sofa_gallery/prettyPhoto/facebook/sprite.png",
-    "app/assets/images/sofa_gallery/prettyPhoto/light_rounded/btnNext.png",
-    "app/assets/images/sofa_gallery/prettyPhoto/light_rounded/btnPrevious.png",
-    "app/assets/images/sofa_gallery/prettyPhoto/light_rounded/default_thumbnail.gif",
-    "app/assets/images/sofa_gallery/prettyPhoto/light_rounded/loader.gif",
-    "app/assets/images/sofa_gallery/prettyPhoto/light_rounded/sprite.png",
-    "app/assets/images/sofa_gallery/prettyPhoto/light_square/btnNext.png",
-    "app/assets/images/sofa_gallery/prettyPhoto/light_square/btnPrevious.png",
-    "app/assets/images/sofa_gallery/prettyPhoto/light_square/default_thumbnail.gif",
-    "app/assets/images/sofa_gallery/prettyPhoto/light_square/loader.gif",
-    "app/assets/images/sofa_gallery/prettyPhoto/light_square/sprite.png",
-    "app/assets/javascripts/sofa_gallery/admin.js",
-    "app/assets/javascripts/sofa_gallery/application.js",
-    "app/assets/javascripts/sofa_gallery/jquery.jcrop.js",
-    "app/assets/javascripts/sofa_gallery/jquery.orbit-1.2.3.min.js",
-    "app/assets/javascripts/sofa_gallery/thumbnails.js",
+    "app/assets/images/comfy_gallery/jcrop.gif",
+    "app/assets/images/comfy_gallery/orbit/bullets.jpg",
+    "app/assets/images/comfy_gallery/orbit/left-arrow.png",
+    "app/assets/images/comfy_gallery/orbit/loading.gif",
+    "app/assets/images/comfy_gallery/orbit/mask-black.png",
+    "app/assets/images/comfy_gallery/orbit/pause-black.png",
+    "app/assets/images/comfy_gallery/orbit/right-arrow.png",
+    "app/assets/images/comfy_gallery/orbit/rotator-black.png",
+    "app/assets/images/comfy_gallery/orbit/timer-black.png",
+    "app/assets/images/comfy_gallery/prettyPhoto/dark_rounded/btnNext.png",
+    "app/assets/images/comfy_gallery/prettyPhoto/dark_rounded/btnPrevious.png",
+    "app/assets/images/comfy_gallery/prettyPhoto/dark_rounded/contentPattern.png",
+    "app/assets/images/comfy_gallery/prettyPhoto/dark_rounded/default_thumbnail.gif",
+    "app/assets/images/comfy_gallery/prettyPhoto/dark_rounded/loader.gif",
+    "app/assets/images/comfy_gallery/prettyPhoto/dark_rounded/sprite.png",
+    "app/assets/images/comfy_gallery/prettyPhoto/dark_square/btnNext.png",
+    "app/assets/images/comfy_gallery/prettyPhoto/dark_square/btnPrevious.png",
+    "app/assets/images/comfy_gallery/prettyPhoto/dark_square/contentPattern.png",
+    "app/assets/images/comfy_gallery/prettyPhoto/dark_square/default_thumbnail.gif",
+    "app/assets/images/comfy_gallery/prettyPhoto/dark_square/loader.gif",
+    "app/assets/images/comfy_gallery/prettyPhoto/dark_square/sprite.png",
+    "app/assets/images/comfy_gallery/prettyPhoto/default/default_thumb.png",
+    "app/assets/images/comfy_gallery/prettyPhoto/default/loader.gif",
+    "app/assets/images/comfy_gallery/prettyPhoto/default/sprite.png",
+    "app/assets/images/comfy_gallery/prettyPhoto/default/sprite_next.png",
+    "app/assets/images/comfy_gallery/prettyPhoto/default/sprite_prev.png",
+    "app/assets/images/comfy_gallery/prettyPhoto/default/sprite_x.png",
+    "app/assets/images/comfy_gallery/prettyPhoto/default/sprite_y.png",
+    "app/assets/images/comfy_gallery/prettyPhoto/facebook/btnNext.png",
+    "app/assets/images/comfy_gallery/prettyPhoto/facebook/btnPrevious.png",
+    "app/assets/images/comfy_gallery/prettyPhoto/facebook/contentPatternBottom.png",
+    "app/assets/images/comfy_gallery/prettyPhoto/facebook/contentPatternLeft.png",
+    "app/assets/images/comfy_gallery/prettyPhoto/facebook/contentPatternRight.png",
+    "app/assets/images/comfy_gallery/prettyPhoto/facebook/contentPatternTop.png",
+    "app/assets/images/comfy_gallery/prettyPhoto/facebook/default_thumbnail.gif",
+    "app/assets/images/comfy_gallery/prettyPhoto/facebook/loader.gif",
+    "app/assets/images/comfy_gallery/prettyPhoto/facebook/sprite.png",
+    "app/assets/images/comfy_gallery/prettyPhoto/light_rounded/btnNext.png",
+    "app/assets/images/comfy_gallery/prettyPhoto/light_rounded/btnPrevious.png",
+    "app/assets/images/comfy_gallery/prettyPhoto/light_rounded/default_thumbnail.gif",
+    "app/assets/images/comfy_gallery/prettyPhoto/light_rounded/loader.gif",
+    "app/assets/images/comfy_gallery/prettyPhoto/light_rounded/sprite.png",
+    "app/assets/images/comfy_gallery/prettyPhoto/light_square/btnNext.png",
+    "app/assets/images/comfy_gallery/prettyPhoto/light_square/btnPrevious.png",
+    "app/assets/images/comfy_gallery/prettyPhoto/light_square/default_thumbnail.gif",
+    "app/assets/images/comfy_gallery/prettyPhoto/light_square/loader.gif",
+    "app/assets/images/comfy_gallery/prettyPhoto/light_square/sprite.png",
+    "app/assets/javascripts/comfy_gallery/admin.js",
+    "app/assets/javascripts/comfy_gallery/application.js",
+    "app/assets/javascripts/comfy_gallery/jquery.jcrop.js",
+    "app/assets/javascripts/comfy_gallery/jquery.orbit-1.2.3.min.js",
+    "app/assets/javascripts/comfy_gallery/thumbnails.js",
     "app/assets/stylesheets/comfy_gallery/admin.css",
     "app/assets/stylesheets/comfy_gallery/application.css",
     "app/assets/stylesheets/comfy_gallery/carousel.css.erb",
@@ -125,8 +125,8 @@ Gem::Specification.new do |s|
     "lib/comfy_gallery/configuration.rb",
     "lib/comfy_gallery/engine.rb",
     "lib/comfy_gallery/form_builder.rb",
-    "lib/generators/README",
-    "lib/generators/comfy_gallery_generator.rb",
+    "lib/generators/comfy/gallery/README",
+    "lib/generators/comfy/gallery/gallery_generator.rb",
     "lib/paperclip_processors/cropper.rb",
     "lib/tasks/comfy_gallery.rake",
     "script/rails",

data/db/migrate/01_create_comfy_gallery.rb

@@ -1,8 +1,8 @@
 class CreateComfyGallery < ActiveRecord::Migration
   def self.up 
     create_table :gallery_galleries do |t|
-      t.string  :title
-      t.string  :slug
+      t.string  :title,               :null => false
+      t.string  :identifier,          :null => false
       t.text    :description
       t.integer :full_width,          :null => false, :default => 640
       t.integer :full_height,         :null => false, :default => 480
@@ -12,12 +12,11 @@ class CreateComfyGallery < ActiveRecord::Migration
       t.boolean :force_ratio_thumb,   :null => false, :default => true
       t.timestamps
     end
-    add_index :gallery_galleries, :slug
+    add_index :gallery_galleries, :identifier, :uniq => true
     
     create_table :gallery_photos do |t|
-      t.integer :gallery_id
+      t.integer :gallery_id, :null => false
       t.string  :title
-      t.string  :slug
       t.text    :description
       t.string  :image_file_name
       t.string  :image_content_type
@@ -26,9 +25,8 @@ class CreateComfyGallery < ActiveRecord::Migration
       t.timestamps
     end
     add_index :gallery_photos, [ :gallery_id, :position ]
-    add_index :gallery_photos, :slug
   end
-
+  
   def self.down
     drop_table :gallery_photos
     drop_table :gallery_galleries

data/lib/generators/comfy/gallery/gallery_generator.rb

@@ -0,0 +1,37 @@
+module Comfy
+  module Generators
+    class GalleryGenerator < Rails::Generators::Base
+      
+      require 'rails/generators/active_record'
+      include Rails::Generators::Migration
+      include Thor::Actions
+      
+      source_root File.expand_path('../../../../..', __FILE__)
+      
+      def generate_migration
+        destination   = File.expand_path('db/migrate/01_create_comfy_gallery.rb', self.destination_root)
+        migration_dir = File.dirname(destination)
+        destination   = self.class.migration_exists?(migration_dir, 'create_comfy_gallery')
+        
+        if destination
+          puts "\e[0m\e[31mFound existing create_comfy_gallery.rb migration. Remove it if you want to regenerate.\e[0m"
+        else
+          migration_template 'db/migrate/01_create_comfy_gallery.rb', 'db/migrate/create_comfy_gallery.rb'
+        end
+      end
+      
+      def generate_initialization
+        copy_file 'config/initializers/comfy_gallery.rb', 'config/initializers/comfy_gallery.rb'
+      end
+      
+      def show_readme
+        readme 'lib/generators/comfy/gallery/README'
+      end
+      
+      def self.next_migration_number(dirname)
+        ActiveRecord::Generators::Base.next_migration_number(dirname)
+      end
+      
+    end
+  end
+end

data/test/fixtures/gallery/galleries.yml

@@ -1,6 +1,6 @@
 default:
   title: Default Gallery
-  slug: default-gallery
+  identifier: default-gallery
   description: Gallery Description
   full_width: 800
   full_height: 600

data/test/fixtures/gallery/photos.yml

@@ -1,7 +1,6 @@
 default:
   gallery: default
   title: Default Photo
-  slug: default-photo
   description: Photo Description
   position: 0
   image_file_name: default.jpg

data/test/functional/admin/gallery/galleries_controller_test.rb

@@ -20,7 +20,7 @@ class Admin::Gallery::GalleriesControllerTest < ActionController::TestCase
     assert_difference 'Gallery::Gallery.count', 1 do
       post :create, :gallery => {
         :title        => 'Test Gallery',
-        :slug         => 'test-gallery',
+        :identifier   => 'test-gallery',
         :description  => 'Test Description'
       }
     end

data/test/functional/admin/gallery/photos_controller_test.rb

@@ -29,7 +29,6 @@ class Admin::Gallery::PhotosControllerTest < ActionController::TestCase
     assert_difference 'Gallery::Photo.count' do
       post :create, :gallery_id => gallery_galleries(:default), :gallery_photo => {
         :title  => 'Test Photo',
-        :slug   => 'test-photo',
         :image  => [fixture_file_upload('/files/default.jpg', 'image/jpeg')]
       }
       assert_response :redirect
@@ -38,11 +37,10 @@ class Admin::Gallery::PhotosControllerTest < ActionController::TestCase
       
       photo = Gallery::Photo.last
       assert_equal 'Test Photo', photo.title
-      assert_equal 'test-photo', photo.slug
     end
   end
   
-  def test_create_without_title_or_slug
+  def test_create_without_title
     assert_difference 'Gallery::Photo.count', 2 do
       post :create, :gallery_id => gallery_galleries(:default), :gallery_photo => {
         :image  => [fixture_file_upload('/files/default.jpg', 'image/jpeg')]
@@ -53,16 +51,13 @@ class Admin::Gallery::PhotosControllerTest < ActionController::TestCase
       
       photo = Gallery::Photo.last
       assert_equal 'default.jpg', photo.title
-      assert_equal 'default-jpg', photo.slug
       
       post :create, :gallery_id => gallery_galleries(:default), :gallery_photo => {
-        :slug   => 'Testrrr',
         :image  => [fixture_file_upload('/files/default.jpg', 'image/jpeg')]
       }
       
       photo = Gallery::Photo.last
       assert_equal 'default.jpg', photo.title
-      assert_equal 'Testrrr', photo.slug
     end
   end
 
@@ -82,7 +77,6 @@ class Admin::Gallery::PhotosControllerTest < ActionController::TestCase
     assert_difference 'Gallery::Photo.count', 2 do
       post :create, :gallery_id => gallery_galleries(:default), :gallery_photo => {
         :title  => 'Test Photo',
-        :slug   => 'test-photo',
         :image  => [
           fixture_file_upload('/files/default.jpg', 'image/jpeg'),
           fixture_file_upload('/files/default.jpg', 'image/jpeg')
@@ -97,8 +91,6 @@ class Admin::Gallery::PhotosControllerTest < ActionController::TestCase
       assert_equal 'default.jpg', photo_b.image_file_name
       assert_equal 'Test Photo 1', photo_a.title
       assert_equal 'Test Photo 2', photo_b.title
-      assert_equal 'test-photo-1', photo_a.slug
-      assert_equal 'test-photo-2', photo_b.slug
       assert_equal 'Photo created', flash[:notice]
     end
   end
@@ -162,7 +154,6 @@ class Admin::Gallery::PhotosControllerTest < ActionController::TestCase
     photo_two = Gallery::Photo.create!(
       :gallery  => gallery,
       :title    => 'Test Photo',
-      :slug     => 'test-photo',
       :image    => fixture_file_upload('/files/default.jpg', 'image/jpeg')
     )
     assert_equal 0, photo_one.position
@@ -205,14 +196,13 @@ class Admin::Gallery::PhotosControllerTest < ActionController::TestCase
   
   def test_crop_thumbnail_and_full
     gallery = Gallery::Gallery.create!(
-      :title            => "Title",
-      :slug             => "title",
+      :title            => 'test',
+      :identifier       => 'test',
       :force_ratio_full => true
     )
     photo = Gallery::Photo.create!(
       :gallery  => gallery,
       :title    => 'Test Photo',
-      :slug     => 'test-photo',
       :image    => fixture_file_upload('/files/default.jpg', 'image/jpeg')
     )
     put :update, :gallery_id => gallery, :id => photo, :photo => {

data/test/unit/gallery_test.rb

@@ -11,19 +11,19 @@ class GalleryTest < ActiveSupport::TestCase
   def test_validations
     gallery = Gallery::Gallery.new
     assert gallery.invalid?
-    assert_has_errors_on gallery, [:title, :slug]
+    assert_has_errors_on gallery, [:title, :identifier]
   end
   
   def test_creation
     assert_difference 'Gallery::Gallery.count' do
       Gallery::Gallery.create!(
-        :title  => 'Test Gallery',
-        :slug   => 'test-gallery'
+        :title      => 'Test Gallery',
+        :identifier => 'test-gallery'
       )
     end
   end
   
-  def test_destoy
+  def test_destroy
     gallery = gallery_galleries(:default)
     assert_difference ['Gallery::Gallery.count', 'Gallery::Photo.count'], -1 do
       gallery.destroy

data/test/unit/photo_test.rb

@@ -13,7 +13,6 @@ class PhotoTest < ActiveSupport::TestCase
     assert photo.invalid?
     assert_has_errors_on photo, {
       :gallery_id       => ["can't be blank"],
-      :slug             => ["can't be blank", "is invalid"],
       :image_file_name  => ["There was no file uploaded!"]
     }
   end
@@ -24,7 +23,6 @@ class PhotoTest < ActiveSupport::TestCase
       Gallery::Photo.create!(
         :gallery  => gallery,
         :title    => 'Test Photo',
-        :slug     => 'test-photo',
         :image    => fixture_file_upload('/files/default.jpg', 'image/jpeg')
       )
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comfy_gallery
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-20 00:00:00.000000000Z
+date: 2012-02-10 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70118917214260 !ruby/object:Gem::Requirement
+  requirement: &70321662930880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70118917214260
+  version_requirements: *70321662930880
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &70118917211280 !ruby/object:Gem::Requirement
+  requirement: &70321662930060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: 2.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70118917211280
+  version_requirements: *70321662930060
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &70118917203280 !ruby/object:Gem::Requirement
+  requirement: &70321662929320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: 1.0.14
   type: :runtime
   prerelease: false
-  version_requirements: *70118917203280
+  version_requirements: *70321662929320
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70118917201060 !ruby/object:Gem::Requirement
+  requirement: &70321662849200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +56,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70118917201060
+  version_requirements: *70321662849200
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70118917198640 !ruby/object:Gem::Requirement
+  requirement: &70321662848460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,7 +67,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70118917198640
+  version_requirements: *70321662848460
 description: ''
 email: oleg@twg.ca
 executables: []
@@ -83,58 +83,58 @@ files:
 - README.md
 - Rakefile
 - VERSION
-- app/assets/images/sofa_gallery/jcrop.gif
-- app/assets/images/sofa_gallery/orbit/bullets.jpg
-- app/assets/images/sofa_gallery/orbit/left-arrow.png
-- app/assets/images/sofa_gallery/orbit/loading.gif
-- app/assets/images/sofa_gallery/orbit/mask-black.png
-- app/assets/images/sofa_gallery/orbit/pause-black.png
-- app/assets/images/sofa_gallery/orbit/right-arrow.png
-- app/assets/images/sofa_gallery/orbit/rotator-black.png
-- app/assets/images/sofa_gallery/orbit/timer-black.png
-- app/assets/images/sofa_gallery/prettyPhoto/dark_rounded/btnNext.png
-- app/assets/images/sofa_gallery/prettyPhoto/dark_rounded/btnPrevious.png
-- app/assets/images/sofa_gallery/prettyPhoto/dark_rounded/contentPattern.png
-- app/assets/images/sofa_gallery/prettyPhoto/dark_rounded/default_thumbnail.gif
-- app/assets/images/sofa_gallery/prettyPhoto/dark_rounded/loader.gif
-- app/assets/images/sofa_gallery/prettyPhoto/dark_rounded/sprite.png
-- app/assets/images/sofa_gallery/prettyPhoto/dark_square/btnNext.png
-- app/assets/images/sofa_gallery/prettyPhoto/dark_square/btnPrevious.png
-- app/assets/images/sofa_gallery/prettyPhoto/dark_square/contentPattern.png
-- app/assets/images/sofa_gallery/prettyPhoto/dark_square/default_thumbnail.gif
-- app/assets/images/sofa_gallery/prettyPhoto/dark_square/loader.gif
-- app/assets/images/sofa_gallery/prettyPhoto/dark_square/sprite.png
-- app/assets/images/sofa_gallery/prettyPhoto/default/default_thumb.png
-- app/assets/images/sofa_gallery/prettyPhoto/default/loader.gif
-- app/assets/images/sofa_gallery/prettyPhoto/default/sprite.png
-- app/assets/images/sofa_gallery/prettyPhoto/default/sprite_next.png
-- app/assets/images/sofa_gallery/prettyPhoto/default/sprite_prev.png
-- app/assets/images/sofa_gallery/prettyPhoto/default/sprite_x.png
-- app/assets/images/sofa_gallery/prettyPhoto/default/sprite_y.png
-- app/assets/images/sofa_gallery/prettyPhoto/facebook/btnNext.png
-- app/assets/images/sofa_gallery/prettyPhoto/facebook/btnPrevious.png
-- app/assets/images/sofa_gallery/prettyPhoto/facebook/contentPatternBottom.png
-- app/assets/images/sofa_gallery/prettyPhoto/facebook/contentPatternLeft.png
-- app/assets/images/sofa_gallery/prettyPhoto/facebook/contentPatternRight.png
-- app/assets/images/sofa_gallery/prettyPhoto/facebook/contentPatternTop.png
-- app/assets/images/sofa_gallery/prettyPhoto/facebook/default_thumbnail.gif
-- app/assets/images/sofa_gallery/prettyPhoto/facebook/loader.gif
-- app/assets/images/sofa_gallery/prettyPhoto/facebook/sprite.png
-- app/assets/images/sofa_gallery/prettyPhoto/light_rounded/btnNext.png
-- app/assets/images/sofa_gallery/prettyPhoto/light_rounded/btnPrevious.png
-- app/assets/images/sofa_gallery/prettyPhoto/light_rounded/default_thumbnail.gif
-- app/assets/images/sofa_gallery/prettyPhoto/light_rounded/loader.gif
-- app/assets/images/sofa_gallery/prettyPhoto/light_rounded/sprite.png
-- app/assets/images/sofa_gallery/prettyPhoto/light_square/btnNext.png
-- app/assets/images/sofa_gallery/prettyPhoto/light_square/btnPrevious.png
-- app/assets/images/sofa_gallery/prettyPhoto/light_square/default_thumbnail.gif
-- app/assets/images/sofa_gallery/prettyPhoto/light_square/loader.gif
-- app/assets/images/sofa_gallery/prettyPhoto/light_square/sprite.png
-- app/assets/javascripts/sofa_gallery/admin.js
-- app/assets/javascripts/sofa_gallery/application.js
-- app/assets/javascripts/sofa_gallery/jquery.jcrop.js
-- app/assets/javascripts/sofa_gallery/jquery.orbit-1.2.3.min.js
-- app/assets/javascripts/sofa_gallery/thumbnails.js
+- app/assets/images/comfy_gallery/jcrop.gif
+- app/assets/images/comfy_gallery/orbit/bullets.jpg
+- app/assets/images/comfy_gallery/orbit/left-arrow.png
+- app/assets/images/comfy_gallery/orbit/loading.gif
+- app/assets/images/comfy_gallery/orbit/mask-black.png
+- app/assets/images/comfy_gallery/orbit/pause-black.png
+- app/assets/images/comfy_gallery/orbit/right-arrow.png
+- app/assets/images/comfy_gallery/orbit/rotator-black.png
+- app/assets/images/comfy_gallery/orbit/timer-black.png
+- app/assets/images/comfy_gallery/prettyPhoto/dark_rounded/btnNext.png
+- app/assets/images/comfy_gallery/prettyPhoto/dark_rounded/btnPrevious.png
+- app/assets/images/comfy_gallery/prettyPhoto/dark_rounded/contentPattern.png
+- app/assets/images/comfy_gallery/prettyPhoto/dark_rounded/default_thumbnail.gif
+- app/assets/images/comfy_gallery/prettyPhoto/dark_rounded/loader.gif
+- app/assets/images/comfy_gallery/prettyPhoto/dark_rounded/sprite.png
+- app/assets/images/comfy_gallery/prettyPhoto/dark_square/btnNext.png
+- app/assets/images/comfy_gallery/prettyPhoto/dark_square/btnPrevious.png
+- app/assets/images/comfy_gallery/prettyPhoto/dark_square/contentPattern.png
+- app/assets/images/comfy_gallery/prettyPhoto/dark_square/default_thumbnail.gif
+- app/assets/images/comfy_gallery/prettyPhoto/dark_square/loader.gif
+- app/assets/images/comfy_gallery/prettyPhoto/dark_square/sprite.png
+- app/assets/images/comfy_gallery/prettyPhoto/default/default_thumb.png
+- app/assets/images/comfy_gallery/prettyPhoto/default/loader.gif
+- app/assets/images/comfy_gallery/prettyPhoto/default/sprite.png
+- app/assets/images/comfy_gallery/prettyPhoto/default/sprite_next.png
+- app/assets/images/comfy_gallery/prettyPhoto/default/sprite_prev.png
+- app/assets/images/comfy_gallery/prettyPhoto/default/sprite_x.png
+- app/assets/images/comfy_gallery/prettyPhoto/default/sprite_y.png
+- app/assets/images/comfy_gallery/prettyPhoto/facebook/btnNext.png
+- app/assets/images/comfy_gallery/prettyPhoto/facebook/btnPrevious.png
+- app/assets/images/comfy_gallery/prettyPhoto/facebook/contentPatternBottom.png
+- app/assets/images/comfy_gallery/prettyPhoto/facebook/contentPatternLeft.png
+- app/assets/images/comfy_gallery/prettyPhoto/facebook/contentPatternRight.png
+- app/assets/images/comfy_gallery/prettyPhoto/facebook/contentPatternTop.png
+- app/assets/images/comfy_gallery/prettyPhoto/facebook/default_thumbnail.gif
+- app/assets/images/comfy_gallery/prettyPhoto/facebook/loader.gif
+- app/assets/images/comfy_gallery/prettyPhoto/facebook/sprite.png
+- app/assets/images/comfy_gallery/prettyPhoto/light_rounded/btnNext.png
+- app/assets/images/comfy_gallery/prettyPhoto/light_rounded/btnPrevious.png
+- app/assets/images/comfy_gallery/prettyPhoto/light_rounded/default_thumbnail.gif
+- app/assets/images/comfy_gallery/prettyPhoto/light_rounded/loader.gif
+- app/assets/images/comfy_gallery/prettyPhoto/light_rounded/sprite.png
+- app/assets/images/comfy_gallery/prettyPhoto/light_square/btnNext.png
+- app/assets/images/comfy_gallery/prettyPhoto/light_square/btnPrevious.png
+- app/assets/images/comfy_gallery/prettyPhoto/light_square/default_thumbnail.gif
+- app/assets/images/comfy_gallery/prettyPhoto/light_square/loader.gif
+- app/assets/images/comfy_gallery/prettyPhoto/light_square/sprite.png
+- app/assets/javascripts/comfy_gallery/admin.js
+- app/assets/javascripts/comfy_gallery/application.js
+- app/assets/javascripts/comfy_gallery/jquery.jcrop.js
+- app/assets/javascripts/comfy_gallery/jquery.orbit-1.2.3.min.js
+- app/assets/javascripts/comfy_gallery/thumbnails.js
 - app/assets/stylesheets/comfy_gallery/admin.css
 - app/assets/stylesheets/comfy_gallery/application.css
 - app/assets/stylesheets/comfy_gallery/carousel.css.erb
@@ -184,8 +184,8 @@ files:
 - lib/comfy_gallery/configuration.rb
 - lib/comfy_gallery/engine.rb
 - lib/comfy_gallery/form_builder.rb
-- lib/generators/README
-- lib/generators/comfy_gallery_generator.rb
+- lib/generators/comfy/gallery/README
+- lib/generators/comfy/gallery/gallery_generator.rb
 - lib/paperclip_processors/cropper.rb
 - lib/tasks/comfy_gallery.rake
 - script/rails
@@ -217,7 +217,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3493133440130363197
+      hash: -686661673297130780
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/generators/comfy_gallery_generator.rb

@@ -1,33 +0,0 @@
-class ComfyGalleryGenerator < Rails::Generators::Base
-  
-  require 'rails/generators/active_record'
-  include Rails::Generators::Migration
-  include Thor::Actions
-  
-  source_root File.expand_path('../../..', __FILE__)
-  
-  def generate_migration
-    destination   = File.expand_path('db/migrate/01_create_comfy_gallery.rb', self.destination_root)
-    migration_dir = File.dirname(destination)
-    destination   = self.class.migration_exists?(migration_dir, 'create_comfy_gallery')
-    
-    if destination
-      puts "\e[0m\e[31mFound existing create_comfy_gallery.rb migration. Remove it if you want to regenerate.\e[0m"
-    else
-      migration_template 'db/migrate/01_create_comfy_gallery.rb', 'db/migrate/create_comfy_gallery.rb'
-    end
-  end
-  
-  def generate_initialization
-    copy_file 'config/initializers/comfy_gallery.rb', 'config/initializers/comfy_gallery.rb'
-  end
-  
-  def show_readme
-    readme 'lib/generators/README'
-  end
-  
-  def self.next_migration_number(dirname)
-    ActiveRecord::Generators::Base.next_migration_number(dirname)
-  end
-  
-end