active_scaffold 3.0.26 → 3.1.3

data/lib/active_scaffold/helpers/search_column_helpers.rb~

@@ -88,7 +88,7 @@ module ActiveScaffold
         else
           options[:include_blank] ||= as_(:_select_) 
         end
-        select(:record, method, select_options, options, html_options)
+        select(:record, method, options_for_select, options, html_options)
       end
 
       def active_scaffold_search_text(column, options)

data/lib/active_scaffold/helpers/view_helpers.rb

@@ -42,6 +42,12 @@ module ActiveScaffold
         end
       end
 
+      # This is the template finder logic, keep it updated with however we find stuff in rails
+      # currently this very similar to the logic in ActionBase::Base.render for options file
+      def template_exists?(template_name, partial = false)
+        lookup_context.exists? template_name, '', partial
+      end
+
       def generate_temporary_id
         (Time.now.to_f*1000).to_i.to_s
       end
@@ -64,7 +70,7 @@ module ActiveScaffold
         return false if column.polymorphic_association?
 
         # A column shouldn't be in the subform if it's the reverse association to the parent
-        return false if column.association.reverse_for?(parent_record.class)
+        return false if column.association.inverse_for?(parent_record.class)
 
         return true
       end
@@ -78,42 +84,9 @@ module ActiveScaffold
         (output << "<iframe id='#{action_iframe_id(url_for_options)}' name='#{action_iframe_id(url_for_options)}' style='display:none'></iframe>").html_safe
       end
 
-      # Provides list of javascripts to include with +javascript_include_tag+
-      # You can use this with your javascripts like
-      #   <%= javascript_include_tag :defaults, 'your_own_cool_script', active_scaffold_javascripts, :cache => true %>
-      def active_scaffold_javascripts(frontend = :default)
-        ActiveScaffold::Config::Core.javascripts(frontend).collect do |name|
-          ActiveScaffold::Config::Core.asset_path(name, frontend)
-        end
-      end
-      
-      # Provides stylesheets to include with +stylesheet_link_tag+
-      def active_scaffold_stylesheets(frontend = :default)
-        [ActiveScaffold::Config::Core.asset_path("stylesheet.css", frontend)]
-      end
-
-      # Provides stylesheets for IE to include with +stylesheet_link_tag+ 
-      def active_scaffold_ie_stylesheets(frontend = :default)
-        [ActiveScaffold::Config::Core.asset_path("stylesheet-ie.css", frontend)]
-      end
-
-      # easy way to include ActiveScaffold assets
-      def active_scaffold_includes(*args)
-        frontend = args.first.is_a?(Symbol) ? args.shift : :default
-        options = args.first.is_a?(Hash) ? args.shift : {}
-        js = javascript_include_tag(*active_scaffold_javascripts(frontend).push(options))
-
-        css = stylesheet_link_tag(*active_scaffold_stylesheets(frontend).push(options))
-        options[:cache] += '_ie' if options[:cache].is_a? String
-        options[:concat] += '_ie' if options[:concat].is_a? String
-        ie_css = stylesheet_link_tag(*active_scaffold_ie_stylesheets(frontend).push(options))
-
-        js + "\n" + css + "\n<!--[if IE]>".html_safe + ie_css + "<![endif]-->\n".html_safe
-      end
-
       # a general-use loading indicator (the "stuff is happening, please wait" feedback)
       def loading_indicator_tag(options)
-        image_tag "/images/active_scaffold/default/indicator.gif", :style => "visibility:hidden;", :id => loading_indicator_id(options), :alt => "loading indicator", :class => "loading-indicator"
+        image_tag "indicator.gif", :style => "visibility:hidden;", :id => loading_indicator_id(options), :alt => "loading indicator", :class => "loading-indicator"
       end
 
       # Creates a javascript-based link that toggles the visibility of some element on the page.
@@ -161,17 +134,18 @@ module ActiveScaffold
       
       def action_link_html_options(link, url_options, record, html_options)
         link_id = get_action_link_id(url_options, record, link.column)
-        html_options.reverse_merge! link.html_options.merge(:class => link.action.to_s)
+        html_options.reverse_merge! link.html_options.merge(:class => link.action)
 
         # Needs to be in html_options to as the adding _method to the url is no longer supported by Rails        
         html_options[:method] = link.method if link.method != :get
 
-        html_options['data-confirm'] = link.confirm(record.try(:to_label)) if link.confirm?
-        html_options['data-position'] = link.position if link.position and link.inline?
         html_options[:class] += ' as_action' if link.inline?
-        html_options['data-action'] = link.action if link.inline?
+        html_options[:data] = {}
+        html_options[:data][:confirm] = link.confirm(record.try(:to_label)) if link.confirm?
+        html_options[:data][:position] = link.position if link.position and link.inline?
+        html_options[:data][:action] = link.action if link.inline?
         if link.popup?
-          html_options['data-popup'] = true
+          html_options[:data][:popup] = true
           html_options[:target] = '_blank'
         end
         html_options[:id] = link_id

data/lib/active_scaffold/helpers/view_helpers.rb~

@@ -70,7 +70,7 @@ module ActiveScaffold
         return false if column.polymorphic_association?
 
         # A column shouldn't be in the subform if it's the reverse association to the parent
-        return false if column.association.inverse_for?(parent_record.class)
+        return false if column.association.reverse_for?(parent_record.class)
 
         return true
       end
@@ -134,7 +134,7 @@ module ActiveScaffold
       
       def action_link_html_options(link, url_options, record, html_options)
         link_id = get_action_link_id(url_options, record, link.column)
-        html_options.reverse_merge! link.html_options.merge(:class => link.action.to_s)
+        html_options.reverse_merge! link.html_options.merge(:class => link.action)
 
         # Needs to be in html_options to as the adding _method to the url is no longer supported by Rails        
         html_options[:method] = link.method if link.method != :get
@@ -194,7 +194,7 @@ module ActiveScaffold
           url_options[:eid] = link.eid
         elsif link.parameters && link.parameters[:named_scope]
           url_options[:assoc_id] = url_options.delete(:id)
-          link.eid = "#{controller_id.from(3)}_#{record.id}_#{link.parameters[:named_scope]}" unless record.nil? || options.has_key?(:reuse_eid)
+          link.eid = "#{controller_id.from(3)}_#{record.id}_#{link.parameters[:named_scope]}" unless options.has_key?(:reuse_eid)
           url_options[:eid] = link.eid
         end
       end

data/lib/active_scaffold/version.rb

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

data/lib/active_scaffold_env.rb

@@ -9,5 +9,3 @@ ActionView::Base.send(:include, ActiveScaffold::Helpers::ViewHelpers)
 ActionController::Base.class_eval {include ActiveRecordPermissions::ModelUserAccess::Controller}
 ActiveRecord::Base.class_eval     {include ActiveRecordPermissions::ModelUserAccess::Model}
 ActiveRecord::Base.class_eval     {include ActiveRecordPermissions::Permissions}
-
-I18n.load_path += Dir[File.join(File.dirname(__FILE__), 'active_scaffold', 'locale', '*.{rb,yml}')]

data/test/bridges/active_scaffold_dependent_protect_test.rb

@@ -0,0 +1,34 @@
+require 'test/unit'
+require File.join(File.dirname(__FILE__), 'company')
+
+class ActiveScaffoldDependentProtectTest < Test::Unit::TestCase
+  def test_destroy_protected_with_companies
+    protected_firm = Company.new(:with_companies)
+    assert !protected_firm.send(:authorized_for_delete?)
+  end
+  
+  def test_destroy_protected_with_company
+    protected_firm = Company.new(:with_company)
+    assert !protected_firm.send(:authorized_for_delete?)
+  end
+  
+  def test_destroy_protected_with_main_company
+    protected_firm = Company.new(:with_main_company)
+    assert !protected_firm.send(:authorized_for_delete?)
+  end
+  
+  def test_destroy_protected_without_companies
+    protected_firm_without_companies = Company.new(:without_companies)
+    assert protected_firm_without_companies.send(:authorized_for_delete?)
+  end
+  
+  def test_destroy_protected_without_company
+    protected_firm_without_company = Company.new(:without_company)
+    assert protected_firm_without_company.send(:authorized_for_delete?)
+  end
+  
+  def test_destroy_protected_without_main_company
+    protected_firm_without_main_company = Company.new(:without_main_company)
+    assert protected_firm_without_main_company.send(:authorized_for_delete?)
+  end
+end

data/test/bridges/bridge_test.rb

@@ -32,6 +32,49 @@ class Bridges::BridgeTest < Test::Unit::TestCase
       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
+      assert(! bridge_will_be_installed("Paperclip"))
+      cm.declare
+      assert(bridge_will_be_installed("Paperclip"))
+    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"))
+    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
+      assert(! bridge_will_be_installed("SemanticAttributes"))
+      cm.declare
+      assert(bridge_will_be_installed("SemanticAttributes"))
+    end
+  end
 
 protected
 

data/test/bridges/company.rb

@@ -0,0 +1,81 @@
+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
+  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
+  end
+  
+  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'),
+    }
+  end
+
+  def self.columns
+    self.columns_hash.values
+  end
+  
+  def self.class_name
+    self.name
+  end
+  
+  def self.table_name
+    'companies'
+  end
+  
+  def self.attachment_definitions
+    {:logo => {}}
+  end
+  
+  # not the real signature of the method, but forgive me
+  def self.before_destroy(s=nil)
+    @@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
+  def self.has_one(association_id, options = {})
+    reflection = create_reflection(:has_one, association_id, options, self)
+  end
+  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'
+  
+  def companies
+    if @with_companies
+      [nil]
+    else
+      []
+    end
+  end
+  
+  def company
+    @with_company
+  end
+  
+  def main_company
+    @with_main_company
+  end
+  
+  def name
+  end
+end

data/test/bridges/paperclip_test.rb

@@ -0,0 +1,68 @@
+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')
+
+class PaperclipCore < ActiveScaffold::Config::Core
+  include ActiveScaffold::PaperclipBridge
+end
+
+class PaperclipTest < ActionView::TestCase
+  include ActiveScaffold::Helpers::ViewHelpers
+
+  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}
+  end
+
+  def test_initialization
+    config = PaperclipCore.new(:company)
+    assert config.create.multipart?
+    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|
+      assert !config.columns._inheritable.include?(attr.to_sym)
+    end
+    assert Company.instance_methods.include?('delete_logo')
+    assert Company.instance_methods.include?('delete_logo=')
+  end
+
+  def test_delete
+    PaperclipCore.new(:company)
+    company = Company.new
+    company.expects(:logo=).never
+    company.delete_logo = 'false'
+
+    company.expects(:logo).returns(stub(:dirty? => false))
+    company.expects(:logo=)
+    company.delete_logo = 'true'
+  end
+
+  def test_list_ui
+    config = PaperclipCore.new(:company)
+    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(config.columns[:logo], company)
+
+    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(config.columns[:logo], company)
+  end
+
+  def test_form_ui
+    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" 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')
+
+    @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')
+  end
+end

data/test/bridges/tiny_mce_test.rb

@@ -0,0 +1,27 @@
+require 'test/unit'
+require File.join(File.dirname(__FILE__), 'company')
+require File.join(File.dirname(__FILE__), '../../lib/bridges/tiny_mce/lib/tiny_mce_bridge')
+
+class TinyMceTest < ActionView::TestCase
+  include ActiveScaffold::Helpers::ViewHelpers
+  include ActiveScaffold::TinyMceBridge
+
+  def test_includes
+    assert_match /.*<script type="text\/javascript">.*ActiveScaffold\.ActionLink\.Abstract\.prototype\.close = function\(\).*<\/script>.*/m, active_scaffold_includes
+  end
+
+  def test_form_ui
+    config = PaperclipCore.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')
+  end
+
+  protected
+  def include_tiny_mce_if_needed; end
+  def tiny_mce_js; end
+  def using_tiny_mce?
+    true
+  end
+end

data/test/bridges/unobtrusive_date_picker_test.rb

@@ -0,0 +1,49 @@
+require 'test/unit'
+require File.join(File.dirname(__FILE__), 'company')
+require File.join(File.dirname(__FILE__), '../../lib/bridges/unobtrusive_date_picker/lib/unobtrusive_date_picker_bridge')
+require File.join(File.dirname(__FILE__), '../../lib/bridges/unobtrusive_date_picker/lib/view_helpers')
+require File.join(File.dirname(__FILE__), '../../lib/bridges/unobtrusive_date_picker/lib/form_ui')
+
+class UDPCore < ActiveScaffold::Config::Core
+  include ActiveScaffold::UnobtrusiveDatePickerBridge
+end
+
+class UnobtrusiveDatePickerTest < ActionView::TestCase
+  include ActiveScaffold::Helpers::ViewHelpers
+  include ActiveScaffold::UnobtrusiveDatePickerHelpers
+
+  def test_set_form_ui
+    config = UDPCore.new(:company)
+    assert_equal nil, config.columns[:name].form_ui, 'form_ui for name'
+    assert_equal :datepicker, config.columns[:date].form_ui, 'form_ui for date'
+    assert_equal :datepicker, config.columns[:datetime].form_ui, 'form_ui for datetime'
+  end
+
+  def test_stylesheets
+    assert active_scaffold_stylesheets.include?('datepicker.css')
+  end
+
+  def test_javascripts
+    assert active_scaffold_javascripts.include?('datepicker.js')
+    assert active_scaffold_javascripts.include?('datepicker_lang/es.js')
+  end
+
+  def test_form_ui
+    config = UDPCore.new(:company)
+    self.expects(:date_select).returns('')
+    self.expects(:date_picker).returns('')
+    assert active_scaffold_input_datepicker(config.columns[:date], :name => 'record[date]', :id => 'record_date')
+
+    self.expects(:datetime_select).returns('')
+    self.expects(:date_picker).returns('')
+    assert active_scaffold_input_datepicker(config.columns[:datetime], :name => 'record[datetime]', :id => 'record_datetime')
+  end
+
+  private
+  def unobtrusive_datepicker_stylesheets
+    ['datepicker.css']
+  end
+  def unobtrusive_datepicker_javascripts
+    ['datepicker.js', 'datepicker_lang/es.js']
+  end
+end