merrycms 0.1.4 → 0.1.7

data/README.rdoc

@@ -0,0 +1,16 @@
+= Merrycms
+
+== Install
+  
+  gem 'merrycms'
+  
+  $ bundle install
+  
+== Usage
+  
+  rake merrycms:setup
+  rake db:migrate
+  rake merrycms:bootstrap
+  
+start the server and go to '/admin'
+  

data/lib/generators/merrycms/install_auth_generator.rb

@@ -40,26 +40,7 @@ module Merrycms
       sleep 1
       migration_template 'roles_users_migration.rb', 'db/migrate/roles_users.rb'
       sleep 1
-    end
-      
-    def create_page_and_category_migration_files
-      migration_template 'create_pages_and_categories_migration.rb', 'db/migrate/create_pages_and_categories.rb'
-      sleep 1
-    end
-    
-    # pages and categories
-    def generate_slugs_table
-      invoke 'friendly_id'
-    end
-    
-    def create_translations_migration_files
-      migration_template 'create_translations_migration.rb', 'db/migrate/create_translations.rb'
-      sleep 1
-    end
-        
-    def copy_locale_initializer
-      copy_file 'locale_initializer.rb', 'config/initializers/locale.rb'
-    end
+    end    
   
   end
 end

data/lib/generators/merrycms/{install_images_generator.rb → install_media_generator.rb}

@@ -2,7 +2,7 @@ require 'rails/generators'
 require 'rails/generators/migration'
 
 module Merrycms
-  class InstallImagesGenerator < Rails::Generators::Base
+  class InstallMediaGenerator < Rails::Generators::Base
     include Rails::Generators::Migration
   
     def self.source_root
@@ -17,7 +17,7 @@ module Merrycms
       end
     end
               
-    def create_translations_migration_files
+    def create_images_migration_files
       migration_template 'create_images_migration.rb', 'db/migrate/create_images.rb'
       sleep 1
     end
@@ -25,6 +25,16 @@ module Merrycms
     def copy_locale_initializer
       copy_file 'paperclip_initializer.rb', 'config/initializers/paperclip.rb'
     end
+    
+    def create_documents_migration_files
+      migration_template 'create_documents_migration.rb', 'db/migrate/create_documents.rb'
+      sleep 1
+    end
+    
+    def create_videos_migration_files
+      migration_template 'create_videos_migration.rb', 'db/migrate/create_videos.rb'
+      sleep 1
+    end
   
   end
 end

data/lib/generators/merrycms/install_pages_generator.rb

@@ -25,16 +25,8 @@ module Merrycms
     # pages and categories
     def generate_slugs_table
       invoke 'friendly_id'
-    end
-    
-    def create_translations_migration_files
-      migration_template 'create_translations_migration.rb', 'db/migrate/create_translations.rb'
       sleep 1
     end
-        
-    def copy_locale_initializer
-      copy_file 'locale_initializer.rb', 'config/initializers/locale.rb'
-    end
   
   end
 end

data/lib/merrycms/railties/merrycms_tasks.rake

@@ -5,9 +5,7 @@ namespace :merrycms do
     system("rails generate merrycms:install_auth")
     system("rails generate merrycms:install_pages")
     system("rails generate merrycms:install_translations")
-    system("rails generate merrycms:install_images")
-    system("rails generate merrycms:install_documents")
-    system("rails generate merrycms:install_videos")
+    system("rails generate merrycms:install_media")
     system("rails generate jquery:install")
     
     Rake::Task['merrycms:import_assets'].invoke
@@ -24,7 +22,7 @@ namespace :merrycms do
     system(command)
   end
 
-  desc "bootstrap app"
+  desc "bootstrap app : create admin user and root category"
   task :bootstrap => :environment do
     create_admins
     create_root_cat
@@ -47,7 +45,7 @@ namespace :merrycms do
     Category.find_or_create_by_name("root")
   end
   
-  desc "cleanup current app"
+  desc "CAUTIOUS : cleanup current app by dropping the DB and removing all migration files"
   task :cleanapp => :environment do
     Rake::Task['db:drop'].invoke
     command = "rm -rf #{Rails.root}/db/migrate/*"

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 7
+  version: 0.1.7
 platform: ruby
 authors: 
 - Franck D'agostini
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-31 00:00:00 +02:00
+date: 2011-05-04 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -197,7 +197,7 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- README
+- README.rdoc
 files: 
 - app/controllers/admin/base_controller.rb
 - app/controllers/admin/categories_controller.rb
@@ -301,11 +301,9 @@ files:
 - config/locales/fr/admin/videos.fr.yml
 - config/locales/fr/fr.yml
 - lib/generators/merrycms/install_auth_generator.rb
-- lib/generators/merrycms/install_documents_generator.rb
-- lib/generators/merrycms/install_images_generator.rb
+- lib/generators/merrycms/install_media_generator.rb
 - lib/generators/merrycms/install_pages_generator.rb
 - lib/generators/merrycms/install_translations_generator.rb
-- lib/generators/merrycms/install_videos_generator.rb
 - lib/generators/merrycms/templates/create_documents_migration.rb
 - lib/generators/merrycms/templates/create_images_migration.rb
 - lib/generators/merrycms/templates/create_pages_and_categories_migration.rb
@@ -325,7 +323,7 @@ files:
 - lib/merrycms/validates_as_image.rb
 - lib/paperclip_processors/poster.rb
 - lib/paperclip_processors/video_thumbnail.rb
-- README
+- README.rdoc
 has_rdoc: true
 homepage: https://github.com/franck/merrycms
 licenses: []

data/README

@@ -1,15 +0,0 @@
-Install
-  gem 'merrycms'
-  
-  $ bundle install
-  
-Usage
-  r g merrycms:install
-  rake db:migrate
-  rake merrycms:bootstrap
-  
-  start the server
-  go to '/admin'
-  
-How to add a new resource in the admin panel
-  

data/lib/generators/merrycms/install_documents_generator.rb

@@ -1,26 +0,0 @@
-require 'rails/generators'
-require 'rails/generators/migration'
-
-module Merrycms
-  class InstallDocumentsGenerator < Rails::Generators::Base
-    include Rails::Generators::Migration
-  
-    def self.source_root
-      @source_root ||= File.join(File.dirname(__FILE__), 'templates')
-    end
-  
-    def self.next_migration_number(dirname)
-      if ActiveRecord::Base.timestamped_migrations
-        Time.now.utc.strftime("%Y%m%d%H%M%S")
-      else
-        "%.3d" % (current_migration_number(dirname) + 1)
-      end
-    end
-              
-    def create_translations_migration_files
-      migration_template 'create_documents_migration.rb', 'db/migrate/create_documents.rb'
-      sleep 1
-    end
-          
-  end
-end

data/lib/generators/merrycms/install_videos_generator.rb

@@ -1,26 +0,0 @@
-require 'rails/generators'
-require 'rails/generators/migration'
-
-module Merrycms
-  class InstallVideosGenerator < Rails::Generators::Base
-    include Rails::Generators::Migration
-  
-    def self.source_root
-      @source_root ||= File.join(File.dirname(__FILE__), 'templates')
-    end
-  
-    def self.next_migration_number(dirname)
-      if ActiveRecord::Base.timestamped_migrations
-        Time.now.utc.strftime("%Y%m%d%H%M%S")
-      else
-        "%.3d" % (current_migration_number(dirname) + 1)
-      end
-    end
-              
-    def create_translations_migration_files
-      migration_template 'create_videos_migration.rb', 'db/migrate/create_videos.rb'
-      sleep 1
-    end
-          
-  end
-end