active_scaffold_vho 3.2.14 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c576f0fdb424066e52144dcec305c1c178ca4918
-  data.tar.gz: 1bc3acea47c7574dd2734fb058743c0778d09987
+  metadata.gz: 16c43edc7915430121126d58256c1870f4c004d8
+  data.tar.gz: d5d5d3062d893e999c1d5f3a0d1e784a62754969
 SHA512:
-  metadata.gz: a8b66e04ad0ee3cbbcb180a25c6f4810233cc52b43868512b390da0354e74bd128bbdaa0159c25c869b6c99c4cd6ae4bd0e20934de72a0ffc15a4ad9b3c92367
-  data.tar.gz: 8aafbe16e23775702d32c62f2446af94ed9f38fb829ba3e9d043f11d7173ef4ea55fa7f5665dcf902fc4c114564b4440d111b130847ebba5cb7957d8415d287e
+  metadata.gz: 6cfcc4ed805ac16c9e7e0f11e8f0595a427d247e86ddad061fd588083a141270596400e80704dd422f977b4f07d9c2d527a1fcba0b1f051ac3a0ca456005ef94
+  data.tar.gz: d30b2830c55b320eb4a2c511f335954fddee15b3b62e91f64e034855412af80b6a10dd65cf5844ff562d2b3623a1a39d973ca19709a2cd5d8b4cc480031b61ce

data/Gemfile.lock

@@ -1,98 +1,90 @@
 PATH
   remote: .
   specs:
-    active_scaffold_vho (3.2.14)
+    active_scaffold_vho (4.0.0)
       kaminari
-      rails (>= 3.1.0)
+      rails (~> 4.0.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.22.4)
-      actionpack (= 3.2.22.4)
-      mail (~> 2.5.4)
-    actionpack (3.2.22.4)
-      activemodel (= 3.2.22.4)
-      activesupport (= 3.2.22.4)
-      builder (~> 3.0.0)
+    actionmailer (4.0.13)
+      actionpack (= 4.0.13)
+      mail (~> 2.5, >= 2.5.4)
+    actionpack (4.0.13)
+      activesupport (= 4.0.13)
+      builder (~> 3.1.0)
       erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.5)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.2.1)
-    activemodel (3.2.22.4)
-      activesupport (= 3.2.22.4)
-      builder (~> 3.0.0)
-    activerecord (3.2.22.4)
-      activemodel (= 3.2.22.4)
-      activesupport (= 3.2.22.4)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.22.4)
-      activemodel (= 3.2.22.4)
-      activesupport (= 3.2.22.4)
-    activesupport (3.2.22.4)
-      i18n (~> 0.6, >= 0.6.4)
-      multi_json (~> 1.0)
-    arel (3.0.3)
-    builder (3.0.4)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    activemodel (4.0.13)
+      activesupport (= 4.0.13)
+      builder (~> 3.1.0)
+    activerecord (4.0.13)
+      activemodel (= 4.0.13)
+      activerecord-deprecated_finders (~> 1.0.2)
+      activesupport (= 4.0.13)
+      arel (~> 4.0.0)
+    activerecord-deprecated_finders (1.0.4)
+    activesupport (4.0.13)
+      i18n (~> 0.6, >= 0.6.9)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
+    arel (4.0.2)
+    builder (3.1.4)
+    concurrent-ruby (1.0.2)
     docile (1.1.5)
     erubis (2.7.0)
-    hike (1.2.3)
     i18n (0.7.0)
-    journey (1.0.4)
-    json (1.8.3)
     kaminari (0.17.0)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
-    mail (2.5.4)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.25.1)
+    mail (2.6.4)
+      mime-types (>= 1.16, < 4)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
+    minitest (4.7.5)
     multi_json (1.12.1)
-    polyglot (0.3.5)
-    rack (1.4.7)
-    rack-cache (1.6.1)
-      rack (>= 0.4)
-    rack-ssl (1.3.4)
-      rack
+    rack (1.5.5)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (3.2.22.4)
-      actionmailer (= 3.2.22.4)
-      actionpack (= 3.2.22.4)
-      activerecord (= 3.2.22.4)
-      activeresource (= 3.2.22.4)
-      activesupport (= 3.2.22.4)
-      bundler (~> 1.0)
-      railties (= 3.2.22.4)
-    railties (3.2.22.4)
-      actionpack (= 3.2.22.4)
-      activesupport (= 3.2.22.4)
-      rack-ssl (~> 1.3.2)
+    rails (4.0.13)
+      actionmailer (= 4.0.13)
+      actionpack (= 4.0.13)
+      activerecord (= 4.0.13)
+      activesupport (= 4.0.13)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.0.13)
+      sprockets-rails (~> 2.0)
+    railties (4.0.13)
+      actionpack (= 4.0.13)
+      activesupport (= 4.0.13)
       rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
+      thor (>= 0.18.1, < 2.0)
     rake (11.2.2)
-    rdoc (3.12.2)
-      json (~> 1.4)
-    shoulda (2.11.3)
+    shoulda (3.5.0)
+      shoulda-context (~> 1.0, >= 1.0.1)
+      shoulda-matchers (>= 1.4.1, < 3.0)
+    shoulda-context (1.2.1)
+    shoulda-matchers (2.8.0)
+      activesupport (>= 3.0.0)
     simplecov (0.9.2)
       docile (~> 1.1.0)
       multi_json (~> 1.0)
       simplecov-html (~> 0.9.0)
     simplecov-html (0.9.0)
-    sprockets (2.2.3)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
+    sprockets (3.7.0)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (2.3.3)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (>= 2.8, < 4.0)
     thor (0.19.1)
-    tilt (1.4.1)
-    treetop (1.4.15)
-      polyglot
-      polyglot (>= 0.3.1)
+    thread_safe (0.3.5)
     tzinfo (0.3.51)
 
 PLATFORMS

data/active_scaffold_vho.gemspec

@@ -26,6 +26,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
   s.add_development_dependency(%q<simplecov>, ["~> 0.9.0"])
 
-  s.add_runtime_dependency(%q<rails>, [">= 3.1.0"])
+  s.add_runtime_dependency(%q<rails>, ["~> 4.0.0"])
   s.add_runtime_dependency(%q<kaminari>)
 end

data/frontends/default/views/_form_association.html.erb

@@ -1,6 +1,6 @@
 <%
 parent_record = @record
-associated = column.singular_association? ? [parent_record.send(column.name)].compact : parent_record.send(column.name).all
+associated = column.singular_association? ? [parent_record.send(column.name)].compact : parent_record.send(column.name).to_a
 associated = associated.sort_by {|r| r.new_record? ? 99999999999 : r.id} unless column.association.options.has_key?(:order)
 if column.show_blank_record? associated
   associated << if column.singular_association?

data/frontends/default/views/_list_record.html.erb

@@ -1,5 +1,5 @@
 <%
-record = list_record if list_record # compat with render :partial :collection
+record = list_record if local_assigns[:list_record] # compat with render :partial :collection
 columns ||= list_columns
 tr_class = cycle("", "even-record")
 tr_class += " #{list_row_class(record)}" if respond_to? :list_row_class

data/lib/active_scaffold.rb

@@ -1,7 +1,3 @@
-unless Rails::VERSION::MAJOR == 3 && Rails::VERSION::MINOR >= 0
-  raise "This version of ActiveScaffold requires Rails 3.0 or higher.  Please use an earlier version."
-end
-
 begin
   require 'render_component'
 rescue LoadError
@@ -189,7 +185,11 @@ module ActiveScaffold
 
       # defines the attribute read methods on the model, so record.send() doesn't find protected/private methods instead
       klass = self.active_scaffold_config.model
-      klass.define_attribute_methods unless klass.attribute_methods_generated?
+
+      if !klass.respond_to?(:attribute_methods_generated) || !klass.attribute_methods_generated?
+        klass.define_attribute_methods
+      end
+
       # include the rest of the code into the controller: the action core and the included actions
       module_eval do
         include ActiveScaffold::Finder

data/lib/active_scaffold/actions/list.rb

@@ -96,13 +96,14 @@ module ActiveScaffold::Actions
 
     def each_record_in_scope
       do_search if respond_to? :do_search, true
-      finder_options = { :order => "#{active_scaffold_config.model.connection.quote_table_name(active_scaffold_config.model.table_name)}.#{active_scaffold_config.model.primary_key} ASC",
-        :conditions => all_conditions,
-        :joins => joins_for_finder}
+      finder_options = { :reorder => "#{active_scaffold_config.model.connection.quote_table_name(active_scaffold_config.model.table_name)}.#{active_scaffold_config.model.primary_key} ASC",
+                         :where => all_conditions,
+                         :joins => joins_for_finder}
       finder_options.merge! custom_finder_options
-      finder_options.merge! :include => (active_scaffold_includes.blank? ? nil : active_scaffold_includes)
+      finder_options.merge! :includes => (active_scaffold_includes.blank? ? nil : active_scaffold_includes)
       klass = beginning_of_chain
-      klass.all(finder_options).each {|record| yield record}
+      append_to_query(klass, finder_options)
+      klass.find_each {|record| yield record}
     end
 
     # The default security delegates to ActiveRecordPermissions.

data/lib/active_scaffold/attribute_params.rb

@@ -144,7 +144,7 @@ module ActiveScaffold
 
     def column_plural_assocation_value_from_value(column, value)
       # it's an array of ids
-      if value and not value.empty?
+      if value && !value.empty?
         ids = value.select {|id| id.respond_to?(:empty?) ? !id.empty? : true}
         ids.empty? ? [] : column.association.klass.find(ids)
       end

data/lib/active_scaffold/bridges/date_picker/lib/datepicker_bridge.rb

@@ -1,5 +1,5 @@
-include Sprockets::Helpers::RailsHelper
-include Sprockets::Helpers::IsolatedHelper
+#include Sprockets::Helpers::RailsHelper
+#include Sprockets::Helpers::IsolatedHelper
 
 class File #:nodoc:
 

data/lib/active_scaffold/extensions/action_view_resolver.rb

@@ -4,7 +4,7 @@ module ActionView
     # activescaffolds view path do not have a subdir, so just remove the prefix
     # > rails 3.2.22 uses an additional fifth parameter
     def find_templates(name, prefix, partial, details, outside_app_allowed = false)
-      if ::Rails::VERSION::MAJOR >= 4 || (::Rails::VERSION::MAJOR == 3 && ::Rails::VERSION::MINOR == 2 && ::Rails::VERSION::TINY >= 22)
+      if (::Rails::VERSION::MAJOR >= 4 && ::Rails::VERSION::MINOR > 0) || (::Rails::VERSION::MAJOR == 3 && ::Rails::VERSION::MINOR == 2 && ::Rails::VERSION::TINY >= 22)
         super(name,'',partial, details, outside_app_allowed)
       else
         super(name,'',partial, details)

data/lib/active_scaffold/extensions/name_option_for_datetime.rb

@@ -1,12 +1,18 @@
-module ActionView
-  module Helpers
-    class InstanceTag
-      private
-      def datetime_selector_with_name(options, html_options)
-        options.merge!(:prefix => options[:name].gsub(/\[[^\[]*\]$/,'')) if options[:name]
-        datetime_selector_without_name(options, html_options)        
+module ActiveScaffold
+  module DateSelectExtension
+    def datetime_selector_with_name(options, html_options)
+      options.merge!(:prefix => options[:name].gsub(/\[[^\[]*\]$/,'')) if options[:name]
+      datetime_selector_without_name(options, html_options)
+    end
+
+    def self.included(base)
+      base.class_eval do
+        alias_method_chain :datetime_selector, :name
+        private :datetime_selector_without_name, :datetime_selector_with_name, :datetime_selector
       end
-      alias_method_chain :datetime_selector, :name
     end
   end
 end
+(defined?(ActionView::Helpers::Tags::DateSelect) ? ActionView::Helpers::Tags::DateSelect : ActionView::Helpers::InstanceTag).class_eval do
+  include ActiveScaffold::DateSelectExtension
+end

data/lib/active_scaffold/extensions/unsaved_associated.rb

@@ -48,9 +48,9 @@ class ActiveRecord::Base
   # returns true otherwise, even when none of the associations have been instantiated. build wrapper methods accordingly.
   def with_unsaved_associated
     associations_for_update.all? do |association|
-      association_proxy = send(association.name)
-      if association_proxy
-        records = association_proxy
+      association_proxy = self.association(association.name)
+      if association_proxy.target.present?
+        records = association_proxy.target
         records = [records] unless records.is_a? Array # convert singular associations into collections for ease of use
         records.select {|r| r.unsaved? and not r.readonly?}.all? {|r| yield r} # must use select instead of find_all, which Rails overrides on association proxies for db access
       else

data/lib/active_scaffold/finder.rb

@@ -1,5 +1,11 @@
 module ActiveScaffold
   module Finder
+
+    extend ActiveSupport::Concern
+    included do
+      helper_method :append_to_query
+    end
+
     def self.like_operator
       @@like_operator ||= ::ActiveRecord::Base.connection.adapter_name == "PostgreSQL" ? "ILIKE" : "LIKE"
     end
@@ -214,12 +220,6 @@ module ActiveScaffold
       :null,
       :not_null
     ]
-    
-    
-
-    def self.included(klass)
-      klass.extend ClassMethods
-    end
 
     protected
 
@@ -286,7 +286,7 @@ module ActiveScaffold
  
       # we build the paginator differently for method- and sql-based sorting
       records = if options[:sorting] && options[:sorting].sorts_by_method?
-        Kaminari.paginate_array(sort_collection_by_column(append_to_query(klass, finder_options).all, *options[:sorting].first))
+        Kaminari.paginate_array(sort_collection_by_column(append_to_query(klass, finder_options).to_a, *options[:sorting].first))
       else
         append_to_query(klass, finder_options)
       end

data/lib/active_scaffold/helpers/form_column_helpers.rb

@@ -94,7 +94,7 @@ module ActiveScaffold
           options = active_scaffold_input_text_options(options) if text_types.include?(column.column.type)
           if column.column.type == :string && options[:maxlength].blank?
             options[:maxlength] = column.column.limit
-            options[:size] ||= ActionView::Helpers::InstanceTag::DEFAULT_FIELD_OPTIONS["size"]
+            options[:size] ||= options[:maxlength].to_i > 30 ? 30 : options[:maxlength]
           end
           options[:include_blank] = true if column.column.null and [:date, :datetime, :time].include?(column.column.type)
           options[:value] = format_number_value(@record.send(column.name), column.options) if column.column.number?
@@ -212,7 +212,8 @@ module ActiveScaffold
         record_select_options = {:controller => remote_controller, :id => options[:id]}
         record_select_options.merge!(active_scaffold_input_text_options)
         record_select_options.merge!(column.options)
-        record_select_options[:size] ||= ActionView::Helpers::InstanceTag::DEFAULT_FIELD_OPTIONS["size"]
+
+        record_select_options[:size] ||= ActionView::Helpers::InstanceTag::DEFAULT_FIELD_OPTIONS["size"] unless defined?(ActionView::Helpers::Tags::DateSelect)
 
         unless options['data-update_url'].nil?
           record_select_options['data-update_url'] = options['data-update_url']
@@ -359,7 +360,7 @@ module ActiveScaffold
           record_select_field(options[:name], @record, options)
         else
           select_options = options_for_select(options_for_association(nested.association)) #unless column.through_association?
-          select_options ||= options_for_select(active_scaffold_config.model.all.collect {|c| [h(c.to_label), c.id]})
+          select_options ||= options_for_select(active_scaffold_config.model.to_a.collect {|c| [h(c.to_label), c.id]})
           select_tag 'associated_id', ('<option value="">' + as_(:_select_) + '</option>' + select_options).html_safe unless select_options.empty?
         end
       end

data/lib/active_scaffold/helpers/human_condition_helpers.rb

@@ -16,7 +16,7 @@ module ActiveScaffold
           when :integer, :decimal, :float
             "#{column.active_record_class.human_attribute_name(column.name)} #{as_(value[:opt].downcase).downcase} #{format_number_value(controller.class.condition_value_for_numeric(column, value[:from]), column.options)} #{value[:opt] == 'BETWEEN' ? '- ' + format_number_value(controller.class.condition_value_for_numeric(column, value[:to]), column.options).to_s : ''}"
           when :string
-            opt = ActiveScaffold::Finder::StringComparators.index(value[:opt]) || value[:opt]
+            opt = ActiveScaffold::Finder::StringComparators.key(value[:opt]) || value[:opt]
             "#{column.active_record_class.human_attribute_name(column.name)} #{as_(opt).downcase} '#{column.stripped_value(value[:from])}' #{opt == 'BETWEEN' ? '- ' + column.stripped_value(value[:to]).to_s : ''}"
           when :date, :time, :datetime, :timestamp
             conversion = column.column.type == :date ? :to_date : :to_time

data/lib/active_scaffold/helpers/list_column_helpers.rb

@@ -102,21 +102,21 @@ module ActiveScaffold
       end
 
       # There are two basic ways to clean a column's value: h() and sanitize(). The latter is useful
-      # when the column contains *valid* html data, and you want to just disable any scripting. People
-      # can always use field overrides to clean data one way or the other, but having this override
-      # lets people decide which way it should happen by default.
-      #
-      # Why is it not a configuration option? Because it seems like a somewhat rare request. But it
-      # could eventually be an option in config.list (and config.show, I guess).
-      def clean_column_value(v)
-        h(v)
+      # when the column contains *valid* html data, and you want to just disable any scripting.
+      # if sanitize_value key is passed to this function sanitize will be used
+      def clean_column_value(v, options = {})
+        if (options[:sanitize_value].present?)
+          sanitize(v)
+        else
+          h(v)
+        end
       end
 
       ##
       ## Overrides
       ##
       def active_scaffold_column_text(column, record)
-        truncate(clean_column_value(record.send(column.name)), :length => column.options[:truncate] || 50)
+        truncate(clean_column_value(record.send(column.name), column.options), :length => column.options[:truncate] || 50)
       end
 
       def active_scaffold_column_select(column, record)
@@ -236,7 +236,7 @@ module ActiveScaffold
         else
           column_value.to_s
         end
-        clean_column_value(value)
+        clean_column_value(value, options)
       end
 
       def cache_association(value, column)

data/lib/active_scaffold/helpers/view_helpers.rb

@@ -301,8 +301,12 @@ module ActiveScaffold
           conditions = controller.send(:all_conditions)
           includes = active_scaffold_config.list.count_includes
           includes ||= controller.send(:active_scaffold_includes) unless conditions.nil?
-          calculation = beginning_of_chain.calculate(column.calculate, column.name, :conditions => conditions,
-           :joins => controller.send(:joins_for_collection), :include => includes)
+          calculation_scope = beginning_of_chain
+          append_to_query(calculation_scope, {
+                                               :where => conditions,
+                                               :joins => controller.send(:joins_for_collection),
+                                               :includes => includes})
+          calculation_scope.calculate(column.calculate, column.name)
         else
           column.calculate.call(@records)
         end

data/lib/active_scaffold/marked_model.rb

@@ -1,10 +1,10 @@
 module ActiveScaffold
   module MarkedModel
     # This is a module aimed at making the make session_stored marked_records available to ActiveRecord models
-    
-    def self.included(base)
-      base.extend ClassMethods
-      base.scope :marked, lambda {{:conditions => {:id => base.marked_records.to_a}}}
+
+    extend ActiveSupport::Concern
+    included do
+      scope :marked, -> { where(primary_key => marked_records.to_a)}
     end
     
     def marked

data/lib/active_scaffold/version.rb

@@ -1,8 +1,8 @@
 module ActiveScaffold
   module Version
-    MAJOR = 3
-    MINOR = 2
-    PATCH = 14
+    MAJOR = 4
+    MINOR = 0
+    PATCH = 0
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold_vho
 version: !ruby/object:Gem::Version
-  version: 3.2.14
+  version: 4.0.0
 platform: ruby
 authors:
 - Many, see README
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-13 00:00:00.000000000 Z
+date: 2016-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
@@ -56,16 +56,16 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement