active_scaffold 3.0.26 → 3.1.3

data/lib/active_scaffold/bridges/dragonfly/{lib/list_ui.rb → list_ui.rb}

@@ -5,7 +5,7 @@ module ActiveScaffold
         attachment = record.send("#{column.name}")
         return nil unless attachment.present?
         content = if attachment.image?
-          image_tag(attachment.thumb(column.options[:thumb] || ActiveScaffold::Bridges::Dragonfly::Lib::DragonflyBridgeHelpers.thumbnail_style).url, :border => 0)
+          image_tag(attachment.thumb(column.options[:thumb] || ActiveScaffold::Bridges::Dragonfly::DragonflyBridgeHelpers.thumbnail_style).url, :border => 0)
         else
           attachment.name
         end
@@ -13,4 +13,4 @@ module ActiveScaffold
       end
     end
   end
-end
+end

data/lib/active_scaffold/bridges/file_column.rb

@@ -0,0 +1,11 @@
+class ActiveScaffold::Bridges::FileColumn < ActiveScaffold::DataStructures::Bridge
+  def self.install
+    if ActiveScaffold::Config::Core.instance_methods.include?("initialize_with_file_column")
+      raise RuntimeError, "We've detected that you have active_scaffold_file_column_bridge installed.  This plugin has been moved to core.  Please remove active_scaffold_file_column_bridge to prevent any conflicts"
+    end
+    require File.join(File.dirname(__FILE__), "file_column/as_file_column_bridge")
+    require File.join(File.dirname(__FILE__), "file_column/form_ui")
+    require File.join(File.dirname(__FILE__), "file_column/list_ui")
+    require File.join(File.dirname(__FILE__), "file_column/file_column_helpers")
+  end
+end

data/lib/active_scaffold/bridges/file_column/{lib/as_file_column_bridge.rb → as_file_column_bridge.rb}

@@ -8,9 +8,9 @@ module ActiveScaffold::Config
     def initialize_with_file_column(model_id)
       initialize_without_file_column(model_id)
       
-      return unless ActiveScaffold::Bridges::Paperclip::Lib::FileColumnHelpers.klass_has_file_column_fields?(self.model)
+      return unless ActiveScaffold::Bridges::FileColumn::FileColumnHelpers.klass_has_file_column_fields?(self.model)
       
-      self.model.send :extend, ActiveScaffold::Bridges::Paperclip::Lib::FileColumnHelpers
+      self.model.send :extend, ActiveScaffold::Bridges::FileColumn::FileColumnHelpers
       
       # include the "delete" helpers for use with active scaffold, unless they are already included
       self.model.generate_delete_helpers

data/lib/active_scaffold/bridges/file_column/file_column_helpers.rb

@@ -0,0 +1,57 @@
+module ActiveScaffold
+  module Bridges
+    class FileColumn
+      module FileColumnHelpers
+        class << self
+          def file_column_fields(klass)
+            klass.instance_methods.grep(/_just_uploaded\?$/).collect{|m| m[0..-16].to_sym }
+          end
+          
+          def generate_delete_helpers(klass)
+            file_column_fields(klass).each { |field|
+              klass.send :class_eval, <<-EOF, __FILE__, __LINE__ + 1  unless klass.methods.include?("#{field}_with_delete=")
+                attr_reader :delete_#{field}
+                
+                def delete_#{field}=(value)
+                  value = (value=="true") if String===value
+                  return unless value
+                  
+                  # passing nil to the file column causes the file to be deleted.  Don't delete if we just uploaded a file!
+                  self.#{field} = nil unless self.#{field}_just_uploaded?
+                end
+              EOF
+            }
+          end
+          
+          def klass_has_file_column_fields?(klass)
+            true unless file_column_fields(klass).empty?
+          end
+        end
+        
+        def file_column_fields
+          @file_column_fields||=FileColumnHelpers.file_column_fields(self)
+        end
+        
+        def options_for_file_column_field(field)
+          self.allocate.send("#{field}_options")
+        end
+        
+        def field_has_image_version?(field, version="thumb")
+          begin
+            # the only way to get to the options of a particular field is to use the instance method
+            options = options_for_file_column_field(field)
+            versions = options[:magick][:versions]
+            raise unless versions.stringify_keys[version]
+            true
+          rescue
+            false
+          end
+        end
+        
+        def generate_delete_helpers
+          FileColumnHelpers.generate_delete_helpers(self)
+        end
+      end
+    end
+  end
+end

data/lib/active_scaffold/bridges/file_column/{lib/form_ui.rb → form_ui.rb}

@@ -15,7 +15,7 @@ module ActiveScaffold
             content_tag(
               :div, 
               get_column_value(@record, column) + " " +
-              hidden_field(:record, "delete_#{column.name}", :value => "false") +
+              custom_hidden_field_tag +
               " | " +
                 content_tag(:a, as_(:remove_file), {:href => '#', :onclick => js_remove_file_code}),
               {}
@@ -34,4 +34,4 @@ module ActiveScaffold
       end      
     end
   end
-end
+end

data/lib/active_scaffold/bridges/paperclip.rb

@@ -0,0 +1,12 @@
+class ActiveScaffold::Bridges::Paperclip < ActiveScaffold::DataStructures::Bridge
+  def self.install
+    if ActiveScaffold::Config::Core.instance_methods.include?("initialize_with_paperclip")
+      raise RuntimeError, "We've detected that you have active_scaffold_paperclip_bridge installed. This plugin has been moved to core. Please remove active_scaffold_paperclip_bridge to prevent any conflicts"
+    end
+    require File.join(File.dirname(__FILE__), "paperclip/form_ui")
+    require File.join(File.dirname(__FILE__), "paperclip/list_ui")
+    require File.join(File.dirname(__FILE__), "paperclip/paperclip_bridge_helpers")
+    require File.join(File.dirname(__FILE__), "paperclip/paperclip_bridge")
+    ActiveScaffold::Config::Core.send :include, ActiveScaffold::Bridges::Paperclip::PaperclipBridge
+  end
+end

data/lib/active_scaffold/bridges/paperclip/{lib/list_ui.rb → list_ui.rb}

@@ -4,8 +4,8 @@ module ActiveScaffold
       def active_scaffold_column_paperclip(column, record)
         paperclip = record.send("#{column.name}")
         return nil unless paperclip.file?
-        content = if paperclip.styles.include?(ActiveScaffold::Bridges::Paperclip::Lib::PaperclipBridgeHelpers.thumbnail_style)
-          image_tag(paperclip.url(ActiveScaffold::Bridges::Paperclip::Lib::PaperclipBridgeHelpers.thumbnail_style), :border => 0)
+        content = if paperclip.styles.include?(ActiveScaffold::Bridges::Paperclip::PaperclipBridgeHelpers.thumbnail_style)
+          image_tag(paperclip.url(ActiveScaffold::Bridges::Paperclip::PaperclipBridgeHelpers.thumbnail_style), :border => 0)
         else
           paperclip.original_filename
         end
@@ -13,4 +13,4 @@ module ActiveScaffold
       end
     end
   end
-end
+end

data/lib/active_scaffold/bridges/paperclip/paperclip_bridge.rb

@@ -0,0 +1,36 @@
+module ActiveScaffold
+  module Bridges
+    class Paperclip
+      module PaperclipBridge
+        def initialize_with_paperclip(model_id)
+          initialize_without_paperclip(model_id)
+          return unless self.model.respond_to?(:attachment_definitions) && !self.model.attachment_definitions.nil? 
+
+          self.update.multipart = true
+          self.create.multipart = true
+
+          self.model.attachment_definitions.keys.each do |field|
+            configure_paperclip_field(field.to_sym)
+            # define the "delete" helper for use with active scaffold, unless it's already defined
+            ActiveScaffold::Bridges::Paperclip::PaperclipBridgeHelpers.generate_delete_helper(self.model, field)
+          end
+        end
+
+        def self.included(base)
+          base.alias_method_chain :initialize, :paperclip
+        end
+
+        private
+        def configure_paperclip_field(field)
+          self.columns << field
+          self.columns[field].form_ui ||= :paperclip
+          self.columns[field].params.add "delete_#{field}"
+
+          [:file_name, :content_type, :file_size, :updated_at].each do |f|
+            self.columns.exclude("#{field}_#{f}".to_sym)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/active_scaffold/bridges/paperclip/paperclip_bridge_helpers.rb

@@ -0,0 +1,24 @@
+module ActiveScaffold
+  module Bridges
+    class Paperclip
+      module PaperclipBridgeHelpers
+        mattr_accessor :thumbnail_style
+        self.thumbnail_style = :thumbnail
+
+        def self.generate_delete_helper(klass, field)
+          klass.class_eval <<-EOF, __FILE__, __LINE__ + 1 unless klass.instance_methods.include?("delete_#{field}=")
+            attr_reader :delete_#{field}
+
+            def delete_#{field}=(value)
+              value = (value == "true") if String === value
+              return unless value
+
+              # passing nil to the file column causes the file to be deleted. Don't delete if we just uploaded a file!
+              self.#{field} = nil unless self.#{field}.dirty?
+            end
+          EOF
+        end
+      end
+    end
+  end
+end

data/lib/active_scaffold/bridges/record_select.rb

@@ -0,0 +1,11 @@
+class ActiveScaffold::Bridges::RecordSelect < ActiveScaffold::DataStructures::Bridge
+  def self.install
+    require File.join(File.dirname(__FILE__), "record_select/helpers.rb")
+  end
+  def self.stylesheets
+    'record_select'
+  end
+  def self.javascripts
+    'record_select'
+  end
+end

data/lib/active_scaffold/bridges/record_select/{lib/record_select_bridge.rb → helpers.rb}

@@ -1,20 +1,9 @@
-module ActiveScaffold
-  module RecordSelectBridge
+class ActiveScaffold::Bridges::RecordSelect
+  module Helpers
     def self.included(base)
       base.class_eval do
         include FormColumnHelpers
         include SearchColumnHelpers
-        include ViewHelpers
-      end
-    end
-
-    module ViewHelpers
-      def self.included(base)
-        base.alias_method_chain :active_scaffold_includes, :record_select
-      end
-
-      def active_scaffold_includes_with_record_select(*args)
-        active_scaffold_includes_without_record_select(*args) + record_select_includes
       end
     end
 
@@ -45,12 +34,12 @@ module ActiveScaffold
         record_select_options = active_scaffold_input_text_options(
           :controller => remote_controller,
           :id => options[:id],
-          :class => options[:class]
+          :class => options[:class].gsub(/update_form/, '')
         )
         record_select_options.merge!(column.options)
         if options['data-update_url']
           record_select_options[:onchange] = %|function(id, label) {
-              ActiveScaffold.update_column($("##{options[:id]}"), "#{options['data-update_url']}", #{options['data-update_send_form'].to_json}, "#{options[:id]}", id);
+              ActiveScaffold.update_column(null, "#{options['data-update_url']}", #{options['data-update_send_form'].to_json}, "#{options[:id]}", id);
             }|
         end
  
@@ -89,4 +78,4 @@ module ActiveScaffold
   end
 end
 
-ActionView::Base.class_eval { include ActiveScaffold::RecordSelectBridge }
+ActionView::Base.class_eval { include ActiveScaffold::Bridges::RecordSelect::Helpers }

data/lib/active_scaffold/bridges/record_select/helpers.rb~

@@ -16,8 +16,6 @@ class ActiveScaffold::Bridges::RecordSelect
           active_scaffold_record_select(column, options, @record.send(column.name), multiple)
         elsif column.plural_association?
           active_scaffold_record_select(column, options, @record.send(column.name), true)
-        else
-          active_scaffold_record_select_autocomplete(column, options)
         end
       end
 
@@ -33,10 +31,17 @@ class ActiveScaffold::Bridges::RecordSelect
           params.merge!({column.association.primary_key_name => ''})
         end
  
-        record_select_options = active_scaffold_input_text_options(options).merge(
-          :controller => remote_controller
+        record_select_options = active_scaffold_input_text_options(
+          :controller => remote_controller,
+          :id => options[:id],
+          :class => options[:class]
         )
         record_select_options.merge!(column.options)
+        if options['data-update_url']
+          record_select_options[:onchange] = %|function(id, label) {
+              ActiveScaffold.update_column(null, "#{options['data-update_url']}", #{options['data-update_send_form'].to_json}, "#{options[:id]}", id);
+            }|
+        end
  
         html = if multiple
           record_multi_select_field(options[:name], value || [], record_select_options)
@@ -46,16 +51,6 @@ class ActiveScaffold::Bridges::RecordSelect
         html = self.class.field_error_proc.call(html, self) if @record.errors[column.name].any?
         html
       end
-      
-      def active_scaffold_record_select_autocomplete(column, options)
-        remote_controller = active_scaffold_controller_for(column.association.klass).controller_path
-        record_select_options = active_scaffold_input_text_options(options).merge(
-          :controller => remote_controller
-        )
-        html = record_select_autocomplete(options[:name], @record, record_select_options)
-        html = self.class.field_error_proc.call(html, self) if @record.errors[column.name].any?
-        html
-      end
     end
 
     module SearchColumnHelpers

data/lib/active_scaffold/bridges/semantic_attributes.rb

@@ -0,0 +1,5 @@
+class ActiveScaffold::Bridges::SemanticAttributes < ActiveScaffold::DataStructures::Bridge
+  def self.install
+    require File.join(File.dirname(__FILE__), "semantic_attributes/column.rb")
+  end
+end

data/lib/active_scaffold/bridges/semantic_attributes/{lib/semantic_attributes_bridge.rb → column.rb}

@@ -1,5 +1,5 @@
-module ActiveScaffold
-  module SemanticAttributesBridge
+class ActiveScaffold::Bridges::SemanticAttributes
+  module Column
     def self.included(base)
       base.class_eval { alias_method_chain :initialize, :semantic_attributes }
     end
@@ -16,5 +16,5 @@ module ActiveScaffold
   end
 end
 ActiveScaffold::DataStructures::Column.class_eval do
-  include ActiveScaffold::SemanticAttributesBridge
+  include ActiveScaffold::Bridges::SemanticAttributes::Column
 end

data/lib/active_scaffold/bridges/tiny_mce.rb

@@ -0,0 +1,5 @@
+class ActiveScaffold::Bridges::TinyMce < ActiveScaffold::DataStructures::Bridge
+  def self.install
+    require File.join(File.dirname(__FILE__), "tiny_mce/helpers.rb")
+  end
+end

data/lib/active_scaffold/bridges/tiny_mce/{lib/tiny_mce_bridge.rb → helpers.rb}

@@ -1,5 +1,13 @@
-module ActiveScaffold
-  module TinyMceBridge
+class ActiveScaffold::Bridges::TinyMce
+  module Helpers
+    def self.included(base)
+      base.class_eval do
+        include FormColumnHelpers
+        include SearchColumnHelpers
+        include ViewHelpers
+      end
+    end
+
     module ViewHelpers
       def active_scaffold_includes(*args)
         if ActiveScaffold.js_framework == :jquery
@@ -28,11 +36,15 @@ ActiveScaffold.ActionLink.Abstract.prototype.close = function() {
     end
 
     module FormColumnHelpers
+      def self.included(base)
+        base.alias_method_chain :onsubmit, :tiny_mce
+      end
+
       def active_scaffold_input_text_editor(column, options)
         options[:class] = "#{options[:class]} mceEditor #{column.options[:class]}".strip
         html = []
         html << send(override_input(:textarea), column, options)
-        html << javascript_tag("tinyMCE.execCommand('mceAddControl', false, '#{options[:id]}');") if request.xhr?
+        html << javascript_tag("tinyMCE.execCommand('mceAddControl', false, '#{options[:id]}');") if request.xhr? || params[:iframe]
         html.join "\n"
       end
 
@@ -54,8 +66,4 @@ ActiveScaffold.ActionLink.Abstract.prototype.close = function() {
   end
 end
 
-ActionView::Base.class_eval do
-  include ActiveScaffold::TinyMceBridge::FormColumnHelpers
-  include ActiveScaffold::TinyMceBridge::SearchColumnHelpers
-  include ActiveScaffold::TinyMceBridge::ViewHelpers
-end
+ActionView::Base.class_eval { include ActiveScaffold::Bridges::TinyMce::Helpers }

data/lib/active_scaffold/config/base.rb

@@ -3,6 +3,10 @@ module ActiveScaffold::Config
     include ActiveScaffold::Configurable
     extend ActiveScaffold::Configurable
 
+    def initialize(core_config)
+      @core = core_config
+    end
+
     def self.inherited(subclass)
       class << subclass
         # the crud type of the action. possible values are :create, :read, :update, :delete, and nil.
@@ -21,12 +25,16 @@ module ActiveScaffold::Config
     # delegate
     def crud_type; self.class.crud_type end
 
+    def label(model = nil)
+      as_(@label, :model => model || @core.label(:count => 1))
+    end
+    
     # the user property gets set to the instantiation of the local UserSettings class during the automatic instantiation of this class.
     attr_accessor :user
 
     # define a default action_group for this action
     # e.g. 'members.crud'
-    class_inheritable_accessor :action_group
+    class_attribute :action_group
 
     # action_group this action should belong to
     attr_accessor :action_group

data/lib/active_scaffold/config/core.rb

@@ -107,7 +107,7 @@ module ActiveScaffold::Config
 
     def initialize(model_id)
       # model_id is the only absolutely required configuration value. it is also not publicly accessible.
-      @model_id = model_id.to_s.pluralize.singularize
+      @model_id = model_id
 
       # inherit the actions list directly from the global level
       @actions = self.class.actions.clone

data/lib/active_scaffold/config/create.rb

@@ -1,8 +1,9 @@
 module ActiveScaffold::Config
   class Create < ActiveScaffold::Config::Form
     self.crud_type = :create
-    def initialize(*args)
+    def initialize(core_config)
       super
+      @label = :create_model
       self.persistent = self.class.persistent
       self.action_after_create = self.class.action_after_create
       self.refresh_list = self.class.refresh_list
@@ -25,20 +26,12 @@ module ActiveScaffold::Config
 
     # whether update form is opened after a create or not
     cattr_accessor :action_after_create
-    @@action_after_create = false
+    @@action_after_create = nil
 
     # whether we should refresh list after create or not
     cattr_accessor :refresh_list
     @@refresh_list = false
 
-    # instance-level configuration
-    # ----------------------------
-    # the label= method already exists in the Form base class
-    def label(model = nil)
-      model ||= @core.label(:count => 1)
-      @label ? as_(@label) : as_(:create_model, :model => model)
-    end
-    
     # whether the form stays open after a create or not
     attr_accessor :persistent