active_scaffold_vho 3.0.10 → 3.0.11

data/README

@@ -2,7 +2,7 @@
 ** For all documentation see the project website: http://github.com/vhochstein/active_scaffold/wiki **
 ******************************************************************************************************
 
-ActiveScaffold plugin by Scott Rutherford (scott@caronsoftware.com), Richard White (rrwhite@gmail.com), Lance Ivy (lance@cainlevy.net), Ed Moss, Tim Harper and Sergio Cambra (sergio@entrecables.com)
+ActiveScaffold Gem/Plugin by Scott Rutherford (scott@caronsoftware.com), Richard White (rrwhite@gmail.com), Lance Ivy (lance@cainlevy.net), Ed Moss, Tim Harper and Sergio Cambra (sergio@entrecables.com)
 
 Uses DhtmlHistory by Brad Neuberg (bkn3@columbia.edu)
 http://codinginparadise.org
@@ -40,7 +40,10 @@ If you want to install as plugins under vendor/plugins, install these versions:
   rails plugin install git://github.com/vhochstein/active_scaffold.git
 
 If you want to use the gem, add to your Gemfile:
-  gem "active_scaffold"
+  gem "active_scaffold_vho"
+
+In case you would like to use most recent commit:
+  gem 'active_scaffold_vho', :git => 'git://github.com/vhochstein/active_scaffold.git'
 
 == Pick your own javascript framework
 
@@ -50,11 +53,14 @@ Out of the box Prototype or JQuery are supported:
 Prototype 1.7 (default js framework)
 rails.js in git://github.com/vhochstein/prototype-ujs.git
 
-JQuery 1.4.1
-rails.js in git://github.com/vhochstein/jquery-ujs.git
+JQuery 1.4.1, 1.4.2
+https://github.com/vhochstein/jquery-ujs/raw/jquery1_4_2/src/rails.js
+
+JQuery > 1.4.2
+https://github.com/vhochstein/jquery-ujs/raw/master/src/rails.js
 
 To configure the javascript framework when installed under vendor/plugins/
-uncomment last line in ...plugins/active_scaffold/environment.rb in order to use jquery instead of prototype
+uncomment last line in ...plugins/active_scaffold/lib/active_scaffold_env.rb in order to use jquery instead of prototype
 
 To configure the javascript framework when installed as a gem:
 Add a config/initializers/active_scaffold.rb containing:

data/active_scaffold_vho.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{active_scaffold_vho}
-  s.version = "3.0.10"
+  s.version = "3.0.11"
 
   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-01}
+  s.date = %q{2011-02-03}
   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 = [
@@ -175,6 +175,22 @@ Gem::Specification.new do |s|
     "lib/active_scaffold/data_structures/nested_info.rb",
     "lib/active_scaffold/data_structures/set.rb",
     "lib/active_scaffold/data_structures/sorting.rb",
+    "lib/active_scaffold/extensions/action_controller_rendering.rb",
+    "lib/active_scaffold/extensions/action_view_rendering.rb",
+    "lib/active_scaffold/extensions/action_view_resolver.rb",
+    "lib/active_scaffold/extensions/active_association_reflection.rb",
+    "lib/active_scaffold/extensions/active_record_offset.rb",
+    "lib/active_scaffold/extensions/array.rb",
+    "lib/active_scaffold/extensions/localize.rb",
+    "lib/active_scaffold/extensions/name_option_for_datetime.rb",
+    "lib/active_scaffold/extensions/nil_id_in_url_params.rb",
+    "lib/active_scaffold/extensions/paginator_extensions.rb",
+    "lib/active_scaffold/extensions/reverse_associations.rb",
+    "lib/active_scaffold/extensions/routing_mapper.rb",
+    "lib/active_scaffold/extensions/to_label.rb",
+    "lib/active_scaffold/extensions/unsaved_associated.rb",
+    "lib/active_scaffold/extensions/unsaved_record.rb",
+    "lib/active_scaffold/extensions/usa_state.rb",
     "lib/active_scaffold/finder.rb",
     "lib/active_scaffold/helpers/association_helpers.rb",
     "lib/active_scaffold/helpers/controller_helpers.rb",
@@ -201,22 +217,6 @@ Gem::Specification.new do |s|
     "lib/active_scaffold_assets.rb",
     "lib/active_scaffold_env.rb",
     "lib/active_scaffold_vho.rb",
-    "lib/extensions/action_controller_rendering.rb",
-    "lib/extensions/action_view_rendering.rb",
-    "lib/extensions/action_view_resolver.rb",
-    "lib/extensions/active_association_reflection.rb",
-    "lib/extensions/active_record_offset.rb",
-    "lib/extensions/array.rb",
-    "lib/extensions/localize.rb",
-    "lib/extensions/name_option_for_datetime.rb",
-    "lib/extensions/nil_id_in_url_params.rb",
-    "lib/extensions/paginator_extensions.rb",
-    "lib/extensions/reverse_associations.rb",
-    "lib/extensions/routing_mapper.rb",
-    "lib/extensions/to_label.rb",
-    "lib/extensions/unsaved_associated.rb",
-    "lib/extensions/unsaved_record.rb",
-    "lib/extensions/usa_state.rb",
     "lib/generators/active_scaffold/USAGE",
     "lib/generators/active_scaffold/active_scaffold_generator.rb",
     "lib/generators/active_scaffold_controller/USAGE",

data/frontends/default/stylesheets/stylesheet.css

@@ -35,7 +35,7 @@ text-decoration: none;
 color: #999;
 }
 
-.active-scaffold a:hover, .active-scaffold div.hover {
+.active-scaffold a:hover, .active-scaffold div.hover, .active-scaffold td span.hover {
 background-color: #ff8;
 }
 

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

@@ -25,6 +25,7 @@ module ActiveScaffold
           def configure_carrierwave_field(field)
             self.columns << field
             self.columns[field].form_ui ||= :carrierwave
+            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|

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

@@ -22,7 +22,8 @@ module ActiveScaffold
             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})
+                  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]")})
               ).html_safe
             ) + content_tag(:div, input, :style => "display: none")
           )

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

@@ -9,7 +9,7 @@ module ActiveScaffold
         else
           paperclip.original_filename
         end
-        link_to(content, paperclip.url, :popup => true)
+        link_to(content, paperclip.url, {'data-popup' => true, :target => '_blank'})
       end
     end
   end

data/lib/{extensions → active_scaffold/extensions}/action_view_rendering.rb

@@ -38,15 +38,19 @@ module ActionView::Rendering #:nodoc:
   #
   def render_with_active_scaffold(*args, &block)
     if args.first == :super
+      last_view = @view_stack.last
       options = args[1] || {}
       options[:locals] ||= {}
-      options[:locals].reverse_merge!(@last_view[:locals] || {})
-      if @last_view[:templates].nil?
-        @last_view[:templates] = lookup_context.find_all_templates(@last_view[:view], controller_path, !@last_view[:is_template])
-        @last_view[:templates].shift
+      options[:locals].reverse_merge!(last_view[:locals] || {})
+      if last_view[:templates].nil?
+        last_view[:templates] = lookup_context.find_all_templates(last_view[:view], controller_path, !last_view[:is_template])
+        last_view[:templates].shift
       end
-      options[:template] = @last_view[:templates].shift
-      render_without_active_scaffold options
+      options[:template] = last_view[:templates].shift
+      @view_stack << last_view
+      result = render_without_active_scaffold options
+      @view_stack.pop
+      result
     elsif args.first.is_a?(Hash) and args.first[:active_scaffold]
       require 'digest/md5'
       options = args.first
@@ -79,11 +83,17 @@ module ActionView::Rendering #:nodoc:
     else
       options = args.first
       if options.is_a?(Hash)
-        @last_view = {:view => options[:partial], :is_template => false} if options[:partial]
-        @last_view = {:view => options[:template], :is_template => !!options[:template]} if @last_view.nil? && options[:template]
-        @last_view[:locals] = options[:locals] if !@last_view.nil? && options[:locals]
+        current_view = {:view => options[:partial], :is_template => false} if options[:partial]
+        current_view = {:view => options[:template], :is_template => !!options[:template]} if current_view.nil? && options[:template]
+        current_view[:locals] = options[:locals] if !current_view.nil? && options[:locals]
+        if current_view.present?
+          @view_stack ||= []
+          @view_stack << current_view
+        end
       end
-      render_without_active_scaffold(*args, &block)
+      result = render_without_active_scaffold(*args, &block)
+      @view_stack.pop if current_view.present?
+      result
     end
   end
   alias_method_chain :render, :active_scaffold

data/lib/active_scaffold/helpers/list_column_helpers.rb

@@ -346,10 +346,10 @@ module ActiveScaffold
       def render_nested_view(action_links, url_options, record)
         rendered = []
         action_links.member.each do |link|
-          if link.nested_link? && link.column && @nested_auto_open[link.column.name] && @records.length <= @nested_auto_open[link.column.name] && respond_to?(:render_component) 
+          if link.nested_link? && link.column && @nested_auto_open[link.column.name] && @records.length <= @nested_auto_open[link.column.name] && controller.respond_to?(:render_component_into_view)
             link_url_options = {:adapter => '_list_inline_adapter', :format => :js}.merge(action_link_url_options(link, url_options, record, options = {:reuse_eid => true})) 
             link_id = get_action_link_id(link_url_options, record, link.column)
-            rendered << (render_component(link_url_options) + javascript_tag("ActiveScaffold.ActionLink.get('#{link_id}').set_opened();"))
+            rendered << (controller.send(:render_component_into_view, link_url_options) + javascript_tag("ActiveScaffold.ActionLink.get('#{link_id}').set_opened();"))
           end 
         end
         rendered.join(' ').html_safe

data/lib/active_scaffold/version.rb

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

data/lib/active_scaffold_env.rb

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

data/lib/generators/active_scaffold_setup/active_scaffold_setup_generator.rb

@@ -39,10 +39,10 @@ module Rails
                     :after => "<%= javascript_include_tag :defaults %>\n"
         elsif js_lib == 'jquery'
           inject_into_file "app/views/layouts/application.html.erb", 
-"  <%= stylesheet_link_tag 'http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.4/themes/ui-lightness/jquery-ui.css' %>
-  <%= javascript_include_tag 'http://ajax.googleapis.com/ajax/libs/jquery/1.4.1/jquery.js' %>
+"  <%= stylesheet_link_tag 'http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.9/themes/ui-lightness/jquery-ui.css' %>
+  <%= javascript_include_tag 'http://ajax.googleapis.com/ajax/libs/jquery/1.4.4/jquery.js' %>
   <%= javascript_include_tag 'rails_jquery.js' %>
-  <%= javascript_include_tag 'http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.4/jquery-ui.js' %>
+  <%= javascript_include_tag 'http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.9/jquery-ui.js' %>
   <%= javascript_include_tag 'jquery-ui-timepicker-addon.js' %>
   <%= javascript_include_tag 'application.js' %>
   <%= active_scaffold_includes %>\n",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_scaffold_vho
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 3
   - 0
-  - 10
-  version: 3.0.10
+  - 11
+  version: 3.0.11
 platform: ruby
 authors: 
 - Many, see README
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-01 00:00:00 +01:00
+date: 2011-02-03 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -290,6 +290,22 @@ files:
 - lib/active_scaffold/data_structures/nested_info.rb
 - lib/active_scaffold/data_structures/set.rb
 - lib/active_scaffold/data_structures/sorting.rb
+- lib/active_scaffold/extensions/action_controller_rendering.rb
+- lib/active_scaffold/extensions/action_view_rendering.rb
+- lib/active_scaffold/extensions/action_view_resolver.rb
+- lib/active_scaffold/extensions/active_association_reflection.rb
+- lib/active_scaffold/extensions/active_record_offset.rb
+- lib/active_scaffold/extensions/array.rb
+- lib/active_scaffold/extensions/localize.rb
+- lib/active_scaffold/extensions/name_option_for_datetime.rb
+- lib/active_scaffold/extensions/nil_id_in_url_params.rb
+- lib/active_scaffold/extensions/paginator_extensions.rb
+- lib/active_scaffold/extensions/reverse_associations.rb
+- lib/active_scaffold/extensions/routing_mapper.rb
+- lib/active_scaffold/extensions/to_label.rb
+- lib/active_scaffold/extensions/unsaved_associated.rb
+- lib/active_scaffold/extensions/unsaved_record.rb
+- lib/active_scaffold/extensions/usa_state.rb
 - lib/active_scaffold/finder.rb
 - lib/active_scaffold/helpers/association_helpers.rb
 - lib/active_scaffold/helpers/controller_helpers.rb
@@ -316,22 +332,6 @@ files:
 - lib/active_scaffold_assets.rb
 - lib/active_scaffold_env.rb
 - lib/active_scaffold_vho.rb
-- lib/extensions/action_controller_rendering.rb
-- lib/extensions/action_view_rendering.rb
-- lib/extensions/action_view_resolver.rb
-- lib/extensions/active_association_reflection.rb
-- lib/extensions/active_record_offset.rb
-- lib/extensions/array.rb
-- lib/extensions/localize.rb
-- lib/extensions/name_option_for_datetime.rb
-- lib/extensions/nil_id_in_url_params.rb
-- lib/extensions/paginator_extensions.rb
-- lib/extensions/reverse_associations.rb
-- lib/extensions/routing_mapper.rb
-- lib/extensions/to_label.rb
-- lib/extensions/unsaved_associated.rb
-- lib/extensions/unsaved_record.rb
-- lib/extensions/usa_state.rb
 - lib/generators/active_scaffold/USAGE
 - lib/generators/active_scaffold/active_scaffold_generator.rb
 - lib/generators/active_scaffold_controller/USAGE