active_scaffold_vho 3.0.12 → 3.0.13

data/active_scaffold_vho.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{active_scaffold_vho}
-  s.version = "3.0.12"
+  s.version = "3.0.13"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Many, see README"]
-  s.date = %q{2011-02-11}
+  s.date = %q{2011-02-18}
   s.description = %q{Save time and headaches, and create a more easily maintainable set of pages, with ActiveScaffold. ActiveScaffold handles all your CRUD (create, read, update, delete) user interface needs, leaving you more time to focus on more challenging (and interesting!) problems.}
   s.email = %q{activescaffold@googlegroups.com}
   s.extra_rdoc_files = [
@@ -95,6 +95,7 @@ Gem::Specification.new do |s|
     "frontends/default/views/list.js.rjs",
     "frontends/default/views/on_action_update.js.rjs",
     "frontends/default/views/on_create.js.rjs",
+    "frontends/default/views/on_mark_all.js.rjs",
     "frontends/default/views/on_update.js.rjs",
     "frontends/default/views/search.html.erb",
     "frontends/default/views/show.html.erb",
@@ -122,6 +123,8 @@ Gem::Specification.new do |s|
     "lib/active_scaffold/bridges/bridge.rb",
     "lib/active_scaffold/bridges/calendar_date_select/bridge.rb",
     "lib/active_scaffold/bridges/calendar_date_select/lib/as_cds_bridge.rb",
+    "lib/active_scaffold/bridges/cancan/bridge.rb",
+    "lib/active_scaffold/bridges/cancan/lib/cancan_bridge.rb",
     "lib/active_scaffold/bridges/carrierwave/bridge.rb",
     "lib/active_scaffold/bridges/carrierwave/lib/carrierwave_bridge.rb",
     "lib/active_scaffold/bridges/carrierwave/lib/carrierwave_bridge_helpers.rb",

data/frontends/default/javascripts/jquery/active_scaffold.js

@@ -563,7 +563,8 @@ var ActiveScaffold = {
 
   delete_subform_record: function(record) {
     if (typeof(record) == 'string') record = '#' + record;
-    var errors = $(record).prev();
+    record = $(record);
+    var errors = record.prev();
     if (errors.hasClass('association-record-errors')) {
       this.replace_html(errors, '');
     }
@@ -701,6 +702,31 @@ var ActiveScaffold = {
         ActiveScaffold.report_500_response(active_scaffold_id)
       }
     });
+  },
+
+  // element is tbody id
+  mark_records: function(element, options) {
+    if (typeof(element) == 'string') element = '#' + element;
+    var element = $(element);
+    var mark_checkboxes = $('#' + element.attr('id') + ' > tr.record td.marked-column input[type="checkbox"]');
+    mark_checkboxes.each(function (index) {
+      var item = $(this);
+     if(options.checked === true) {
+       item.attr('checked', 'checked');
+     } else {
+       item.removeAttr('checked');
+     }
+     item.attr('value', ('' + !options.checked));
+    });
+    if(options.include_mark_all === true) {
+      var mark_all_checkbox = element.prev('thead').find('th.marked-column_heading span input[type="checkbox"]');
+      if(options.checked === true) {
+        mark_all_checkbox.attr('checked', 'checked');
+      } else {
+        mark_all_checkbox.removeAttr('checked');
+      }
+      mark_all_checkbox.attr('value', ('' + !options.checked));
+    }
   }
 }
 

data/frontends/default/javascripts/prototype/active_scaffold.js

@@ -568,7 +568,31 @@ var ActiveScaffold = {
         }
       }
     );
+  },
+
+  // element is tbody id
+  mark_records: function(element, options) {
+    var element = $(element);
+    var mark_checkboxes = $$('#' + element.readAttribute('id') + ' > tr.record td.marked-column input[type="checkbox"]');
+    mark_checkboxes.each(function(item) {
+     if(options.checked === true) {
+       item.writeAttribute({ checked: 'checked' });
+     } else {
+       item.removeAttribute('checked');
+     }
+     item.writeAttribute('value', ('' + !options.checked));
+    });
+    if(options.include_mark_all === true) {
+      var mark_all_checkbox = element.previous('thead').down('th.marked-column_heading span input[type="checkbox"]');
+      if(options.checked === true) {
+        mark_all_checkbox.writeAttribute({ checked: 'checked' }); 
+      } else {
+        mark_all_checkbox.removeAttribute('checked');
+      }
+      mark_all_checkbox.writeAttribute('value', ('' + !options.checked));
+    }
   }
+
 }
 
 /*

data/frontends/default/views/on_mark_all.js.rjs

@@ -0,0 +1,4 @@
+options = {:checked => mark_all,
+           :include_mark_all => true}
+page << "ActiveScaffold.mark_records('#{active_scaffold_tbody_id}', #{options.to_json});"
+

data/lib/active_scaffold/actions/create.rb

@@ -103,17 +103,21 @@ module ActiveScaffold::Actions
             create_association_with_parent(@record) 
             register_constraints_with_action_columns(nested.constrained_fields)
           end
-          before_create_save(@record)
-          self.successful = [@record.valid?, @record.associated_valid?].all? {|v| v == true} # this syntax avoids a short-circuit
-          if successful?
-            @record.save! and @record.save_associated!
-            after_create_save(@record)
-          end
+          create_save
         end
       rescue ActiveRecord::RecordInvalid
       end
     end
 
+    def create_save
+      before_create_save(@record)
+      self.successful = [@record.valid?, @record.associated_valid?].all? {|v| v == true} # this syntax avoids a short-circuit
+      if successful?
+        @record.save! and @record.save_associated!
+        after_create_save(@record)
+      end
+    end
+
     # override this method if you want to inject data in the record (or its associated objects) before the save
     def before_create_save(record); end
 

data/lib/active_scaffold/actions/mark.rb

@@ -13,10 +13,19 @@ module ActiveScaffold::Actions
       else
         do_demark_all
       end
-      do_list
-      respond_to_action(:list) 
+      respond_to_action(:mark_all)
     end
  protected
+
+    def mark_all_respond_to_html
+      do_list
+      list_respond_to_html
+    end
+
+    def mark_all_respond_to_js
+      do_list
+      render :action => 'on_mark_all', :locals => {:mark_all => mark_all?}
+    end
  
     # We need to give the ActiveRecord classes a handle to currently marked records. We don't want to just pass the object,
     # because the object may change. So we give ActiveRecord a proc that ties to the
@@ -46,5 +55,9 @@ module ActiveScaffold::Actions
     def mark_authorized?
       authorized_for?(:action => :read)
     end
+
+    def mark_all_formats
+      (default_formats + active_scaffold_config.formats).uniq
+    end
   end
 end

data/lib/active_scaffold/attribute_params.rb

@@ -110,11 +110,7 @@ module ActiveScaffold
         # it's a single id
         column.association.klass.find(value) if value and not value.empty?
       elsif column.plural_association?
-        # it's an array of ids
-        if value and not value.empty?
-          ids = value.select {|id| id.respond_to?(:empty?) ? !id.empty? : true}
-          ids.empty? ? [] : column.association.klass.find(ids)
-        end
+        column_plural_assocation_value_from_value(column, value)
       elsif column.column && column.column.number? && [:i18n_number, :currency].include?(column.options[:format])
         self.class.i18n_number_to_native_format(value)
       else
@@ -126,6 +122,14 @@ module ActiveScaffold
       end
     end
 
+    def column_plural_assocation_value_from_value(column, value)
+      # it's an array of ids
+      if value and not value.empty?
+        ids = value.select {|id| id.respond_to?(:empty?) ? !id.empty? : true}
+        ids.empty? ? [] : column.association.klass.find(ids)
+      end
+    end
+
     def column_value_from_param_hash_value(parent_record, column, value)
       # this is just for backwards compatibility. we should clean this up in 2.0.
       if column.form_ui == :select

data/lib/active_scaffold/bridges/cancan/bridge.rb

@@ -0,0 +1,11 @@
+ActiveScaffold::Bridges.bridge "CanCan" do
+  install do
+    require File.join(File.dirname(__FILE__), "lib", "cancan_bridge.rb")
+
+    ActiveScaffold::Actions::Core.send :include, ActiveScaffold::CancanBridge::Core
+    ActiveScaffold::Actions::Nested.send :include, ActiveScaffold::CancanBridge::Core
+    ActionController::Base.send :include, ActiveScaffold::CancanBridge::ModelUserAccess::Controller
+    ActiveRecord::Base.send :include, ActiveScaffold::CancanBridge::ModelUserAccess::Model
+    ActiveRecord::Base.send :include, ActiveScaffold::CancanBridge::ActiveRecord
+  end
+end

data/lib/active_scaffold/bridges/cancan/lib/cancan_bridge.rb

@@ -0,0 +1,81 @@
+module ActiveScaffold
+  module CancanBridge
+
+    module Core
+      extend ActiveSupport::Concern
+      included do
+        alias_method_chain :beginning_of_chain, :cancan
+      end
+      # :TODO can this be expanded more ?
+      def beginning_of_chain_with_cancan
+        beginning_of_chain_without_cancan.accessible_by(current_ability)
+      end
+    end
+
+    # This is a module aimed at making the current_ability available to ActiveRecord models for permissions.
+    module ModelUserAccess
+      module Controller
+        extend ActiveSupport::Concern
+        included do
+          prepend_before_filter :assign_current_ability_to_models
+        end
+
+        # We need to give the ActiveRecord classes a handle to the current ability. We don't want to just pass the object,
+        # because the object may change (someone may log in or out). So we give ActiveRecord a proc that ties to the
+        # current_ability_method on this ApplicationController.
+        def assign_current_ability_to_models
+          ::ActiveRecord::Base.current_ability_proc = proc {send(:current_ability)}
+        end
+      end
+
+      module Model
+        extend ActiveSupport::Concern
+
+        module ClassMethods
+          # The proc to call that retrieves the current_ability from the ApplicationController.
+          attr_accessor :current_ability_proc
+
+          # Class-level access to the current ability
+          def current_ability
+            ::ActiveRecord::Base.current_ability_proc.call if ::ActiveRecord::Base.current_ability_proc
+          end
+        end
+
+        # Instance-level access to the current ability
+        def current_ability; self.class.current_ability end
+      end
+    end
+
+
+    module ActiveRecord
+      extend ActiveSupport::Concern
+      included do
+        extend SecurityMethods
+        include SecurityMethods
+        alias_method_chain :authorized_for?, :cancan
+        class << self
+          alias_method_chain :authorized_for?, :cancan
+        end
+      end
+
+      module SecurityMethods
+        class InvalidArgument < StandardError; end
+
+        # is usually called with :crud_type and :column, or :action
+        #     {:crud_type=>:update, :column=>"some_colum_name"}
+        #     {:action=>"edit"}
+        # to allow access cancan must allow both :crud_type and :action
+        # if cancan says "no", it delegates to default AS behavior
+        def authorized_for_with_cancan?(options = {})
+          raise InvalidArgument if options[:crud_type].blank? and options[:action].blank?
+          crud_type_result = options[:crud_type].nil? ? true : current_ability.can?(options[:crud_type], self)
+          action_result = options[:action].nil? ? true : current_ability.can?(options[:action], self)
+          default_result = authorized_for_without_cancan?(options)
+          result = (crud_type_result and action_result) or default_result
+          return result
+        end
+      end
+    end
+
+  end
+end

data/lib/active_scaffold/bridges/carrierwave/lib/carrierwave_bridge.rb

@@ -12,8 +12,6 @@ module ActiveScaffold
       
             self.model.uploaders.keys.each do |field|
               configure_carrierwave_field(field.to_sym)
-              # define the "delete" helper for use with active scaffold, unless it's already defined
-              ActiveScaffold::Bridges::Carrierwave::Lib::CarrierwaveBridgeHelpers.generate_delete_helper(self.model, field)
             end
           end
       
@@ -24,13 +22,9 @@ module ActiveScaffold
           private
           def configure_carrierwave_field(field)
             self.columns << field
-            self.columns[field].form_ui ||= :carrierwave
+            self.columns[field].form_ui ||= :carrierwave # :TODO thumbnail
             self.columns[field].params.add "#{field}_cache"
-            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
+            self.columns[field].params.add "remove_#{field}"
           end
         end
       end

data/lib/active_scaffold/bridges/carrierwave/lib/carrierwave_bridge_helpers.rb

@@ -5,22 +5,8 @@ module ActiveScaffold
         module CarrierwaveBridgeHelpers
           mattr_accessor :thumbnail_style
           self.thumbnail_style = :thumbnail
-        
-          def self.generate_delete_helper(klass, field)
-            klass.class_eval <<-EOF, __FILE__, __LINE__ + 1 unless klass.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.remove_#{field}! unless new_record?
-              end
-            EOF
-          end
         end
       end
     end
   end
-end
+end

data/lib/active_scaffold/bridges/carrierwave/lib/form_ui.rb

@@ -12,18 +12,23 @@ module ActiveScaffold
             js_remove_file_code = "$(this).previous().value='true'; $(this).up().hide().next().show(); return false;";
           end
 
-          hidden_field_options = {
-            :name => options[:name].gsub(/\[#{column.name}\]$/, "[delete_#{column.name}]"),
-            :id => options[:id] + '_delete',
-            :value => "false"
+          remove_field_options = {
+            :name => options[:name].gsub(/\[#{column.name}\]$/, "[remove_#{column.name}]"),
+            :id => 'remove_' + options[:id],
+            :value => false
+          }
+
+          cache_field_options = {
+            :name => options[:name].gsub(/\[#{column.name}\]$/, "[#{column.name}_cache]"),
+            :id => options[:id] + '_cache'
           }
 
           content_tag( :div,
             content_tag(:div, (
                 get_column_value(@record, column) + " | " +
-                  hidden_field(:record, "delete_#{column.name}", hidden_field_options) +
-                  content_tag(:a, as_(:remove_file), {:href => '#', :onclick => js_remove_file_code}) +
-                  hidden_field(:record, "#{column.name}_cache", {:name => options[:name].gsub(/\[#{column.name}\]$/, "[#{column.name}_cache]")})
+                  hidden_field(:record, "#{column.name}_cache", cache_field_options) +
+                  hidden_field(:record, "remove_#{column.name}", remove_field_options) +
+                  content_tag(:a, as_(:remove_file), {:href => '#', :onclick => js_remove_file_code})
               ).html_safe
             ) + content_tag(:div, input, :style => "display: none")
           )

data/lib/active_scaffold/bridges/shared/date_bridge.rb

@@ -70,14 +70,36 @@ module ActiveScaffold
           def active_scaffold_human_condition_date_bridge(column, value)
             case value[:opt]
             when 'RANGE'
-              "#{column.active_record_class.human_attribute_name(column.name)} = #{as_(value[:range].downcase).downcase}"
+              range_type, range = value[:range].downcase.split('_')
+              format = active_scaffold_human_condition_date_bridge_range_format(range_type, range)
+              from, to = controller.class.date_bridge_from_to(column, value)
+              "#{column.active_record_class.human_attribute_name(column.name)} = #{as_(value[:range].downcase).downcase} (#{I18n.l(from, :format => format)})"
             when 'PAST', 'FUTURE'
-              "#{column.active_record_class.human_attribute_name(column.name)} #{as_(value[:opt].downcase).downcase} #{as_(value[:number])} #{as_(value[:unit].downcase)}"
+              from, to = controller.class.date_bridge_from_to(column, value)
+              "#{column.active_record_class.human_attribute_name(column.name)} #{as_('BETWEEN'.downcase).downcase} #{I18n.l(from)} - #{I18n.l(to)}"
             else
               from, to = controller.class.date_bridge_from_to(column, value)
               "#{column.active_record_class.human_attribute_name(column.name)} #{as_(value[:opt].downcase).downcase} #{I18n.l(from)} #{value[:opt] == 'BETWEEN' ? '- ' + I18n.l(to) : ''}"
             end
           end
+
+          def active_scaffold_human_condition_date_bridge_range_format(range_type, range)
+            case range
+            when 'week'
+              first_day_of_week = I18n.translate 'active_scaffold.date_picker_options.firstDay'
+              if first_day_of_week == 1
+                '%W %Y'
+              else
+                '%U %Y'
+              end
+            when 'month'
+              '%b %Y'
+            when 'year'
+              '%Y'
+            else
+              I18n.translate 'date.formats.default'
+            end
+          end
         end
         
         module Finder
@@ -146,7 +168,7 @@ module ActiveScaffold
                 return date_bridge_now.beginning_of_day, date_bridge_now.end_of_day
               when 'YESTERDAY'
                 return date_bridge_now.ago(1.day).beginning_of_day, date_bridge_now.ago(1.day).end_of_day
-              when 'TOMMORROW'
+              when 'TOMORROW'
                 return date_bridge_now.in(1.day).beginning_of_day, date_bridge_now.in(1.day).end_of_day
               else
                 range_type, range = value[:range].downcase.split('_')
@@ -184,8 +206,4 @@ ActiveScaffold::Finder.const_set('TimeUnits', ["SECONDS", "MINUTES", "HOURS"])
 ActiveScaffold::Finder.const_set('DateRanges', ["TODAY", "YESTERDAY", "TOMORROW",
                                                 "THIS_WEEK", "PREV_WEEK", "NEXT_WEEK",
                                                 "THIS_MONTH", "PREV_MONTH", "NEXT_MONTH",
-                                                "THIS_YEAR", "PREV_YEAR", "NEXT_YEAR"])
-
-
-
-
+                                                "THIS_YEAR", "PREV_YEAR", "NEXT_YEAR"])

data/lib/active_scaffold/data_structures/action_link.rb

@@ -17,6 +17,7 @@ module ActiveScaffold::DataStructures
       self.html_options = {}
       self.column = nil
       self.image = nil
+      self.dynamic_parameters = nil
 
       # apply quick properties
       options.each_pair do |k, v|
@@ -43,6 +44,9 @@ module ActiveScaffold::DataStructures
     # a hash of request parameters
     attr_accessor :parameters
 
+    # a block for dynamic_parameters
+    attr_accessor :dynamic_parameters
+
     # the RESTful method
     attr_accessor :method
 

data/lib/active_scaffold/extensions/action_view_rendering.rb

@@ -66,8 +66,8 @@ module ActionView::Rendering #:nodoc:
       id = "as_#{eid}-content"
       url_options = {:controller => remote_controller.to_s, :action => 'index'}.merge(options[:params])
       
-      if respond_to? :render_component
-        render_component url_options
+      if controller.respond_to?(:render_component_into_view)
+        controller.send(:render_component_into_view, url_options)
       else
         content_tag(:div, {:id => id}) do
           url = url_for(url_options)

data/lib/active_scaffold/helpers/form_column_helpers.rb

@@ -107,6 +107,7 @@ module ActiveScaffold
 
         html_options.update(column.options[:html_options] || {})
         options.update(column.options)
+        html_options[:name] = "#{html_options[:name]}[]" if (html_options[:multiple] == true && !html_options[:name].to_s.ends_with?("[]"))
         select(:record, method, select_options.uniq, options, html_options)
       end
 
@@ -171,7 +172,9 @@ module ActiveScaffold
       # ... maybe this should be provided in a bridge?
       def active_scaffold_input_record_select(column, options)
         if column.singular_association?
-          active_scaffold_record_select(column, options, @record.send(column.name), false)
+          multiple = false
+          multiple = column.options[:html_options][:multiple] if column.options[:html_options] &&  column.options[:html_options][:multiple]
+          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)
         end

data/lib/active_scaffold/helpers/view_helpers.rb

@@ -151,6 +151,9 @@ module ActiveScaffold
         url_options[:controller] = link.controller if link.controller
         url_options.delete(:search) if link.controller and link.controller.to_s != params[:controller]
         url_options.merge! link.parameters if link.parameters
+        @link_record = record
+        url_options.merge! self.instance_eval(&(link.dynamic_parameters)) if link.dynamic_parameters.is_a?(Proc)
+        @link_record = nil
         url_options_for_nested_link(link.column, record, link, url_options, options) if link.nested_link?
         url_options_for_sti_link(link.column, record, link, url_options, options) unless record.nil? || active_scaffold_config.sti_children.nil?
         url_options[:_method] = link.method if !link.confirm? && link.inline? && link.method != :get

data/lib/active_scaffold/version.rb

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

data/lib/active_scaffold.rb

@@ -81,8 +81,7 @@ module ActiveScaffold
     self.class.active_scaffold_config_for(klass)
   end
 
-  def active_scaffold_session_storage
-    id = params[:eid] || params[:controller]
+  def active_scaffold_session_storage(id = (params[:eid] || params[:controller]))
     session_index = "as:#{id}"
     session[session_index] ||= {}
     session[session_index]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_scaffold_vho
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 3
   - 0
-  - 12
-  version: 3.0.12
+  - 13
+  version: 3.0.13
 platform: ruby
 authors: 
 - Many, see README
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-11 00:00:00 +01:00
+date: 2011-02-18 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -210,6 +210,7 @@ files:
 - frontends/default/views/list.js.rjs
 - frontends/default/views/on_action_update.js.rjs
 - frontends/default/views/on_create.js.rjs
+- frontends/default/views/on_mark_all.js.rjs
 - frontends/default/views/on_update.js.rjs
 - frontends/default/views/search.html.erb
 - frontends/default/views/show.html.erb
@@ -237,6 +238,8 @@ files:
 - lib/active_scaffold/bridges/bridge.rb
 - lib/active_scaffold/bridges/calendar_date_select/bridge.rb
 - lib/active_scaffold/bridges/calendar_date_select/lib/as_cds_bridge.rb
+- lib/active_scaffold/bridges/cancan/bridge.rb
+- lib/active_scaffold/bridges/cancan/lib/cancan_bridge.rb
 - lib/active_scaffold/bridges/carrierwave/bridge.rb
 - lib/active_scaffold/bridges/carrierwave/lib/carrierwave_bridge.rb
 - lib/active_scaffold/bridges/carrierwave/lib/carrierwave_bridge_helpers.rb