ixtlan-generators 0.1.4 → 0.1.5

data/lib/generators/ixtlan/configuration_base.rb

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

data/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

data/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 @@ class <%= class_name %> < <%= parent_class_name.classify %>
   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

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

@@ -10,7 +10,7 @@ class <%= controller_class_name %>Controller < ApplicationController
     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
 

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

@@ -9,7 +9,7 @@ class <%= controller_class_name %>Controller < ApplicationController
     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
 

metadata

@@ -2,7 +2,7 @@
 name: ixtlan-generators
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors: 
   - mkristian
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-18 00:00:00 +05:30
+date: 2012-01-30 00:00:00 +05:30
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -151,7 +151,6 @@ files:
   - lib/generators/ixtlan/setup/templates/error_with_session.html.erb~
   - lib/generators/ixtlan/setup/templates/application_layout.html.erb
   - lib/generators/ixtlan/setup/templates/preinitializer.rb
-  - lib/generators/ixtlan/setup/templates/initializer.rb
   - lib/generators/ixtlan/setup/templates/gitignore
   - lib/generators/ixtlan/setup/templates/initializer.rb~
   - lib/generators/ixtlan/setup/templates/passwords.yml.example
@@ -165,6 +164,7 @@ files:
   - lib/generators/ixtlan/error_dumps_scaffold/error_dumps_scaffold_generator.rb~
   - lib/generators/ixtlan/templates/dynamic.rb~
   - lib/generators/ixtlan/templates/dynamic.rb
+  - lib/generators/ixtlan/templates/seed.rb
   - lib/ixtlan/railtie.rb~
   - lib/ixtlan/railtie.rb
   - features/step_definitions/simple_steps.rb

data/lib/generators/ixtlan/setup/templates/initializer.rb

@@ -1,64 +0,0 @@
-# dynamic configuration through a Configuration singleton model
-
-# configuration model
-# -------------------
-# CONFIGURATION = Configuration
-# config.configuration_model = CONFIGURATION
-begin
-  config_instance = CONFIGURATION.instance
-rescue
-  # allow rake tasks to work without configuration migrated
-  return
-end
-
-# notification email on errors and dump directory for the system dump
-# the error dumps will be cleanup after the days to keeps dump expired
-# --------------------------------------------------------------------
-# config_instance.register("error_dumper") do |config|
-#   Rails.configuration.error_dumper.dump_dir = config.errors_dir
-#   Rails.configuration.error_dumper.email_from = config.errors_from
-#   Rails.configuration.error_dumper.email_to = config.errors_to
-#   Rails.configuration.error_dumper.keep_dumps = config.errors_keep_dump # days
-# end
-
-# idle session timeout configuration (in minutes)
-# -----------------------------------------------
-# config_instance.register("session_idle_timeout") do |config|
-#   Rails.configuration.session_idle_timeout = config.session_idle_timeout
-# end
-
-# audit log manager
-# -----------------
-
-# config.audit_manager.model = MyAudit # default: Audit
-# config.audit_manager.username_method = :username # default: :login
-
-# config_instance.register("audit_manager") do |config|
-#   Rails.configuration.audit_manager.keep_log = config.keep_log # days
-# end
-
-# --------------------
-# static configuration
-# --------------------
-
-# error dumper
-# ------------
-# notification email on errors and dump directory for the system dump. per 
-# default there is no email notification and if email_from or email_to is
-# missing then there is no email too
-
-# config.error_dumper.dump_dir = Rails.root + "/log/errors" # default: log/errors
-# config.error_dumper.email_from = "no-reply@example.com"
-# config.error_dumper.email_to = "developer1@example.com,developer2@example.com"
-# config.error_dumper.keep_dumps = 30 # days
-# config.skip_rescue_module = true # do not include the predefined Rescue 
-
-# idle session timeout configuration
-# ----------------------------------
-# config.session_idle_timeout = 30 #minutes
-
-# audit log manager
-# -----------------
-# config.audit_manager.model = MyAudit # default: Audit
-# config.audit_manager.username_method = :username # default: :login
-# config.audit_manager.keep_log = 30 # days