active_scaffold 3.4.43 → 3.5.0

data/lib/generators/active_scaffold/resource_generator.rb

@@ -0,0 +1,56 @@
+require 'rails/generators/rails/resource/resource_generator'
+# require 'generators/active_scaffold_controller/active_scaffold_controller_generator'
+
+module ActiveScaffold
+  module Generators
+    class ResourceGenerator < Rails::Generators::ResourceGenerator # metagenerator
+      remove_hook_for :resource_controller
+      remove_hook_for :resource_route
+      remove_class_option :actions
+
+      desc <<-DESC.strip_heredoc
+      Description:
+          Scaffolds an entire resource, from model and migration to controller,
+              along with a full test suite and configured to use active_scaffold.
+          The resource is ready to use as a starting point for your RESTful,
+              resource-oriented application.
+
+          Pass the name of the model (in singular form), either CamelCased or
+              under_scored, as the first argument, and an optional list of attribute
+          pairs.
+
+          Attribute pairs are field:type arguments specifying the
+          model's attributes. Timestamps are added by default, so you don't have to
+          specify them by hand as 'created_at:datetime updated_at:datetime'.
+
+          You don't have to think up every attribute up front, but it helps to
+          sketch out a few so you can start working with the resource immediately.
+
+          For example, 'active_scaffold post title:string body:text published:boolean'
+          gives you a model with those three attributes, a controller configured to use active_scaffold,
+          as well as a resources :posts with additional active_scaffold routes
+          declaration in config/routes.rb.
+
+          If you want to remove all the generated files, run
+          'rails destroy active_scaffold ModelName'.
+
+      Examples:
+          `rails generate active_scaffold:resource post`
+          `rails generate active_scaffold:resource post title:string body:text published:boolean`
+          `rails generate active_scaffold:resource purchase order_id:integer amount:decimal`
+      DESC
+
+      def add_resource_route
+        routing_code =  class_path.collect { |namespace| "namespace :#{namespace} do " }.join(' ')
+        routing_code << "resources :#{file_name.pluralize}, concerns: :active_scaffold"
+        routing_code << ' end' * class_path.size
+        log :route, routing_code
+        in_root do
+          inject_into_file 'config/routes.rb', "  #{routing_code}\n", {after: /^[ ]*concern :active_scaffold,.*\n/, verbose: false, force: true}
+        end
+      end
+
+      invoke 'active_scaffold:controller'
+    end
+  end
+end

data/shoulda_macros/macros.rb

@@ -61,7 +61,7 @@ class ActiveSupport::TestCase
   def self.should_render_as_form_hidden(column_name)
     before_block = lambda do
       @rendered_columns = []
-      @controller.view_context_class.any_instance.expects(:"hidden_field").at_least_once.with do |_, method, _|
+      @controller.view_context_class.any_instance.expects(:hidden_field).at_least_once.with do |_, method, _|
         @rendered_columns << method
         true
       end
@@ -125,8 +125,8 @@ class ActiveSupport::TestCase
       script = block ? instance_eval(&block) : /.*/
       script = script.is_a?(Regexp) ? script.source : Regexp.quote(script)
       script = script.gsub('\n', '\\\\\\n')
-               .gsub(/['"]/, '\\\\\\\\\&')
-               .gsub('</script>', '</scr"+"ipt>')
+                     .gsub(/['"]/, '\\\\\\\\\&')
+                     .gsub('</script>', '</scr"+"ipt>')
       assert_select 'script[type=text/javascript]', Regexp.new('.*' + Regexp.quote("with(window.parent) { setTimeout(function() { window.eval('") + script + Regexp.quote("'); if (typeof(loc) !== 'undefined') loc.replace('about:blank'); }, 1) };") + '.*')
     end
   end

data/test/active_scaffold_config_mock.rb

@@ -0,0 +1,33 @@
+module ActiveScaffoldConfigMock
+  module ClassMethods
+    class Config
+      def active_record?
+        @type == :active_record
+      end
+
+      def mongoid?
+        @type == :mongoid
+      end
+
+      def initialize(type = :active_record)
+        @type = type
+      end
+
+      def primary_key
+        mongoid? ? '_id' : 'id'
+      end
+    end
+
+    def active_scaffold_config
+      @active_scaffold_config ||= Config.new
+    end
+  end
+
+  def self.included(klass)
+    klass.extend ClassMethods
+  end
+
+  def active_scaffold_config
+    self.class.active_scaffold_config
+  end
+end

data/test/bridges/bridge_test.rb

@@ -5,22 +5,21 @@ class BridgeTest < MiniTest::Test
     @const_store = {}
   end
 
-  def teardown
-  end
+  def teardown; end
 
   def test__shouldnt_throw_errors
     ActiveScaffold::Bridges.run_all
   end
 
   def test__cds_bridge
-    js, ActiveScaffold.js_framework = ActiveScaffold.js_framework, :prototype
-    ConstMocker.mock('CalendarDateSelect') do |cm|
-      cm.remove
-      assert(!bridge_will_be_installed('CalendarDateSelect'))
-      cm.declare
-      assert(bridge_will_be_installed('CalendarDateSelect'))
+    with_js_framework :prototype do
+      ConstMocker.mock('CalendarDateSelect') do |cm|
+        cm.remove
+        assert(!bridge_will_be_installed('CalendarDateSelect'))
+        cm.declare
+        assert(bridge_will_be_installed('CalendarDateSelect'))
+      end
     end
-    ActiveScaffold.js_framework = js
   end
 
   def test__file_column_bridge
@@ -54,6 +53,7 @@ class BridgeTest < MiniTest::Test
         end
       end
     end
+    ActiveScaffold.js_framework = nil
   end
 
   def test__semantic_attributes_bridge

data/test/bridges/date_picker_test.rb

@@ -1,4 +1,5 @@
 require 'test_helper'
+require 'active_scaffold_config_mock'
 require File.join(File.dirname(__FILE__), '../../lib/active_scaffold/bridges/date_picker/ext')
 # require File.join(File.dirname(__FILE__), '../../lib/active_scaffold/bridges/date_picker/helper')
 
@@ -9,13 +10,14 @@ class DatePickerTest < ActionView::TestCase
 
   def setup
     @controller.class.class_eval do
+      include ActiveScaffoldConfigMock
       include ActiveScaffold::Finder
     end
   end
 
   def test_set_form_ui
     config = ActiveScaffold::Config::Core.new(:company)
-    assert_equal nil, config.columns[:name].form_ui, 'form_ui for name'
+    assert_nil config.columns[:name].form_ui, 'form_ui for name'
     assert_equal :date_picker, config.columns[:date].form_ui, 'form_ui for date'
     assert_equal :datetime_picker, config.columns[:datetime].form_ui, 'form_ui for datetime'
   end

data/test/bridges/paper_trail_test.rb

@@ -7,9 +7,8 @@ class PaperTrailTest < ActionController::TestCase
   def test_deleted_route
     with_routing do |map|
       map.draw do
-        resources :addresses do
-          as_routes
-        end
+        concern :active_scaffold, ActiveScaffold::Routing::Basic.new
+        resources :addresses, concerns: :active_scaffold
       end
       assert_routing '/addresses/deleted', :controller => 'addresses', :action => 'deleted'
     end

data/test/bridges/paperclip_test.rb

@@ -25,7 +25,7 @@ class PaperclipTest < ActionView::TestCase
     assert config.update.multipart?
     assert_equal :paperclip, config.columns[:logo].form_ui
     assert_equal [:delete_logo], config.columns[:logo].params.to_a
-    %w(logo_file_name logo_file_size logo_updated_at logo_content_type).each do |attr|
+    %w[logo_file_name logo_file_size logo_updated_at logo_content_type].each do |attr|
       refute config.columns._inheritable.include?(attr.to_sym)
     end
     assert Company.method_defined?(:delete_logo)
@@ -55,16 +55,27 @@ class PaperclipTest < ActionView::TestCase
   end
 
   def test_form_ui
-    js, ActiveScaffold.js_framework = ActiveScaffold.js_framework, :jquery
-    config = PaperclipCore.new(:company)
-    @record = Company.new
+    with_js_framework :jquery do
+      config = PaperclipCore.new(:company)
+      @record = Company.new
 
-    @record.stubs(:logo).returns(stub(:file? => true, :original_filename => 'file', :url => '/system/file', :styles => Company.attachment_definitions[:logo]))
-    escaped_quote = Rails::VERSION::MAJOR < 4 ? '&#x27;' : '&#39;'
-    assert_dom_equal %{<div><a href="/system/file" target="_blank">file</a> | <input name="record[delete_logo]" type="hidden" id="record_delete_logo" value="false" /><a href="#" onclick="jQuery(this).prev().val(#{escaped_quote}true#{escaped_quote}); jQuery(this).parent().hide().next().show(); return false;">Remove or Replace file</a></div><div style="display: none"><input name="record[logo]" class="text-input" autocomplete="off" type="file" id="record_logo" /></div>}, active_scaffold_input_paperclip(config.columns[:logo], :name => 'record[logo]', :id => 'record_logo', :object => @record)
+      @record.stubs(:logo).returns(stub(:file? => true, :original_filename => 'file', :url => '/system/file', :styles => Company.attachment_definitions[:logo]))
+      quote = '&#39;'
+      click_js = "jQuery(this).prev().val(#{quote}true#{quote}); jQuery(this).parent().hide().next().show(); return false;"
+      change_js = "jQuery(this).parents(#{quote}div.paperclip_controls#{quote}).find(#{quote}input.remove_file#{quote}).val(#{quote}false#{quote}); return false;"
+      template = [
+        '<div class="paperclip_controls"><div>',
+        '<a href="/system/file" target="_blank">file</a> | ',
+        '<input name="record[delete_logo]" type="hidden" class="remove_file" id="record_delete_logo" value="false" />',
+        %(<a href="#" onclick="#{click_js}">Remove or Replace file</a>),
+        '</div><div style="display: none">',
+        %(<input name="record[logo]" class="text-input" autocomplete="off" type="file" id="record_logo" onchange="#{change_js}" />),
+        '</div></div>'
+      ].join
+      assert_dom_equal template, active_scaffold_input_paperclip(config.columns[:logo], :name => 'record[logo]', :id => 'record_logo', :object => @record)
 
-    @record.stubs(:logo).returns(stub(:file? => false))
-    assert_dom_equal '<input name="record[logo]" class="text-input" autocomplete="off" type="file" id="record_logo" />', active_scaffold_input_paperclip(config.columns[:logo], :name => 'record[logo]', :id => 'record_logo', :object => @record)
-    ActiveScaffold.js_framework = js
+      @record.stubs(:logo).returns(stub(:file? => false))
+      assert_dom_equal '<input name="record[logo]" class="text-input" autocomplete="off" type="file" id="record_logo" />', active_scaffold_input_paperclip(config.columns[:logo], :name => 'record[logo]', :id => 'record_logo', :object => @record)
+    end
   end
 end

data/test/bridges/tiny_mce_test.rb

@@ -8,44 +8,43 @@ class TinyMceTest < ActionView::TestCase
   # configuration options from tinymce.yml
   #
   # [1]: https://github.com/spohlenz/tinymce-rails/blob/master/lib/tinymce/rails/helper.rb#L37
-  def tinymce_configuration(config=:default)
-    return case config
-           when :default
-             Class.new do
-               def options
-                 {theme: 'modern'}
-               end
-             end.new
-           when :alternate
-             Class.new do
-               def options
-                 {theme: 'alternate', toolbar: 'undo redo | format'}
-               end
-             end.new
-           end
+  def tinymce_configuration(config = :default)
+    case config
+    when :default
+      Class.new do
+        def options
+          {theme: 'modern'}
+        end
+      end.new
+    when :alternate
+      Class.new do
+        def options
+          {theme: 'alternate', toolbar: 'undo redo | format'}
+        end
+      end.new
+    end
   end
 
   def test_includes
     ActiveScaffold::Bridges::TinyMce.expects(:install?).returns(true)
-    ActiveScaffold.js_framework = :jquery
-    assert ActiveScaffold::Bridges.all_javascripts.include?('tinymce-jquery')
+    with_js_framework :jquery do
+      assert ActiveScaffold::Bridges.all_javascripts.include?('tinymce-jquery')
+    end
   end
 
   def test_form_ui
     config = ActiveScaffold::Config::Core.new(:company)
     record = Company.new
-    expects(:request).returns(stub(:xhr? => true))
 
-    assert_dom_equal %{<textarea name=\"record[name]\" class=\"name-input mceEditor\" id=\"record_name\">\n</textarea>\n<script#{' type="text/javascript"' if Rails::VERSION::MAJOR < 4}>\n//<![CDATA[\ntinyMCE.settings = {\"theme\":\"modern\"};tinyMCE.execCommand('mceAddEditor', false, 'record_name');\n//]]>\n</script>}, active_scaffold_input_text_editor(config.columns[:name], :name => 'record[name]', :id => 'record_name', :class => 'name-input', :object => record)
+    assert_dom_equal %(<textarea name=\"record[name]\" class=\"name-input mceEditor\" id=\"record_name\" data-tinymce=\"{&quot;theme&quot;:&quot;modern&quot;}\">\n</textarea>), active_scaffold_input_text_editor(config.columns[:name], :name => 'record[name]', :id => 'record_name', :class => 'name-input', :object => record)
   end
 
   def test_form_ui_alternate
     config = ActiveScaffold::Config::Core.new(:company)
     record = Company.new
-    expects(:request).returns(stub(:xhr? => true))
     config.columns[:name].options[:tinymce_config] = :alternate
 
-    assert_dom_equal %{<textarea name=\"record[name]\" class=\"name-input mceEditor\" id=\"record_name\">\n</textarea>\n<script#{' type="text/javascript"' if Rails::VERSION::MAJOR < 4}>\n//<![CDATA[\ntinyMCE.settings = {\"theme\":\"alternate\",\"toolbar\":\"undo redo | format\"};tinyMCE.execCommand('mceAddEditor', false, 'record_name');\n//]]>\n</script>}, active_scaffold_input_tinymce(config.columns[:name], :name => 'record[name]', :id => 'record_name', :class => 'name-input', :object => record)
+    assert_dom_equal %(<textarea name=\"record[name]\" class=\"name-input mceEditor\" id=\"record_name\" data-tinymce=\"{&quot;theme&quot;:&quot;alternate&quot;,&quot;toolbar&quot;:&quot;undo redo | format&quot;}\">\n</textarea>), active_scaffold_input_tinymce(config.columns[:name], :name => 'record[name]', :id => 'record_name', :class => 'name-input', :object => record)
   end
 
   protected

data/test/class_with_finder.rb

@@ -0,0 +1,42 @@
+require 'active_scaffold_config_mock'
+
+class ClassWithFinder
+  include ActiveScaffoldConfigMock
+  include ActiveScaffold::Finder
+
+  def active_scaffold_config
+    self.class.active_scaffold_config
+  end
+
+  def conditions_for_collection; end
+
+  def conditions_from_params; end
+
+  def conditions_from_constraints; end
+
+  def active_scaffold_embedded_params
+    {}
+  end
+
+  def params_hash(v)
+    v
+  end
+
+  def joins_for_collection; end
+
+  def custom_finder_options
+    {}
+  end
+
+  def beginning_of_chain
+    active_scaffold_config.model
+  end
+
+  def conditional_get_support?; end
+
+  def params; {}; end
+
+  def grouped_search?
+    false
+  end
+end

data/test/company.rb

@@ -9,7 +9,7 @@ class Company < ActiveRecord::Base
   end
 
   def self.columns_hash
-    {
+    @columns_hash ||= {
       'name' => ColumnMock.new('name', nil, 'varchar(255)'),
       'date' => ColumnMock.new('date', nil, 'date'),
       'datetime' => ColumnMock.new('datetime', nil, 'datetime'),
@@ -49,16 +49,18 @@ class Company < ActiveRecord::Base
     end
   else
     def self.create_reflection(*args)
-      ActiveRecord::Reflection.create *args
+      ActiveRecord::Reflection.create(*args)
     end
   end
 
   def self.has_many(association_id, options = {})
     create_reflection(:has_many, association_id, nil, options, self)
   end
+
   def self.has_one(association_id, options = {})
     create_reflection(:has_one, association_id, nil, options, self)
   end
+
   def self.belongs_to(association_id, options = {})
     create_reflection(:belongs_to, association_id, nil, options, self)
   end
@@ -86,10 +88,10 @@ class Company < ActiveRecord::Base
   def name_came_from_user?; end
 
   def date
-    Date.today
+    Time.zone.today
   end
 
   def datetime
-    Time.now
+    Time.zone.now
   end
 end

data/test/config/core_test.rb

@@ -13,7 +13,7 @@ module Config
     def test_default_options
       refute @config.add_sti_create_links?
       refute @config.sti_children
-      assert_equal [:create, :list, :search, :update, :delete, :show, :nested, :subform], @config.actions.to_a
+      assert_equal %i[create list search update delete show nested subform], @config.actions.to_a
       assert_equal :default, @config.frontend
       assert_equal :default, @config.theme
       assert_equal 'Model stub', @config.label(:count => 1)

data/test/config/create_test.rb

@@ -12,7 +12,7 @@ module Config
     end
 
     def test_default_columns
-      assert_equal [:a, :d, :other_model, :other_models], @config.create.columns.names
+      assert_equal %i[a d other_model other_models], @config.create.columns.names
     end
 
     def test_default_options

data/test/config/list_test.rb

@@ -21,7 +21,7 @@ module Config
       assert_equal '-', @config.list.empty_field_text
       assert_equal ', ', @config.list.association_join_text
       assert_equal true, @config.list.pagination
-      assert_equal nil, @config.list.search_partial
+      assert_nil @config.list.search_partial
       assert_equal :no_entries, @config.list.no_entries_message
       assert_equal :filtered, @config.list.filtered_message
       refute @config.list.always_show_create
@@ -127,8 +127,8 @@ module Config
     end
 
     def test_count_includes
-      @config.list.count_includes = [:assoc_1, :assoc_2]
-      assert_equal [:assoc_1, :assoc_2], @config.list.count_includes
+      @config.list.count_includes = %i[assoc_1 assoc_2]
+      assert_equal %i[assoc_1 assoc_2], @config.list.count_includes
     end
   end
 end

data/test/config/update_test.rb

@@ -7,11 +7,11 @@ module Config
     end
 
     def test_copy_columns_from_create
-      @config.create.columns = [:a, :c, :d]
-      assert_equal [:a, :d], @config.create.columns.names
+      @config.create.columns = %i[a c d]
+      assert_equal %i[a d], @config.create.columns.names
       @config.update.columns = @config.create.columns
       @config._load_action_columns
-      assert_equal [:a, :c, :d], @config.update.columns.names
+      assert_equal %i[a c d], @config.update.columns.names
     end
 
     def test__params_for_columns__returns_all_params

data/test/data_structures/action_columns_test.rb

@@ -4,7 +4,7 @@ require 'test_helper'
 
 class ActionColumnsTest < MiniTest::Test
   def setup
-    @columns = ActiveScaffold::DataStructures::ActionColumns.new([:a, :b])
+    @columns = ActiveScaffold::DataStructures::ActionColumns.new(%i[a b])
     @columns.action = stub(:core => stub(:model_id => 'model_stub'))
   end
 
@@ -35,7 +35,7 @@ class ActionColumnsTest < MiniTest::Test
   def test_exclude_array
     # exclude with a symbol
     assert @columns.include?(:b)
-    @columns.exclude [:a, :b]
+    @columns.exclude %i[a b]
     refute @columns.include?(:b)
     refute @columns.include?(:a)
   end
@@ -58,7 +58,7 @@ class ActionColumnsTest < MiniTest::Test
 
     # try adding an array of columns
     refute @columns.include?(:f)
-    @columns.add [:f, :g]
+    @columns.add %i[f g]
     assert @columns.include?(:f)
     assert @columns.include?(:g)
   end