active_scaffold_vho 3.0.16 → 3.0.17

data/active_scaffold_vho.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{active_scaffold_vho}
-  s.version = "3.0.16"
+  s.version = "3.0.17"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Many, see README"]
-  s.date = %q{2011-03-07}
+  s.date = %q{2011-03-14}
   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 = [

data/frontends/default/views/_field_search.html.erb

@@ -14,7 +14,7 @@ form_tag url_options, options %>
     <% unless hiddens.empty?  -%>
       <li class="sub-section">
       <h5><%= as_(:optional_attributes) %></h5>
-      <ol id ="<%= sub_section_id(:sub_section => 'further_options') %>" class="form" 'style="display: none;"'>
+      <ol id ="<%= sub_section_id(:sub_section => 'further_options') %>" class="form" style="display:none;">
       <% hiddens.each do |column| -%>
         <%= render :partial => 'search_attribute', :locals => {:column => column} %>
       <% end -%>

data/frontends/default/views/_form.html.erb

@@ -1,5 +1,5 @@
 <% subsection_id ||= nil %>
-<ol class="form" <%= "id=#{subsection_id}" unless subsection_id.nil? %>  <%= 'style="display: none;"' if columns.collapsed -%>>
+<ol class="form" <%= "id=#{subsection_id}" unless subsection_id.nil? %> <%= "style=\"display: none;\"" if columns.collapsed %>>
   <% columns.each :for => @record do |column| %>
   <% renders_as = column_renders_as(column) %>
   <% if renders_as == :subsection -%>

data/frontends/default/views/_form_association.html.erb

@@ -1,6 +1,6 @@
 <%
 parent_record = @record
-associated = column.singular_association? ? [parent_record.send(column.name)].compact : parent_record.send(column.name).to_a
+associated = column.singular_association? ? [parent_record.send(column.name)].compact : parent_record.send(column.name).all
 associated = associated.sort_by {|r| r.new_record? ? 99999999999 : r.id} unless column.association.options.has_key?(:order)
 if column.show_blank_record? associated
   associated << if column.singular_association?

data/frontends/default/views/_horizontal_subform.html.erb

@@ -1,9 +1,13 @@
 <table cellpadding="0" cellspacing="0">
-  <% 
-  @record = if column.singular_association?
-      parent_record.send("build_#{column.name}".to_sym)
+  <%
+    if associated.empty?
+      @record = if column.singular_association?
+        parent_record.send("build_#{column.name}".to_sym)
+      else
+        parent_record.send(column.name).build
+      end
     else
-      parent_record.send(column.name).build
+      @record = associated.last
     end
   -%>
   <%= render :partial => 'horizontal_subform_header', :locals => {:parent_record => parent_record} %>

data/lib/active_scaffold/bridges/bridge.rb

@@ -49,5 +49,11 @@ end
 
 require File.join(File.dirname(__FILE__), 'shared', 'date_bridge.rb')
 Dir[File.join(File.dirname(__FILE__), "*/bridge.rb")].each{|bridge_require|
-  require bridge_require
+  load_bridge = true
+  unless ActiveScaffold.exclude_bridges.empty?
+    match = bridge_require.match('bridges\/(.*)\/bridge.rb')
+    bridge_name = match[1] ? match[1] : nil
+    load_bridge = ActiveScaffold.exclude_bridges.exclude?(bridge_name.to_sym) if bridge_name
+  end
+  require bridge_require if load_bridge == true
 } 

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

@@ -2,8 +2,9 @@ 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
+    ActiveScaffold::ClassMethods.send :include, ActiveScaffold::CancanBridge::ClassMethods
+    ActiveScaffold::Actions::Core.send :include, ActiveScaffold::CancanBridge::Actions::Core
+    ActiveScaffold::Actions::Nested.send :include, ActiveScaffold::CancanBridge::Actions::Core
     ActionController::Base.send :include, ActiveScaffold::CancanBridge::ModelUserAccess::Controller
     ActiveRecord::Base.send :include, ActiveScaffold::CancanBridge::ModelUserAccess::Model
     ActiveRecord::Base.send :include, ActiveScaffold::CancanBridge::ActiveRecord

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

@@ -1,14 +1,35 @@
 module ActiveScaffold
   module CancanBridge
 
-    module Core
+    # controller level authorization
+    # As already has callbacks to ensure authorization at controller method via "authorization_method"
+    # but let's include this too, just in case, no sure how performance is affected tough :TODO benchmark
+    module ClassMethods
       extend ActiveSupport::Concern
       included do
-        alias_method_chain :beginning_of_chain, :cancan
+        alias_method_chain :active_scaffold, :cancan
       end
-      # :TODO can this be expanded more ?
-      def beginning_of_chain_with_cancan
-        beginning_of_chain_without_cancan.accessible_by(current_ability)
+
+      def active_scaffold_with_cancan(model_id = nil, &block)
+        active_scaffold_without_cancan(model_id, &block)
+        authorize_resource(
+          :class => active_scaffold_config.model,
+          :instance => :record
+        )
+      end
+    end
+
+    # beginning of chain integration
+    module Actions
+      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
     end
 
@@ -47,6 +68,7 @@ module ActiveScaffold
     end
 
 
+    # plug into AS#authorized_for calls
     module ActiveRecord
       extend ActiveSupport::Concern
       included do

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

@@ -4,7 +4,7 @@ module ActiveScaffold
       def active_scaffold_input_carrierwave(column, options)
         options = active_scaffold_input_text_options(options)
         carrierwave = @record.send("#{column.name}")
-        if carrierwave.file.present? && !carrierwave.file.empty?
+        if !carrierwave.file.blank?
 
           remove_field_options = {
             :name => options[:name].gsub(/\[#{column.name}\]$/, "[remove_#{column.name}]"),

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

@@ -3,7 +3,7 @@ module ActiveScaffold
     module ListColumnHelpers
       def active_scaffold_column_carrierwave(column, record)
         carrierwave = record.send("#{column.name}")
-        return nil unless carrierwave.file.present? && !carrierwave.file.empty?
+        return nil unless !carrierwave.file.blank?
         thumbnail_style = ActiveScaffold::Bridges::Carrierwave::Lib::CarrierwaveBridgeHelpers.thumbnail_style
         content = if carrierwave.versions.keys.include?(thumbnail_style)
           image_tag(carrierwave.url(thumbnail_style), :border => 0).html_safe

data/lib/active_scaffold/data_structures/column.rb

@@ -153,7 +153,10 @@ module ActiveScaffold::DataStructures
     # a collection of associations to pre-load when finding the records on a page
     attr_reader :includes
     def includes=(value)
-      @includes = value.is_a?(Array) ? value : [value] # automatically convert to an array
+      @includes = case value
+        when Array, Hash then value 
+        else [value] # automatically convert to an array
+      end
     end
 
     # a collection of columns to load when eager loading is disabled, if it's nil all columns will be loaded

data/lib/active_scaffold/version.rb

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

data/lib/active_scaffold.rb

@@ -107,6 +107,20 @@ module ActiveScaffold
     @@js_framework ||= :prototype
   end
 
+  # exclude bridges you do not need
+  # name of bridge subdir should be used to exclude it
+  # eg
+  #   ActiveScaffold.exclude_bridges = [:cancan, :ancestry]
+  #   if you are using Activescaffold as a gem add to initializer
+  #   if you are using Activescaffold as a plugin add to active_scaffold_env.rb
+  def self.exclude_bridges=(bridges)
+    @@exclude_bridges = bridges
+  end
+
+  def self.exclude_bridges
+    @@exclude_bridges ||= []
+  end
+
   def self.root
     File.dirname(__FILE__) + "/.."
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_scaffold_vho
 version: !ruby/object:Gem::Version 
-  hash: 39
+  hash: 37
   prerelease: false
   segments: 
   - 3
   - 0
-  - 16
-  version: 3.0.16
+  - 17
+  version: 3.0.17
 platform: ruby
 authors: 
 - Many, see README
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-07 00:00:00 +01:00
+date: 2011-03-14 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency