singular/plural fixes. added seed for config

lib/generators/ixtlan/configuration_base.rb

@@ -32,6 +32,10 @@ def create
 
         generate generator_name, *args
       end
+
+      def create_seed
+        template 'seed.rb', File.join('db', 'seed.rb')
+      end
     end
   end
 end

lib/generators/ixtlan/templates/seed.rb

@@ -0,0 +1,15 @@
+
+c = Configuration.new
+<% if options[:modified_by] -%>
+  c.modified_by_id = 0
+<% end -%>
+<% if defined? Ixtlan::Errors -%>
+c.errors_keep_dumps = 30
+<% end -%>
+<% if defined? Ixtlan::Sessions -%>
+c.idle_session_timeout = 15
+<% end -%>
+<% if defined? Ixtlan::Audit -%>
+c.audits_keep_logs = 90
+<% end -%>
+c.save

lib/generators/rails/active_record/model/model.rb

@@ -3,7 +3,7 @@ class <%= class_name %> < <%= parent_class_name.classify %>
   belongs_to :<%= attribute.name %>
 <% end -%>
 <% attributes.select {|attr| [:has_one, :has_many].include?(attr.type) }.each do |attribute| -%>
-  <%= attribute.type %> :<%= attribute.name %>
+  <%= attribute.type %> :<%= attribute.name.singularize %>
 <% end -%>
 <% if options[:modified_by] -%>
   belongs_to :modified_by, :class_name => "User"
@@ -19,8 +19,11 @@ def self.instance
   def self.options
     {
 <% except = []
-    except = [:created_at, :updated_at] if options[:timestamps]
-    except << :modified_by_id if options[:modified_by] -%>
+   if options[:timestamps]
+     except = [:created_at]
+     except << :updated_at unless options[:optimistic]
+   end
+   except << :modified_by_id if options[:modified_by] -%>
       :except => <%= except.inspect %>
     }
   end

lib/generators/rails/scaffold_controller/scaffold_controller/controller.rb

@@ -10,7 +10,7 @@ def cleanup_params
     model.delete :id
 <% if options[:timestamps] -%>
     model.delete :created_at
-    <% if options[:optimistic] -%>params[:updated_at] = <% end -%>model.delete :updated_at
+    <% if options[:optimistic] -%>params[:updated_at] ||= <% end -%>model.delete :updated_at
 <% if options[:optimistic] -%>
   end
 

lib/generators/rails/scaffold_controller/scaffold_controller/singleton_controller.rb

@@ -9,7 +9,7 @@ def cleanup_params
     model = params[:<%= singular_table_name %>] || []
 <% if options[:timestamps] -%>
     model.delete :created_at
-    <% if options[:optimistic] -%>params[:updated_at] = <% end -%>model.delete :updated_at
+    <% if options[:optimistic] -%>params[:updated_at] ||= <% end -%>model.delete :updated_at
 <% if options[:optimistic] -%>
   end