active_scaffold 3.3.2 → 3.3.3

data/lib/active_scaffold/finder.rb

@@ -175,7 +175,7 @@ module ActiveScaffold
 
       def condition_value_for_numeric(column, value)
         return value if value.nil?
-        value = i18n_number_to_native_format(value) if [:i18n_number, :currency].include?(column.options[:format]) && column.search_ui != :number
+        value = column.number_to_native(value) if column.options[:format] && column.search_ui != :number
         case (column.search_ui || column.column.type)
         when :integer   then value.to_i rescue value ? 1 : 0
         when :float     then value.to_f
@@ -184,18 +184,6 @@ module ActiveScaffold
           value
         end
       end
-
-      def i18n_number_to_native_format(value)
-        native = '.'
-        delimiter = I18n.t('number.format.delimiter')
-        separator = I18n.t('number.format.separator')
-        return value if value.blank? || !value.is_a?(String)
-        unless delimiter == native && !value.include?(separator) && value !~ /\.\d{3}$/
-          value.gsub(/[^0-9\-#{I18n.t('number.format.separator')}]/, '').gsub(I18n.t('number.format.separator'), native)
-        else
-          value
-        end
-      end
       
       def datetime_conversion_for_condition(column)
         if column.column
@@ -367,7 +355,7 @@ module ActiveScaffold
       end
 
       klass = beginning_of_chain
-      klass = klass.uniq if find_options[:outer_joins].present?
+      klass = klass.where(nil).uniq if find_options[:outer_joins].present? # HACK: call where(nil) because calling uniq on associations (nested scaffolds) send SQL to DB
       # we build the paginator differently for method- and sql-based sorting
       if options[:sorting] and options[:sorting].sorts_by_method?
         pager = ::Paginator.new(count, options[:per_page]) do |offset, per_page|

data/lib/active_scaffold/helpers/form_column_helpers.rb

@@ -119,6 +119,7 @@ module ActiveScaffold
           url_params = url_params.except(:parent_scaffold, :association, nested.param_name) if nested? && scope
           url_params[:eid] = params[:eid] if params[:eid]
           if scope
+            url_params[:parent_controller] ||= url_params[:controller]
             url_params[:controller] = subform_controller.controller_path
             url_params[:scope] = scope
             url_params[:parent_id] = params[:parent_id] || params[:id]

data/lib/active_scaffold/helpers/list_column_helpers.rb

@@ -160,7 +160,7 @@ module ActiveScaffold
             if column.associated_limit == 0
               size if column.associated_number?
             else
-              joined_associated = firsts.join(active_scaffold_config.list.association_join_text)
+              joined_associated = firsts.join(h(active_scaffold_config.list.association_join_text)).html_safe
               joined_associated << " (#{size})" if column.associated_number? and column.associated_limit and value.size > column.associated_limit
               joined_associated
             end

data/lib/active_scaffold/helpers/pagination_helpers.rb

@@ -38,7 +38,7 @@ module ActiveScaffold
             page = current_page.number - offset
             if page < start_number && page > last_page
               html << '..' if page > last_page + 1
-              html << pagination_ajax_link(page, params)
+              html << pagination_ajax_link(page, url_options, options)
               last_page = page
             end
           end

data/lib/active_scaffold/helpers/search_column_helpers.rb

@@ -82,7 +82,7 @@ module ActiveScaffold
         active_scaffold_checkbox_list(column, select_options, associated, options)
       end
 
-      def active_scaffold_search_select(column, html_options)
+      def active_scaffold_search_select(column, html_options, options = {})
         associated = html_options.delete :value
         if column.association
           associated = associated.is_a?(Array) ? associated.map(&:to_i) : associated.to_i unless associated.nil?
@@ -95,7 +95,7 @@ module ActiveScaffold
           end
         end
 
-        options = { :selected => associated }.merge! column.options
+        options = options.merge(:selected => associated).merge column.options
         html_options.merge! column.options[:html_options] || {}
         if html_options[:multiple]
           html_options[:name] += '[]'

data/lib/active_scaffold/helpers/view_helpers.rb

@@ -235,7 +235,12 @@ module ActiveScaffold
           url_options = action_link_url_options(link, record)
           if active_scaffold_config.cache_action_link_urls
             url = url_for(url_options)
-            @action_links_urls[link.name_to_cache_link_url] = url unless link.dynamic_parameters.is_a?(Proc)
+            model = active_scaffold_config.model
+            is_sti_record = record && model.columns_hash.include?(model.inheritance_column) &&
+              record[model.inheritance_column].present?
+            unless link.dynamic_parameters.is_a?(Proc) || is_sti_record
+              @action_links_urls[link.name_to_cache_link_url] = url 
+            end
             url
           else
             url_for(params_for(url_options))
@@ -339,10 +344,7 @@ module ActiveScaffold
           html_options[:data][:cancel_refresh] = true if link.refresh_on_close
           html_options[:data][:keep_open] = true if link.keep_open?
         end
-        if link.popup?
-          html_options[:data][:popup] = true
-          html_options[:target] = '_blank'
-        end
+        html_options[:target] = '_blank' if link.popup?
         html_options[:id] = link_id
         html_options[:remote] = true unless link.page? || link.popup?
         if link.dhtml_confirm?

data/lib/active_scaffold/tableless.rb

@@ -69,10 +69,10 @@ class ActiveScaffold::Tableless < ActiveRecord::Base
   end
 
   def self.execute_simple_calculation(relation, operation, column_name, distinct)
-    if operation == 'count' && column_name == :all && !distinct
+    if operation == 'count' && [relation.klass.primary_key, :all].include?(column_name)
       find_all(relation).size
     else
-      raise "self.execute_simple_calculation must be implemented in a Tableless model to support #{operation} #{column_name} #{' distinct' if distinct} columns"
+      raise "self.execute_simple_calculation must be implemented in a Tableless model to support #{operation} #{column_name}#{' distinct' if distinct} columns"
     end
   end
 

data/lib/active_scaffold/version.rb

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

data/test/bridges/bridge_test.rb

@@ -1,9 +1,6 @@
-def dbg; require "ruby-debug"; debugger; end;
+require 'test_helper'
 
-require File.join(File.dirname(__FILE__), '../test_helper.rb')
-
-
-class Bridges::BridgeTest < Test::Unit::TestCase
+class BridgeTest < Test::Unit::TestCase
   def setup
     @const_store = {}
   end
@@ -12,36 +9,29 @@ class Bridges::BridgeTest < Test::Unit::TestCase
   end
   
   def test__shouldnt_throw_errors
-    ActiveScaffold::Bridge.run_all
+    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"))
     end
+    ActiveScaffold.js_framework = js
   end
   
   def test__file_column_bridge
     ConstMocker.mock("FileColumn") do |cm|
-      cm.remove
-      assert(! bridge_will_be_installed("FileColumn"))
+    cm.remove
+    assert(! bridge_will_be_installed("FileColumn"))
       cm.declare
       assert(bridge_will_be_installed("FileColumn"))
     end
   end
   
-  def test__dependent_protect_bridge
-    ConstMocker.mock("DependentProtect") do |cm|
-      cm.remove
-      assert(! bridge_will_be_installed("DependentProtect"))
-      cm.declare
-      assert(bridge_will_be_installed("DependentProtect"))
-    end
-  end
-  
   def test__paperclip_bridge
     ConstMocker.mock("Paperclip") do |cm|
       cm.remove
@@ -51,22 +41,21 @@ class Bridges::BridgeTest < Test::Unit::TestCase
     end
   end
   
-  def test__unobtrusive_date_picker_bridge
-    ConstMocker.mock("UnobtrusiveDatePicker") do |cm|
-      cm.remove
-      assert(! bridge_will_be_installed("UnobtrusiveDatePicker"))
-      cm.declare
-      assert(bridge_will_be_installed("UnobtrusiveDatePicker"))
+  def test__date_picker_bridge
+    ConstMocker.mock("Jquery") do |jquery|
+      jquery.declare
+      ConstMocker.mock("Rails", jquery.const) do |rails|
+        rails.declare
+        ConstMocker.mock("Ui", jquery.const) do |cm|
+          cm.remove
+          assert(! bridge_will_be_installed("DatePicker"))
+          cm.declare
+          assert(bridge_will_be_installed("DatePicker"))
+        end
+      end
     end
   end
   
-  def test__validation_reflection_bridge
-    class << ActiveRecord::Base; undef_method :reflect_on_validations_for; end rescue nil
-    assert(! bridge_will_be_installed("ValidationReflection"))
-    class << ActiveRecord::Base; define_method :reflect_on_validations_for, lambda{}; end
-    assert(bridge_will_be_installed("ValidationReflection"))
-  end
-  
   def test__semantic_attributes_bridge
     ConstMocker.mock("SemanticAttributes") do |cm|
       cm.remove
@@ -79,12 +68,12 @@ class Bridges::BridgeTest < Test::Unit::TestCase
 protected
 
   def find_bridge(name)
-    ActiveScaffold::Bridge.bridges.find{|b| b.name.to_s==name.to_s}
+    ActiveScaffold::Bridges[name.to_s.underscore.to_sym]
   end
   
   def bridge_will_be_installed(name)
     assert bridge=find_bridge(name), "No bridge found matching #{name}"
     
-    bridge.instance_variable_get("@install_if").call
+    bridge.install?
   end
-end
+end

data/test/bridges/date_picker_test.rb

@@ -0,0 +1,29 @@
+require 'test_helper'
+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')
+
+class DatePickerTest < ActionView::TestCase
+  include ActiveScaffold::Helpers::ViewHelpers
+  include ActiveScaffold::Bridges::DatePicker::Helper::FormColumnHelpers
+  include ActiveScaffold::Bridges::DatePicker::Helper::DatepickerColumnHelpers
+
+  def setup
+    @controller.class.class_eval do
+      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_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
+
+  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')
+  end
+end

data/test/bridges/paperclip_test.rb

@@ -1,12 +1,11 @@
-require 'test/unit'
-require File.join(File.dirname(__FILE__), 'company')
-require File.join(File.dirname(__FILE__), '../../lib/bridges/paperclip/lib/paperclip_bridge')
-require File.join(File.dirname(__FILE__), '../../lib/bridges/paperclip/lib/paperclip_bridge_helpers')
-require File.join(File.dirname(__FILE__), '../../lib/bridges/paperclip/lib/form_ui')
-require File.join(File.dirname(__FILE__), '../../lib/bridges/paperclip/lib/list_ui')
+require 'test_helper'
+require File.expand_path('../../../lib/active_scaffold/bridges/paperclip/paperclip_bridge', __FILE__)
+require File.expand_path('../../../lib/active_scaffold/bridges/paperclip/paperclip_bridge_helpers', __FILE__)
+require File.expand_path('../../../lib/active_scaffold/bridges/paperclip/form_ui', __FILE__)
+require File.expand_path('../../../lib/active_scaffold/bridges/paperclip/list_ui', __FILE__)
 
 class PaperclipCore < ActiveScaffold::Config::Core
-  include ActiveScaffold::PaperclipBridge
+  include ActiveScaffold::Bridges::Paperclip::PaperclipBridge
 end
 
 class PaperclipTest < ActionView::TestCase
@@ -49,10 +48,10 @@ 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" onclick="window.open(this.href);return false;">file</a>', active_scaffold_column_paperclip(company, config.columns[:logo])
+    assert_dom_equal '<a href="/system/file" data-popup="true" 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" onclick="window.open(this.href);return false;"><img src="/system/file" border="0" alt="File"/></a>', active_scaffold_column_paperclip(company, config.columns[:logo])
+    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])
   end
 
   def test_form_ui
@@ -60,9 +59,9 @@ class PaperclipTest < ActionView::TestCase
     @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" onclick="window.open(this.href);return false;">file</a>|<a href="#" onclick="$(this).next().value=\'true\'; $(this).up().hide().next().show(); return false;">Remove or Replace file</a><input name="record[delete_logo]" type="hidden" id="record_delete_logo" value="false" /></div><div style="display: none"><input name="record[logo]" size="30" type="file" id="record_logo" /></div>', active_scaffold_input_paperclip(config.columns[:logo], :name => 'record[logo]', :id => 'record_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')
 
     @record.stubs(:logo).returns(stub(:file? => false))
-    assert_dom_equal '<input name="record[logo]" size="30" 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')
   end
 end

data/test/bridges/tiny_mce_test.rb

@@ -1,21 +1,21 @@
-require 'test/unit'
-require File.join(File.dirname(__FILE__), 'company')
-require File.join(File.dirname(__FILE__), '../../lib/bridges/tiny_mce/lib/tiny_mce_bridge')
+require 'test_helper'
+require File.join(File.dirname(__FILE__), '../../lib/active_scaffold/bridges/tiny_mce/helpers')
 
 class TinyMceTest < ActionView::TestCase
   include ActiveScaffold::Helpers::ViewHelpers
-  include ActiveScaffold::TinyMceBridge
+  include ActiveScaffold::Bridges::TinyMce::Helpers
 
   def test_includes
-    assert_match /.*<script type="text\/javascript">.*ActiveScaffold\.ActionLink\.Abstract\.prototype\.close = function\(\).*<\/script>.*/m, active_scaffold_includes
+    ActiveScaffold::Bridges::TinyMce.expects(:install?).returns(true)
+    assert ActiveScaffold::Bridges.all_javascripts.include?("tinymce-jquery")
   end
 
   def test_form_ui
-    config = PaperclipCore.new(:company)
+    config = ActiveScaffold::Config::Core.new(:company)
     @record = Company.new
     self.expects(:request).returns(stub(:xhr? => true))
 
-    assert_dom_equal "<textarea name=\"record[name]\" class=\"name-input mceEditor\" id=\"record_name\"></textarea><script type=\"text/javascript\">\n//<![CDATA[\ntinyMCE.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')
+    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)
   end
 
   protected

data/test/{bridges/company.rb → company.rb}

@@ -1,14 +1,10 @@
-require 'rubygems'
-require 'active_record'
-require 'active_record/reflection'
-require File.join(File.dirname(__FILE__), '../../lib/bridges/dependent_protect/lib/dependent_protect_bridge')
-
-# Mocking everything necesary to test the plugin.
-class Company
+class Company < ActiveRecord::Base
   def initialize(with_or_without = nil)
     @with_companies = with_or_without == :with_companies
     @with_company = with_or_without == :with_company
     @with_main_company = with_or_without == :with_main_company
+    @attributes = {}
+    @attributes_cache = {}
   end
   
   def self.columns_hash
@@ -44,9 +40,6 @@ class Company
     @@before = s
   end
   
-  include ActiveRecord::Reflection
-  include DependentProtectSecurity
-  
   def self.has_many(association_id, options = {})
     reflection = create_reflection(:has_many, association_id, options, self)
   end
@@ -56,9 +49,9 @@ class Company
   def self.belongs_to(association_id, options = {})
     reflection = create_reflection(:belongs_to, association_id, options, self)
   end
-  has_many :companies, :dependent => :protect
-  has_one :company, :dependent => :protect
-  belongs_to :main_company, :dependent => :protect, :class_name => 'Company'
+  has_many :companies
+  has_one :company
+  belongs_to :main_company, :class_name => 'Company'
   
   def companies
     if @with_companies
@@ -78,4 +71,12 @@ class Company
   
   def name
   end
+
+  def date
+    Date.today
+  end
+
+  def datetime
+    Time.now
+  end
 end

data/test/config/base_test.rb

@@ -1,15 +1,17 @@
-require File.join(File.dirname(__FILE__), '../test_helper.rb')
+require 'test_helper'
 
-class Config::BaseTest < Test::Unit::TestCase
-  def setup
-    @base = ActiveScaffold::Config::Base.new(ActiveScaffold::Config::Core.new(:model_stub))
-  end
-  
-  def test_formats
-    assert_equal [], @base.formats
-    @base.formats << :pdf
-    assert_equal [:pdf], @base.formats
-    @base.formats = [:html]
-    assert_equal [:html], @base.formats
+module Config
+  class BaseTest < Test::Unit::TestCase
+    def setup
+      @base = ActiveScaffold::Config::Base.new(ActiveScaffold::Config::Core.new(:model_stub))
+    end
+    
+    def test_formats
+      assert_equal [], @base.formats
+      @base.formats << :pdf
+      assert_equal [:pdf], @base.formats
+      @base.formats = [:html]
+      assert_equal [:html], @base.formats
+    end
   end
 end

data/test/config/core_test.rb

@@ -1,58 +1,64 @@
-require File.join(File.dirname(__FILE__), '../test_helper.rb')
+require 'test_helper'
 
-class Config::CoreTest < Test::Unit::TestCase
-  def setup
-    @config = ActiveScaffold::Config::Core.new :model_stub
-  end
-  
-  def test_default_options
-    assert !@config.add_sti_create_links?
-    assert !@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
-    assert_equal 'ModelStub', @config.label(:count => 1)
-    assert_equal 'ModelStubs', @config.label
-  end
-  
-  def test_add_sti_children
-    @config.sti_create_links = true
-    assert !@config.add_sti_create_links?
-    @config.sti_children = [:a]
-    assert @config.add_sti_create_links?
-  end
-  
-  def test_sti_children
-    @config.sti_children = [:a]
-    assert_equal [:a], @config.sti_children
-  end
-  
-  def test_actions
-    assert @config.actions.include?(:create)
-    @config.actions = [:list]
-    assert !@config.actions.include?(:create)
-    assert_equal [:list], @config.actions.to_a
-  end
-  
-  def test_form_ui_in_sti
-    @config.columns << :type
+module Config
+  class CoreTest < Test::Unit::TestCase
+    class ModelStubsController < ActionController::Base; end
+    def setup
+      @config = ActiveScaffold::Config::Core.new :model_stub
+      ModelStubsController.instance_variable_set :@active_scaffold_config, @config
+    end
     
-    @config.sti_children = [:model_stub]
-    @config._configure_sti
-    assert_equal :select, @config.columns[:type].form_ui
-    assert_equal [['Modelstub', 'ModelStub']], @config.columns[:type].options[:options]
+    def test_default_options
+      assert !@config.add_sti_create_links?
+      assert !@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
+      assert_equal 'Model stub', @config.label(:count => 1)
+      assert_equal 'ModelStubs', @config.label
+    end
     
-    @config.columns[:type].form_ui = nil
-    @config.sti_create_links = true
-    @config._configure_sti
-    assert_equal :hidden, @config.columns[:type].form_ui
-  end
-  
-  def test_sti_children_links
-    @config.sti_children = [:model_stub]
-    @config.sti_create_links = true
-    @config.action_links.add @config.create.link
-    @config._add_sti_create_links
-    assert_equal 'Create Modelstub', @config.action_links[:new].label
+    def test_add_sti_children
+      @config.sti_create_links = true
+      assert !@config.add_sti_create_links?
+      @config.sti_children = [:a]
+      assert @config.add_sti_create_links?
+    end
+    
+    def test_sti_children
+      @config.sti_children = [:a]
+      assert_equal [:a], @config.sti_children
+    end
+    
+    def test_actions
+      assert @config.actions.include?(:create)
+      @config.actions = [:list]
+      assert !@config.actions.include?(:create)
+      assert_equal [:list], @config.actions.to_a
+    end
+    
+    def test_form_ui_in_sti
+      @config.columns << :type
+      
+      @config.sti_create_links = false
+      @config.sti_children = [:model_stub]
+      @config._configure_sti
+      assert_equal :select, @config.columns[:type].form_ui
+      assert_equal [['Model stub', 'ModelStub']], @config.columns[:type].options[:options]
+      
+      @config.columns[:type].form_ui = nil
+      @config.sti_create_links = true
+      @config._configure_sti
+      assert_equal :hidden, @config.columns[:type].form_ui
+    end
+    
+    def test_sti_children_links
+      @config.sti_children = [:model_stub]
+      @config.sti_create_links = true
+      @config.action_links.add @config.create.link
+      ModelStubsController.send(:_add_sti_create_links)
+      assert_equal 'Create Model stub', @config.action_links[:new].label
+      assert_equal 'config/core_test/model_stubs', @config.action_links[:new].parameters[:parent_sti]
+    end
   end
 end