active_scaffold 3.2.19 → 3.2.20

data/CHANGELOG

@@ -1,4 +1,9 @@
-= 3.2.19 (not released yet)
+= 3.2.20
+- Some fixes for ruby 1.9
+- Some fixes for rails 3.1
+- Fix detection of empty for has_and_belongs_to_many on subforms
+
+= 3.2.19
 - Avoid crashing when between is chosen and from or to is not filled
 
 = 3.2.18

data/README.md

@@ -0,0 +1,67 @@
+Overview
+========
+ActiveScaffold provides a quick and powerful user interfaces for CRUD (create, read, update, delete) operations for Rails applications. It offers additonal features including searching, pagination & layout control. 
+
+Branch Details
+--------------
+This branch (rails-3.2) on Github supports Rails 3.1 & 3.2, and is the current source of the 3.2.x line of gems. The master branch has dropped support for Rails 3.1
+
+Quick Start
+-----------
+To get started with a new Rails project
+
+Added to Gemfile
+
+    gem 'active_scaffold'
+
+Run the following commands
+
+    bundle install
+    bundle exec rake db:create
+    rails g active_scaffold User name:string
+    bundle exec rake db:migrate
+
+Add the following line to app/assets/javascripts/application.js
+
+    //= require active_scaffold
+
+Add the following line to /app/assets/stylesheets/application.css
+
+    *= require active_scaffold
+
+Run the app and visit localhost:3000/teams 
+
+Configuration
+-------------
+See Wiki for instructions on customising ActiveScaffold and to find the full API details.
+
+Compatability Issues
+--------------------
+jQuery 1.9 deprecates some methods that this branch still uses (NB: jQuery 1.9 is supported in the master branch). You'll therefore need to ensure you use jQuery 1.8. You can do this by fixing version in your Gemfile:
+
+    gem 'jquery-rails', '2.1.4'
+
+active_scaffold_batch plugin gem (versions 3.2.x) require the master branch. Therefore if you wish to try using active_scaffold_batch with this branch, you'll need to fork the project and edit the runtime dependency in the gempsec file (use at your own discretion)
+
+Credits
+-------
+ActiveScaffold grew out of a project named Ajaxscaffold dating back to 2006. It has had numerous contributors including:
+
+ActiveScaffold Gem/Plugin by Scott Rutherford (scott@caronsoftware.com), Richard White (rrwhite@gmail.com), Lance Ivy (lance@cainlevy.net), Ed Moss, Tim Harper and Sergio Cambra (sergio@entrecables.com)
+
+Uses DhtmlHistory by Brad Neuberg (bkn3@columbia.edu)
+http://codinginparadise.org
+
+Uses Querystring by Adam Vandenberg
+http://adamv.com/dev/javascript/querystring
+
+Uses Paginator by Bruce Williams
+http://paginator.rubyforge.org/
+
+Supports RecordSelect by Lance Ivy
+http://code.google.com/p/recordselect/
+
+
+License
+=======
+Released under the MIT license (included)

data/app/assets/javascripts/jquery/date_picker_bridge.js.erb

@@ -1,3 +1,4 @@
+<%# encoding: utf-8 %>
 <%= ActiveScaffold::Bridges[:date_picker].localization %>
 
 jQuery(document).ready(function() {

data/frontends/default/views/on_create.js.erb

@@ -17,7 +17,7 @@ action_link.update_flash_messages('<%=escape_javascript(render(:partial => 'mess
   <% elsif params[:parent_controller].nil? %>
     <% new_row = render :partial => 'list_record', :locals => {:record => @record} %>
     ActiveScaffold.create_record_row(action_link.scaffold(),'<%= escape_javascript(new_row) %>', <%= {:insert_at => insert_at}.to_json.html_safe %>);
-    <%= render :partial => 'update_calculations', :formats => [:js] %>
+    <%= render :partial => 'update_calculations.js' %>
   <% end %>
 
   <% unless render_parent? %>

data/frontends/default/views/on_update.js.erb

@@ -6,7 +6,7 @@ action_link.update_flash_messages('<%= escape_javascript(render(:partial => 'mes
   <% if params[:dont_close] %>
     <% row_selector = element_row_id(:action => :list, :id => @record.id) %>
     ActiveScaffold.update_row('<%= row_selector %>', '<%= escape_javascript(render(:partial => 'list_record', :locals => {:record => @record})) %>');
-    <%= render :partial => 'update_calculations', :formats => [:js] %>
+    <%= render :partial => 'update_calculations.js' %>
     ActiveScaffold.scroll_to('<%= row_selector %>', true);
   <% else %>
     <% if render_parent? %>
@@ -19,7 +19,7 @@ action_link.update_flash_messages('<%= escape_javascript(render(:partial => 'mes
       <%= render :partial => 'refresh_list' %>
     <% else %>
       action_link.close('<%= escape_javascript(render(:partial => 'list_record', :locals => {:record => @record})) %>');
-      <%= render :partial => 'update_calculations', :formats => [:js] %>
+      <%= render :partial => 'update_calculations.js' %>
     <% end %>
   <% end %>
 <% else %>

data/lib/active_scaffold.rb

@@ -16,6 +16,7 @@ require 'active_scaffold/engine' unless defined? ACTIVE_SCAFFOLD_PLUGIN
 require 'json'  # for js_config
 
 module ActiveScaffold
+  METHOD_CONVERSION = RUBY_VERSION < '1.9' ? :to_s : :to_sym
   autoload :AttributeParams, 'active_scaffold/attribute_params'
   autoload :Configurable, 'active_scaffold/configurable'
   autoload :Constraints, 'active_scaffold/constraints'

data/lib/active_scaffold/actions/create.rb

@@ -34,7 +34,7 @@ module ActiveScaffold::Actions
     def create_respond_to_html
       if params[:iframe]=='true' # was this an iframe post ?
         responds_to_parent do
-          render :action => 'on_create', :formats => [:js], :layout => false
+          render :action => 'on_create.js', :layout => false
         end
       else
         if successful?

data/lib/active_scaffold/actions/update.rb

@@ -35,7 +35,7 @@ module ActiveScaffold::Actions
     def update_respond_to_html
       if params[:iframe]=='true' # was this an iframe post ?
         responds_to_parent do
-          render :action => 'on_update', :formats => [:js], :layout => false
+          render :action => 'on_update.js', :layout => false
         end
       else # just a regular post
         if successful?

data/lib/active_scaffold/attribute_params.rb

@@ -190,7 +190,7 @@ module ActiveScaffold
         if value.is_a?(Hash)
           attributes_hash_is_empty?(value, klass)
         elsif value.is_a?(Array)
-          value.any? {|id| id.respond_to?(:empty?) ? !id.empty? : true}
+          value.all?(&:blank?)
         else
           value.respond_to?(:empty?) ? value.empty? : false
         end

data/lib/active_scaffold/bridges/calendar_date_select.rb

@@ -3,7 +3,7 @@ class ActiveScaffold::Bridges::CalendarDateSelect < ActiveScaffold::DataStructur
     # check to see if the old bridge was installed.  If so, warn them
     # we can detect this by checking to see if the bridge was installed before calling this code
        
-    if ActiveScaffold::Config::Core.instance_methods.include?("initialize_with_calendar_date_select")
+    if ActiveScaffold::Config::Core.instance_methods.include?("initialize_with_calendar_date_select".send(::ActiveScaffold::METHOD_CONVERSION))
       raise RuntimeError, "We've detected that you have active_scaffold_calendar_date_select_bridge installed.  This plugin has been moved to core.  Please remove active_scaffold_calendar_date_select_bridge to prevent any conflicts"
     end
     

data/lib/active_scaffold/bridges/file_column.rb

@@ -1,6 +1,6 @@
 class ActiveScaffold::Bridges::FileColumn < ActiveScaffold::DataStructures::Bridge
   def self.install
-    if ActiveScaffold::Config::Core.instance_methods.include?("initialize_with_file_column")
+    if ActiveScaffold::Config::Core.instance_methods.include?("initialize_with_file_column".send(::ActiveScaffold::METHOD_CONVERSION))
       raise RuntimeError, "We've detected that you have active_scaffold_file_column_bridge installed.  This plugin has been moved to core.  Please remove active_scaffold_file_column_bridge to prevent any conflicts"
     end
     require File.join(File.dirname(__FILE__), "file_column/as_file_column_bridge")

data/lib/active_scaffold/bridges/file_column/as_file_column_bridge.rb

@@ -24,7 +24,7 @@ module ActiveScaffold::Config
       }
     end
     
-    alias_method_chain :initialize, :file_column unless self.instance_methods.include?("initialize_without_file_column")
+    alias_method_chain :initialize, :file_column unless self.instance_methods.include?("initialize_without_file_column".send(::ActiveScaffold::METHOD_CONVERSION))
     
     def configure_file_column_field(field)
       # set list_ui first because it gets its default value from form_ui

data/lib/active_scaffold/bridges/file_column/file_column_helpers.rb

@@ -4,12 +4,12 @@ module ActiveScaffold
       module FileColumnHelpers
         class << self
           def file_column_fields(klass)
-            klass.instance_methods.grep(/_just_uploaded\?$/).collect{|m| m[0..-16].to_sym }
+            klass.instance_methods.select{|m| m.to_s =~ /_just_uploaded\?$/}.collect{|m| m[0..-16].to_sym }
           end
           
           def generate_delete_helpers(klass)
             file_column_fields(klass).each { |field|
-              klass.send :class_eval, <<-EOF, __FILE__, __LINE__ + 1  unless klass.methods.include?("#{field}_with_delete=")
+              klass.send :class_eval, <<-EOF, __FILE__, __LINE__ + 1  unless klass.methods.include?("#{field}_with_delete=".send(::ActiveScaffold::METHOD_CONVERSION))
                 attr_reader :delete_#{field}
                 
                 def delete_#{field}=(value)

data/lib/active_scaffold/bridges/paperclip.rb

@@ -1,6 +1,6 @@
 class ActiveScaffold::Bridges::Paperclip < ActiveScaffold::DataStructures::Bridge
   def self.install
-    if ActiveScaffold::Config::Core.instance_methods.include?("initialize_with_paperclip")
+    if ActiveScaffold::Config::Core.instance_methods.include?("initialize_with_paperclip".send(::ActiveScaffold::METHOD_CONVERSION))
       raise RuntimeError, "We've detected that you have active_scaffold_paperclip_bridge installed. This plugin has been moved to core. Please remove active_scaffold_paperclip_bridge to prevent any conflicts"
     end
     require File.join(File.dirname(__FILE__), "paperclip/form_ui")

data/lib/active_scaffold/bridges/paperclip/paperclip_bridge_helpers.rb

@@ -6,7 +6,7 @@ module ActiveScaffold
         self.thumbnail_style = :thumbnail
 
         def self.generate_delete_helper(klass, field)
-          klass.class_eval <<-EOF, __FILE__, __LINE__ + 1 unless klass.instance_methods.include?("delete_#{field}=")
+          klass.class_eval <<-EOF, __FILE__, __LINE__ + 1 unless klass.instance_methods.include?("delete_#{field}=".send(::ActiveScaffold::METHOD_CONVERSION))
             attr_reader :delete_#{field}
 
             def delete_#{field}=(value)

data/lib/active_scaffold/bridges/tiny_mce/helpers.rb

@@ -16,7 +16,7 @@ class ActiveScaffold::Bridges::TinyMce
         options[:class] = "#{options[:class]} mceEditor #{column.options[:class]}".strip
 				
 				settings = { :theme => 'simple' }.merge(column.options[:tinymce] || {})
-				settings = settings.to_s.gsub(/:(.+?)\=\>/, '\1:')
+        settings = settings.to_json
 				settings = "tinyMCE.settings = #{settings};"
 
         html = []

data/lib/active_scaffold/data_structures/column.rb

@@ -174,7 +174,11 @@ module ActiveScaffold::DataStructures
     end
 
     # a collection of columns to load when eager loading is disabled, if it's nil all columns will be loaded
-    attr_accessor :select_columns
+    attr_accessor :select_associated_columns
+    def select_columns=(value)
+      ActiveSupport::Deprecation.warn "Use select_associated_columns= instead of select_columns="
+      self.select_associated_columns = value
+    end
 
     # describes how to search on a column
     #   search = true           default, uses intelligent search sql

data/lib/active_scaffold/finder.rb

@@ -357,8 +357,8 @@ module ActiveScaffold
     
     def append_to_query(query, options)
       options.assert_valid_keys :where, :select, :group, :reorder, :limit, :offset, :joins, :includes, :lock, :readonly, :from, :conditions
-      query = apply_conditions(query, *options.delete(:conditions)) if options[:conditions]
-      options.reject{|k, v| v.blank?}.inject(query) do |query, (k, v)|
+      query = apply_conditions(query, *options[:conditions]) if options[:conditions]
+      options.reject{|k, v| k == :conditions || v.blank?}.inject(query) do |query, (k, v)|
         query.send((k.to_sym), v) 
       end
     end

data/lib/active_scaffold/helpers/list_column_helpers.rb

@@ -237,7 +237,7 @@ module ActiveScaffold
           if column.associated_limit.nil?
             Rails.logger.warn "ActiveScaffold: Enable eager loading for #{column.name} association to reduce SQL queries"
           elsif column.associated_limit > 0
-            value.target = value.find(:all, :limit => column.associated_limit + 1, :select => column.select_columns)
+            value.target = value.find(:all, :limit => column.associated_limit + 1, :select => column.select_associated_columns)
           elsif @cache_associations
             value.target = size.to_i.zero? ? [] : [nil]
           end

data/lib/active_scaffold/version.rb

@@ -2,7 +2,7 @@ module ActiveScaffold
   module Version
     MAJOR = 3
     MINOR = 2
-    PATCH = 19
+    PATCH = 20
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_scaffold
 version: !ruby/object:Gem::Version 
-  hash: 41
+  hash: 39
   prerelease: 
   segments: 
   - 3
   - 2
-  - 19
-  version: 3.2.19
+  - 20
+  version: 3.2.20
 platform: ruby
 authors: 
 - Many, see README
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-02-04 00:00:00 Z
+date: 2013-04-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :development
@@ -84,7 +84,7 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- README
+- README.md
 files: 
 - app/assets/images/active_scaffold/add.png
 - app/assets/images/active_scaffold/arrow_down.png
@@ -332,7 +332,7 @@ files:
 - vendor/assets/stylesheets/jquery-ui.css
 - MIT-LICENSE
 - CHANGELOG
-- README
+- README.md
 - test/bridges/active_scaffold_dependent_protect_test.rb
 - test/bridges/bridge_test.rb
 - test/bridges/company.rb
@@ -442,7 +442,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Rails 3.1 Version of activescaffold supporting prototype and jquery

data/README

@@ -1,66 +0,0 @@
-ActiveScaffold Gem/Plugin by Scott Rutherford (scott@caronsoftware.com), Richard White (rrwhite@gmail.com), Lance Ivy (lance@cainlevy.net), Ed Moss, Tim Harper and Sergio Cambra (sergio@entrecables.com)
-
-Uses DhtmlHistory by Brad Neuberg (bkn3@columbia.edu)
-http://codinginparadise.org
-
-Uses Querystring by Adam Vandenberg
-http://adamv.com/dev/javascript/querystring
-
-Uses Paginator by Bruce Williams
-http://paginator.rubyforge.org/
-
-Supports RecordSelect by Lance Ivy
-http://code.google.com/p/recordselect/
-
-== Version Information
-
-If you want to use the gem, add to your Gemfile:
-  gem "active_scaffold"
-
-In case you would like to use most recent commit:
-  gem 'active_scaffold', :git => 'git://github.com/activescaffold/active_scaffold.git'
-
-3.1.* and 3.2.* versions works with rails 3.1 and 3.2, 3.0.* versions with rails 3.0.
-To use previous rails versions you will have to install the right branch as a plugin.
-
-Active Scaffold master currently supports rails 3.1 and rails 3.2, you can use following branches for previous rails versions:
-Rails 3.0.*: Active Scaffold rails-3.0
-Rails 2.3.*: Active Scaffold rails-2.3 and v2.4
-Rails 2.2.*: Active Scaffold rails-2.2
-Rails 2.1.*: Active Scaffold rails-2.1
-Rails < 2.1: Active Scaffold 1-1-stable (no guarantees)
-
-Since Rails 2.3, render_component plugin is needed for nested and embedded scaffolds. It works with rails-2.3 branch from ewildgoose repository:
-script/plugin install git://github.com/ewildgoose/render_component.git -r rails-2.3
-
-Since Rails 3.0 render_component is not used for nesting, but is optional for embedded scaffolds.
-For Rails 3.0, https://github.com/rails/verification.git is also needed, not in rails 3.1 or higher.
-
-If you want to install as plugins under vendor/plugins, install these versions:
-  rails plugin install git://github.com/vhochstein/render_component.git
-  rails plugin install git://github.com/rails/verification.git
-  rails plugin install git://github.com/activescaffold/active_scaffold.git -r 'rails-3.0'
-
-== Pick your own javascript framework
-
-The Rails 3.0 version uses unobtrusive Javascript, so you are free to pick your javascript framework.
-Out of the box Prototype or JQuery are supported for rails 3.1 and later. For rails 3.0 pick a JS file:
-
-Prototype 1.7 (default js framework)
-rails.js in git://github.com/vhochstein/prototype-ujs.git
-
-JQuery 1.4.1, 1.4.2
-https://github.com/vhochstein/jquery-ujs/raw/jquery1_4_2/src/rails.js
-
-JQuery > 1.4.2
-https://github.com/vhochstein/jquery-ujs/raw/master/src/rails.js
-
-To configure the javascript framework when installed under vendor/plugins/
-uncomment last line in config/initializers/active_scaffold.rb in order to use jquery instead of prototype.
-That file is created when you install ActiveScaffold as a plugin.
-
-To configure the javascript framework when installed as a gem:
-Add a config/initializers/active_scaffold.rb containing:
-ActiveScaffold.js_framework = :jquery # :prototype is the default
-
-Released under the MIT license (included)