active_scaffold 3.3.0.rc3 → 3.3.0

data/lib/active_scaffold/helpers/view_helpers.rb

@@ -49,10 +49,6 @@ module ActiveScaffold
         lookup_context.exists? template_name, '', partial
       end
 
-      def generate_temporary_id
-        (Time.now.to_f*1000).to_i.to_s
-      end
-
       # Turns [[label, value]] into <option> tags
       # Takes optional parameter of :include_blank
       def option_tags_for(select_options, options = {})
@@ -169,7 +165,7 @@ module ActiveScaffold
           options.delete :link if link.crud_type == :create
         end
         if link.action.nil? || (link.type == :member && options.has_key?(:authorized) && !options[:authorized])
-          action_link_html(link, nil, {:link => options[:link], :class => "disabled #{link.action}#{" #{link.html_options[:class]}" unless link.html_options[:class].blank?}"}, record)
+          action_link_html(link, nil, {:link => action_link_text(link, options), :class => "disabled #{link.action}#{" #{link.html_options[:class]}" unless link.html_options[:class].blank?}"}, record)
         else
           url = action_link_url(link, record)
           html_options = action_link_html_options(link, record, options)
@@ -321,10 +317,15 @@ module ActiveScaffold
         url_options
       end
       
+      def action_link_text(link, options)
+        text = image_tag(link.image[:name], :size => link.image[:size], :alt => options[:link] || link.label, :title => options[:link] || link.label) if link.image
+        text || options[:link]
+      end
+      
       def action_link_html_options(link, record, options)
         link_id = get_action_link_id(link, record)
         html_options = link.html_options.merge(:class => [link.html_options[:class], link.action.to_s].compact.join(' '))
-        html_options[:link] = options[:link] if options[:link]
+        html_options[:link] = action_link_text(link, options)
 
         # Needs to be in html_options to as the adding _method to the url is no longer supported by Rails        
         html_options[:method] = link.method if link.method != :get
@@ -374,7 +375,6 @@ module ActiveScaffold
       def action_link_html(link, url, html_options, record)
         label = html_options.delete(:link)
         label ||= link.label
-        label = image_tag(link.image[:name], :size => link.image[:size], :alt => label, :title => label) if link.image
         if url.nil?
           content_tag(:a, label, html_options)
         else
@@ -469,7 +469,7 @@ module ActiveScaffold
 
       def column_calculation(column)
         unless column.calculate.instance_of? Proc
-          calculate(column)
+          calculate_query.calculate(column.calculate, column.name)
         else
           column.calculate.call(@records)
         end

data/lib/active_scaffold/tableless.rb

@@ -79,4 +79,12 @@ class ActiveScaffold::Tableless < ActiveRecord::Base
   def destroy
     raise 'destroy must be implemented in a Tableless model'
   end
+
+  def create #:nodoc:
+    run_callbacks(:create) {}
+  end
+
+  def update(*) #:nodoc:
+    run_callbacks(:update) {}
+  end
 end

data/lib/active_scaffold/version.rb

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

data/lib/active_scaffold.rb

@@ -16,6 +16,7 @@ require 'active_scaffold/engine' unless defined? ACTIVE_SCAFFOLD_PLUGIN
 require 'json'  # for js_config
 
 module ActiveScaffold
+  METHOD_CONVERSION = RUBY_VERSION < '1.9' ? :to_s : :to_sym
   autoload :AttributeParams, 'active_scaffold/attribute_params'
   autoload :Configurable, 'active_scaffold/configurable'
   autoload :Constraints, 'active_scaffold/constraints'

data/lib/generators/active_scaffold_controller/templates/controller.rb

@@ -1,4 +1,10 @@
+<% if namespaced? -%>
+require_dependency "<%= namespaced_file_path %>/application_controller"
+
+<% end -%>
+<% module_namespacing do -%>
 class <%= controller_class_name %>Controller < ApplicationController
-  active_scaffold :<%= class_name.demodulize.underscore %> do |conf|
+  active_scaffold :"<%= class_name.underscore %>" do |conf|
   end
 end
+<% end -%>

metadata

@@ -1,15 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_scaffold
 version: !ruby/object:Gem::Version 
-  hash: 2488911141
-  prerelease: 6
+  hash: 11
+  prerelease: 
   segments: 
   - 3
   - 3
   - 0
-  - rc
-  - 3
-  version: 3.3.0.rc3
+  version: 3.3.0
 platform: ruby
 authors: 
 - Many, see README
@@ -17,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-03-06 00:00:00 Z
+date: 2013-05-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :development
@@ -86,7 +84,7 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- README
+- README.md
 files: 
 - app/assets/images/active_scaffold/add.png
 - app/assets/images/active_scaffold/arrow_down.png
@@ -128,8 +126,6 @@ files:
 - app/views/active_scaffold_overrides/_form_association.html.erb
 - app/views/active_scaffold_overrides/_form_association_footer.html.erb
 - app/views/active_scaffold_overrides/_form_association_record.html.erb
-- app/views/active_scaffold_overrides/_form_attribute.html.erb
-- app/views/active_scaffold_overrides/_form_hidden_attribute.html.erb
 - app/views/active_scaffold_overrides/_form_messages.html.erb
 - app/views/active_scaffold_overrides/_horizontal_subform.html.erb
 - app/views/active_scaffold_overrides/_horizontal_subform_footer.html.erb
@@ -281,6 +277,7 @@ files:
 - lib/active_scaffold/extensions/action_view_rendering.rb
 - lib/active_scaffold/extensions/array.rb
 - lib/active_scaffold/extensions/cache_association.rb
+- lib/active_scaffold/extensions/left_outer_joins.rb
 - lib/active_scaffold/extensions/localize.rb
 - lib/active_scaffold/extensions/name_option_for_datetime.rb
 - lib/active_scaffold/extensions/paginator_extensions.rb
@@ -333,7 +330,7 @@ files:
 - vendor/assets/stylesheets/jquery-ui.css
 - MIT-LICENSE
 - CHANGELOG
-- README
+- README.md
 - test/bridges/active_scaffold_dependent_protect_test.rb
 - test/bridges/bridge_test.rb
 - test/bridges/company.rb

data/README

@@ -1,66 +0,0 @@
-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
-
-Uses Querystring by Adam Vandenberg
-http://adamv.com/dev/javascript/querystring
-
-Uses Paginator by Bruce Williams
-http://paginator.rubyforge.org/
-
-Supports RecordSelect by Lance Ivy
-http://code.google.com/p/recordselect/
-
-== Version Information
-
-If you want to use the gem, add to your Gemfile:
-  gem "active_scaffold"
-
-In case you would like to use most recent commit:
-  gem 'active_scaffold', :git => 'git://github.com/activescaffold/active_scaffold.git'
-
-3.1.* and 3.2.* versions works with rails 3.1 and 3.2, 3.0.* versions with rails 3.0.
-To use previous rails versions you will have to install the right branch as a plugin.
-
-Active Scaffold master currently supports rails 3.1 and rails 3.2, you can use following branches for previous rails versions:
-Rails 3.0.*: Active Scaffold rails-3.0
-Rails 2.3.*: Active Scaffold rails-2.3 and v2.4
-Rails 2.2.*: Active Scaffold rails-2.2
-Rails 2.1.*: Active Scaffold rails-2.1
-Rails < 2.1: Active Scaffold 1-1-stable (no guarantees)
-
-Since Rails 2.3, render_component plugin is needed for nested and embedded scaffolds. It works with rails-2.3 branch from ewildgoose repository:
-script/plugin install git://github.com/ewildgoose/render_component.git -r rails-2.3
-
-Since Rails 3.0 render_component is not used for nesting, but is optional for embedded scaffolds.
-For Rails 3.0, https://github.com/rails/verification.git is also needed, not in rails 3.1 or higher.
-
-If you want to install as plugins under vendor/plugins, install these versions:
-  rails plugin install git://github.com/vhochstein/render_component.git
-  rails plugin install git://github.com/rails/verification.git
-  rails plugin install git://github.com/activescaffold/active_scaffold.git -r 'rails-3.0'
-
-== Pick your own javascript framework
-
-The Rails 3.0 version uses unobtrusive Javascript, so you are free to pick your javascript framework.
-Out of the box Prototype or JQuery are supported for rails 3.1 and later. For rails 3.0 pick a JS file:
-
-Prototype 1.7 (default js framework)
-rails.js in git://github.com/vhochstein/prototype-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 config/initializers/active_scaffold.rb in order to use jquery instead of prototype.
-That file is created when you install ActiveScaffold as a plugin.
-
-To configure the javascript framework when installed as a gem:
-Add a config/initializers/active_scaffold.rb containing:
-ActiveScaffold.js_framework = :jquery # :prototype is the default
-
-Released under the MIT license (included)

data/app/views/active_scaffold_overrides/_form_attribute.html.erb

@@ -1,27 +0,0 @@
-<%
-  scope ||= nil
-  column_options = active_scaffold_input_options(column, scope)
-  attributes = field_attributes(column, @record)
-  if local_assigns[:col_class].present?
-    attributes[:class] = "#{attributes[:class]} #{col_class}"
-  end
-%>
-<%= tag :dl, attributes, true %>
-  <dt>
-    <label for="<%= column_options[:id] %>"><%= column.label %></label>
-  </dt>
-  <dd>
-  <% unless local_assigns[:only_value] %>
-    <%=raw active_scaffold_input_for column, scope %>
-  <% else %>
-    <%= content_tag :span, get_column_value(@record, column), column_options.except(:name) %>
-    <%= hidden_field :record, column.association ? column.association.foreign_key : column.name, column_options -%>
-  <% end %>
-  <% if column.update_columns -%>
-    <%= loading_indicator_tag(:action => :render_field, :id => params[:id]) %>
-  <% end -%>
-  <% if column.description.present? -%>
-    <span class="description"><%= column.description %></span>
-  <% end -%>
-  </dd>
-</dl>

data/app/views/active_scaffold_overrides/_form_hidden_attribute.html.erb

@@ -1,7 +0,0 @@
-<% scope ||= nil %>
-<dl style="display: none;">
-<dt></dt>
-<dd>
-  <%= hidden_field :record, column.name, active_scaffold_input_options(column, scope) %>
-</dd>
-</dl>