mondo-generators 0.6.4 → 0.6.5

data/VERSION

@@ -1 +1 @@
-0.6.4
+0.6.5

data/mondo-generators.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mondo-generators}
-  s.version = "0.6.4"
+  s.version = "0.6.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Luca Tironi"]

data/rails_generators/mondo_authentication/lib/insert_commands.rb

@@ -1,4 +1,15 @@
 Rails::Generator::Commands::Create.class_eval do
+  def route_root(route_options = {})
+    sentinel = 'ActionController::Routing::Routes.draw do |map|'
+    
+    logger.route "map.root :controller => '#{route_options[:controller]}', :action => '#{route_options[:action]}'"
+    unless options[:pretend]
+      gsub_file 'config/routes.rb', /(#{Regexp.escape(sentinel)})/mi do |match|
+        "#{match}\n  map.root :controller => '#{route_options[:controller]}', :action => '#{route_options[:action]}'"
+      end
+    end
+  end
+  
   def route_resource(*resources)
     resource_list = resources.map { |r| r.to_sym.inspect }.join(', ')
     sentinel = 'ActionController::Routing::Routes.draw do |map|'
@@ -14,10 +25,10 @@ Rails::Generator::Commands::Create.class_eval do
   def route_resource_with_options(resource, route_options = {})
     sentinel = 'ActionController::Routing::Routes.draw do |map|'
     
-    logger.route "map.resource #{resource}, :member => { #{route_options[:members]} }, :collection => { #{route_options[:collections]} }"
+    logger.route "map.resource #{resource.to_sym.inspect}, :member => { #{route_options[:members]} }, :collection => { #{route_options[:collections]} }"
     unless options[:pretend]
       gsub_file 'config/routes.rb', /(#{Regexp.escape(sentinel)})/mi do |match|
-        "#{match}\n  map.resource #{resource}, :member => { #{route_options[:members]} }, :collection => { #{route_options[:collections]} }\n"
+        "#{match}\n  map.resource #{resource.to_sym.inspect}, :member => { #{route_options[:members]} }, :collection => { #{route_options[:collections]} }\n"
       end
     end
   end
@@ -44,6 +55,14 @@ Rails::Generator::Commands::Create.class_eval do
 end
 
 Rails::Generator::Commands::Destroy.class_eval do
+  def route_root(route_options = {})
+    look_for =   "\n  map.root :controller => '#{route_options[:controller]}', :action => '#{route_options[:action]}'"
+    logger.route "map.root     :controller => '#{route_options[:controller]}', :action => '#{route_options[:action]}'"
+    unless options[:pretend]
+      gsub_file    'config/routes.rb', /(#{look_for})/mi, ''
+    end
+  end
+  
   def route_resource(*resources)
     resource_list = resources.map { |r| r.to_sym.inspect }.join(', ')
     look_for = "\n  map.resource #{resource_list}\n"
@@ -54,8 +73,8 @@ Rails::Generator::Commands::Destroy.class_eval do
   end
   
   def route_resource_with_options(resource, route_options = {})
-    look_for = "\n  map.resource #{resource}, #{route_options}\n"
-    logger.route "map.resource #{resource}, :member => { #{route_options[:members]} }, :collection => { #{route_options[:collections]} }"
+    look_for = "\n  map.resource #{resource.to_sym.inspect}, #{route_options}\n"
+    logger.route "map.resource #{resource.to_sym.inspect}, :member => { #{route_options[:members]} }, :collection => { #{route_options[:collections]} }"
     unless options[:pretend]
       gsub_file 'config/routes.rb', /(#{look_for})/mi, ''
     end
@@ -78,13 +97,17 @@ Rails::Generator::Commands::Destroy.class_eval do
 end
 
 Rails::Generator::Commands::List.class_eval do
+  def route_root(route_options = {})
+    logger.route "map.root :controller => '{options[:controller]}', :action => '#{options[:action]}'"
+  end
+  
   def route_resource(*resources)
     resource_list = resources.map { |r| r.to_sym.inspect }.join(', ')
     logger.route "map.resource #{resource_list}"
   end
   
   def route_resource_with_options(resource, route_options = {})
-    logger.route "map.resource #{resource}, :member => { #{route_options[:members]} }, :collection => { #{route_options[:collections]} }"
+    logger.route "map.resource #{resource.to_sym.inspect}, :member => { #{route_options[:members]} }, :collection => { #{route_options[:collections]} }"
   end
   
   def route_name(name, path, options = {})

data/rails_generators/mondo_authentication/mondo_authentication_generator.rb

@@ -44,7 +44,8 @@ class MondoAuthenticationGenerator < Rails::Generator::Base
       m.route_name :signup, '/signup', :controller => user_plural_name, :action => 'new'
       m.route_name :logout, '/logout', :controller => session_plural_name, :action => 'destroy'
       m.route_name :login, '/login', :controller => session_plural_name, :action => 'new'
-      m.route_name :root, '/', :controller => 'static_pages', :action => 'home'
+
+      m.route_root :controller => 'static_pages', :action => 'home'
 
       m.route_resources session_plural_name
       m.route_resource_with_options user_plural_name, :collections => ':mass_new => :get, :mass_create => :post'

data/rails_generators/mondo_authentication/templates/views/_form.html.haml

@@ -1,5 +1,5 @@
 = f.error_messages
-- disabled = (permitted_to? :manage, @<%= user_singular_name %>) ? false : true
+- disabled = (permitted_to? :manage, @<%= user_singular_name %>) || @<%= user_singular_name %>.new_record?  ? false : true
 %p
   = f.label :first_name
   %br

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 6
-  - 4
-  version: 0.6.4
+  - 5
+  version: 0.6.5
 platform: ruby
 authors: 
 - Luca Tironi