active_scaffold 3.4.12 → 3.4.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e90634abde41880d285eb02b74524c356bb44ba
-  data.tar.gz: 10e6bd5dcdd6ca95f8bbfc43cb6b65e6a162293e
+  metadata.gz: fd09ee16b2e93880391fad8eab47d2b2e41687c4
+  data.tar.gz: 186a9efd135d86b371ae7cf93206634753aed0ca
 SHA512:
-  metadata.gz: ec33031cbabe0367c55e532adff3557527c309a700404bd0e19570e76ad4e199ae257f49fe4668a0550f33906aa5cdbeab2a0475b90222de85df356dd36ed38e
-  data.tar.gz: cdaf43ba742dddfa274acc83610e2a7895cf471139da9868eb588c46c20c723a12c261567f8e2b1e212ebdd587a10017d8c3fc90e0ba2d3d65801de943315c6a
+  metadata.gz: 4cf41d9f68f77f7bd4ce86e457ad7ce536a4cf646a088b196867cacd74d654f428966f30f148f11aa2972a00575609e14bdd9b3ccb297ece4833927315a7de7f
+  data.tar.gz: cff3c6c6c20eabb9a99961a1991fb7ddaada2baef7476170c5c508a8017a8fbea6d986710d153ba3ebb38cb0d058fc122d1ee5046741ed1920e8e98c8f26682d

data/CHANGELOG

@@ -1,3 +1,13 @@
+= 3.4.13
+- fix parent_prefixes deprecation on rails 4.2
+- set parent record on add existing
+- add record_select_params_for_add_existing to allow to set params on record select browse url, so add existing records are filtered
+- fix search with date and boolean columns on rails 4.2
+- fix cache association for has many through
+- move handle_user_settings and check_input_device filters to Actions::Core so filters are not added to ActionController::Base, see cb2fabd
+- allow to use search and field_search without AJAX
+- allow to remove reset button in search and field_search
+
 = 3.4.12
 - Workaround for counter_cache bug on polymorphic associations on rails4
 - Improve use of CRUD actions without list action

data/app/views/active_scaffold_overrides/_field_search.html.erb

@@ -1,8 +1,8 @@
-<% url_options = params_for(:action => :index, :search => nil) -%>
+<% url_options ||= params_for(:action => :index, :search => nil) -%>
 <%=
 options = {:id => element_form_id(:action => 'search'),
            :class => "as_form search",
-           :remote => true,
+           :remote => xhr ||= request.xhr?,
            :method => :get,
            'data-loading' => true}
 form_tag url_options, options %>
@@ -28,7 +28,7 @@ form_tag url_options, options %>
   </ol>
   <p class="form-footer">
     <%= submit_tag as_(:search), :class => "submit" %>
-    <%= link_to as_(:reset), url_for(url_options.merge(:search => '')), :class => 'as_cancel reset', :remote => true, :data => {:refresh => true} %>
+    <%= link_to as_(:reset), url_for(url_options.merge(:search => '')), :class => 'as_cancel reset', :remote => true, :data => {:refresh => true} unless local_assigns[:skip_reset] %>
     <%= loading_indicator_tag(:action => :search) %>
   </p>
 </form>

data/app/views/active_scaffold_overrides/_form_association_footer.html.erb

@@ -35,7 +35,7 @@ add_new_url = params_for(:controller => controller_path, :action => 'edit_associ
 
     <% if show_add_existing -%>
       <% if remote_controller and remote_controller.respond_to? :uses_record_select? and remote_controller.uses_record_select? -%>
-        <%= link_to_record_select as_(:add_existing), remote_controller.controller_path, :onselect => "ActiveScaffold.record_select_onselect(#{url_for(edit_associated_url).to_json}, #{active_scaffold_id.to_json}, id);" -%>
+        <%= link_to_record_select as_(:add_existing), remote_controller.controller_path, record_select_params_for_add_existing(column.association, edit_associated_url, parent_record) -%>
       <% else -%>
         <% select_options = options_from_collection_for_select(sorted_association_options_find(column.association, nil, parent_record), :to_param, :to_label)
            add_existing_id = "#{sub_form_id(:association => column.name, :id => parent_record.id || temporary_id || 99999999999)}-add-existing"

data/app/views/active_scaffold_overrides/_list_with_header.html.erb

@@ -9,7 +9,7 @@
         <tr>
           <td>
             <div class="active-scaffold show_search-view <%= "#{id_from_controller params[:controller]}-view" %> view">
-              <%= render :partial => active_scaffold_config.list.search_partial %>
+              <%= render :partial => active_scaffold_config.list.search_partial, :locals => {:xhr => true} %>
             </div> 
           </td> 
         </tr>

data/app/views/active_scaffold_overrides/_search.html.erb

@@ -3,12 +3,12 @@
 <%=
 options = {:id => element_form_id(:action => 'search'),
            :class => "as_form search#{' live' if live_search}",
-           :remote => true,
+           :remote => xhr ||= request.xhr?,
            :'data-loading' => true,
            :method => :get}
   form_tag url_options, options %>
   <%= search_field_tag :search, (search_params if search_params.is_a? String), :class => 'text-input', :id => search_input_id, :size => 50, :autocomplete => :off, :placeholder => as_(live_search ? :live_search : :search_terms) %>
   <%= submit_tag as_(:search), :class => "submit", :style => ('display:none;' if live_search) %>
-  <%= link_to as_(:reset), url_for(url_options.merge(:search => '')), :class => 'as_cancel reset', :remote => true, :data => {:refresh => true} %>
+  <%= link_to as_(:reset), url_for(url_options.merge(:search => '')), :class => 'as_cancel reset', :remote => true, :data => {:refresh => true} unless local_assigns[:skip_reset] %>
   <%= loading_indicator_tag(:action => :search) %>
 </form>

data/lib/active_scaffold/actions/core.rb

@@ -2,6 +2,8 @@ module ActiveScaffold::Actions
   module Core
     def self.included(base)
       base.class_eval do
+        before_filter :handle_user_settings
+        before_filter :check_input_device
         before_filter :register_constraints_with_action_columns, :unless => :nested?
         after_filter :clear_flashes
         after_filter :clear_storage
@@ -13,6 +15,8 @@ module ActiveScaffold::Actions
       base.helper_method :loading_embedded?
       base.helper_method :calculate_query
       base.helper_method :new_model
+      base.helper_method :touch_device?
+      base.helper_method :hover_via_click?
     end
     def render_field
       if request.get?
@@ -208,9 +212,9 @@ module ActiveScaffold::Actions
           next if active_scaffold_constraints[key]
           next if nested? and nested.param_name == key
           conditions[key] = if value.is_a?(Array)
-            value.map {|v| v == '' && not_string ? nil : column.type_cast(v) }
+            value.map {|v| v == '' && not_string ? nil : ActiveScaffold::Core.column_type_cast(v, column) }
           else
-            value == '' && not_string ? nil : column.type_cast(value)
+            value == '' && not_string ? nil : ActiveScaffold::Core.column_type_cast(value, column)
           end
         end
         conditions
@@ -234,6 +238,36 @@ module ActiveScaffold::Actions
       @record = find_if_allowed(params[:id], crud_type_or_security_options, klass)
     end
 
+    # at some point we need to pass the session and params into config. we'll just take care of that before any particular action occurs by passing those hashes off to the UserSettings class of each action.
+    def handle_user_settings
+      if self.class.uses_active_scaffold?
+        storage = active_scaffold_config.store_user_settings ? active_scaffold_session_storage : {}
+        active_scaffold_config.actions.each do |action_name|
+          conf_instance = active_scaffold_config.send(action_name) rescue next
+          next if conf_instance.class::UserSettings == ActiveScaffold::Config::Base::UserSettings # if it hasn't been extended, skip it
+          conf_instance.user = conf_instance.class::UserSettings.new(conf_instance, storage, params)
+        end
+      end
+    end
+
+    def check_input_device
+      if request.env["HTTP_USER_AGENT"] && request.env["HTTP_USER_AGENT"][/(iPhone|iPod|iPad)/i]
+        session[:input_device_type] = 'TOUCH'
+        session[:hover_supported] = false
+      else
+        session[:input_device_type] = 'MOUSE'
+        session[:hover_supported] = true
+      end if session[:input_device_type].nil?
+     end
+
+    def touch_device?
+      session[:input_device_type] == 'TOUCH'
+    end
+
+    def hover_via_click?
+      session[:hover_supported] == false
+    end
+
     # call this method in your action_link action to simplify processing of actions
     # eg for member action_link :fire
     # process_action_link_action do |record|

data/lib/active_scaffold/actions/subform.rb

@@ -19,7 +19,17 @@ module ActiveScaffold::Actions
 
       # NOTE: we don't check whether the user is allowed to update this record, because if not, we'll still let them associate the record. we'll just refuse to do more than associate, is all.
       @record = @column.association.klass.find(params[:associated_id]) if params[:associated_id]
-      @record ||= build_associated(@column.association, @parent_record)
+      if @record
+        if association = active_scaffold_config.columns[params[:child_association]].association.reverse
+          if @record.class.reflect_on_association(association).collection?
+            @record.send(association) << @parent_record
+          else
+            @record.send("#{association}=", @parent_record)
+          end
+        end
+      else
+        @record = build_associated(@column.association, @parent_record)
+      end
       @scope = params[:scope]
     end
 

data/lib/active_scaffold/core.rb

@@ -2,14 +2,6 @@ module ActiveScaffold
   module Core
     def self.included(base)
       base.extend(ClassMethods)
-      base.module_eval do
-        # TODO: these should be in actions/core
-        before_filter :handle_user_settings
-        before_filter :check_input_device
-      end
-
-      base.helper_method :touch_device?
-      base.helper_method :hover_via_click?
       base.helper_method :active_scaffold_constraints
     end
 
@@ -36,36 +28,6 @@ module ActiveScaffold
       session_index = active_scaffold_session_storage_key
       session.delete(session_index) unless session[session_index].present?
     end
-
-    # at some point we need to pass the session and params into config. we'll just take care of that before any particular action occurs by passing those hashes off to the UserSettings class of each action.
-    def handle_user_settings
-      if self.class.uses_active_scaffold?
-        storage = active_scaffold_config.store_user_settings ? active_scaffold_session_storage : {}
-        active_scaffold_config.actions.each do |action_name|
-          conf_instance = active_scaffold_config.send(action_name) rescue next
-          next if conf_instance.class::UserSettings == ActiveScaffold::Config::Base::UserSettings # if it hasn't been extended, skip it
-          conf_instance.user = conf_instance.class::UserSettings.new(conf_instance, storage, params)
-        end
-      end
-    end
-
-    def check_input_device
-      if request.env["HTTP_USER_AGENT"] && request.env["HTTP_USER_AGENT"][/(iPhone|iPod|iPad)/i]
-        session[:input_device_type] = 'TOUCH'
-        session[:hover_supported] = false
-      else
-        session[:input_device_type] = 'MOUSE'
-        session[:hover_supported] = true
-      end if session[:input_device_type].nil?
-     end
-
-    def touch_device?
-      session[:input_device_type] == 'TOUCH'
-    end
-
-    def hover_via_click?
-      session[:hover_supported] == false
-    end
       
     module ClassMethods
       def active_scaffold(model_id = nil, &block)
@@ -121,8 +83,8 @@ module ActiveScaffold
       end
 
       module Prefixes
-        def parent_prefixes
-          @parent_prefixes ||= super << 'active_scaffold_overrides'
+        define_method Rails.version < '4.2' ? 'parent_prefixes' : 'local_prefixes' do
+          @local_prefixes ||= super() << 'active_scaffold_overrides'
         end
       end
 
@@ -273,5 +235,13 @@ module ActiveScaffold
       end
       raise ActiveScaffold::ControllerNotFound, "Could not find " + error_message.join(" or "), caller
     end
+
+    def self.column_type_cast(value, column)
+      if Rails.version < '4.2'
+        column.type_cast value
+      else
+        column.cast_type.type_cast_from_user value
+      end
+    end
   end
 end

data/lib/active_scaffold/finder.rb

@@ -26,7 +26,7 @@ module ActiveScaffold
         tokens.collect do |value|
           columns.inject([phrase]) do |condition, column|
             Array(column.search_sql).size.times do
-              condition.push(column.text? ? like_pattern.sub('?', value) : column.column.type_cast(value))
+              condition.push(column.text? ? like_pattern.sub('?', value) : ActiveScaffold::Core.column_type_cast(value, column.column))
             end
             condition
           end
@@ -52,7 +52,7 @@ module ActiveScaffold
             else
               case search_ui
               when :boolean, :checkbox
-                ["%{search_sql} = ?", column.column ? column.column.type_cast(value) : value]
+                ["%{search_sql} = ?", column.column ? ActiveScaffold::Core.column_type_cast(value, column.column) : value]
               when :integer, :decimal, :float
                 condition_for_numeric(column, value)
               when :string, :range
@@ -65,7 +65,7 @@ module ActiveScaffold
                 if column.text?
                   ["%{search_sql} #{ActiveScaffold::Finder.like_operator} ?", like_pattern.sub('?', value)]
                 else
-                  ["%{search_sql} = ?", column.column.type_cast(value)]
+                  ["%{search_sql} = ?", ActiveScaffold::Core.column_type_cast(value, column.column)]
                 end
               end
             end
@@ -100,7 +100,7 @@ module ActiveScaffold
           if column.text?
             ["%{search_sql} #{ActiveScaffold::Finder.like_operator} ?", like_pattern.sub('?', value)]
           else
-            ["%{search_sql} = ?", column.column.type_cast(value)]
+            ["%{search_sql} = ?", ActiveScaffold::Core.column_type_cast(value, column.column)]
           end
         elsif ActiveScaffold::Finder::NullComparators.include?(value[:opt])
           condition_for_null_type(column, value[:opt], like_pattern)

data/lib/active_scaffold/helpers/association_helpers.rb

@@ -109,6 +109,10 @@ module ActiveScaffold
             nil
         end
       end
+
+      def record_select_params_for_add_existing(association, edit_associated_url_options, record)
+        {:onselect => "ActiveScaffold.record_select_onselect(#{url_for(edit_associated_url_options).to_json}, #{active_scaffold_id.to_json}, id);"}
+      end
     end
   end
 end

data/lib/active_scaffold/helpers/human_condition_helpers.rb

@@ -38,7 +38,7 @@ module ActiveScaffold
             end
             as_(:association, :scope => :human_conditions, :column => column.active_record_class.human_attribute_name(column.name), :value => associated.join(', '))
           when :boolean, :checkbox
-            label = column.column.type_cast(value) ? as_(:true) : as_(:false)
+            label = ActiveScaffold::Core.column_type_cast(value, column.column) ? as_(:true) : as_(:false)
             as_(:boolean, :scope => :human_conditions, :column => column.active_record_class.human_attribute_name(column.name), :value => label)
           when :null
             "#{column.active_record_class.human_attribute_name(column.name)} #{as_(value.to_sym)}"

data/lib/active_scaffold/helpers/list_column_helpers.rb

@@ -193,7 +193,7 @@ module ActiveScaffold
           logger.warn "ActiveScaffold: Enable eager loading for #{column.name} association to reduce SQL queries"
         elsif column.associated_limit > 0
           # load at least one record more, is needed to display '...'
-          association.target = association.reader.limit(column.associated_limit + 1).select(column.select_associated_columns || '*').to_a
+          association.target = association.reader.limit(column.associated_limit + 1).select(column.select_associated_columns || "#{association.klass.quoted_table_name}.*").to_a
         elsif @cache_associations
           association.target = []
         end

data/lib/active_scaffold/helpers/search_column_helpers.rb

@@ -137,7 +137,7 @@ module ActiveScaffold
         select_options << [as_(:true), true]
         select_options << [as_(:false), false]
 
-        select_tag(options[:name], options_for_select(select_options, column.column.type_cast(options[:value])), :id => options[:id])
+        select_tag(options[:name], options_for_select(select_options, ActiveScaffold::Core.column_type_cast(options[:value], column.column)), :id => options[:id])
       end
       # we can't use checkbox ui because it's not possible to decide whether search for this field or not
       alias_method :active_scaffold_search_checkbox, :active_scaffold_search_boolean

data/lib/active_scaffold/version.rb

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

data/test/data_structures/action_columns_test.rb

@@ -5,6 +5,7 @@ require 'test_helper'
 class ActionColumnsTest < MiniTest::Test
   def setup
     @columns = ActiveScaffold::DataStructures::ActionColumns.new([:a, :b])
+    @columns.action = stub(:core => stub(:model_id => 'model_stub'))
   end
 
   def test_label

data/test/helpers/search_column_helpers_test.rb

@@ -0,0 +1,14 @@
+require 'test_helper'
+
+class SearchColumnHelpersTest < ActionView::TestCase
+  include ActiveScaffold::Helpers::SearchColumnHelpers
+
+  def setup
+    @column = ActiveScaffold::DataStructures::Column.new(:adult, Person)
+    @record = Person.new
+  end
+
+  def test_choices_for_boolean_search_ui
+    assert_dom_equal "<select name=\"search[adult]\"><option value=\"\">- select -</option>\n<option value=\"true\">True</option>\n<option value=\"false\" selected=\"selected\">False</option></select>", active_scaffold_search_boolean(@column, :object => @record, :name => "search[adult]", :value => '0')
+  end
+end

data/test/misc/finder_test.rb

@@ -92,6 +92,11 @@ class FinderTest < MiniTest::Test
     page = @klass.send :find_page, :pagination => :infinite
   end
 
+  def test_condition_for_column
+    column = ActiveScaffold::DataStructures::Column.new('adult', Person)
+    assert_equal ['"people"."adult" = ?', false], ClassWithFinder.condition_for_column(column, '0')
+  end
+
   private
   def relation_class
     @klass.active_scaffold_config.model.send(:relation).class

data/test/misc/render_test.rb

@@ -0,0 +1,9 @@
+require 'test_helper'
+
+class RenderTest < ActionController::TestCase
+  tests AddressesController
+  test 'render activescaffold views' do
+    get :index
+    assert_template 'list'
+  end
+end

data/test/mock_app/db/schema.rb

@@ -48,6 +48,7 @@ ActiveRecord::Schema.define do
     t.integer 'buildings_count', :null => false, :default => 0
     t.integer 'floors_count', :null => false, :default => 0
     t.integer 'contacts_count', :null => false, :default => 0
+    t.boolean 'adult', :null => false, :default => false
     t.datetime "created_at"
     t.datetime "updated_at"
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold
 version: !ruby/object:Gem::Version
-  version: 3.4.12
+  version: 3.4.13
 platform: ruby
 authors:
 - Many, see README
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-19 00:00:00.000000000 Z
+date: 2015-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
@@ -336,6 +336,7 @@ files:
 - test/helpers/form_column_helpers_test.rb
 - test/helpers/list_column_helpers_test.rb
 - test/helpers/pagination_helpers_test.rb
+- test/helpers/search_column_helpers_test.rb
 - test/misc/active_record_permissions_test.rb
 - test/misc/attribute_params_test.rb
 - test/misc/calculation_test.rb
@@ -344,6 +345,7 @@ files:
 - test/misc/convert_numbers_format_test.rb
 - test/misc/finder_test.rb
 - test/misc/lang_test.rb
+- test/misc/render_test.rb
 - test/misc/tableless_test.rb
 - test/mock_app/.gitignore
 - test/mock_app/Rakefile
@@ -462,6 +464,7 @@ test_files:
 - test/helpers/form_column_helpers_test.rb
 - test/helpers/list_column_helpers_test.rb
 - test/helpers/pagination_helpers_test.rb
+- test/helpers/search_column_helpers_test.rb
 - test/misc/active_record_permissions_test.rb
 - test/misc/attribute_params_test.rb
 - test/misc/calculation_test.rb
@@ -470,6 +473,7 @@ test_files:
 - test/misc/convert_numbers_format_test.rb
 - test/misc/finder_test.rb
 - test/misc/lang_test.rb
+- test/misc/render_test.rb
 - test/misc/tableless_test.rb
 - test/mock_app/.gitignore
 - test/mock_app/Rakefile