active_scaffold_vho 3.1.0 → 3.1.1

data/active_scaffold_vho.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{active_scaffold_vho}
-  s.version = "3.1.0"
+  s.version = "3.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Many, see README"]
-  s.date = %q{2011-11-05}
+  s.date = %q{2011-12-22}
   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/app/assets/javascripts/jquery/active_scaffold.js

@@ -144,7 +144,7 @@ $(document).ready(function() {
     event.data_url = url;
     return true;
   });
-  $('input.update_form, select.update_form').live('change', function(event) {
+  $('input.update_form, textarea.update_form, select.update_form').live('change', function(event) {
       var element = $(this);
       var as_form = element.closest('form.as_form');
       var params = null;

data/app/assets/javascripts/jquery/date_picker_bridge.js.erb

@@ -1,3 +1,4 @@
+<% ActiveScaffold::Bridges::Bridge.run_all unless defined?(ActiveScaffold::Bridges::DatePickerBridge) %>
 <%= ActiveScaffold::Bridges::DatePickerBridge.localization %>
 
 $(document).ready(function() {

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

@@ -236,7 +236,7 @@ document.observe("dom:loaded", function() {
     event.memo.url = url;
     return true;
   });
-  document.on('change', 'input.update_form, select.update_form', function(event) {
+  document.on('change', 'input.update_form, textarea.update_form, select.update_form', function(event) {
     var element = event.findElement();
     var as_form = element.up('form.as_form');
     var params = null;
@@ -409,9 +409,14 @@ var ActiveScaffold = {
   replace: function(element, html) {
     element = $(element);
     var elements = element.select('[data-as_load]');
+    var new_element = null;
     elements.unshift(element);
     ActiveScaffold.trigger_unload_events(elements);
-    var new_element = new Element('div').update(html);
+    if (html.startsWith('<tr')) {
+        new_element = new Element('tbody').update(html);
+    } else {
+        new_element = new Element('div').update(html);
+    }
     new_element = new_element.firstDescendant();
     Element.replace(element, new_element);
     elements = new_element.select('[data-as_load]');

data/app/assets/stylesheets/active_scaffold.css.erb

@@ -171,21 +171,21 @@ background-repeat: no-repeat;
 }
 
 .active-scaffold-header div.actions div.action_group div {
-  background-image: url(<%= asset_path 'gears.png' %>); /* default icon for actions or override with css */
+  background-image: url(<%= asset_data_uri 'gears.png' %>); /* default icon for actions or override with css */
 }
 
 .active-scaffold-header div.actions a.show_config_list {
-  background-image: url(<%= asset_path 'config.png' %>);
+  background-image: url(<%= asset_data_uri 'config.png' %>);
 }
 
 .active-scaffold-header div.actions a.new,
 .active-scaffold-header div.actions a.new_existing {
-background-image: url(<%= asset_path 'add.gif' %>);
+background-image: url(<%= asset_data_uri 'add.gif' %>);
 }
 
 .active-scaffold-header div.actions a.show_search {
 
-background-image: url(<%= asset_path 'magnifier.png' %>);
+background-image: url(<%= asset_data_uri 'magnifier.png' %>);
 }
 
 .blue-theme .active-scaffold-header div.actions a:hover {
@@ -244,17 +244,17 @@ padding-right: 18px;
 
 .active-scaffold th.asc a,
 .active-scaffold th.asc a:hover {
-background: #333 url(<%= asset_path 'arrow_up.gif' %>) right 50% no-repeat;
+background: #333 url(<%= asset_data_uri 'arrow_up.gif' %>) right 50% no-repeat;
 }
 
 .active-scaffold th.desc a,
 .active-scaffold th.desc a:hover {
-background: #333 url(<%= asset_path 'arrow_down.gif' %>) right 50% no-repeat;
+background: #333 url(<%= asset_data_uri 'arrow_down.gif' %>) right 50% no-repeat;
 }
 
 .active-scaffold th.loading a,
 .active-scaffold th.loading a:hover {
-background: #333 url(<%= asset_path 'indicator-small.gif' %>) right 50% no-repeat;
+background: #333 url(<%= asset_data_uri 'indicator-small.gif' %>) right 50% no-repeat;
 }
 
 .active-scaffold th .mark_heading {
@@ -433,7 +433,7 @@ float: right;
 text-indent: -4000px;
 width: 16px;
 height: 17px;
-background: url(<%= asset_path 'close.gif' %>) 0 0 no-repeat;
+background: url(<%= asset_data_uri 'close.gif' %>) 0 0 no-repeat;
 }
 
 /* Nested
@@ -955,7 +955,7 @@ height: 16px;
 padding: 0;
 width: 16px;
 text-indent: -4000px;
-background: url(<%= asset_path 'cross.png' %>) 0 0 no-repeat;
+background: url(<%= asset_data_uri 'cross.png' %>) 0 0 no-repeat;
 }
 
 .active-scaffold .sub-form .locked a.destroy {
@@ -1000,7 +1000,7 @@ font-size: 100%;
 .as_touch a.inline-adapter-close {
 width: 25px;
 height: 27px;
-background: url(<%= asset_path 'close_touch.png' %>) 0 0 no-repeat;
+background: url(<%= asset_data_uri 'close_touch.png' %>) 0 0 no-repeat;
 }
 
 .as_touch .as_paginate {

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

@@ -6,9 +6,8 @@ tr_class += " #{list_row_class(record)}" if respond_to? :list_row_class
 url_options = params_for(:action => :list, :id => record.id)
 action_links ||= active_scaffold_config.action_links.member
 -%>
-
 <tr class="record <%= tr_class %>" id="<%= element_row_id(:action => :list, :id => record.id) %>" data-refresh="<%= url_for(params_for(:action => :row, :id => record.id, :_method => :get, :escape => false)).html_safe %>" data-as_load="tr">
   <%= render :partial => 'list_record_columns', :locals => {:record => record, :columns => columns} %>
   <%= render :partial => 'list_actions', :locals => {:record => record, :url_options => url_options, :action_links => action_links} unless action_links.empty? %>
   <%= render_nested_view(action_links, url_options, record) unless @nested_auto_open.nil? %>
-</tr>
+</tr>

data/lib/active_scaffold.rb

@@ -362,6 +362,17 @@ module ActiveScaffold
       raise ActiveScaffold::ControllerNotFound, "Could not find " + error_message.join(" or "), caller
     end
 
+    # tries to find activescaffoldcontroller by controllername eg. admin/teams, or teams
+    def active_scaffold_controller_by_controller_name(controller_name)
+      begin
+        controller = "#{controller_name.camelize}Controller".constantize
+      rescue NameError => error
+        raise ActiveScaffold::ControllerNotFound, "#{controller} not found", caller
+      end
+      raise ActiveScaffold::ControllerNotFound, "#{controller} missing ActiveScaffold", caller unless controller.uses_active_scaffold?
+      return controller
+    end
+
     def uses_active_scaffold?
       !active_scaffold_config.nil?
     end

data/lib/active_scaffold/bridges/tiny_mce/lib/tiny_mce_bridge.rb

@@ -8,7 +8,7 @@ module ActiveScaffold
         options[:class] = "#{options[:class]} as_mceEditor #{column.options[:class]}".strip
         html = []
         html << send(override_input(:textarea), column, options)
-        html.join "\n"
+        html.join("\n").html_safe
       end
     end
 

data/lib/active_scaffold/extensions/action_view_rendering.rb

@@ -44,7 +44,7 @@ module ActionView #:nodoc:
     def render_with_active_scaffold(context, options, &block)
       if options && options[:partial] == :super
         render_as_super_view(context, options, &block)
-      elsif context.is_a?(Hash) and context[:active_scaffold]
+      elsif options[:active_scaffold]
         render_as_embedded_view(context, options, &block)
       else
         render_as_view(context, options, &block)
@@ -92,18 +92,20 @@ module ActionView #:nodoc:
       remote_controller = options[:active_scaffold]
       constraints = options[:constraints]
       conditions = options[:conditions]
-      eid = Digest::MD5.hexdigest(params[:controller] + remote_controller.to_s + constraints.to_s + conditions.to_s)
-      session["as:#{eid}"] = {:constraints => constraints, :conditions => conditions, :list => {:label => args.first[:label]}}
+      eid = Digest::MD5.hexdigest(context.controller.controller_name + remote_controller.to_s + constraints.to_s + conditions.to_s)
       options[:params] ||= {}
       options[:params].merge! :eid => eid, :embedded => true
-
-      id = "as_#{eid}-content"
       url_options = {:controller => remote_controller.to_s, :action => 'index'}.merge(options[:params])
 
-      if controller.respond_to?(:render_component_into_view)
-        controller.send(:render_component_into_view, url_options)
+      label = options[:label] || context.controller.class.active_scaffold_controller_by_controller_name(remote_controller.to_s).active_scaffold_config.list.label
+      context.controller.session["as:#{eid}"] = {:constraints => constraints, :conditions => conditions, :list => {:label => options[:label]}}
+      
+      id = "as_#{eid}-content"
+     
+      if context.controller.respond_to?(:render_component_into_view)
+        context.controller.send(:render_component_into_view, url_options)
       else
-        content_tag(:div, {:id => id}) do
+        content_tag(:div, {:id => id, :class => 'active-scaffold-component'}) do
           url = url_for(url_options)
           link_to(remote_controller.to_s, url, {:remote => true, :id => id}) <<
             if ActiveScaffold.js_framework == :prototype

data/lib/active_scaffold/helpers/view_helpers.rb

@@ -225,13 +225,21 @@ module ActiveScaffold
         # issue 260, use url_options[:link] if it exists. This prevents DB data from being localized.
         label = url.delete(:link) if url.is_a?(Hash) 
         label ||= link.label
-        if link.image.nil?
-          html = link_to(label, url, html_options)
-        else
-          html = link_to(image_tag(link.image[:name] , :size => link.image[:size], :alt => label), url, html_options)
+        begin
+          if link.image.nil?
+            #http://www.continuousthinking.com/2011/09/22/rails-3-1-engine-namespaces-can-creep-into-urls-in-application-layout.html
+            #its not possible to link from a namespacedcontroller back to a non namespaced-controller anymore
+            # seems to be only working with named_routes...
+            html = link_to(label, url, html_options)
+          else
+            html = link_to(image_tag(link.image[:name] , :size => link.image[:size], :alt => label), url, html_options)
+          end
+          # if url is nil we would like to generate an anchor without href attribute
+          url.nil? ? html.sub(/href=".*?"/, '').html_safe : html.html_safe
+        rescue ActionController::RoutingError => e
+          Rails.logger.error("ActiveScaffold link_to routing Error: #{e.inspect}")
+          "Routing Error"
         end
-        # if url is nil we would like to generate an anchor without href attribute
-        url.nil? ? html.sub(/href=".*?"/, '').html_safe : html.html_safe
       end
       
       def url_options_for_nested_link(column, record, link, url_options, options = {})

data/lib/active_scaffold/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_scaffold_vho
 version: !ruby/object:Gem::Version 
-  hash: 3
   prerelease: false
   segments: 
   - 3
   - 1
-  - 0
-  version: 3.1.0
+  - 1
+  segments_generated: true
+  version: 3.1.1
 platform: ruby
 authors: 
 - Many, see README
@@ -15,97 +15,97 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-05 00:00:00 +01:00
+date: 2011-12-22 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  name: shoulda
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
+        segments_generated: true
         version: "0"
   type: :development
-  name: shoulda
   prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
+  name: bundler
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
         segments: 
         - 1
         - 0
         - 0
+        segments_generated: true
         version: 1.0.0
   type: :development
-  name: bundler
   prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
+  name: jeweler
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
         - 1
         - 5
         - 2
+        segments_generated: true
         version: 1.5.2
   type: :development
-  name: jeweler
   prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
+  name: rcov
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
+        segments_generated: true
         version: "0"
   type: :development
-  name: rcov
   prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
+  name: render_component_vho
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
+        segments_generated: true
         version: "0"
   type: :runtime
-  name: render_component_vho
   prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
+  name: rails
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 3
         - 1
         - 0
+        segments_generated: true
         version: 3.1.0
   type: :runtime
-  name: rails
   prerelease: false
   version_requirements: *id006
 description: 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.
@@ -420,18 +420,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: -1540629792815748302
       segments: 
       - 0
+      segments_generated: true
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
+      segments_generated: true
       version: "0"
 requirements: []