active_scaffold 3.4.43 → 3.5.0

data/test/misc/render_test.rb

@@ -4,6 +4,6 @@ class RenderTest < ActionController::TestCase
   tests AddressesController
   test 'render activescaffold views' do
     get :index
-    assert_template 'list'
+    assert_select 'div.active-scaffold'
   end
 end

data/test/misc/tableless_test.rb

@@ -5,6 +5,18 @@ class TablelessTest < MiniTest::Test
     assert FileModel.all.to_a.empty?
   end
 
+  def test_where
+    assert FileModel.where(name: 'file').to_a.empty?
+  end
+
+  def test_where_using_assoc
+    assert FileModel.includes(:person).where(people: {name: 'Name'}).to_a.empty?
+  end
+
+  def test_count
+    assert_equal 0, FileModel.count
+  end
+
   def test_find_by_id
     assert_raises ActiveRecord::RecordNotFound do
       FileModel.find('filename')
@@ -14,4 +26,16 @@ class TablelessTest < MiniTest::Test
   def test_find_with_association
     assert Person.new.files.empty?
   end
+
+  def test_find_with_through_association
+    assert Building.new.files.empty?
+  end
+
+  def test_new
+    assert FileModel.new
+  end
+
+  def test_association
+    assert FileModel.new.person.nil?
+  end
 end

data/test/mock_app/app/models/building.rb

@@ -1,8 +1,9 @@
 class Building < ActiveRecord::Base
-  belongs_to :owner, :class_name => 'Person', :counter_cache => true, :inverse_of => :building
+  belongs_to :owner, :class_name => 'Person', :counter_cache => true, :inverse_of => :buildings
   has_many :floors, :dependent => :destroy, :inverse_of => :building
 
   has_one :address, :as => :addressable
 
   has_many :tenants, :through => :floors, :class_name => 'Person'
+  has_many :files, :through => :tenants, :class_name => 'FileModel'
 end

data/test/mock_app/config.ru

@@ -1,4 +1,4 @@
 # This file is used by Rack-based servers to start the application.
 
-require ::File.expand_path('../config/environment',  __FILE__)
+require ::File.expand_path('../config/environment', __FILE__)
 run TestApp::Application

data/test/mock_app/config/environments/test.rb

@@ -16,7 +16,7 @@ RailsApp::Application.configure do
   config.action_dispatch.show_exceptions = false
 
   # Disable request forgery protection in test environment
-  config.action_controller.allow_forgery_protection    = false
+  config.action_controller.allow_forgery_protection = false
 
   # Tell Action Mailer not to deliver emails to the real world.
   # The :test delivery method accumulates sent emails in the

data/test/mock_app/config/routes.rb

@@ -1,6 +1,14 @@
-RailsApp::Application.routes.draw do
-  resources :addresses do
-    as_routes
+Rails.application.routes.draw do
+  concern :active_scaffold, ActiveScaffold::Routing::Basic.new(association: true)
+  concern :active_scaffold_association, ActiveScaffold::Routing::Association.new
+
+  resources :addresses, concerns: :active_scaffold
+  resources :buildings, except: :index do
+    concerns :active_scaffold, except: %i[mark add_existing new_existing destroy_existing]
   end
+  resources :cars, only: %i[edit update] do
+    concerns :active_scaffold, association: false, except: [:mark]
+  end
+
   match ':controller(/:action(/:id))', :via => :any
 end

data/test/model_stub.rb

@@ -4,16 +4,13 @@ class ModelStub < ActiveRecord::Base
   has_many :other_models, :class_name => 'ModelStub'
 
   cattr_accessor :stubbed_columns
-  self.stubbed_columns = [:a, :b, :c, :d, :id, :created_at]
-  attr_accessor *stubbed_columns
+  self.stubbed_columns = %i[a b c d id created_at]
+  attr_accessor(*stubbed_columns)
   self.primary_key = :id
 
   @@nested_scope_calls = []
   cattr_accessor :nested_scope_calls
 
-  scope :a_is_defined, -> { where.not(:a => nil) }
-  scope :b_like, ->(pattern) { where('b like ?', pattern) }
-
   def self.a_is_defined
     @@nested_scope_calls << :a_is_defined
     self
@@ -37,7 +34,7 @@ class ModelStub < ActiveRecord::Base
   def self.columns
     @columns ||= stubbed_columns.map do |c|
       column = ColumnMock.new(c.to_s, '', 'varchar(255)')
-      column.primary = true if c.to_s == self.primary_key.to_s && column.respond_to?(:primary=)
+      column.primary = true if c.to_s == primary_key.to_s && column.respond_to?(:primary=)
       column
     end
   end
@@ -46,13 +43,21 @@ class ModelStub < ActiveRecord::Base
     @columns_hash ||= columns.each_with_object({}) { |column, hash| hash[column.name.to_s] = column }
   end
 
+  if respond_to? :type_for_attribute
+    def self.type_for_attribute(attribute_name)
+      defined?(ActiveModel::Type) ? ActiveModel::Type::String.new : super
+    end
+  end
+
   # column-level security methods, used for testing
   def self.a_authorized_for_bar?
     true
   end
+
   def self.b_authorized?
     false
   end
+
   def self.c_authorized_for_create?
     false
   end

data/test/run_all.rb

@@ -1,4 +1,4 @@
-test_folders = %w(bridges config data_structures extensions misc)
+test_folders = %w[bridges config data_structures extensions misc]
 
 all_tests = test_folders.inject([]) do |folder, output|
   output << Dir[File.join(File.dirname(__FILE__), "#{folder}/**/*.rb")]

data/test/test_helper.rb

@@ -1,4 +1,4 @@
-require 'simplecov' unless RUBY_ENGINE == 'rbx'
+require 'simplecov' if RUBY_ENGINE == 'ruby'
 
 ENV['RAILS_ENV'] = 'test'
 require 'mock_app/config/environment'
@@ -12,30 +12,45 @@ Minitest::Reporters.use!
 def load_schema
   stdout = $stdout
   $stdout = StringIO.new # suppress output while building the schema
-  load File.join(Rails.root, 'db', 'schema.rb')
+  load Rails.root.join('db', 'schema.rb')
   $stdout = stdout
 end
 load_schema
 
-%w(model_stub const_mocker company).each do |file|
+%w[model_stub const_mocker company].each do |file|
   require File.join(File.dirname(__FILE__), file)
 end
 
 I18n.backend.store_translations :en, YAML.load_file(File.expand_path('../../config/locales/en.yml', __FILE__))['en']
 
+# rails 4.0
 unless defined? Minitest::Test
   class Minitest::Test < MiniTest::Unit::TestCase
   end
+
+  class MiniTest::Unit::TestCase
+    def with_js_framework(framework)
+      framework, ActiveScaffold.js_framework = ActiveScaffold.js_framework, framework
+      yield
+      ActiveScaffold.js_framework = framework
+    end
+  end
 end
 
 class MiniTest::Test
   protected
 
+  def with_js_framework(framework)
+    framework, ActiveScaffold.js_framework = ActiveScaffold.js_framework, framework
+    yield
+    ActiveScaffold.js_framework = framework
+  end
+
   def config_for(klass, namespace = nil)
     ActiveScaffold::Config::Core.new("#{namespace}#{klass.to_s.underscore.downcase}")
   end
 end
 
-Config = RbConfig # HACK needed some comments
+Config = RbConfig # HACK: needed some comments
 
 class ColumnMock < ActiveScaffold::Tableless::Column; end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold
 version: !ruby/object:Gem::Version
-  version: 3.4.43
+  version: 3.5.0
 platform: ruby
 authors:
 - Many, see README
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-30 00:00:00.000000000 Z
+date: 2018-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,20 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.22.2
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5'
+        version: 4.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.22.2
-    - - "<"
+        version: 4.0.5
+- !ruby/object:Gem::Dependency
+  name: ice_nine
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.11'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '0.11'
 description: Save time and headaches, and create a more easily maintainable set of
   pages, with ActiveScaffold. ActiveScaffold handles all your CRUD (create, read,
   update, delete) user interface needs, leaving you more time to focus on more challenging
@@ -41,7 +49,7 @@ extra_rdoc_files:
 - README.md
 files:
 - CHANGELOG
-- LICENSE
+- LICENSE.md
 - README.md
 - app/assets/images/active_scaffold/add.png
 - app/assets/images/active_scaffold/arrow_down.png
@@ -120,6 +128,7 @@ files:
 - app/views/active_scaffold_overrides/_row.html.erb
 - app/views/active_scaffold_overrides/_search.html.erb
 - app/views/active_scaffold_overrides/_show.html.erb
+- app/views/active_scaffold_overrides/_show_actions.html.erb
 - app/views/active_scaffold_overrides/_show_association.html.erb
 - app/views/active_scaffold_overrides/_show_association_horizontal.html.erb
 - app/views/active_scaffold_overrides/_show_association_vertical.html.erb
@@ -153,6 +162,9 @@ files:
 - app/views/active_scaffold_overrides/update.html.erb
 - app/views/active_scaffold_overrides/update_column.js.erb
 - app/views/active_scaffold_overrides/update_row.js.erb
+- config/brakeman.ignore
+- config/brakeman.yml
+- config/i18n-tasks.yml
 - config/locales/de.yml
 - config/locales/en.yml
 - config/locales/es.yml
@@ -248,10 +260,14 @@ files:
 - lib/active_scaffold/data_structures/action_link.rb
 - lib/active_scaffold/data_structures/action_links.rb
 - lib/active_scaffold/data_structures/actions.rb
+- lib/active_scaffold/data_structures/association.rb
+- lib/active_scaffold/data_structures/association/abstract.rb
+- lib/active_scaffold/data_structures/association/active_mongoid.rb
+- lib/active_scaffold/data_structures/association/active_record.rb
+- lib/active_scaffold/data_structures/association/mongoid.rb
 - lib/active_scaffold/data_structures/bridge.rb
 - lib/active_scaffold/data_structures/column.rb
 - lib/active_scaffold/data_structures/columns.rb
-- lib/active_scaffold/data_structures/error_message.rb
 - lib/active_scaffold/data_structures/nested_info.rb
 - lib/active_scaffold/data_structures/set.rb
 - lib/active_scaffold/data_structures/sorting.rb
@@ -265,12 +281,12 @@ files:
 - lib/active_scaffold/extensions/localize.rb
 - lib/active_scaffold/extensions/name_option_for_datetime.rb
 - lib/active_scaffold/extensions/paginator_extensions.rb
-- lib/active_scaffold/extensions/reverse_associations.rb
 - lib/active_scaffold/extensions/routing_mapper.rb
 - lib/active_scaffold/extensions/to_label.rb
 - lib/active_scaffold/extensions/unsaved_associated.rb
 - lib/active_scaffold/extensions/unsaved_record.rb
 - lib/active_scaffold/finder.rb
+- lib/active_scaffold/helpers/action_link_helpers.rb
 - lib/active_scaffold/helpers/association_helpers.rb
 - lib/active_scaffold/helpers/controller_helpers.rb
 - lib/active_scaffold/helpers/form_column_helpers.rb
@@ -282,24 +298,26 @@ files:
 - lib/active_scaffold/helpers/show_column_helpers.rb
 - lib/active_scaffold/helpers/view_helpers.rb
 - lib/active_scaffold/marked_model.rb
+- lib/active_scaffold/orm_checks.rb
 - lib/active_scaffold/paginator.rb
 - lib/active_scaffold/responds_to_parent.rb
 - lib/active_scaffold/tableless.rb
 - lib/active_scaffold/version.rb
-- lib/generators/active_scaffold/USAGE
-- lib/generators/active_scaffold/active_scaffold_generator.rb
-- lib/generators/active_scaffold_controller/USAGE
-- lib/generators/active_scaffold_controller/active_scaffold_controller_generator.rb
-- lib/generators/active_scaffold_controller/templates/controller.rb
-- lib/generators/active_scaffold_controller/templates/helper.rb
+- lib/generators/active_scaffold/controller_generator.rb
+- lib/generators/active_scaffold/install_generator.rb
+- lib/generators/active_scaffold/resource_generator.rb
+- lib/generators/templates/controller.rb
+- lib/generators/templates/helper.rb
 - lib/tasks/brakeman.rake
 - public/blank.html
 - shoulda_macros/macros.rb
+- test/active_scaffold_config_mock.rb
 - test/bridges/bridge_test.rb
 - test/bridges/date_picker_test.rb
 - test/bridges/paper_trail_test.rb
 - test/bridges/paperclip_test.rb
 - test/bridges/tiny_mce_test.rb
+- test/class_with_finder.rb
 - test/company.rb
 - test/config/base_test.rb
 - test/config/core_test.rb
@@ -320,7 +338,6 @@ files:
 - test/data_structures/association_column_test.rb
 - test/data_structures/column_test.rb
 - test/data_structures/columns_test.rb
-- test/data_structures/error_message_test.rb
 - test/data_structures/set_test.rb
 - test/data_structures/sorting_test.rb
 - test/data_structures/standard_column_test.rb
@@ -340,6 +357,7 @@ files:
 - test/misc/convert_numbers_format_test.rb
 - test/misc/finder_test.rb
 - test/misc/lang_test.rb
+- test/misc/parse_datetime_test.rb
 - test/misc/render_test.rb
 - test/misc/tableless_test.rb
 - test/mock_app/.gitignore
@@ -398,7 +416,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '1.9'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -409,14 +427,15 @@ rubyforge_project:
 rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
-summary: Rails 3.2, 4.0, 4.1 and 4.2 versions of ActiveScaffold supporting prototype
-  and jquery
+summary: Rails 4.x and 5.x versions of ActiveScaffold supporting prototype and jquery
 test_files:
+- test/active_scaffold_config_mock.rb
 - test/bridges/bridge_test.rb
 - test/bridges/date_picker_test.rb
 - test/bridges/paper_trail_test.rb
 - test/bridges/paperclip_test.rb
 - test/bridges/tiny_mce_test.rb
+- test/class_with_finder.rb
 - test/company.rb
 - test/config/base_test.rb
 - test/config/core_test.rb
@@ -437,7 +456,6 @@ test_files:
 - test/data_structures/association_column_test.rb
 - test/data_structures/column_test.rb
 - test/data_structures/columns_test.rb
-- test/data_structures/error_message_test.rb
 - test/data_structures/set_test.rb
 - test/data_structures/sorting_test.rb
 - test/data_structures/standard_column_test.rb
@@ -457,6 +475,7 @@ test_files:
 - test/misc/convert_numbers_format_test.rb
 - test/misc/finder_test.rb
 - test/misc/lang_test.rb
+- test/misc/parse_datetime_test.rb
 - test/misc/render_test.rb
 - test/misc/tableless_test.rb
 - test/mock_app/.gitignore

data/lib/active_scaffold/data_structures/error_message.rb

@@ -1,22 +0,0 @@
-module ActiveScaffold::DataStructures
-  # Wrapper for error strings so that they may be exported using to_xxx
-  class ErrorMessage
-    def initialize(error)
-      @error = error
-    end
-
-    def public_attributes
-      {:error => @error}
-    end
-
-    def to_xml
-      public_attributes.to_xml(:root => 'errors')
-    end
-
-    delegate :to_yaml, :to => :public_attributes
-
-    def to_s
-      @error
-    end
-  end
-end

data/lib/active_scaffold/extensions/reverse_associations.rb

@@ -1,119 +0,0 @@
-module ActiveScaffold
-  module ReverseAssociation
-    module CommonMethods
-      def self.included(base)
-        base.class_eval { attr_writer :reverse }
-        base.alias_method_chain :inverse_of, :autodetect
-      end
-
-      def inverse_of_with_autodetect
-        inverse_of_without_autodetect || autodetect_inverse
-      end
-
-      def inverse_for?(klass)
-        inverse_class = inverse_of.try(:active_record)
-        inverse_class.present? && (inverse_class == klass || klass < inverse_class)
-      end
-
-      def reverse(klass = nil)
-        unless defined? @reverse # rubocop:disable Style/IfUnlessModifier
-          @reverse ||= inverse_of.try(:name)
-        end
-        @reverse || (autodetect_inverse(klass).try(:name) unless klass.nil?)
-      end
-
-      def autodetect_inverse(klass = nil)
-        return nil if klass.nil? && options[:polymorphic]
-        klass ||= self.klass
-
-        # name-based matching (association name vs self.active_record.to_s)
-        matches = reverse_matches(klass)
-        if matches.length > 1
-          matches.find_all do |assoc|
-            active_record.to_s.underscore.include? assoc.name.to_s.pluralize.singularize
-          end
-        end
-
-        matches.first
-      end
-    end
-
-    module AssociationReflection
-      def self.included(base)
-        base.send :include, ActiveScaffold::ReverseAssociation::CommonMethods
-      end
-
-      protected
-
-      def reverse_matches(klass)
-        reverse_matches = []
-
-        # collect associations that point back to this model and use the same foreign_key
-        klass.reflect_on_all_associations.each do |assoc|
-          next if assoc == self
-          # skip over has_many :through associations
-          next if assoc.options[:through]
-          next unless assoc.options[:polymorphic] || assoc.class_name == active_record.name
-
-          case [assoc.macro, macro].find_all { |m| m == :has_and_belongs_to_many }.length
-            # if both are a habtm, then match them based on the join table
-            when 2
-              next unless assoc.options[:join_table] == options[:join_table]
-
-            # if only one is a habtm, they do not match
-            when 1
-              next
-
-            # otherwise, match them based on the foreign_key
-            when 0
-              if assoc.foreign_key.is_a? Array
-                next unless assoc.foreign_key == foreign_key
-              else
-                next unless assoc.foreign_key.to_sym == foreign_key.to_sym
-              end
-          end
-
-          reverse_matches << assoc
-        end
-        reverse_matches
-      end
-    end
-
-    module ThroughReflection
-      def self.included(base)
-        base.send :include, ActiveScaffold::ReverseAssociation::CommonMethods unless base < ActiveScaffold::ReverseAssociation::CommonMethods
-      end
-
-      protected
-
-      def reverse_matches(klass)
-        reverse_matches = []
-
-        # collect associations that point back to this model and use the same foreign_key
-        klass.reflect_on_all_associations.each do |assoc|
-          next if assoc == self
-          # only iterate has_many :through associations
-          next unless assoc.options[:through]
-          next unless assoc.class_name == active_record.name
-          next unless assoc.through_reflection.class_name == through_reflection.class_name
-
-          reverse_matches << assoc
-        end
-        reverse_matches
-      end
-    end
-
-    module ThroughAssociation
-      # NOTE - for now, we're only supporting inverse setting back onto has_one associations.
-      # TODO remove when rails fixes this and old versions are not supported
-      def invertible_for?(record)
-        inverse = super
-        inverse && !inverse.collection?
-      end
-    end
-  end
-end
-
-ActiveRecord::Reflection::AssociationReflection.send :include, ActiveScaffold::ReverseAssociation::AssociationReflection
-ActiveRecord::Reflection::ThroughReflection.send :include, ActiveScaffold::ReverseAssociation::ThroughReflection
-ActiveRecord::Associations::ThroughAssociation.send :include, ActiveScaffold::ReverseAssociation::ThroughAssociation