leonardo 1.7.1 → 1.7.2

data/CHANGELOG

@@ -1,7 +1,14 @@
+1.7.2 (October 5th, 2011) Marco Mastrodonato
+* Updated formtastic support to version 2.0
+* Updated template.rb
+
+
+
 1.7.1 (October 3th, 2011) Marco Mastrodonato
 * Fixed a layout issue
 
 
+
 1.7.0 (September 28th, 2011) Marco Mastrodonato
 * New feature to add a resource management within a namescape. Unlike the original way (rails g leosca admin/resource ...which remains available), the resource is not under the namespace but only its management so you could create one for several kind of users. Try it adding the new option like this example: --leospace=admin
 * Huge code improvements

data/lib/generators/leolay/leolay_generator.rb

@@ -43,14 +43,8 @@ class LeolayGenerator < Rails::Generators::Base
         break if files.any?
       end
 
-      #copy_file "styles/#{style_name}/views/kaminari/_next_page.html.erb", "app/views/kaminari/_next_page.html.erb"
-      #copy_file "styles/#{style_name}/views/kaminari/_page.html.erb", "app/views/kaminari/_page.html.erb"
-      #copy_file "styles/#{style_name}/views/kaminari/_paginator.html.erb", "app/views/kaminari/_paginator.html.erb"
-      #copy_file "styles/#{style_name}/views/kaminari/_prev_page.html.erb", "app/views/kaminari/_prev_page.html.erb"
       directory "styles/#{style_name}/views/kaminari", "app/views/kaminari"
 
-
-      #copy_file "styles/#{style_name}/images/kaminari/nav.png", "app/assets/images/styles/#{style_name}/kaminari/nav.png"
       directory "styles/#{style_name}/images/kaminari", "app/assets/images/styles/#{style_name}/kaminari"
     end
 
@@ -199,12 +193,15 @@ class LeolayGenerator < Rails::Generators::Base
     copy_file file, file
 
     file = "config/initializers/formtastic.rb"
-    inject_into_file file, :after => "# Formtastic::SemanticFormBuilder.i18n_lookups_by_default = false" do
+    inject_into_file file, :after => "# Formtastic::FormBuilder.i18n_lookups_by_default = false" do
       <<-FILE.gsub(/^      /, '')
 
-      Formtastic::SemanticFormBuilder.i18n_lookups_by_default = true
+      Formtastic::FormBuilder.i18n_lookups_by_default = true
       FILE
     end if File.exists?(file)
+
+    path = "lib/templates/erb/"
+    remove_file path if File.exists?(path)
   end
 
   def setup_javascript
@@ -244,10 +241,6 @@ class LeolayGenerator < Rails::Generators::Base
         FILE
       end
 
-      #files = Dir["#{vendor_path}/jquery-ui/jquery.ui.datepicker-??.js"]
-      #files.each do |f|
-      #  copy_file f, f
-      #end
       directory "#{vendor_path}/jquery-ui", "#{vendor_path}/jquery-ui"
 
       file = "#{vendor_path}/vendor.js"
@@ -336,12 +329,6 @@ class LeolayGenerator < Rails::Generators::Base
     copy_file file, file
     file = "spec/helpers/application_helpers_spec.rb"
     copy_file file, file
-    #file = "lib/templates/rspec/scaffold"
-    #directory file, file
-    #file = "lib/templates/rspec/scaffold"
-    #directory file, file
-    #file = "lib/generators/rspec/scaffold"
-    #directory file, file
 
   end
 

data/lib/generators/leolay/templates/vendor/assets/javascripts/vendor.js

@@ -1,2 +1,3 @@
 // Leonardo
-// Group files into a folder and require it
+// Group files into a folder and require it
+//= require_tree ./include

data/template.rb

@@ -6,6 +6,7 @@
 # USAGE: rails new yourappname -m template.rb
 # 
 # -------------------------------------------------------
+# 05-10-2011: Added ajax option
 # 25-08-2011: Added rspec generation
 #########################################################
 
@@ -38,10 +39,6 @@ gem 'state_machine' if yes?("Do you have to handle states ?")
 
 formtastic = yes?("Formtastic ?")
 if formtastic
-  #gem 'justinfrench-formtastic', :lib => 'formtastic', :source => 'http://gems.github.com'
-  #rake "gems:install" if install_gem
-
-  #A Rails FormBuilder DSL (with some other goodies) to make it far easier to create beautiful, semantically rich, syntactically awesome, readily stylable and wonderfully accessible HTML forms in your Rails applications.
   gem 'formtastic'
   gem 'validation_reflection'
 end
@@ -56,7 +53,7 @@ if rspec
 end
 
 model_name = nil
-devise = yes?("Would you like to install Devise?")
+devise = yes?("Would you install Devise?")
 if devise
   gem 'devise'
   model_name = ask(" What would you like the user model to be called? [user]")
@@ -66,6 +63,9 @@ end
 cancan = yes?("Authorization ?")
 gem 'cancan' if cancan
 
+ajax = yes?("Would you enhance ajax ?")
+gem "rails3-jquery-autocomplete" if ajax
+
 #home = yes?("Generate controller home ? (raccomanded)")
 home = true
 
@@ -79,7 +79,7 @@ if leolay
   leolay_second_color = ask(" Choose secondary color [blank=default color]:")
 end
 
-run "bundle install"
+run "bundle install" if yes?("Bundle install ?")
 
 generate "kaminari:config" if pagination
 
@@ -95,6 +95,30 @@ end
 
 generate "cancan:ability" if cancan
 
+generate "autocomplete:install" if ajax
+
+####################################################################
+#     F   I   X
+####################################################################
+p "Update source path #{File.join(File.dirname(__FILE__), app_name)}"
+source_paths << File.join(File.dirname(__FILE__), app_name)
+
+if formtastic
+  path = "lib/templates/erb/"
+  remove_file path if File.exists?(path)
+end
+
+if ajax
+  path = "public/javascripts/"
+  file = "autocomplete-rails.js"
+  pathfile = "#{path}#{file}"
+  if File.exists? pathfile
+    copy_file pathfile, "vendor/assets/javascripts/include/#{file}"
+    remove_file path
+  end
+end
+####################################################################
+
 if leolay
   generate  "leolay",
             "cloudy",
@@ -102,9 +126,12 @@ if leolay
             ("--second_color=#{leolay_second_color}" if leolay_second_color.any?),
             (cancan ? "" : "--skip-authorization"),
             (devise ? "" : "--skip-authentication"),
+            (ajax ? "" : "--skip-jquery_ui"),
             (formtastic ? "" : "--skip-formtastic")
 end
 
+generate "autocomplete:install" if ajax
+
 if home
   generate "controller", "home", "index"
   route "root :to => 'home#index'"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: leonardo
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: 
   segments: 
   - 1
   - 7
-  - 1
-  version: 1.7.1
+  - 2
+  version: 1.7.2
 platform: ruby
 authors: 
 - Marco Mastrodonato
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-03 00:00:00 Z
+date: 2011-10-05 00:00:00 Z
 dependencies: []
 
 description: A generator for creating Rails 3.1 applications ready to go. It generates the layout, the style, the internationalization and manage external gems for authentication, authorization and other. It also provides a customized scaffold to generates cool sites ajax ready in few minutes. If you find a bug please report to m.mastrodonato@gmail.com