ixtlan-core 0.2.0 → 0.4.0

data/lib/generators/ixtlan/base.rb

@@ -20,7 +20,7 @@ module Ixtlan
         end
 
         if defined? ::Ixtlan::Errors
-          args << "errors_keep_dumps:integer"
+          args << "errors_keep_dump:integer"
           args << "errors_dir:string"
           args << "errors_from:string"
           args << "errors_to:string"

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

@@ -4,11 +4,12 @@
 # -------------------
 # CONFIGURATION = Configuration
 # config.configuration_model = CONFIGURATION
-<% if defined? DataMapper -%>
-# config_instance = CONFIGURATION.get(1) || CONFIGURATION.new
-<% else -%>
-# config_instance = CONFIGURATION.find(1) || CONFIGURATION.new
-<%end -%>
+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
@@ -17,7 +18,7 @@
 #   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_dumps # days
+#   Rails.configuration.error_dumper.keep_dumps = config.errors_keep_dump # days
 # end
 
 # idle session timeout configuration (in minutes)

data/lib/generators/rails/active_record/active_record_generator.rb

@@ -0,0 +1,40 @@
+require 'rails/generators/active_record'
+
+module ActiveRecord
+  module Generators
+    class ModelGenerator < Base
+      include ::Ixtlan::Core::Singleton
+
+      argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
+
+      check_class_collision
+
+      class_option :migration,  :type => :boolean
+      class_option :timestamps, :type => :boolean
+      class_option :parent,     :type => :string, :desc => "The parent class for the generated model"
+
+      def create_migration_file
+        return unless options[:migration] && options[:parent].nil?
+        migration_template "migration.rb", "db/migrate/create_#{table_name}.rb"
+      end
+
+      def create_model_file
+        template 'model.rb', File.join('app/models', class_path, "#{file_name}.rb")
+      end
+
+      def create_module_file
+        return if class_path.empty?
+        template 'module.rb', File.join('app/models', "#{class_path.join('/')}.rb") if behavior == :invoke
+      end
+
+      hook_for :test_framework
+
+      protected
+
+        def parent_class_name
+          options[:parent] || "ActiveRecord::Base"
+        end
+
+    end
+  end
+end

data/lib/generators/rails/erb/erb_generator.rb

@@ -0,0 +1,37 @@
+require 'rails/generators/erb'
+require 'rails/generators/resource_helpers'
+
+module Erb
+  module Generators
+    class ScaffoldGenerator < Base
+      include Rails::Generators::ResourceHelpers
+
+      class_option :optimistic, :type => :boolean, :default => false
+      class_option :singleton, :type => :boolean, :default => false
+      class_option :timestamps, :type => :boolean, :default => true
+
+      argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
+
+      def create_root_folder
+        empty_directory File.join("app/views", controller_file_path)
+      end
+
+      def copy_view_files
+        available_views.each do |view|
+          filename = filename_with_extensions(view)
+          template filename, File.join("app/views", controller_file_path, filename)
+        end
+      end
+
+    protected
+
+      def available_views
+        if options[:singleton]
+          %w(edit show _form)
+        else
+          %w(index edit show new _form)
+        end
+      end
+    end
+  end
+end

data/lib/generators/rails/{templates → erb/scaffold}/_form.html.erb

@@ -20,6 +20,9 @@
   </div><!-- end - <%= attribute.name %> -->
 <% end -%>
   <div class="actions">
+<% if options[:optimistic] && options[:timestamps] -%>
+    <%%= f.hidden_field :updated_at %>
+<% end -%>
     <%%= f.submit %>
   </div>
 <%% end %>

data/lib/generators/rails/{templates → erb/scaffold}/index.html.erb

@@ -28,7 +28,9 @@
 <%% end %>
 <%% if allowed?(:<%= table_name %>, :destroy) %>
 <% end -%>
-    <td><%%= link_to 'Destroy', <%= singular_table_name %>, :confirm => 'Are you sure?', :method => :delete %></td>
+    <td><% if options[:optimistic] && options[:timestamps] -%>
+<%%= link_to 'Destroy', <%= singular_table_name %>_path(<%= singular_table_name %>) + "?<%= singular_table_name %>[updated_at]=#{<%= singular_table_name %>.updated_at.utc.strftime('%Y-%m-%d %H:%M:%S.%N')}", :confirm => 'Are you sure?', :method => :delete %><% else -%><%%= link_to 'Destroy', <%= singular_table_name %>, :confirm => 'Are you sure?', :method => :delete %>
+<% end -%></td>
 <% if defined? ::Ixtlan::Guard -%>
 <%% end %>
 <% end -%>

data/lib/generators/{scaffold_controller/templates → rails/scaffold_controller/scaffold_controller}/controller.rb

@@ -61,7 +61,23 @@ class <%= controller_class_name %>Controller < ApplicationController
   # PUT <%= route_url %>/1.xml
   # PUT <%= route_url %>/1.json
   def update
+<% if options[:optimistic] && options[:timestamps] -%>
+    @<%= singular_table_name %> = <%= orm_class.find(class_name, "(params[:#{singular_table_name}]||[]).delete(:updated_at), params[:id]").sub(/\.(get|find)/, '.optimistic_\1') %>
+
+    if @<%= singular_table_name %>.nil?
+      @<%= singular_table_name %> = <%= orm_class.find(class_name, "params[:id]") %>
+      respond_to do |format|
+        format.html { render :action => "edit" }
+        format.xml  { render :xml => nil, :status => :conflict }
+        format.json  { render :json => nil, :status => :conflict }
+      end
+      return
+    end
+<% else -%>
     @<%= singular_table_name %> = <%= orm_class.find(class_name, "params[:id]") %>
+    (params[:<%= singular_table_name %>]||[]).delete(:updated_at)
+<% end -%>
+    (params[:<%= singular_table_name %>]||[]).delete(:id)
 <% if options[:modified_by] -%>
     @<%= singular_table_name %>.current_user = current_user
 <% end -%>
@@ -83,7 +99,21 @@ class <%= controller_class_name %>Controller < ApplicationController
   # DELETE <%= route_url %>/1.xml
   # DELETE <%= route_url %>/1.json
   def destroy
+<% if options[:optimistic] && options[:timestamps] -%>
+    @<%= singular_table_name %> = <%= orm_class.find(class_name, "(params[:#{singular_table_name}]||[]).delete(:updated_at), params[:id]").sub(/\.(get|find)/, '.optimistic_\1') %>
+
+    if @<%= singular_table_name %>.nil?
+      @<%= singular_table_name %> = <%= orm_class.find(class_name, "params[:id]") %>
+      respond_to do |format|
+        format.html { render :action => "edit" }
+        format.xml  { render :xml => nil, :status => :conflict }
+        format.json  { render :json => nil, :status => :conflict }
+      end
+      return
+    end
+<% else -%>
     @<%= singular_table_name %> = <%= orm_class.find(class_name, "params[:id]") %>
+<% end -%>
 <% if options[:modified_by] -%>
     @<%= singular_table_name %>.current_user = current_user
 <% end -%>

data/lib/generators/scaffold/scaffold_generator.rb

@@ -15,6 +15,10 @@ module Rails
         hook_for :resty, :type => :boolean, :default => true
       end
 
+      if defined? ::Ixtlan::Guard
+        hook_for :guard, :type => :boolean, :default => true
+      end
+
       def add_resource_route
         return if options[:actions].present?
         route_config =  class_path.collect{|namespace| "namespace :#{namespace} do " }.join(" ")

data/lib/generators/scaffold_controller/scaffold_controller_generator.rb

@@ -6,14 +6,14 @@ module ScaffoldController
     class ScaffoldControllerGenerator < ::Rails::Generators::NamedBase
       include ::Rails::Generators::ResourceHelpers
 
-      source_root File.expand_path('../templates', __FILE__)
-
       check_class_collision :suffix => "Controller"
 
       class_option :orm, :banner => "NAME", :type => :string, :required => true,
                          :desc => "ORM to generate the controller for"
 
       class_option :singleton, :type => :boolean, :default => false
+      class_option :optimistic, :type => :boolean, :default => false
+      class_option :timestamps, :type => :boolean, :default => true
 
       def create_controller_files
         if options[:singleton]
@@ -29,20 +29,6 @@ module ScaffoldController
       hook_for :helper, :as => :scaffold, :in => :rails do |invoked|
         invoke invoked, [ controller_name ]
       end
-
-      if defined? ::Resty
-        # resty gwt controller
-        hook_for :resty, :type => :boolean, :default => true do |controller|
-          invoke controller, [class_name]
-        end
-      end
-
-      if defined? ::Ixtlan::Guard
-        # allow the ixtlan guards to be generated
-        hook_for :guard, :type => :boolean, :default => true do |controller|
-          invoke controller, [class_name]
-        end
-      end
     end
   end
 end

data/lib/ixtlan/core/optimistic_active_record.rb

@@ -0,0 +1,17 @@
+module Ixtlan
+  module Core
+    module OptimisticActiveRecord
+
+      def self.included(base)
+        base.class_eval do
+          def self.optimistic_find(updated_at, *args)
+            updated_at_date = new(:updated_at => updated_at).updated_at
+            # try different ways to use the date
+            first(:conditions => ["id = ? and updated_at = ?", args[0], updated_at_date]) || first(:conditions => ["id = ? and updated_at = ?", args[0], updated_at])
+            # TODO make it work with different PKs
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ixtlan/core/optimistic_data_mapper.rb

@@ -0,0 +1,16 @@
+module Ixtlan
+  module Core
+    module OptimisticDataMapper
+
+      def self.included(base)
+        base.class_eval do
+          def optimistic_find(updated_at, *args)
+            updated_at = new(:updated_at => updated_at).updated_at
+            # TODO make it work with different PKs
+            first(:id => args[0], :updated_at => updated_at)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ixtlan/core/railtie.rb

@@ -1,36 +1,41 @@
 require 'ixtlan/core/extra_headers'
 require 'ixtlan/core/cache_headers'
 require 'ixtlan/core/x_frame_headers'
+require 'ixtlan/core/optimistic_active_record'
+require 'ixtlan/core/optimistic_data_mapper'
 require 'ixtlan/core/configuration_rack'
 require 'ixtlan/core/configuration_manager'
-
 module Ixtlan
   module Core
-    class Railtie < Rails::Railtie
-      config.generators do
-        require 'rails/generators'
-        
-        templates = File.expand_path('../../../generators/rails/templates', __FILE__)
-        
-        require 'rails/generators/erb/scaffold/scaffold_generator'
-        Erb::Generators::ScaffoldGenerator.source_paths.insert(0, templates)
-        Erb::Generators::ScaffoldGenerator.class_option :singleton, :type => :boolean, :default => false
-        Erb::Generators::ScaffoldGenerator.class_eval do
+
+    module Singleton
+      
+      def self.included(base)
+        base.class_eval do
+          class_option :singleton, :type => :boolean, :default => false
+
+          if self.class.to_s =~  /ScaffoldGenerator$/
           
-          protected
-          alias :available_views_old :available_views
-          def available_views
-            if options[:singleton]
-              %w(edit show _form)
-            else
-              available_views_old
+            protected
+            alias :available_views_old :available_views
+            def available_views
+              if options[:singleton]
+                %w(new create edit show destroy _form)
+              else
+                available_views_old
+              end
             end
+            
           end
         end
+      end
+    end
+
+    class Railtie < Rails::Railtie
+      config.generators do |config|
+        
+        config.templates << File.expand_path('../../../generators/rails', __FILE__)
 
-        require 'rails/generators/active_record/model/model_generator'
-        ActiveRecord::Generators::ModelGenerator.source_paths.insert(0, templates)
-        ActiveRecord::Generators::ModelGenerator.class_option :singleton, :type => :boolean, :default => false
       end
 
       config.before_configuration do |app|
@@ -54,6 +59,19 @@ module Ixtlan
 
         app.config.middleware.use Ixtlan::Core::ConfigurationRack
       end
+      config.after_initialize do |app|
+        if defined? DataMapper
+
+          ::DataMapper::Resource.send(:include, 
+                                      Ixtlan::Core::OptimisticDataMapper)
+
+        elsif defined? ActiveRecord
+
+          ::ActiveRecord::Base.send(:include, 
+                                    Ixtlan::Core::OptimisticActiveRecord)
+
+        end
+      end
     end
   end
 end

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: ixtlan-core
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-    - 0
-    - 2
-    - 0
-  version: 0.2.0
+  prerelease: 
+  version: 0.4.0
 platform: ruby
 authors: 
   - mkristian
@@ -14,27 +10,20 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-03 00:00:00 +05:30
+date: 2011-07-23 00:00:00 +05:30
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: slf4r
     prerelease: false
     requirement: &id001 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
-            segments: 
-              - 0
-              - 4
-              - 2
             version: 0.4.2
         - - <
           - !ruby/object:Gem::Version 
-            segments: 
-              - 0
-              - 4
-              - 99999
             version: 0.4.99999
     type: :runtime
     version_requirements: *id001
@@ -42,41 +31,32 @@ dependencies:
     name: rails
     prerelease: false
     requirement: &id002 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - "="
           - !ruby/object:Gem::Version 
-            segments: 
-              - 3
-              - 0
-              - 5
-            version: 3.0.5
+            version: 3.0.9
     type: :development
     version_requirements: *id002
   - !ruby/object:Gem::Dependency 
     name: rspec
     prerelease: false
     requirement: &id003 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - "="
           - !ruby/object:Gem::Version 
-            segments: 
-              - 2
-              - 4
-              - 0
-            version: 2.4.0
+            version: 2.6.0
     type: :development
     version_requirements: *id003
   - !ruby/object:Gem::Dependency 
     name: cucumber
     prerelease: false
     requirement: &id004 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - "="
           - !ruby/object:Gem::Version 
-            segments: 
-              - 0
-              - 9
-              - 4
             version: 0.9.4
     type: :development
     version_requirements: *id004
@@ -84,19 +64,11 @@ dependencies:
     name: ruby-maven
     prerelease: false
     requirement: &id005 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - "="
           - !ruby/object:Gem::Version 
-            segments: 
-              - 0
-              - 8
-              - 3
-              - 0
-              - 2
-              - 0
-              - 26
-              - 0
-            version: 0.8.3.0.2.0.26.0
+            version: 0.8.3.0.3.0.28.3
     type: :development
     version_requirements: *id005
 description: base for some gems related to protect privacy and increase security along some other utils
@@ -113,35 +85,39 @@ files:
   - lib/ixtlan-core.rb
   - lib/generators/model/model_generator.rb
   - lib/generators/scaffold/scaffold_generator.rb
+  - lib/generators/scaffold_controller/scaffold_controller_generator.rb
+  - lib/generators/rails/erb/erb_generator.rb
+  - lib/generators/rails/erb/scaffold/new.html.erb
+  - lib/generators/rails/erb/scaffold/_form.html.erb
+  - lib/generators/rails/erb/scaffold/index.html.erb
+  - lib/generators/rails/erb/scaffold/show.html.erb
+  - lib/generators/rails/erb/scaffold/edit.html.erb
+  - lib/generators/rails/scaffold_controller/scaffold_controller/controller.rb
+  - lib/generators/rails/scaffold_controller/scaffold_controller/singleton_controller.rb
+  - lib/generators/rails/active_record/active_record_generator.rb
+  - lib/generators/rails/active_record/model/model.rb
+  - lib/generators/rails/active_record/model/migration.rb
   - lib/generators/ixtlan/base.rb
   - lib/generators/ixtlan/configuration_scaffold/configuration_scaffold_generator.rb
   - lib/generators/ixtlan/setup/setup_generator.rb
-  - lib/generators/ixtlan/setup/templates/gitignore
+  - lib/generators/ixtlan/setup/templates/database.yml.example
   - lib/generators/ixtlan/setup/templates/error_with_session.html.erb
-  - lib/generators/ixtlan/setup/templates/production.yml.example
-  - lib/generators/ixtlan/setup/templates/preinitializer.rb
   - lib/generators/ixtlan/setup/templates/error.html.erb
-  - lib/generators/ixtlan/setup/templates/database.yml.example
   - 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/stale.html.erb
+  - lib/generators/ixtlan/setup/templates/production.yml.example
   - lib/generators/ixtlan/configuration_model/configuration_model_generator.rb
-  - lib/generators/scaffold_controller/scaffold_controller_generator.rb
-  - lib/generators/scaffold_controller/templates/controller.rb
-  - lib/generators/scaffold_controller/templates/singleton_controller.rb
-  - lib/generators/rails/templates/index.html.erb
-  - lib/generators/rails/templates/new.html.erb
-  - lib/generators/rails/templates/model.rb
-  - lib/generators/rails/templates/show.html.erb
-  - lib/generators/rails/templates/edit.html.erb
-  - lib/generators/rails/templates/migration.rb
-  - lib/generators/rails/templates/_form.html.erb
-  - lib/ixtlan/core/extra_headers.rb
   - lib/ixtlan/core/x_frame_headers.rb
+  - lib/ixtlan/core/optimistic_data_mapper.rb
+  - lib/ixtlan/core/configuration_rack.rb
+  - lib/ixtlan/core/optimistic_active_record.rb
+  - lib/ixtlan/core/extra_headers.rb
+  - lib/ixtlan/core/cache_headers.rb
   - lib/ixtlan/core/railtie.rb
   - lib/ixtlan/core/configuration_manager.rb
-  - lib/ixtlan/core/cache_headers.rb
-  - lib/ixtlan/core/configuration_rack.rb
   - lib/ixtlan/core/controllers/configuration_controller.rb
   - spec/configuration_manager_spec.rb
 has_rdoc: true
@@ -155,23 +131,21 @@ rdoc_options:
 require_paths: 
   - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-          - 0
         version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-          - 0
         version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.5.1
 signing_key: 
 specification_version: 3
 summary: cache header control, dynamic configuration, and rails generator templates