ixtlan-core 0.6.0 → 0.6.1

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

@@ -1,43 +0,0 @@
-class <%= controller_class_name %>Controller < ApplicationController
- 
-  # GET <%= route_url %>
-  # GET <%= route_url %>.xml
-  # GET <%= route_url %>.json
-  def show
-    @<%= singular_table_name %> = <%= class_name %>.instance
-
-    respond_to do |format|
-      format.html # show.html.erb
-      format.xml  { render :xml => @<%= singular_table_name %> }
-      format.json  { render :json => @<%= singular_table_name %> }
-    end
-  end
-
-  # GET <%= route_url %>/edit
-  def edit
-    @<%= singular_table_name %> = <%= class_name %>.instance
-  end
-
-  # PUT <%= route_url %>
-  # PUT <%= route_url %>.xml
-  # PUT <%= route_url %>.json
-  def update
-    @<%= singular_table_name %> = <%= class_name %>.instance
-<% orm_class.find(class_name)
-   if options[:modified_by] -%>
-    @<%= singular_table_name %>.current_user = current_user
-<% end -%>
-
-    respond_to do |format|
-      if @<%= orm_instance.update_attributes("params[:#{singular_table_name}]") %>
-        format.html { redirect_to(<%= singular_table_name %>_path, :notice => '<%= human_name %> was successfully updated.') }
-        format.xml  { render :xml => @<%= singular_table_name %> }
-        format.json  { render :json => @<%= singular_table_name %> }
-      else
-        format.html { render :action => "edit" }
-        format.xml  { render :xml => @<%= orm_instance.errors %>, :status => :unprocessable_entity }
-        format.json  { render :json => @<%= orm_instance.errors %>, :status => :unprocessable_entity }
-      end
-    end
-  end
-end

data/lib/generators/scaffold/scaffold_generator.rb

@@ -1,35 +0,0 @@
-require 'rails/generators/rails/resource/resource_generator'
-
-module Rails
-  module Generators
-    class ScaffoldGenerator < ResourceGenerator #metagenerator
-      remove_hook_for :resource_controller
-      remove_class_option :actions
-
-      class_option :singleton, :type => :boolean, :default => false
-
-      hook_for :scaffold_controller, :required => true, :in => :scaffold_controller
-      hook_for :stylesheets 
-
-      if defined? Resty
-        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(" ")
-        if options[:singleton]
-          route_config << "resource :#{file_name}"
-        else
-          route_config << "resources :#{file_name.pluralize}"
-        end
-        route_config << " end" * class_path.size
-        route route_config
-      end
-    end
-  end
-end

data/lib/generators/scaffold_controller/scaffold_controller_generator.rb

@@ -1,34 +0,0 @@
-require 'rails/generators/resource_helpers'
-require 'rails/generators/named_base'
-
-module ScaffoldController
-  module Generators
-    class ScaffoldControllerGenerator < ::Rails::Generators::NamedBase
-      include ::Rails::Generators::ResourceHelpers
-
-      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]
-          template 'singleton_controller.rb', File.join('app/controllers', class_path, "#{controller_file_name}_controller.rb")
-        else
-          template 'controller.rb', File.join('app/controllers', class_path, "#{controller_file_name}_controller.rb")
-        end
-      end
-      
-      hook_for :template_engine, :test_framework, :as => :scaffold, :in => :rails
-
-      # Invoke the helper using the controller name (pluralized)
-      hook_for :helper, :as => :scaffold, :in => :rails do |invoked|
-        invoke invoked, [ controller_name ]
-      end
-    end
-  end
-end

data/lib/ixtlan/core/optimistic_active_record.rb

@@ -1,18 +0,0 @@
-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
-            # TODO maybe there is a nicer way ??
-            first(:conditions => ["id = ? and updated_at <= ? and updated_at >= ?", args[0], updated_at, updated_at_date - 0.001]) || first(:conditions => ["id = ? and updated_at <= ? and updated_at >= ?", args[0], updated_at_date, updated_at_date - 0.001])
-            # TODO make it work with different PKs
-          end
-        end
-      end
-    end
-  end
-end