active_scaffold 3.2.9 → 3.2.10

data/CHANGELOG

@@ -1,4 +1,10 @@
-= 3.2.9 (not released)
+= 3.2.10 (not released yet)
+- fix nested scaffolds with update action disabled
+- initial work for tableless support (index with limited options)
+- fix scrolling on closing nested scaffolds
+- fix calculations which were broken in 3.2.9
+
+= 3.2.9
 - remove duplicated conditions with constraints
 - fix constraints for polymorphic associations
 

data/app/assets/javascripts/jquery/active_scaffold.js

@@ -85,7 +85,7 @@ jQuery(document).ready(function() {
 
     if (action_link) {
       if (action_link.position) {
-        action_link.close(response);
+        action_link.close();
       } else {
         response.evalResponse(); 
       }
@@ -931,7 +931,7 @@ ActiveScaffold.ActionLink.Abstract = Class.extend({
     this.enable();
     this.adapter.remove();
     if (this.hide_target) this.target.show();
-    if (ActiveScaffold.config.scroll_on_close) ActiveScaffold.scroll_to(this.target, ActiveScaffold.config.scroll_on_close == 'checkInViewport');
+    if (ActiveScaffold.config.scroll_on_close) ActiveScaffold.scroll_to(this.target.attr('id'), ActiveScaffold.config.scroll_on_close == 'checkInViewport');
   },
 
   get_new_adapter_id: function() {

data/app/assets/javascripts/prototype/active_scaffold.js

@@ -109,7 +109,7 @@ document.observe("dom:loaded", function() {
     var action_link = ActiveScaffold.find_action_link(event.findElement());
     if (action_link) {
       if (action_link.position) {
-        action_link.close(event.memo.request.responseText);
+        action_link.close();
       } else {
         event.memo.request.evalResponse(); 
       }
@@ -819,7 +819,7 @@ ActiveScaffold.ActionLink.Abstract = Class.create({
     this.enable();
     this.adapter.remove();
     if (this.hide_target) this.target.show();
-    if (ActiveScaffold.config.scroll_on_close) ActiveScaffold.scroll_to(this.target, ActiveScaffold.config.scroll_on_close == 'checkInViewport');
+    if (ActiveScaffold.config.scroll_on_close) ActiveScaffold.scroll_to(this.target.id, ActiveScaffold.config.scroll_on_close == 'checkInViewport');
   },
 
   get_new_adapter_id: function() {

data/lib/active_scaffold/actions/core.rb

@@ -6,7 +6,7 @@ module ActiveScaffold::Actions
         after_filter :clear_flashes
       end
       base.helper_method :nested?
-      base.helper_method :beginning_of_chain
+      base.helper_method :calculate
       base.helper_method :new_model
     end
     def render_field

data/lib/active_scaffold/actions/delete.rb

@@ -50,9 +50,11 @@ module ActiveScaffold::Actions
       begin
         self.successful = @record.destroy
         marked_records.delete @record.id.to_s if successful?
-      rescue
+      rescue Exception => ex
         flash[:warning] = as_(:cant_destroy_record, :record => @record.to_label)
         self.successful = false
+        logger.debug ex.message
+        logger.debug ex.backtrace.join("\n")
       end
     end
 

data/lib/active_scaffold/config/base.rb

@@ -63,7 +63,7 @@ module ActiveScaffold::Config
     private
     
     def columns=(val)
-      @columns.set_values(*val) if @column
+      @columns.set_values(*val) if @columns
       @columns ||= ActiveScaffold::DataStructures::ActionColumns.new(*val).tap do |columns|
         columns.action = self
         columns.set_columns(@core.columns) if @columns.respond_to?(:set_columns)

data/lib/active_scaffold/constraints.rb

@@ -16,8 +16,11 @@ module ActiveScaffold
       constrained_fields ||= []
       constrained_fields |= active_scaffold_constraints.reject{|k, v| v.is_a? Hash}.keys.collect(&:to_sym)
       exclude_actions = []
-      exclude_actions << :list unless active_scaffold_config.list.hide_nested_column
-      exclude_actions << :update unless active_scaffold_config.update.hide_nested_column
+      [:list, :update].each do |action_name|
+	if active_scaffold_config.actions.include? action_name
+          exclude_actions << action_name unless active_scaffold_config.send(action_name).hide_nested_column
+        end
+      end
 
       if self.class.uses_active_scaffold?
         # we actually want to do this whether constrained_fields exist or not, so that we can reset the array when they don't

data/lib/active_scaffold/data_structures/action_columns.rb

@@ -103,8 +103,6 @@ module ActiveScaffold::DataStructures
         result = false
         # skip if this matches a constrained column
         result = true if constraint_columns.include?(column.name.to_sym)
-        # skip if this matches the field_name of a constrained column
-        result = true if column.field_name and constraint_columns.include?(column.field_name.to_sym)
         # skip this field if it's not authorized
         unless options[:for].authorized_for?(:action => options[:action], :crud_type => options[:crud_type] || self.action.crud_type, :column => column.name)
           self.unauthorized_columns << column.name.to_sym

data/lib/active_scaffold/data_structures/column.rb

@@ -358,6 +358,8 @@ module ActiveScaffold::DataStructures
           self.sort = {:method => "#{self.name}.join(',')"}
         elsif @active_record_class.connection
           self.sort = {:sql => self.field}
+        else
+          self.sort = false
         end
       end
     end

data/lib/active_scaffold/finder.rb

@@ -325,6 +325,14 @@ module ActiveScaffold
       end
       pager.page(options[:page])
     end
+
+    def calculate(column)
+      conditions = all_conditions
+      includes = active_scaffold_config.list.count_includes
+      includes ||= active_scaffold_includes unless conditions.nil?
+      append_to_query(beginning_of_chain, :conditions => conditions, :includes => includes,
+        :joins => joins_for_collection).calculate(column.calculate, column.name)
+    end
     
     def append_to_query(query, options)
       options.assert_valid_keys :where, :select, :group, :reorder, :limit, :offset, :joins, :includes, :lock, :readonly, :from, :conditions

data/lib/active_scaffold/helpers/view_helpers.rb

@@ -264,11 +264,7 @@ module ActiveScaffold
 
       def column_calculation(column)
         unless column.calculate.instance_of? Proc
-          conditions = controller.send(:all_conditions)
-          includes = active_scaffold_config.list.count_includes
-          includes ||= controller.send(:active_scaffold_includes) unless conditions.nil?
-          calculation = beginning_of_chain.calculate(column.calculate, column.name, :conditions => conditions,
-           :joins => controller.send(:joins_for_collection), :include => includes)
+          calculate(column)
         else
           column.calculate.call(@records)
         end

data/lib/active_scaffold/tableless.rb

@@ -0,0 +1,66 @@
+class ActiveScaffold::Tableless < ActiveRecord::Base
+  class Relation < ActiveRecord::Relation
+    attr_reader :conditions
+    def initialize(klass, table)
+      super
+      @conditions ||= []
+    end
+
+    def initialize_copy(other)
+      @conditions = @conditions.dup
+      super
+    end
+
+    def where(opts, *rest)
+      unless opts.blank?
+        opts = opts.with_indifferent_access if opts.is_a? Hash
+        @conditions << (rest.empty? ? opts : [opts, *rest])
+      end
+      self
+    end
+
+    def merge(r)
+      super.tap do |merged|
+        merged.conditions.concat r.conditions unless r.nil? || r.is_a?(Array)
+      end
+    end
+
+    def to_a
+      @klass.find_all(self)
+    end
+
+    def find_one(id)
+      @klass.find_one(id, self)
+    end
+  end
+
+  def self.columns; @columns ||= []; end
+  def self.table_name; @table_name ||= ActiveModel::Naming.plural(self); end
+  def self.connection; nil; end
+  def self.table_exists?; true; end
+  self.abstract_class = true
+  class << self
+    private
+    def relation
+      @relation ||= ActiveScaffold::Tableless::Relation.new(self, arel_table)
+      super
+    end
+  end
+
+  def self.column(name, sql_type = nil, options = {})
+    column = ActiveRecord::ConnectionAdapters::Column.new(name.to_s, options[:default], sql_type.to_s, options.has_key?(:null) ? options[:null] : true)
+    column.tap { columns << column }
+  end
+
+  def self.find_all(relation)
+    raise 'self.find_all must be implemented in a Tableless model'
+  end
+
+  def self.find_one(id, relation)
+    raise 'self.find_one must be implemented in a Tableless model'
+  end
+
+  def destroy
+    raise 'destroy must be implemented in a Tableless model'
+  end
+end

data/lib/active_scaffold/version.rb

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

data/lib/active_scaffold_env.rb

@@ -1,5 +1,8 @@
 # TODO: clean up extensions. some could be organized for autoloading, and others could be removed entirely.
 Dir["#{File.dirname __FILE__}/active_scaffold/extensions/*.rb"].each { |file| require file }
+module ActiveScaffold
+  autoload :Tableless, 'active_scaffold/tableless'
+end
 
 ActionController::Base.send(:include, ActiveScaffold)
 ActionController::Base.send(:include, RespondsToParent)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_scaffold
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 3
   - 2
-  - 9
-  version: 3.2.9
+  - 10
+  version: 3.2.10
 platform: ruby
 authors: 
 - Many, see README
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-22 00:00:00 Z
+date: 2012-05-23 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :development
@@ -303,6 +303,7 @@ files:
 - lib/active_scaffold/marked_model.rb
 - lib/active_scaffold/paginator.rb
 - lib/active_scaffold/responds_to_parent.rb
+- lib/active_scaffold/tableless.rb
 - lib/active_scaffold/version.rb
 - lib/active_scaffold_env.rb
 - lib/generators/active_scaffold/USAGE