active_scaffold 3.0.4 → 3.0.5

data/lib/generators/active_scaffold/active_scaffold_generator.rb

@@ -6,14 +6,14 @@ module Rails
     class ActiveScaffoldGenerator < ResourceGenerator #metagenerator
       remove_hook_for :resource_controller
       remove_class_option :actions
-      
+
       def add_resource_route
-        route_config =  class_path.collect{|namespace| "namespace :#{namespace} do " }.join(" ") 
+        route_config =  class_path.collect{|namespace| "namespace :#{namespace} do " }.join(" ")
         route_config << "resources :#{file_name.pluralize} do as_routes end"
-        route_config << " end" * class_path.size 
+        route_config << " end" * class_path.size
         route route_config
-      end 
-     
+      end
+
       invoke "active_scaffold_controller"
     end
   end

data/lib/generators/active_scaffold_controller/active_scaffold_controller_generator.rb

@@ -22,7 +22,7 @@ module Rails
 
       def create_view_root_folder
         empty_directory File.join("app/views", controller_file_path)
-      end 
+      end
     end
   end
-end
+end

data/lib/generators/active_scaffold_setup/active_scaffold_setup_generator.rb

@@ -1,8 +1,8 @@
 module Rails
   module Generators
     class ActiveScaffoldSetupGenerator < Rails::Generators::Base #metagenerator
-      argument :js_lib, :type => :string, :default => 'prototype', :desc => 'js_lib for activescaffold (prototype|jquery)' 
-      
+      argument :js_lib, :type => :string, :default => 'prototype', :desc => 'js_lib for activescaffold (prototype|jquery)'
+
       def self.source_root
          @source_root ||= File.join(File.dirname(__FILE__), 'templates')
       end
@@ -17,20 +17,20 @@ module Rails
           get "https://github.com/vhochstein/jQuery-Timepicker-Addon/raw/master/jquery-ui-timepicker-addon.js", "public/javascripts/jquery-ui-timepicker-addon.js"
         end
       end
-      
+
       def configure_active_scaffold
         if js_lib == 'jquery'
           gsub_file 'vendor/plugins/active_scaffold/environment.rb', /#ActiveScaffold.js_framework = :jquery/, 'ActiveScaffold.js_framework = :jquery'
         end
       end
-      
+
       def configure_application_layout
         if js_lib == 'prototype'
-          inject_into_file "app/views/layouts/application.html.erb", 
+          inject_into_file "app/views/layouts/application.html.erb",
                     "  <%= active_scaffold_includes %>\n",
                     :after => "<%= javascript_include_tag :defaults %>\n"
         elsif js_lib == 'jquery'
-          inject_into_file "app/views/layouts/application.html.erb", 
+          inject_into_file "app/views/layouts/application.html.erb",
 "  <%= stylesheet_link_tag 'http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.4/themes/ui-lightness/jquery-ui.css' %>
   <%= javascript_include_tag 'http://ajax.googleapis.com/ajax/libs/jquery/1.4.1/jquery.js' %>
   <%= javascript_include_tag 'rails_jquery.js' %>
@@ -39,15 +39,15 @@ module Rails
   <%= javascript_include_tag 'application.js' %>
   <%= active_scaffold_includes %>\n",
                    :after => "<%= javascript_include_tag :defaults %>\n"
-           
+
           inject_into_file "config/locales/en.yml",
 "  time:
     formats:
-      default: \"%a, %d %b %Y %H:%M:%S\"",                  
+      default: \"%a, %d %b %Y %H:%M:%S\"",
                    :after => "hello: \"Hello world\"\n"
           gsub_file 'app/views/layouts/application.html.erb', /<%= javascript_include_tag :defaults/, '<%# javascript_include_tag :defaults'
         end
-      end     
+      end
     end
   end
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_scaffold
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 3
   - 0
-  - 4
-  version: 3.0.4
+  - 5
+  version: 3.0.5
 platform: ruby
 authors: 
 - Many, see README
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-20 00:00:00 -05:00
+date: 2010-11-22 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -109,7 +109,6 @@ files:
 - README
 - Rakefile
 - active_scaffold.gemspec
-- environment.rb
 - frontends/default/images/add.gif
 - frontends/default/images/arrow_down.gif
 - frontends/default/images/arrow_up.gif
@@ -183,7 +182,6 @@ files:
 - frontends/default/views/update_column.js.rjs
 - frontends/default/views/update_row.js.rjs
 - init.rb
-- install_assets.rb
 - lib/active_record_permissions.rb
 - lib/active_scaffold.rb
 - lib/active_scaffold/actions/common_search.rb

data/environment.rb

@@ -1,24 +0,0 @@
-require 'active_scaffold'
-
-# TODO: clean up extensions. some could be organized for autoloading, and others could be removed entirely.
-Dir["#{File.dirname __FILE__}/lib/extensions/*.rb"].each { |file| require file }
-#Dir["#{File.dirname __FILE__}/lib/generators/*/*.rb"].each { |file| require file }
-require "#{File.dirname __FILE__}/lib/active_scaffold/data_structures/set.rb"
-Dir["#{File.dirname __FILE__}/lib/active_scaffold/data_structures/*.rb"].each { |file| require file }
-Dir["#{File.dirname __FILE__}/lib/active_scaffold/actions/*.rb"].each { |file| require file }
-Dir["#{File.dirname __FILE__}/lib/active_scaffold/config/*.rb"].each { |file| require file }
-require "#{File.dirname __FILE__}/lib/active_scaffold/helpers/id_helpers.rb"
-Dir["#{File.dirname __FILE__}/lib/active_scaffold/helpers/*.rb"].each { |file| require file }
-
-ActionController::Base.send(:include, ActiveScaffold)
-ActionController::Base.send(:include, RespondsToParent)
-ActionController::Base.send(:include, ActiveScaffold::Helpers::ControllerHelpers)
-ActionView::Base.send(:include, ActiveScaffold::Helpers::ViewHelpers)
-
-ActionController::Base.class_eval {include ActiveRecordPermissions::ModelUserAccess::Controller}
-ActiveRecord::Base.class_eval     {include ActiveRecordPermissions::ModelUserAccess::Model}
-ActiveRecord::Base.class_eval     {include ActiveRecordPermissions::Permissions}
-
-require "#{File.dirname __FILE__}/lib/active_scaffold/bridges/bridge.rb"
-I18n.load_path += Dir[File.join(File.dirname(__FILE__), 'lib', 'active_scaffold', 'locale', '*.{rb,yml}')]
-#ActiveScaffold.js_framework = :jquery

data/install_assets.rb

@@ -1,44 +0,0 @@
-# Workaround a problem with script/plugin and http-based repos.
-# See http://dev.rubyonrails.org/ticket/8189
-Dir.chdir(Dir.getwd.sub(/vendor.*/, '')) do
-
-##
-## Copy over asset files (javascript/css/images) from the plugin directory to public/
-##
-
-def copy_files(source_path, destination_path, directory, file_mask = '*.*', clean_up_destination = false)
-  source, destination = File.join(directory, source_path), File.join(Rails.root, destination_path)
-  FileUtils.mkdir_p(destination) unless File.exist?(destination)
-
-  FileUtils.rm Dir.glob("#{destination}/*") if clean_up_destination
-  FileUtils.cp_r(Dir.glob("#{source}/#{file_mask}"), destination)
-end
-
-directory = File.dirname(__FILE__)
-
-copy_files("/public", "/public", directory)
-
-available_frontends = Dir[File.join(directory, 'frontends', '*')].collect { |d| File.basename d }
-[ :stylesheets, :javascripts, :images].each do |asset_type|
-  path = "/public/#{asset_type}/active_scaffold"
-  copy_files(path, path, directory)
-
-  File.open(File.join(Rails.root, path, 'DO_NOT_EDIT'), 'w') do |f|
-    f.puts "Any changes made to files in sub-folders will be lost."
-    f.puts "See http://activescaffold.com/tutorials/faq#custom-css."
-  end
-
-  available_frontends.each do |frontend|
-    if asset_type == :javascripts
-      file_mask = '*.js'
-      source = "/frontends/#{frontend}/#{asset_type}/#{ActiveScaffold.js_framework}"
-    else
-      file_mask = '*.*'
-      source = "/frontends/#{frontend}/#{asset_type}"
-    end
-    destination = "/public/#{asset_type}/active_scaffold/#{frontend}"
-    copy_files(source, destination, directory, file_mask, true)
-  end
-end
-
-end