RubyGems - active_scaffold - Versions diffs - 3.3.3 → 3.4.0 - Mend

active_scaffold 3.3.3 → 3.4.0

Files changed (198) hide show

checksums.yaml +4 -4
data/CHANGELOG +39 -0
data/README.md +5 -3
data/app/assets/images/active_scaffold/refresh.png +0 -0
data/app/assets/javascripts/jquery/active_scaffold.js +182 -91
data/app/assets/javascripts/jquery/date_picker_bridge.js.erb +14 -16
data/app/assets/javascripts/jquery/draggable_lists.js +33 -26
data/app/assets/javascripts/jquery/jquery.editinplace.js +3 -3
data/app/assets/javascripts/prototype/active_scaffold.js +61 -19
data/app/assets/stylesheets/active_scaffold_colors.css.scss +4 -0
data/app/assets/stylesheets/active_scaffold_images.css.scss +3 -0
data/app/assets/stylesheets/active_scaffold_layout.css +23 -2
data/app/views/active_scaffold_overrides/_add_existing_form.html.erb +1 -3
data/app/views/active_scaffold_overrides/_base_form.html.erb +7 -5
data/app/views/active_scaffold_overrides/_field_search.html.erb +1 -2
data/app/views/active_scaffold_overrides/_form.html.erb +6 -4
data/app/views/active_scaffold_overrides/_form_association.html.erb +4 -3
data/app/views/active_scaffold_overrides/_form_association_footer.html.erb +5 -5
data/app/views/active_scaffold_overrides/_form_association_record.html.erb +8 -6
data/app/views/active_scaffold_overrides/_horizontal_subform_header.html.erb +3 -2
data/app/views/active_scaffold_overrides/_list.html.erb +8 -6
data/app/views/active_scaffold_overrides/_list_column_headings.html.erb +1 -4
data/app/views/active_scaffold_overrides/_list_pagination.html.erb +4 -4
data/app/views/active_scaffold_overrides/_list_pagination_links.html.erb +1 -1
data/app/views/active_scaffold_overrides/_list_record.html.erb +3 -3
data/app/views/active_scaffold_overrides/_refresh_list.js.erb +8 -1
data/app/views/active_scaffold_overrides/_search.html.erb +7 -13
data/app/views/active_scaffold_overrides/_show_columns.html.erb +1 -1
data/app/views/active_scaffold_overrides/on_create.js.erb +4 -4
data/app/views/active_scaffold_overrides/render_field_inplace.html.erb +1 -1
data/app/views/active_scaffold_overrides/row.js.erb +1 -1
data/config/locales/de.yml +106 -95
data/config/locales/en.yml +108 -97
data/config/locales/es.yml +109 -98
data/config/locales/fr.yml +108 -97
data/config/locales/hu.yml +109 -98
data/config/locales/ja.yml +100 -89
data/config/locales/ru.yml +115 -104
data/lib/active_scaffold.rb +18 -294
data/lib/active_scaffold/actions/common_search.rb +50 -17
data/lib/active_scaffold/actions/core.rb +93 -22
data/lib/active_scaffold/actions/create.rb +15 -6
data/lib/active_scaffold/actions/field_search.rb +68 -60
data/lib/active_scaffold/actions/list.rb +49 -28
data/lib/active_scaffold/actions/nested.rb +14 -6
data/lib/active_scaffold/actions/search.rb +36 -35
data/lib/active_scaffold/actions/show.rb +9 -4
data/lib/active_scaffold/actions/subform.rb +1 -1
data/lib/active_scaffold/actions/update.rb +22 -7
data/lib/active_scaffold/active_record_permissions.rb +125 -118
data/lib/active_scaffold/attribute_params.rb +84 -66
data/lib/active_scaffold/bridges.rb +3 -3
data/lib/active_scaffold/bridges/ancestry/ancestry_bridge.rb +10 -5
data/lib/active_scaffold/bridges/cancan.rb +2 -1
data/lib/active_scaffold/bridges/cancan/cancan_bridge.rb +13 -2
data/lib/active_scaffold/bridges/carrierwave/form_ui.rb +11 -6
data/lib/active_scaffold/bridges/chosen/helpers.rb +2 -2
data/lib/active_scaffold/bridges/country_helper/country_helper_bridge.rb +45 -29
data/lib/active_scaffold/bridges/date_picker/ext.rb +11 -6
data/lib/active_scaffold/bridges/date_picker/helper.rb +5 -1
data/lib/active_scaffold/bridges/dragonfly/form_ui.rb +10 -5
data/lib/active_scaffold/bridges/dragonfly/list_ui.rb +6 -1
data/lib/active_scaffold/bridges/file_column/form_ui.rb +12 -11
data/lib/active_scaffold/bridges/paperclip/form_ui.rb +14 -6
data/lib/active_scaffold/bridges/paperclip/list_ui.rb +1 -1
data/lib/active_scaffold/bridges/record_select/helpers.rb +15 -12
data/lib/active_scaffold/bridges/shared/date_bridge.rb +7 -8
data/lib/active_scaffold/bridges/tiny_mce.rb +5 -3
data/lib/active_scaffold/bridges/tiny_mce/helpers.rb +4 -5
data/lib/active_scaffold/config/base.rb +4 -0
data/lib/active_scaffold/config/core.rb +12 -5
data/lib/active_scaffold/config/delete.rb +0 -2
data/lib/active_scaffold/config/field_search.rb +1 -4
data/lib/active_scaffold/config/form.rb +0 -2
data/lib/active_scaffold/config/list.rb +31 -1
data/lib/active_scaffold/config/search.rb +0 -3
data/lib/active_scaffold/config/show.rb +0 -6
data/lib/active_scaffold/config/subform.rb +1 -0
data/lib/active_scaffold/configurable.rb +2 -2
data/lib/active_scaffold/constraints.rb +11 -14
data/lib/active_scaffold/core.rb +277 -0
data/lib/active_scaffold/data_structures/action_columns.rb +18 -2
data/lib/active_scaffold/data_structures/action_link.rb +25 -6
data/lib/active_scaffold/data_structures/action_links.rb +9 -4
data/lib/active_scaffold/data_structures/actions.rb +1 -1
data/lib/active_scaffold/data_structures/column.rb +6 -6
data/lib/active_scaffold/data_structures/columns.rb +2 -2
data/lib/active_scaffold/data_structures/nested_info.rb +5 -1
data/lib/active_scaffold/data_structures/sorting.rb +15 -5
data/lib/active_scaffold/delayed_setup.rb +30 -0
data/lib/active_scaffold/engine.rb +25 -0
data/lib/active_scaffold/extensions/action_view_rendering.rb +1 -1
data/lib/active_scaffold/extensions/left_outer_joins.rb +61 -21
data/lib/active_scaffold/extensions/localize.rb +1 -1
data/lib/active_scaffold/extensions/name_option_for_datetime.rb +13 -8
data/lib/active_scaffold/extensions/paginator_extensions.rb +5 -1
data/lib/active_scaffold/extensions/reverse_associations.rb +1 -0
data/lib/active_scaffold/extensions/routing_mapper.rb +1 -1
data/lib/active_scaffold/extensions/unsaved_record.rb +4 -6
data/lib/active_scaffold/finder.rb +79 -27
data/lib/active_scaffold/helpers/association_helpers.rb +48 -18
data/lib/active_scaffold/helpers/controller_helpers.rb +19 -10
data/lib/active_scaffold/helpers/form_column_helpers.rb +185 -87
data/lib/active_scaffold/helpers/human_condition_helpers.rb +2 -1
data/lib/active_scaffold/helpers/id_helpers.rb +14 -8
data/lib/active_scaffold/helpers/list_column_helpers.rb +65 -56
data/lib/active_scaffold/helpers/pagination_helpers.rb +5 -1
data/lib/active_scaffold/helpers/search_column_helpers.rb +21 -18
data/lib/active_scaffold/helpers/view_helpers.rb +102 -64
data/lib/active_scaffold/responds_to_parent.rb +39 -64
data/lib/active_scaffold/tableless.rb +129 -10
data/lib/active_scaffold/version.rb +2 -2
data/test/bridges/bridge_test.rb +1 -1
data/test/bridges/date_picker_test.rb +2 -2
data/test/bridges/paperclip_test.rb +10 -8
data/test/bridges/tiny_mce_test.rb +2 -2
data/test/company.rb +22 -10
data/test/config/base_test.rb +1 -1
data/test/config/core_test.rb +8 -6
data/test/config/create_test.rb +6 -6
data/test/config/delete_test.rb +4 -4
data/test/config/field_search_test.rb +6 -6
data/test/config/list_test.rb +7 -7
data/test/config/nested_test.rb +8 -7
data/test/config/search_test.rb +7 -7
data/test/config/show_test.rb +5 -5
data/test/config/subform_test.rb +1 -1
data/test/config/update_test.rb +5 -4
data/test/data_structures/action_columns_test.rb +15 -16
data/test/data_structures/action_link_test.rb +10 -10
data/test/data_structures/action_links_test.rb +6 -6
data/test/data_structures/actions_test.rb +4 -4
data/test/data_structures/association_column_test.rb +4 -4
data/test/data_structures/column_test.rb +9 -9
data/test/data_structures/columns_test.rb +7 -7
data/test/data_structures/error_message_test.rb +2 -4
data/test/data_structures/set_test.rb +13 -13
data/test/data_structures/sorting_test.rb +8 -8
data/test/data_structures/standard_column_test.rb +2 -2
data/test/data_structures/validation_reflection_test.rb +8 -8
data/test/data_structures/virtual_column_test.rb +5 -5
data/test/extensions/active_record_test.rb +1 -1
data/test/helpers/form_column_helpers_test.rb +5 -5
data/test/helpers/list_column_helpers_test.rb +2 -1
data/test/helpers/pagination_helpers_test.rb +1 -1
data/test/misc/active_record_permissions_test.rb +23 -4
data/test/misc/attribute_params_test.rb +304 -136
data/test/misc/calculation_test.rb +55 -0
data/test/misc/configurable_test.rb +22 -21
data/test/misc/constraints_test.rb +10 -7
data/test/misc/convert_numbers_format_test.rb +149 -0
data/test/misc/finder_test.rb +17 -13
data/test/misc/lang_test.rb +1 -1
data/test/misc/tableless_test.rb +18 -0
data/test/mock_app/app/controllers/addresses_controller.rb +4 -0
data/test/mock_app/app/controllers/buildings_controller.rb +4 -0
data/test/mock_app/app/controllers/cars_controller.rb +4 -0
data/test/mock_app/app/controllers/contacts_controller.rb +4 -0
data/test/mock_app/app/controllers/floors_controller.rb +6 -0
data/test/mock_app/app/controllers/people_controller.rb +4 -0
data/test/mock_app/app/models/address.rb +3 -0
data/test/mock_app/app/models/building.rb +8 -0
data/test/mock_app/app/models/car.rb +3 -0
data/test/mock_app/app/models/contact.rb +3 -0
data/test/mock_app/app/models/file_model.rb +19 -0
data/test/mock_app/app/models/floor.rb +8 -0
data/test/mock_app/app/models/person.rb +11 -0
data/test/mock_app/config/application.rb +2 -0
data/test/mock_app/config/environments/test.rb +1 -1
data/test/mock_app/config/initializers/secret_token.rb +5 -1
data/test/mock_app/config/routes.rb +1 -1
data/test/mock_app/db/schema.rb +51 -0
data/test/model_stub.rb +3 -3
data/test/test_helper.rb +15 -12
metadata +51 -50
data/lib/active_scaffold/extensions/array.rb +0 -7
data/lib/active_scaffold/extensions/cache_association.rb +0 -16
data/lib/active_scaffold/extensions/usa_state.rb +0 -46
data/lib/active_scaffold_env.rb +0 -13
data/test/extensions/array_test.rb +0 -12
data/test/mock_app/public/blank.html +0 -33
data/test/mock_app/public/images/active_scaffold/DO_NOT_EDIT +0 -2
data/test/mock_app/public/images/active_scaffold/default/add.gif +0 -0
data/test/mock_app/public/images/active_scaffold/default/arrow_down.gif +0 -0
data/test/mock_app/public/images/active_scaffold/default/arrow_up.gif +0 -0
data/test/mock_app/public/images/active_scaffold/default/close.gif +0 -0
data/test/mock_app/public/images/active_scaffold/default/cross.png +0 -0
data/test/mock_app/public/images/active_scaffold/default/indicator-small.gif +0 -0
data/test/mock_app/public/images/active_scaffold/default/indicator.gif +0 -0
data/test/mock_app/public/images/active_scaffold/default/magnifier.png +0 -0
data/test/mock_app/public/javascripts/active_scaffold/DO_NOT_EDIT +0 -2
data/test/mock_app/public/javascripts/active_scaffold/default/active_scaffold.js +0 -532
data/test/mock_app/public/javascripts/active_scaffold/default/dhtml_history.js +0 -867
data/test/mock_app/public/javascripts/active_scaffold/default/form_enhancements.js +0 -117
data/test/mock_app/public/javascripts/active_scaffold/default/rico_corner.js +0 -370
data/test/mock_app/public/stylesheets/active_scaffold/DO_NOT_EDIT +0 -2
data/test/mock_app/public/stylesheets/active_scaffold/default/stylesheet-ie.css +0 -35
data/test/mock_app/public/stylesheets/active_scaffold/default/stylesheet.css +0 -848

data/lib/active_scaffold/responds_to_parent.rb CHANGED

@@ -1,70 +1,45 @@
-#  Copyright (c) 2006 Sean Treadway
-#
-#  Permission is hereby granted, free of charge, to any person obtaining
-#  a copy of this software and associated documentation files (the
-#  "Software"), to deal in the Software without restriction, including
-#  without limitation the rights to use, copy, modify, merge, publish,
-#  distribute, sublicense, and/or sell copies of the Software, and to
-#  permit persons to whom the Software is furnished to do so, subject to
-#  the following conditions:
-#
-#  The above copyright notice and this permission notice shall be
-#  included in all copies or substantial portions of the Software.
-#
-#  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-#  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-#  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-#  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-#  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-#  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-#  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+module ActiveScaffold
+  # Module containing the methods useful for child IFRAME to parent window communication
+  module RespondsToParent
+    # Executes the response body as JavaScript in the context of the parent window.
+    # Use this method of you are posting a form to a hidden IFRAME or if you would like
+    # to use IFRAME base RPC.
+    def responds_to_parent(&block)
+      yield
+      if performed?
+        # Either pull out a redirect or the request body
+        script =  if response.headers['Location']
+                    #TODO: erase_redirect_results is missing in rails 3.0
+                    "document.location.href = '#{self.class.helpers.escape_javascript location.to_s}'"
+                  else
+                    response.body || ''
+                  end
-# Module containing the methods useful for child IFRAME to parent window communication
-module RespondsToParent
-  # Executes the response body as JavaScript in the context of the parent window.
-  # Use this method of you are posting a form to a hidden IFRAME or if you would like
-  # to use IFRAME base RPC.
-  def responds_to_parent(&block)
-    yield
-    if performed?
-      # We're returning HTML instead of JS or XML now
-      response.headers['Content-Type'] = 'text/html; charset=UTF-8'
-      # Either pull out a redirect or the request body
-      script =  if response.headers['Location']
-                  #TODO: erase_redirect_results is missing in rails 3.0 has to be implemented
-                  #erase redirect
-                  "document.location.href = #{location.to_s.inspect}"
-                else
-                  response.body
-                end
-      # Escape quotes, linebreaks and slashes, maintaining previously escaped slashes
-      # Suggestions for improvement?
-      script = (script || '').
-        gsub('\\', '\\\\\\').
-        gsub(/\r\n|\r|\n/, '\\n').
-        gsub(/['"]/, '\\\\\&').
-        gsub('</script>','</scr"+"ipt>')
+        # Eval in parent scope and replace document location of this frame
+        # so back button doesn't replay action on targeted forms
+        # loc = document.location to be set after parent is updated for IE
+        # with(window.parent) - pull in variables from parent window
+        # setTimeout - scope the execution in the windows parent for safari
+        # window.eval - legal eval for Opera
+        script = "<html><body><script type='text/javascript' charset='utf-8'>
+          var loc = document.location;
+          with(window.parent) { setTimeout(function() { window.eval('#{self.class.helpers.escape_javascript script}'); window.loc && loc.replace('about:blank'); }, 1) }
+        </script></body></html>"
-      # Clear out the previous render to prevent double render
-      response.request.env['action_controller.instance'].instance_variable_set(:@_response_body, nil)
-      # Eval in parent scope and replace document location of this frame
-      # so back button doesn't replay action on targeted forms
-      # loc = document.location to be set after parent is updated for IE
-      # with(window.parent) - pull in variables from parent window
-      # setTimeout - scope the execution in the windows parent for safari
-      # window.eval - legal eval for Opera
-      render :text => "<html><body><script type='text/javascript' charset='utf-8'>
-        var loc = document.location;
-        with(window.parent) { setTimeout(function() { window.eval('#{script}'); if (typeof(loc) !== 'undefined') loc.replace('about:blank'); }, 1) };
-        </script></body></html>".html_safe
+        # We're returning HTML instead of JS or XML now
+        response.headers['Content-Type'] = 'text/html; charset=UTF-8'
+        # Clear out the previous render to prevent double render and then render
+        if respond_to?(:erase_results, true)
+          erase_results
+        else
+          instance_variable_set(:@_response_body, nil)
+        end
+        render :text => script
+      end
     end
+    alias respond_to_parent responds_to_parent
   end
-  alias respond_to_parent responds_to_parent
 end

data/lib/active_scaffold/tableless.rb CHANGED

@@ -1,13 +1,99 @@
 class ActiveScaffold::Tableless < ActiveRecord::Base
-  class Relation < ActiveRecord::Relation
-    attr_reader :conditions
+  class AssociationScope < ActiveRecord::Associations::AssociationScope
+    def column_for(table_name, column_name, alias_tracker = nil)
+      klass = alias_tracker ? alias_tracker.connection.klass : self.klass
+      if table_name == klass.table_name
+        klass.columns_hash[column_name]
+      else
+        super
+      end
+    end
+    if defined?(ActiveRecord::Associations::AssociationScope::INSTANCE) # rails >= 4.1
+      INSTANCE = respond_to?(:create) ? create : new # create for rails >= 4.2
+      def self.scope(association, connection)
+        INSTANCE.scope association, connection
+      end
+    end
+  end
+  class Connection < ActiveRecord::ConnectionAdapters::AbstractAdapter
+    attr_reader :klass
+    def initialize(klass, *args)
+      super(nil, *args)
+      @klass = klass
+    end
+  end
+  class Column < ActiveRecord::ConnectionAdapters::Column
+    def initialize(name, default, sql_type = nil, null = true)
+      if defined?(ActiveRecord::ConnectionAdapters::Type) # rails >= 4.2
+        cast_type = ActiveRecord::Base.connection.send :lookup_cast_type, sql_type
+        super(name, default, cast_type, sql_type, null)
+      else # rails < 4.2
+        super
+      end
+    end
+  end
+  module Association
+    def self.included(base)
+      base.alias_method_chain :association_scope, :tableless
+      base.alias_method_chain :target_scope, :tableless
+    end
+    def association_scope_with_tableless
+      @association_scope ||= overrided_association_scope if klass < ActiveScaffold::Tableless
+      association_scope_without_tableless
+    end
+    def overrided_association_scope
+      if AssociationScope.respond_to?(:scope) # rails >= 4.1
+        AssociationScope.scope(self, klass.connection)
+      else # rails < 4.1
+        AssociationScope.new(self).scope
+      end
+    end
+    def target_scope_with_tableless
+      target_scope_without_tableless.tap do |scope|
+        if klass < ActiveScaffold::Tableless
+          class << scope; include RelationExtension; end
+        end
+      end
+    end
+  end
+  module CollectionAssociation
+    def self.included(base)
+      base.alias_method_chain :get_records, :tableless if Rails.version >= '4.2'
+    end
+    def get_records_with_tableless
+      klass < ActiveScaffold::Tableless ? scope.to_a : get_records_without_tableless
+    end
+  end
+  module SingularAssociation
+    def self.included(base)
+      base.alias_method_chain :get_records, :tableless if Rails.version >= '4.2'
+    end
+    def get_records_with_tableless
+      klass < ActiveScaffold::Tableless ? scope.limit(1).to_a : get_records_without_tableless
+    end
+  end
+  module RelationExtension
+    def conditions
+      @conditions
+    end
     def initialize(klass, table)
       super
       @conditions ||= []
     end
     def initialize_copy(other)
-      @conditions = @conditions.dup
+      @conditions = @conditions.try(:dup) || []
       super
     end
@@ -44,10 +130,9 @@ class ActiveScaffold::Tableless < ActiveRecord::Base
     end
   end
-  def self.columns; @columns ||= []; end
-  def self.table_name; @table_name ||= ActiveModel::Naming.plural(self); end
-  def self.table_exists?; true; end
-  self.abstract_class = true
+  class Relation < ActiveRecord::Relation
+    include RelationExtension
+  end
   class << self
     private
     def relation
@@ -55,8 +140,40 @@ class ActiveScaffold::Tableless < ActiveRecord::Base
     end
   end
+  class StatementCache
+    def initialize(key)
+      @key = key
+    end
+    def execute(values, model, connection)
+      model.where(@key => values)
+    end
+  end
+  unless Rails.version < '4.2'
+    def self.columns_hash
+      if self < ActiveScaffold::Tableless
+        @columns_hash ||= Hash[self.columns.map { |c| [c.name, c] }]
+      else
+        super
+      end
+    end
+    def self.initialize_find_by_cache
+      self.find_by_statement_cache = Hash.new { |h, k| h[k] = StatementCache.new(k) }
+    end
+  end
+  def self.columns; @columns ||= []; end
+  def self.table_name; @table_name ||= ActiveModel::Naming.plural(self); end
+  def self.table_exists?; true; end
+  self.abstract_class = true
+  def self.connection
+    @connection ||= Connection.new(self)
+  end
   def self.column(name, sql_type = nil, options = {})
-    column = ActiveRecord::ConnectionAdapters::Column.new(name.to_s, options[:default], sql_type.to_s, options.has_key?(:null) ? options[:null] : true)
+    column = Column.new(name.to_s, options[:default], sql_type.to_s, options.has_key?(:null) ? options[:null] : true)
     column.tap { columns << column }
   end
@@ -80,11 +197,13 @@ class ActiveScaffold::Tableless < ActiveRecord::Base
     raise 'destroy must be implemented in a Tableless model'
   end
-  def create #:nodoc:
+  def create_record #:nodoc:
     run_callbacks(:create) {}
   end
+  alias_method :create, :create_record # for rails3
-  def update(*) #:nodoc:
+  def update_record(*) #:nodoc:
     run_callbacks(:update) {}
   end
+  alias_method :update, :update_record # for rails3
 end

data/lib/active_scaffold/version.rb CHANGED

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

data/test/bridges/bridge_test.rb CHANGED

@@ -1,6 +1,6 @@
 require 'test_helper'
-class BridgeTest < Test::Unit::TestCase
+class BridgeTest < MiniTest::Test
   def setup
     @const_store = {}
   end

data/test/bridges/date_picker_test.rb CHANGED

@@ -23,7 +23,7 @@ class DatePickerTest < ActionView::TestCase
   def test_form_ui
     config = ActiveScaffold::Config::Core.new(:company)
     @record = Company.new
-    assert active_scaffold_input_date_picker(config.columns[:date], :name => 'record[date]', :id => 'record_date')
-    assert active_scaffold_input_date_picker(config.columns[:datetime], :name => 'record[datetime]', :id => 'record_datetime')
+    assert active_scaffold_input_date_picker(config.columns[:date], :name => 'record[date]', :id => 'record_date', :object => @record)
+    assert active_scaffold_input_date_picker(config.columns[:datetime], :name => 'record[datetime]', :id => 'record_datetime', :object => @record)
   end
 end

data/test/bridges/paperclip_test.rb CHANGED

@@ -14,9 +14,9 @@ class PaperclipTest < ActionView::TestCase
   def test_initialization_without_paperclip
     Company.expects(:attachment_definitions)
     config = PaperclipCore.new(:company)
-    assert !config.create.multipart?
-    assert !config.update.multipart?
-    assert !config.columns.any? {|column| column.form_ui == :paperclip}
+    refute config.create.multipart?
+    refute config.update.multipart?
+    refute config.columns.any? {|column| column.form_ui == :paperclip}
   end
   def test_initialization
@@ -26,7 +26,7 @@ class PaperclipTest < ActionView::TestCase
     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|
-      assert !config.columns._inheritable.include?(attr.to_sym)
+      refute config.columns._inheritable.include?(attr.to_sym)
     end
     assert Company.method_defined?(:delete_logo)
     assert Company.method_defined?(:'delete_logo=')
@@ -48,20 +48,22 @@ class PaperclipTest < ActionView::TestCase
     company = Company.new
     company.stubs(:logo).returns(stub(:file? => true, :original_filename => 'file', :url => '/system/file', :styles => Company.attachment_definitions[:logo]))
-    assert_dom_equal '<a href="/system/file" data-popup="true" target="_blank">file</a>', active_scaffold_column_paperclip(company, config.columns[:logo])
+    assert_dom_equal '<a href="/system/file" target="_blank">file</a>', active_scaffold_column_paperclip(company, config.columns[:logo])
     company.stubs(:logo).returns(stub(:file? => true, :original_filename => 'file', :url => '/system/file', :styles => {:thumbnail => '40x40'}))
-    assert_dom_equal '<a href="/system/file" data-popup="true" target="_blank"><img src="/system/file" border="0" alt="File"/></a>', active_scaffold_column_paperclip(company, config.columns[:logo])
+    assert_dom_equal '<a href="/system/file" target="_blank"><img src="/system/file" border="0" alt="File"/></a>', active_scaffold_column_paperclip(company, config.columns[:logo])
   end
   def test_form_ui
+    js, ActiveScaffold.js_framework = ActiveScaffold.js_framework, :jquery
     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]))
-    assert_dom_equal '<div><a href="/system/file" data-popup="true" target="_blank">file</a> | <input name="record[delete_logo]" type="hidden" id="record_delete_logo" value="false" /><a href="#" onclick="$(this).prev().val(&#x27;true&#x27;); $(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')
+    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? => 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')
+    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

data/test/bridges/tiny_mce_test.rb CHANGED

@@ -1,5 +1,4 @@
 require 'test_helper'
-require File.join(File.dirname(__FILE__), '../../lib/active_scaffold/bridges/tiny_mce/helpers')
 class TinyMceTest < ActionView::TestCase
   include ActiveScaffold::Helpers::ViewHelpers
@@ -7,6 +6,7 @@ class TinyMceTest < ActionView::TestCase
   def test_includes
     ActiveScaffold::Bridges::TinyMce.expects(:install?).returns(true)
+    ActiveScaffold.js_framework = :jquery
     assert ActiveScaffold::Bridges.all_javascripts.include?("tinymce-jquery")
   end
@@ -15,7 +15,7 @@ class TinyMceTest < ActionView::TestCase
     @record = Company.new
     self.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\">\n//<![CDATA[\ntinyMCE.settings = {\"theme\":\"simple\"};tinyMCE.execCommand('mceAddControl', 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\">\n</textarea>\n<script#{' type="text/javascript"' if Rails::VERSION::MAJOR < 4}>\n//<![CDATA[\ntinyMCE.settings = {\"theme\":\"simple\"};tinyMCE.execCommand('mceAddControl', 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)
   end
   protected

data/test/company.rb CHANGED

@@ -9,13 +9,13 @@ class Company < ActiveRecord::Base
   def self.columns_hash
     {
-      'name' => ActiveRecord::ConnectionAdapters::Column.new('name', nil, 'varchar(255)'),
-      'date' => ActiveRecord::ConnectionAdapters::Column.new('date', nil, 'date'),
-      'datetime' => ActiveRecord::ConnectionAdapters::Column.new('datetime', nil, 'datetime'),
-      'logo_file_name' => ActiveRecord::ConnectionAdapters::Column.new('logo_file_name', nil, 'varchar(255)'),
-      'logo_content_type' => ActiveRecord::ConnectionAdapters::Column.new('logo_content_type', nil, 'varchar(255)'),
-      'logo_file_size' => ActiveRecord::ConnectionAdapters::Column.new('logo_file_size', nil, 'int(11)'),
-      'logo_updated_at' => ActiveRecord::ConnectionAdapters::Column.new('logo_updated_at', nil, 'datetime'),
+      'name' => ColumnMock.new('name', nil, 'varchar(255)'),
+      'date' => ColumnMock.new('date', nil, 'date'),
+      'datetime' => ColumnMock.new('datetime', nil, 'datetime'),
+      'logo_file_name' => ColumnMock.new('logo_file_name', nil, 'varchar(255)'),
+      'logo_content_type' => ColumnMock.new('logo_content_type', nil, 'varchar(255)'),
+      'logo_file_size' => ColumnMock.new('logo_file_size', nil, 'int(11)'),
+      'logo_updated_at' => ColumnMock.new('logo_updated_at', nil, 'datetime'),
     }
   end
@@ -39,15 +39,27 @@ class Company < ActiveRecord::Base
   def self.before_destroy(s=nil)
     @@before = s
   end
+  if respond_to?(:create_reflection)
+    if method(:create_reflection).arity == 4
+      def self.create_reflection(macro, name, scope, options, active_record)
+        super(macro, name, options, active_record)
+      end
+    end
+  else
+    def self.create_reflection(*args)
+      ActiveRecord::Reflection.create *args
+    end
+  end
   def self.has_many(association_id, options = {})
-    reflection = create_reflection(:has_many, association_id, options, self)
+    reflection = create_reflection(:has_many, association_id, nil, options, self)
   end
   def self.has_one(association_id, options = {})
-    reflection = create_reflection(:has_one, association_id, options, self)
+    reflection = create_reflection(:has_one, association_id, nil, options, self)
   end
   def self.belongs_to(association_id, options = {})
-    reflection = create_reflection(:belongs_to, association_id, options, self)
+    reflection = create_reflection(:belongs_to, association_id, nil, options, self)
   end
   has_many :companies
   has_one :company

data/test/config/base_test.rb CHANGED

@@ -1,7 +1,7 @@
 require 'test_helper'
 module Config
-  class BaseTest < Test::Unit::TestCase
+  class BaseTest < MiniTest::Test
     def setup
       @base = ActiveScaffold::Config::Base.new(ActiveScaffold::Config::Core.new(:model_stub))
     end

data/test/config/core_test.rb CHANGED

@@ -1,16 +1,18 @@
 require 'test_helper'
 module Config
-  class CoreTest < Test::Unit::TestCase
-    class ModelStubsController < ActionController::Base; end
+  class CoreTest < MiniTest::Test
+    class ModelStubsController < ActionController::Base
+      include ActiveScaffold::Core
+    end
     def setup
       @config = ActiveScaffold::Config::Core.new :model_stub
       ModelStubsController.instance_variable_set :@active_scaffold_config, @config
     end
     def test_default_options
-      assert !@config.add_sti_create_links?
-      assert !@config.sti_children
+      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 :default, @config.frontend
       assert_equal :default, @config.theme
@@ -20,7 +22,7 @@ module Config
     def test_add_sti_children
       @config.sti_create_links = true
-      assert !@config.add_sti_create_links?
+      refute @config.add_sti_create_links?
       @config.sti_children = [:a]
       assert @config.add_sti_create_links?
     end
@@ -33,7 +35,7 @@ module Config
     def test_actions
       assert @config.actions.include?(:create)
       @config.actions = [:list]
-      assert !@config.actions.include?(:create)
+      refute @config.actions.include?(:create)
       assert_equal [:list], @config.actions.to_a
     end