active_scaffold 3.1.4 → 3.1.5

data/lib/active_scaffold/data_structures/action_link.rb~

@@ -0,0 +1,179 @@
+module ActiveScaffold::DataStructures
+  class ActionLink
+    # provides a quick way to set any property of the object from a hash
+    def initialize(action, options = {})
+      # set defaults
+      self.action = action.to_s
+      self.label = action
+      self.confirm = false
+      self.type = :collection
+      self.inline = true
+      self.method = :get
+      self.crud_type = :delete if [:destroy].include?(action.try(:to_sym))
+      self.crud_type = :create if [:create, :new].include?(action.try(:to_sym))
+      self.crud_type = :update if [:edit, :update].include?(action.try(:to_sym))
+      self.crud_type ||= :read
+      self.parameters = {}
+      self.html_options = {}
+      self.column = nil
+      self.image = nil
+      self.dynamic_parameters = nil
+
+      # apply quick properties
+      options.each_pair do |k, v|
+        setter = "#{k}="
+        self.send(setter, v) if self.respond_to? setter
+      end
+    end
+
+    # the action-path for this link. what page to request? this is required!
+    attr_accessor :action
+    
+    # the controller for this action link. if nil, the current controller should be assumed.
+    attr_writer :controller
+
+    def controller
+      @controller = @controller.call if @controller.is_a?(Proc)
+      @controller
+    end
+
+    def static_controller?
+      !(@controller.is_a?(Proc) || (@controller == :polymorph))
+    end
+
+    # a hash of request parameters
+    attr_accessor :parameters
+
+    # a block for dynamic_parameters
+    attr_accessor :dynamic_parameters
+
+    # the RESTful method
+    attr_accessor :method
+
+    # what string to use to represent this action
+    attr_writer :label
+    def label
+      @label.is_a?(Symbol) ? as_(@label) : @label
+    end
+    
+    # image to use {:name => 'arrow.png', :size => '16x16'}
+    attr_accessor :image
+
+    # if the action requires confirmation
+    def confirm=(value)
+      @dhtml_confirm = nil if value
+      @confirm = value
+    end
+    def confirm(label = '')
+      @confirm.is_a?(String) ? @confirm : as_(@confirm, :label => label)
+    end
+    def confirm?
+      !!@confirm
+    end
+    
+    # if the action uses a DHTML based (i.e. 2-phase) confirmation
+    attr_accessor :dhtml_confirm
+    def dhtml_confirm=(value)
+      @confirm = nil if value
+      @dhtml_confirm = value
+    end
+    def dhtml_confirm?
+      !!@dhtml_confirm
+    end
+
+    # what method to call on the controller to see if this action_link should be visible
+    # note that this is only the UI part of the security. to prevent URL hax0rz, you also need security on requests (e.g. don't execute update method unless authorized).
+    attr_writer :security_method
+    def security_method
+      @security_method || "#{self.action}_authorized?"
+    end
+
+    def security_method_set?
+      !!@security_method
+    end
+    
+    attr_accessor :ignore_method
+    
+    # the crud type of the (eventual?) action. different than :method, because this crud action may not be imminent.
+    # this is used to determine record-level authorization (e.g. record.authorized_for?(:crud_type => link.crud_type).
+    # options are :create, :read, :update, and :delete
+    attr_accessor :crud_type
+
+    # an "inline" link is inserted into the existing page
+    # exclusive with popup? and page?
+    def inline=(val)
+      @inline = (val == true)
+      self.popup = self.page = false if @inline
+    end
+    def inline?; @inline end
+
+    # a "popup" link displays in a separate (browser?) window. this will eventually take arguments.
+    # exclusive with inline? and page?
+    def popup=(val)
+      @popup = (val == true)
+      if @popup
+        self.inline = self.page = false
+
+        # the :method parameter doesn't mix with the :popup parameter
+        # when/if we start using DHTML popups, we can bring :method back
+        self.method = nil
+      end
+    end
+    def popup?; @popup end
+
+    # a "page" link displays by reloading the current page
+    # exclusive with inline? and popup?
+    def page=(val)
+      @page = (val == true)
+      if @page
+        self.inline = self.popup = false
+
+        # when :method is defined, ActionView adds an onclick to use a form ...
+        # so it's best to just empty out :method whenever possible.
+        # we only ever need to know @method = :get for things that default to POST.
+        # the only things that default to POST are forms and ajax calls.
+        # when @page = true, we don't use ajax.
+        self.method = nil if method == :get
+      end
+    end
+    def page?; @page end
+
+    # where the result of this action should insert in the display.
+    # for :type => :collection, supported values are:
+    #   :top
+    #   :bottom
+    #   :replace (for updating the entire table)
+    #   false (no attempt at positioning)
+    # for :type => :member, supported values are:
+    #   :before
+    #   :replace
+    #   :after
+    #   false (no attempt at positioning)
+    attr_writer :position
+    def position
+      return @position unless @position.nil? or @position == true
+      return :replace if self.type == :member
+      return :top if self.type == :collection
+      raise "what should the default position be for #{self.type}?"
+    end
+
+    # what type of link this is. currently supported values are :collection and :member.
+    attr_accessor :type
+
+    # html options for the link
+    attr_accessor :html_options
+    
+    # nested action_links are referencing a column
+    attr_accessor :column
+    
+    # indicates that this a nested_link
+    def nested_link?
+      @column || (parameters && parameters[:named_scope])
+    end
+    
+    # Internal use: generated eid for this action_link
+    attr_accessor :eid
+    
+    
+  end
+end

data/lib/active_scaffold/data_structures/nested_info.rb~

@@ -0,0 +1,124 @@
+module ActiveScaffold::DataStructures
+  class NestedInfo
+    def self.get(model, session_storage)
+      if session_storage[:nested].nil? 
+        nil
+      else
+        session_info = session_storage[:nested].clone
+        begin
+          debugger
+          session_info[:parent_scaffold] = "#{session_info[:parent_scaffold].to_s.camelize}Controller".constantize
+          session_info[:parent_model] = session_info[:parent_scaffold].active_scaffold_config.model
+          session_info[:association] = session_info[:parent_model].reflect_on_association(session_info[:name])
+          unless session_info[:association].nil?
+            ActiveScaffold::DataStructures::NestedInfoAssociation.new(model, session_info)
+          else
+            ActiveScaffold::DataStructures::NestedInfoScope.new(model, session_info)
+          end
+        rescue ActiveScaffold::ControllerNotFound
+          nil
+        end
+      end
+    end
+    
+    attr_accessor :association, :child_association, :parent_model, :parent_scaffold, :parent_id, :constrained_fields, :scope
+        
+    def initialize(model, session_info)
+      @parent_model = session_info[:parent_model]
+      @parent_id = session_info[:parent_id]
+      @parent_scaffold = session_info[:parent_scaffold]
+    end
+    
+    def new_instance?
+      result = @new_instance.nil?
+      @new_instance = false
+      result
+    end
+    
+    def parent_scope
+      parent_model.find(parent_id)
+    end
+    
+    def habtm?
+      false 
+    end
+    
+    def belongs_to?
+      false
+    end
+
+    def has_one?
+      false
+    end
+    
+    def readonly?
+      false
+    end
+
+    def sorted?
+      false
+    end
+  end
+  
+  class NestedInfoAssociation < NestedInfo
+    def initialize(model, session_info)
+      super(model, session_info)
+      @association = session_info[:association]
+      iterate_model_associations(model)
+    end
+    
+    def habtm?
+      association.macro == :has_and_belongs_to_many 
+    end
+    
+    def belongs_to?
+      association.belongs_to?
+    end
+
+    def has_one?
+      association.macro == :has_one
+    end
+    
+    def readonly?
+      if association.options.has_key? :readonly
+        association.options[:readonly]
+      else
+        association.options.has_key? :through
+      end
+    end
+
+    def sorted?
+      association.options.has_key? :order
+    end
+
+    def default_sorting
+      association.options[:order]
+    end
+    
+    protected
+    
+    def iterate_model_associations(model)
+      @constrained_fields = [] 
+      @constrained_fields << association.foreign_key.to_sym unless association.belongs_to?
+      model.reflect_on_all_associations.each do |current|
+        if !current.belongs_to? && association.foreign_key == current.association_foreign_key
+          constrained_fields << current.name.to_sym
+          @child_association = current if current.klass == @parent_model
+        end
+        if association.foreign_key == current.foreign_key
+          # show columns for has_many and has_one child associationes
+          constrained_fields << current.name.to_sym if current.belongs_to? 
+          @child_association = current
+        end
+      end
+    end
+  end
+  
+  class NestedInfoScope < NestedInfo
+    def initialize(model, session_info)
+      super(model, session_info)
+      @scope = session_info[:name]
+      @constrained_fields = [] 
+    end
+  end
+end

data/lib/active_scaffold/extensions/unsaved_associated.rb~

@@ -0,0 +1,62 @@
+# save and validation support for associations.
+class ActiveRecord::Base
+  def associated_valid?(path = [])
+    return true if path.include?(self) # prevent recursion (if associated and parent are new records)
+    path << self
+    # using [].all? syntax to avoid a short-circuit
+    with_unsaved_associated { |a| debugger; [a.valid?, a.associated_valid?(path)].all? {|v| v == true} }
+  end
+
+  def save_associated
+    with_unsaved_associated { |a| a.save and a.save_associated }
+  end
+
+  def save_associated!
+    save_associated or raise(ActiveRecord::RecordNotSaved)
+  end
+
+  def no_errors_in_associated?
+    with_unsaved_associated {|a| a.errors.count == 0 and a.no_errors_in_associated?}
+  end
+
+  protected
+
+  # Provide an override to allow the model to restrict which associations are considered
+  # by ActiveScaffolds update mechanism. This allows the model to restrict things like
+  # Acts-As-Versioned versions associations being traversed.
+  #
+  # By defining the method :scaffold_update_nofollow returning an array of associations
+  # these associations will not be traversed.
+  # By defining the method :scaffold_update_follow returning an array of associations,
+  # only those associations will be traversed.
+  #
+  # Otherwise the default behaviour of traversing all associations will be preserved.
+  def associations_for_update
+    if self.respond_to?( :scaffold_update_nofollow )
+      self.class.reflect_on_all_associations.reject { |association| self.scaffold_update_nofollow.include?( association.name ) }
+    elsif self.respond_to?( :scaffold_update_follow )
+      self.class.reflect_on_all_associations.select { |association| self.scaffold_update_follow.include?( association.name ) }
+    else
+      self.class.reflect_on_all_associations
+    end
+  end
+
+  private
+
+  # yields every associated object that has been instantiated and is flagged as unsaved.
+  # returns false if any yield returns false.
+  # returns true otherwise, even when none of the associations have been instantiated. build wrapper methods accordingly.
+  def with_unsaved_associated
+    associations_for_update.all? do |association|
+      association_proxy = send(association.name)
+      if association_proxy
+        records = association_proxy
+        records = [records] unless records.is_a? Array # convert singular associations into collections for ease of use
+        debugger
+        records.select {|r| r.unsaved? and not r.readonly?}.all? {|r| yield r} # must use select instead of find_all, which Rails overrides on association proxies for db access
+      else
+        true
+      end
+    end
+  end
+end

data/lib/active_scaffold/finder.rb

@@ -108,11 +108,18 @@ module ActiveScaffold
       
       def condition_value_for_datetime(value, conversion = :to_time)
         if value.is_a? Hash
-          Time.zone.local(*[:year, :month, :day, :hour, :minute, :second].collect {|part| value[field][part].to_i}) rescue nil
+          Time.zone.local(*[:year, :month, :day, :hour, :minute, :second].collect {|part| value[part].to_i}) rescue nil
         elsif value.respond_to?(:strftime)
           value.send(conversion)
+        elsif conversion == :to_date
+          Date.strptime(value, I18n.t('date.formats.default')) rescue nil
         else
-          Time.zone.parse(value).in_time_zone.send(conversion) rescue nil
+          parts = Date._parse(value)
+          time_parts = [[:hour, '%H'], [:min, '%M'], [:sec, '%S']].collect {|part, format_part| format_part if parts[part].present?}.compact
+          format = "#{I18n.t('date.formats.default')} #{time_parts.join(':')} #{'%z' if parts[:offset].present?}"
+          time = DateTime.strptime(value, format)
+          time = Time.zone.local_to_utc(time) unless parts[:offset]
+          time.in_time_zone.send(conversion) rescue nil
         end unless value.nil? || value.blank?
       end
 

data/lib/active_scaffold/finder.rb~

@@ -108,11 +108,18 @@ module ActiveScaffold
       
       def condition_value_for_datetime(value, conversion = :to_time)
         if value.is_a? Hash
-          Time.zone.local(*[:year, :month, :day, :hour, :minute, :second].collect {|part| value[field][part].to_i}) rescue nil
+          Time.zone.local(*[:year, :month, :day, :hour, :minute, :second].collect {|part| value[part].to_i}) rescue nil
         elsif value.respond_to?(:strftime)
           value.send(conversion)
+        elsif conversion == :to_date
+          Date.strptime(value, I18n.t('date.formats.default')) rescue nil
         else
-          Time.zone.parse(value).in_time_zone.send(conversion) rescue nil
+          parts = Date._parse(value)
+          time_parts = [[:hour, '%H'], [:min, '%M'], [:sec, '%S']].collect {|part, format_part| format_part if parts[part].present?}.compact
+          format = "#{I18n.t('date.formats.default')} #{time_parts.join(':')} #{'%z' if parts[:offset].present?}"
+          time = DateTime.strptime(value, format)
+          time = Time.zone.local_to_utc(time) unless parts[:offset]
+          time.in_time_zone.send(conversion) rescue nil
         end unless value.nil? || value.blank?
       end
 
@@ -270,7 +277,7 @@ module ActiveScaffold
     # Returns a hash with options to count records, rejecting select and order options
     # See finder_options for valid options
     def count_options(find_options = {}, count_includes = nil)
-      count_includes ||= find_options[:includes] unless find_options[:conditions].nil?
+      count_includes ||= find_options[:includes] unless find_options[:where].nil?
       options = find_options.reject{|k,v| [:select, :order].include? k}
       options[:includes] = count_includes
       options
@@ -289,6 +296,7 @@ module ActiveScaffold
       # NOTE: we must use :include in the count query, because some conditions may reference other tables
       if options[:pagination] && options[:pagination] != :infinite
         count_query = append_to_query(klass, count_options(find_options, options[:count_includes]))
+        debugger
         count = count_query.count unless options[:pagination] == :infinite
       end
   

data/lib/active_scaffold/helpers/list_column_helpers.rb

@@ -34,13 +34,14 @@ module ActiveScaffold
         if column.link
           link = column.link
           associated = record.send(column.association.name) if column.association
-          url_options = params_for(:action => nil, :id => record.id, :link => text)
+          url_options = params_for(:action => nil, :id => record.id)
 
           # setup automatic link
           if column.autolink? && column.singular_association? # link to inline form
-            link = action_link_to_inline_form(column, record, associated)
-            return text if link.crud_type.nil?
-            url_options[:link] = as_(:create_new) if link.crud_type == :create
+            link = action_link_to_inline_form(column, record, associated, text)
+            return text if link.nil?
+          else
+            url_options[:link] = text
           end
 
           if column_link_authorized?(link, column, record, associated)
@@ -55,8 +56,9 @@ module ActiveScaffold
       end
 
       # setup the action link to inline form
-      def action_link_to_inline_form(column, record, associated)
+      def action_link_to_inline_form(column, record, associated, text)
         link = column.link.clone
+        link.label = text
         if column.polymorphic_association?
           polymorphic_controller = controller_path_for_activerecord(record.send(column.association.name).class)
           return link if polymorphic_controller.nil?
@@ -70,6 +72,7 @@ module ActiveScaffold
           if actions.include?(:new)
             link.action = 'new'
             link.crud_type = :create
+            link.label = as_(:create_new)
           end
         elsif actions.include?(:edit)
           link.action = 'edit'
@@ -81,7 +84,7 @@ module ActiveScaffold
           link.action = 'index'
           link.crud_type = :read
         end
-        link
+        link if link.action.present?
       end
 
       def column_link_authorized?(link, column, record, associated)

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

@@ -34,13 +34,14 @@ module ActiveScaffold
         if column.link
           link = column.link
           associated = record.send(column.association.name) if column.association
-          url_options = params_for(:action => nil, :id => record.id, :link => text)
+          url_options = params_for(:action => nil, :id => record.id)
 
           # setup automatic link
           if column.autolink? && column.singular_association? # link to inline form
-            link = action_link_to_inline_form(column, record, associated)
-            return text if link.crud_type.nil?
-            url_options[:link] = as_(:create_new) if link.crud_type == :create
+            link = action_link_to_inline_form(column, record, associated, text)
+            return text if link.nil?
+          else
+            url_options[:link] = text
           end
 
           if column_link_authorized?(link, column, record, associated)
@@ -55,8 +56,9 @@ module ActiveScaffold
       end
 
       # setup the action link to inline form
-      def action_link_to_inline_form(column, record, associated)
+      def action_link_to_inline_form(column, record, associated, text)
         link = column.link.clone
+        link.label = text
         if column.polymorphic_association?
           polymorphic_controller = controller_path_for_activerecord(record.send(column.association.name).class)
           return link if polymorphic_controller.nil?
@@ -70,6 +72,7 @@ module ActiveScaffold
           if actions.include?(:new)
             link.action = 'new'
             link.crud_type = :create
+            link.label = as_(:create_new)
           end
         elsif actions.include?(:edit)
           link.action = 'edit'
@@ -81,7 +84,7 @@ module ActiveScaffold
           link.action = 'index'
           link.crud_type = :read
         end
-        link
+        link if link.crud_type.present?
       end
 
       def column_link_authorized?(link, column, record, associated)

data/lib/active_scaffold/helpers/view_helpers.rb

@@ -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)
+        html_options.reverse_merge! link.html_options.merge(:class => link.action.to_s)
 
         # 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

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.reverse_for?(parent_record.class)
+        return false if column.association.inverse_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)
+        html_options.reverse_merge! link.html_options.merge(:class => link.action.to_s)
 
         # 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 options.has_key?(:reuse_eid)
+          link.eid = "#{controller_id.from(3)}_#{record.id}_#{link.parameters[:named_scope]}" unless record.nil? || options.has_key?(:reuse_eid)
           url_options[:eid] = link.eid
         end
       end

data/lib/active_scaffold/version.rb

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

data/lib/active_scaffold.rb

@@ -266,7 +266,7 @@ module ActiveScaffold
           column.actions_for_association_links.delete :new unless actions.include? :create
           column.actions_for_association_links.delete :edit unless actions.include? :update
           column.actions_for_association_links.delete :show unless actions.include? :show
-          ActiveScaffold::DataStructures::ActionLink.new(:none, options.merge({:crud_type => nil, :html_options => {:class => column.name}}))
+          ActiveScaffold::DataStructures::ActionLink.new(nil, options.merge(:html_options => {:class => column.name}))
         end 
       end
     end