active_scaffold 3.0.26 → 3.1.3

data/test/config/show_test.rb

@@ -10,10 +10,6 @@ class Config::ShowTest < Test::Unit::TestCase
     @config.show.link = @default_link
   end
   
-  def test_default_options
-    assert_equal 'Show Modelstub', @config.show.label
-  end
-
   def test_link_defaults
     link = @config.show.link
     assert !link.page?
@@ -36,8 +32,12 @@ class Config::ShowTest < Test::Unit::TestCase
   end
   
   def test_label
-    label = 'create new monkeys'
+    label = 'show monkeys'
     @config.show.label = label
     assert_equal label, @config.show.label
+    I18n.backend.store_translations :en, :active_scaffold => {:view_model => 'View %{model}'}
+    @config.show.label = :view_model
+    assert_equal 'View ModelStub', @config.show.label
+    assert_equal 'View record', @config.show.label('record')
   end
 end

data/test/config/subform_test.rb

@@ -0,0 +1,17 @@
+require File.join(File.dirname(__FILE__), '../test_helper.rb')
+
+class Config::SubformTest < Test::Unit::TestCase
+  def setup
+    @config = ActiveScaffold::Config::Core.new :model_stub
+  end
+
+  def test_defaults
+    assert_equal :horizontal, @config.subform.layout
+  end
+  
+  def test_setting_layout
+    layout = :vertical
+    @config.subform.layout = layout
+    assert_equal layout, @config.subform.layout
+  end
+end

data/test/config/update_test.rb

@@ -3,15 +3,38 @@ require File.join(File.dirname(__FILE__), '../test_helper.rb')
 class Config::UpdateTest < Test::Unit::TestCase
   def setup
     @config = ActiveScaffold::Config::Core.new :model_stub
-    @update = @config.update
-    
-    @config._load_action_columns
   end
   
   def test__params_for_columns__returns_all_params
+    @config._load_action_columns
     @config.columns[:a].params.add :keep_a, :a_temp
-    
     assert @config.columns[:a].params.include?(:keep_a)
     assert @config.columns[:a].params.include?(:a_temp)
   end
+  
+  def test_default_options
+    assert !@config.update.persistent
+    assert !@config.update.nested_links
+    assert_equal 'Update ModelStub', @config.update.label
+  end
+  
+  def test_persistent
+    @config.update.persistent = true
+    assert @config.update.persistent
+  end
+  
+  def test_nested_links
+    @config.update.nested_links = true
+    assert @config.update.nested_links
+  end
+  
+  def test_label
+    label = 'update new monkeys'
+    @config.update.label = label
+    assert_equal label, @config.update.label
+    I18n.backend.store_translations :en, :active_scaffold => {:change_model => 'Change %{model}'}
+    @config.update.label = :change_model
+    assert_equal 'Change ModelStub', @config.update.label
+    assert_equal 'Change record', @config.update.label('record')
+  end
 end

data/test/helpers/list_column_helpers_test.rb

@@ -6,22 +6,33 @@ class ListColumnHelpersTest < ActionView::TestCase
 
   def setup
     @column = ActiveScaffold::DataStructures::Column.new(:a, ModelStub)
+    @column.form_ui = :select
     @record = stub(:a => 'value_2')
-    @config = stub(:list => stub(:empty_field_text => '-'))
+    @config = stub(:list => stub(:empty_field_text => '-', :association_join_text => ', '))
+    @association_column = ActiveScaffold::DataStructures::Column.new(:b, ModelStub)
+    @association_column.stubs(:association).returns(stub(:macro => :has_many))
   end
 
   def test_options_for_select_list_ui_for_simple_column
     @column.options[:options] = [:value_1, :value_2, :value_3]
-    assert_equal 'Value 2', active_scaffold_column_select(@column, @record)
+    assert_equal 'Value 2', format_column_value(@record, @column)
 
     @column.options[:options] = %w(value_1 value_2 value_3)
-    assert_equal 'value_2', active_scaffold_column_select(@column, @record)
+    assert_equal 'value_2', format_column_value(@record, @column)
 
     @column.options[:options] = [%w(text_1 value_1), %w(text_2 value_2), %w(text_3 value_3)]
-    assert_equal 'text_2', active_scaffold_column_select(@column, @record)
+    assert_equal 'text_2', format_column_value(@record, @column)
 
     @column.options[:options] = [[:text_1, :value_1], [:text_2, :value_2], [:text_3, :value_3]]
-    assert_equal 'Text 2', active_scaffold_column_select(@column, @record)
+    assert_equal 'Text 2', format_column_value(@record, @column)
+  end
+
+  def test_association_join_text
+    value = [1, 2, 3, 4].map(&:to_s)
+    value.each {|v| v.stubs(:to_label).returns(v)}
+    assert_equal '1, 2, 3, … (4)', format_association_value(value, @association_column, value.size)
+    @config.list.stubs(:association_join_text => ',<br/>')
+    assert_equal '1,<br/>2,<br/>3,<br/>… (4)', format_association_value(value, @association_column, value.size)
   end
 
   private

data/test/helpers/pagination_helpers_test.rb

@@ -52,4 +52,8 @@ class PaginationHelpersTest < Test::Unit::TestCase
     current_page = stub(:number => current, :pager => paginator)
     pagination_ajax_links(current_page, {}, window_size)
   end
+
+  def content_tag(tag, text)
+    text
+  end
 end

data/test/misc/attribute_params_test.rb

@@ -19,6 +19,12 @@ class AttributeParamsTest < Test::Unit::TestCase
       :delimiter => '.',
       :separator => ','
     }}
+    I18n.backend.store_translations :ru, :number => {:currency => {
+      :format => {
+        :separator => ',',
+        :delimiter => ''
+      }
+    }}
 
     @config = config_for('number_model')
     class << @config.list.columns
@@ -101,9 +107,39 @@ class AttributeParamsTest < Test::Unit::TestCase
     assert_equal 1234000.1, convert_number('1.234.000,100')
   end
 
+  def test_english_currency_format_with_decimal_separator_using_russian_language
+    I18n.locale = :ru
+    assert_equal 0.1, convert_number('.1', :currency)
+    assert_equal 0.1, convert_number('0.1', :currency)
+    assert_equal 0.12, convert_number('+0.12', :currency)
+    assert_equal -0.12, convert_number('-0.12', :currency)
+    assert_equal 9.1, convert_number('9.1', :currency)
+    assert_equal 90.1, convert_number('90.1', :currency)
+  end
+
+  def test_russian_currency_format_with_decimal_separator_using_russian_language
+    I18n.locale = :ru
+    assert_equal 0.1, convert_number(',1', :currency)
+    assert_equal 0.1, convert_number(',100', :currency)
+    assert_equal 0.1, convert_number('0,1', :currency)
+    assert_equal 0.345, convert_number('0,345', :currency)
+    assert_equal 0.345, convert_number('+0,345', :currency)
+    assert_equal -0.345, convert_number('-0,345', :currency)
+    assert_equal 9.1, convert_number('9,1', :currency)
+    assert_equal 90.1, convert_number('90,1', :currency)
+    assert_equal 9.1, convert_number('9,100', :currency)
+  end
+
+  def test_english_format_with_decimal_separator_with_no_localized_format
+    I18n.locale = :ru
+    assert_equal 0.1, convert_number('.1')
+    assert_equal 0.1, convert_number('0.1')
+  end
+
   private
-  def convert_number(value)
+  def convert_number(value, format = nil)
     record = NumberModel.new
+    @config.columns[:number].options[:format] = format unless format.nil?
     update_record_from_params(record, @config.list.columns, HashWithIndifferentAccess.new({:number => value}))
     record.number
   end

data/test/misc/finder_test.rb

@@ -80,7 +80,6 @@ class FinderTest < Test::Unit::TestCase
   end
 
   def test_disabled_pagination
-    ModelStub.expects(:count).returns(85)
     ModelStub.expects(:find).with(:all, Not(has_entries(:limit => 20, :offset => 0)))
     page = @klass.send :find_page, :per_page => 20, :pagination => false
     page.items

data/test/misc/lang_test.rb

@@ -3,10 +3,9 @@ require File.join(File.dirname(__FILE__), '../test_helper.rb')
 class LocalizationTest < Test::Unit::TestCase
 
   def test_localization
-    ##
-    ## test no language specified
-    ##
     assert_equal "Dutch", as_(:dutch)
+    assert_equal "dutch", as_('dutch')
+    I18n.backend.store_translations :en, :active_scaffold => {:create_model => 'Create %{model}'}
     assert_equal "Create Test", as_(:create_model, :model => 'Test')
   end
 end

data/test/mock_app/public/javascripts/active_scaffold/default/active_scaffold.js

@@ -3,9 +3,9 @@ if (typeof Prototype == 'undefined')
   warning = "ActiveScaffold Error: Prototype could not be found. Please make sure that your application's layout includes prototype.js (e.g. <%= javascript_include_tag :defaults %>) *before* it includes active_scaffold.js (e.g. <%= active_scaffold_includes %>).";
   alert(warning);
 }
-if (Prototype.Version.substring(0, 3) != '1.6')
+if (Prototype.Version.substring(0, 3) < '1.6')
 {
-  warning = "ActiveScaffold Error: Prototype version 1.6.x is required. Please update prototype.js (rake rails:update:javascripts).";
+  warning = "ActiveScaffold Error: Prototype version 1.6.x or higher is required. Please update prototype.js (rake rails:update:javascripts).";
   alert(warning);
 }
 if (!Element.Methods.highlight) Element.addMethods({highlight: Prototype.emptyFunction});

data/test/mock_app/public/stylesheets/active_scaffold/default/stylesheet.css

@@ -52,6 +52,10 @@ padding: 5px 20px 5px 5px;
 color: #333;
 }
 
+.active-scaffold .mark_record_column {
+  width: 1px;
+}
+
 /* Header
    ======================== */
 
@@ -87,10 +91,6 @@ background-position: 1px 50%;
 background-repeat: no-repeat;
 }
 
-.view .active-scaffold-header div.actions a {
-float: left;
-}
-
 .blue-theme .active-scaffold-header div.actions a {
 color: #fff;
 }
@@ -295,7 +295,7 @@ background: transparent;
 }
 
 .active-scaffold .active-scaffold .active-scaffold-header {
-margin-right: 15px;
+margin-right: 25px;
 }
 
 .active-scaffold .active-scaffold .active-scaffold-header h2 {
@@ -315,7 +315,6 @@ right: 0px;
 
 .active-scaffold .active-scaffold .active-scaffold-header div.actions a {
 font: bold 11px verdana, sans-serif;
-padding: 0 2px 1px 17px;
 }
 
 .blue-theme .active-scaffold .active-scaffold-header div.actions a,
@@ -525,7 +524,7 @@ margin: 0;
 }
 
 .active-scaffold .active-scaffold-header .loading-indicator {
-margin-bottom: 3px;
+margin-top: 3px;
 }
 
 /* Show
@@ -534,6 +533,9 @@ margin-bottom: 3px;
 .active-scaffold .show-view dl {
 margin-left: 5px;
 }
+.active-scaffold .show-view dl dl {
+margin-left: 0px;
+}
 
 .active-scaffold .show-view dt {
 width: 12em;
@@ -554,6 +556,10 @@ margin-bottom: 5px;
 /* Form
    ============================== */
 
+.active-scaffold dl {
+margin: 0;
+}
+
 .active-scaffold .submit {
 font-weight: bold;
 font-size: 14px;

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_scaffold
 version: !ruby/object:Gem::Version 
-  hash: 51
+  hash: 5
   prerelease: 
   segments: 
   - 3
-  - 0
-  - 26
-  version: 3.0.26
+  - 1
+  - 3
+  version: 3.1.3
 platform: ruby
 authors: 
 - Many, see README
@@ -15,10 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-28 00:00:00 Z
+date: 2011-10-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -27,12 +27,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id001
-  prerelease: false
   type: :development
   name: shoulda
+  version_requirements: *id001
+  prerelease: false
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -43,12 +43,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  requirement: *id002
-  prerelease: false
   type: :development
   name: bundler
+  version_requirements: *id002
+  prerelease: false
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -57,54 +57,26 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id003
-  prerelease: false
   type: :development
   name: rcov
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id004
-  prerelease: false
-  type: :runtime
-  name: render_component_vho
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id005
+  version_requirements: *id003
   prerelease: false
-  type: :runtime
-  name: verification
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 3
         segments: 
         - 3
+        - 1
         - 0
-        - 0
-        version: 3.0.0
-  requirement: *id006
-  prerelease: false
+        version: 3.1.0
   type: :runtime
   name: rails
+  version_requirements: *id004
+  prerelease: false
 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.
 email: activescaffold@googlegroups.com
 executables: []
@@ -114,25 +86,36 @@ extensions: []
 extra_rdoc_files: 
 - README
 files: 
-- frontends/default/images/add.gif
-- frontends/default/images/arrow_down.gif
-- frontends/default/images/arrow_up.gif
-- frontends/default/images/close.gif
-- frontends/default/images/close_touch.png
-- frontends/default/images/config.png
-- frontends/default/images/cross.png
-- frontends/default/images/gears.png
-- frontends/default/images/indicator-small.gif
-- frontends/default/images/indicator.gif
-- frontends/default/images/magnifier.png
-- frontends/default/javascripts/jquery/active_scaffold.js
-- frontends/default/javascripts/jquery/jquery.editinplace.js
-- frontends/default/javascripts/prototype/active_scaffold.js
-- frontends/default/javascripts/prototype/dhtml_history.js
-- frontends/default/javascripts/prototype/form_enhancements.js
-- frontends/default/javascripts/prototype/rico_corner.js
-- frontends/default/stylesheets/stylesheet-ie.css
-- frontends/default/stylesheets/stylesheet.css
+- app/assets/images/add.gif
+- app/assets/images/arrow_down.gif
+- app/assets/images/arrow_up.gif
+- app/assets/images/close.gif
+- app/assets/images/close_touch.png
+- app/assets/images/config.png
+- app/assets/images/cross.png
+- app/assets/images/gears.png
+- app/assets/images/indicator-small.gif
+- app/assets/images/indicator.gif
+- app/assets/images/magnifier.png
+- app/assets/javascripts/active_scaffold.js.erb
+- app/assets/javascripts/jquery/active_scaffold.js
+- app/assets/javascripts/jquery/date_picker_bridge.js.erb
+- app/assets/javascripts/jquery/jquery.editinplace.js
+- app/assets/javascripts/jquery/active_scaffold.js~
+- app/assets/javascripts/prototype/active_scaffold.js
+- app/assets/javascripts/prototype/dhtml_history.js
+- app/assets/javascripts/prototype/form_enhancements.js
+- app/assets/javascripts/prototype/rico_corner.js
+- app/assets/javascripts/prototype/active_scaffold.js~
+- app/assets/stylesheets/active_scaffold-ie.css
+- app/assets/stylesheets/active_scaffold.css.erb
+- config/locales/de.yml
+- config/locales/en.yml
+- config/locales/es.yml
+- config/locales/fr.yml
+- config/locales/hu.yml
+- config/locales/ja.yml
+- config/locales/ru.yml
 - frontends/default/views/_add_existing_form.html.erb
 - frontends/default/views/_create_form.html.erb
 - frontends/default/views/_create_form_on_list.html.erb
@@ -155,56 +138,57 @@ files:
 - frontends/default/views/_list_pagination_links.html.erb
 - frontends/default/views/_list_record.html.erb
 - frontends/default/views/_action_group.html.erb
+- frontends/default/views/_render_field.js.erb
+- frontends/default/views/_row.html.erb
 - frontends/default/views/_messages.html.erb
-- frontends/default/views/_base_form.html.erb
-- frontends/default/views/_render_field.js.rjs
 - frontends/default/views/_search.html.erb
 - frontends/default/views/_show.html.erb
 - frontends/default/views/list.html.erb
+- frontends/default/views/list.js.erb
 - frontends/default/views/_show_columns.html.erb
 - frontends/default/views/_update_actions.html.erb
 - frontends/default/views/_update_form.html.erb
 - frontends/default/views/_vertical_subform.html.erb
 - frontends/default/views/_vertical_subform_record.html.erb
-- frontends/default/views/_row.html.erb
-- frontends/default/views/list.js.rjs
+- frontends/default/views/_base_form.html.erb
 - frontends/default/views/delete.html.erb
 - frontends/default/views/add_existing_form.html.erb
 - frontends/default/views/create.html.erb
-- frontends/default/views/_list_messages.html.erb
 - frontends/default/views/_human_conditions.html.erb
+- frontends/default/views/_list_messages.html.erb
 - frontends/default/views/field_search.html.erb
-- frontends/default/views/add_existing.js.rjs
+- frontends/default/views/add_existing.js.erb
 - frontends/default/views/search.html.erb
-- frontends/default/views/destroy.js.rjs
+- frontends/default/views/destroy.js.erb
 - frontends/default/views/update.html.erb
-- frontends/default/views/_list_with_header.html.erb
 - frontends/default/views/_list_pagination.html.erb
-- frontends/default/views/show.html.erb
-- frontends/default/views/form_messages.js.rjs
 - frontends/default/views/_list_record_columns.html.erb
-- frontends/default/views/edit_associated.js.rjs
+- frontends/default/views/show.html.erb
+- frontends/default/views/_list_with_header.html.erb
 - frontends/default/views/_search_attribute.html.erb
 - frontends/default/views/action_confirmation.html.erb
-- frontends/default/views/on_action_update.js.rjs
-- frontends/default/views/on_create.js.rjs
-- frontends/default/views/on_mark_all.js.rjs
-- frontends/default/views/on_update.js.rjs
-- frontends/default/views/render_field.js.rjs
-- frontends/default/views/update_column.js.rjs
-- frontends/default/views/update_row.js.rjs
+- frontends/default/views/edit_associated.js.erb
+- frontends/default/views/form_messages.js.erb
+- frontends/default/views/mark.js.rjs
+- frontends/default/views/on_action_update.js.erb
+- frontends/default/views/on_create.js.erb
+- frontends/default/views/on_mark_all.js.erb
+- frontends/default/views/on_update.js.erb
+- frontends/default/views/render_field.js.erb
+- frontends/default/views/update_column.js.erb
 - frontends/default/views/_base_form.html.erb~
+- frontends/default/views/_horizontal_subform_footer.html.erb
+- frontends/default/views/update_row.js.erb
 - frontends/default/views/_form.html.erb~
 - frontends/default/views/_row.html.erb~
 - frontends/default/views/render_field.js.erb~
-- frontends/default/views/update_column.js.erb~
+- frontends/default/views/_horizontal_subform_record.html.erb~
 - frontends/default/views/_form_association_footer.html.erb~
 - frontends/default/views/edit_associated.js.erb~
 - frontends/default/views/_list_inline_adapter.html.erb~
 - frontends/default/views/_form_association.html.erb~
 - frontends/default/views/_vertical_subform.html.erb~
 - frontends/default/views/_horizontal_subform.html.erb~
-- frontends/default/views/_show.html.erb~
 - frontends/default/views/_horizontal_subform_header.html.erb~
 - frontends/default/views/_list_pagination.html.erb~
 - frontends/default/views/_list_actions.html.erb~
@@ -212,12 +196,6 @@ files:
 - frontends/default/views/_list_messages.html.erb~
 - frontends/default/views/_render_field.js.erb~
 - frontends/default/views/_action_group.html.erb~
-- frontends/default/views/on_update.js.erb~
-- frontends/default/views/on_create.js.erb~
-- frontends/default/views/_horizontal_subform_record.html.erb~
-- frontends/default/views/_list_with_header.html.erb~
-- frontends/default/views/_update_form.html.erb~
-- frontends/default/views/add_existing.js.erb~
 - lib/active_scaffold.rb
 - lib/active_scaffold_env.rb
 - lib/active_scaffold/actions/core.rb
@@ -229,9 +207,9 @@ files:
 - lib/active_scaffold/actions/show.rb
 - lib/active_scaffold/actions/nested.rb
 - lib/active_scaffold/actions/search.rb
+- lib/active_scaffold/actions/mark.rb
 - lib/active_scaffold/actions/subform.rb
 - lib/active_scaffold/actions/update.rb
-- lib/active_scaffold/actions/mark.rb
 - lib/active_scaffold/actions/core.rb~
 - lib/active_scaffold/actions/nested.rb~
 - lib/active_scaffold/actions/update.rb~
@@ -254,8 +232,6 @@ files:
 - lib/active_scaffold/config/update.rb
 - lib/active_scaffold/config/mark.rb
 - lib/active_scaffold/config/search.rb~
-- lib/active_scaffold/config/nested.rb~
-- lib/active_scaffold/config/base.rb~
 - lib/active_scaffold/configurable.rb
 - lib/active_scaffold/constraints.rb
 - lib/active_scaffold/data_structures/action_columns.rb
@@ -268,9 +244,8 @@ files:
 - lib/active_scaffold/data_structures/set.rb
 - lib/active_scaffold/data_structures/sorting.rb
 - lib/active_scaffold/data_structures/nested_info.rb
-- lib/active_scaffold/data_structures/nested_info.rb~
+- lib/active_scaffold/data_structures/bridge.rb
 - lib/active_scaffold/data_structures/action_columns.rb~
-- lib/active_scaffold/data_structures/action_link.rb~
 - lib/active_scaffold/finder.rb
 - lib/active_scaffold/helpers/association_helpers.rb
 - lib/active_scaffold/helpers/controller_helpers.rb
@@ -289,59 +264,49 @@ files:
 - lib/active_scaffold/helpers/list_column_helpers.rb~
 - lib/active_scaffold/helpers/search_column_helpers.rb~
 - lib/active_scaffold/active_record_permissions.rb
-- lib/active_scaffold/locale/de.yml
-- lib/active_scaffold/locale/en.yml
-- lib/active_scaffold/locale/es.yml
-- lib/active_scaffold/locale/fr.yml
-- lib/active_scaffold/locale/hu.yml
-- lib/active_scaffold/locale/ja.yml
-- lib/active_scaffold/locale/ru.yml
-- lib/active_scaffold/bridges/ancestry/bridge.rb
-- lib/active_scaffold/bridges/ancestry/lib/ancestry_bridge.rb
-- lib/active_scaffold/bridges/bridge.rb
-- lib/active_scaffold/bridges/calendar_date_select/bridge.rb
-- lib/active_scaffold/bridges/calendar_date_select/lib/as_cds_bridge.rb
-- lib/active_scaffold/bridges/cancan/bridge.rb
-- lib/active_scaffold/bridges/cancan/lib/cancan_bridge.rb
-- lib/active_scaffold/bridges/carrierwave/bridge.rb
-- lib/active_scaffold/bridges/carrierwave/lib/carrierwave_bridge.rb
-- lib/active_scaffold/bridges/carrierwave/lib/carrierwave_bridge_helpers.rb
-- lib/active_scaffold/bridges/carrierwave/lib/form_ui.rb
-- lib/active_scaffold/bridges/carrierwave/lib/list_ui.rb
-- lib/active_scaffold/bridges/country_helper/bridge.rb
-- lib/active_scaffold/bridges/country_helper/lib/country_helper_bridge.rb
-- lib/active_scaffold/bridges/date_picker/bridge.rb
-- lib/active_scaffold/bridges/date_picker/lib/datepicker_bridge.rb
-- lib/active_scaffold/bridges/date_picker/public/javascripts/date_picker_bridge.js
-- lib/active_scaffold/bridges/dragonfly/bridge.rb
-- lib/active_scaffold/bridges/dragonfly/lib/dragonfly_bridge.rb
-- lib/active_scaffold/bridges/dragonfly/lib/dragonfly_bridge_helpers.rb
-- lib/active_scaffold/bridges/dragonfly/lib/form_ui.rb
-- lib/active_scaffold/bridges/dragonfly/lib/list_ui.rb
-- lib/active_scaffold/bridges/paperclip/bridge.rb
-- lib/active_scaffold/bridges/paperclip/lib/form_ui.rb
-- lib/active_scaffold/bridges/paperclip/lib/list_ui.rb
-- lib/active_scaffold/bridges/paperclip/lib/paperclip_bridge.rb
-- lib/active_scaffold/bridges/paperclip/lib/paperclip_bridge_helpers.rb
-- lib/active_scaffold/bridges/semantic_attributes/bridge.rb
-- lib/active_scaffold/bridges/semantic_attributes/lib/semantic_attributes_bridge.rb
-- lib/active_scaffold/bridges/tiny_mce/bridge.rb
-- lib/active_scaffold/bridges/tiny_mce/lib/tiny_mce_bridge.rb
-- lib/active_scaffold/bridges/validation_reflection/bridge.rb
-- lib/active_scaffold/bridges/validation_reflection/lib/validation_reflection_bridge.rb
-- lib/active_scaffold/bridges/file_column/bridge.rb
-- lib/active_scaffold/bridges/file_column/lib/as_file_column_bridge.rb
-- lib/active_scaffold/bridges/file_column/lib/file_column_helpers.rb
-- lib/active_scaffold/bridges/file_column/lib/form_ui.rb
-- lib/active_scaffold/bridges/file_column/lib/list_ui.rb
+- lib/active_scaffold/bridges.rb
+- lib/active_scaffold/bridges/ancestry.rb
+- lib/active_scaffold/bridges/ancestry/ancestry_bridge.rb
+- lib/active_scaffold/bridges/calendar_date_select.rb
+- lib/active_scaffold/bridges/calendar_date_select/as_cds_bridge.rb
+- lib/active_scaffold/bridges/cancan.rb
+- lib/active_scaffold/bridges/cancan/cancan_bridge.rb
+- lib/active_scaffold/bridges/carrierwave.rb
+- lib/active_scaffold/bridges/carrierwave/carrierwave_bridge.rb
+- lib/active_scaffold/bridges/carrierwave/carrierwave_bridge_helpers.rb
+- lib/active_scaffold/bridges/carrierwave/form_ui.rb
+- lib/active_scaffold/bridges/carrierwave/list_ui.rb
+- lib/active_scaffold/bridges/country_helper.rb
+- lib/active_scaffold/bridges/country_helper/country_helper_bridge.rb
+- lib/active_scaffold/bridges/date_picker.rb
+- lib/active_scaffold/bridges/date_picker/ext.rb
+- lib/active_scaffold/bridges/date_picker/helper.rb
+- lib/active_scaffold/bridges/dragonfly.rb
+- lib/active_scaffold/bridges/dragonfly/dragonfly_bridge.rb
+- lib/active_scaffold/bridges/dragonfly/dragonfly_bridge_helpers.rb
+- lib/active_scaffold/bridges/dragonfly/form_ui.rb
+- lib/active_scaffold/bridges/dragonfly/list_ui.rb
+- lib/active_scaffold/bridges/file_column.rb
+- lib/active_scaffold/bridges/file_column/as_file_column_bridge.rb
+- lib/active_scaffold/bridges/file_column/file_column_helpers.rb
+- lib/active_scaffold/bridges/file_column/form_ui.rb
+- lib/active_scaffold/bridges/file_column/list_ui.rb
 - lib/active_scaffold/bridges/file_column/test/functional/file_column_keep_test.rb
 - lib/active_scaffold/bridges/file_column/test/mock_model.rb
 - lib/active_scaffold/bridges/file_column/test/test_helper.rb
-- lib/active_scaffold/bridges/record_select/bridge.rb
-- lib/active_scaffold/bridges/record_select/lib/record_select_bridge.rb
+- lib/active_scaffold/bridges/paperclip.rb
+- lib/active_scaffold/bridges/paperclip/form_ui.rb
+- lib/active_scaffold/bridges/paperclip/list_ui.rb
+- lib/active_scaffold/bridges/paperclip/paperclip_bridge.rb
+- lib/active_scaffold/bridges/paperclip/paperclip_bridge_helpers.rb
+- lib/active_scaffold/bridges/record_select.rb
+- lib/active_scaffold/bridges/record_select/helpers.rb
 - lib/active_scaffold/bridges/record_select/helpers.rb~
+- lib/active_scaffold/bridges/semantic_attributes.rb
+- lib/active_scaffold/bridges/semantic_attributes/column.rb
 - lib/active_scaffold/bridges/shared/date_bridge.rb
-- lib/active_scaffold/bridges/shared/date_bridge.rb~
+- lib/active_scaffold/bridges/tiny_mce.rb
+- lib/active_scaffold/bridges/tiny_mce/helpers.rb
 - lib/active_scaffold/version.rb
 - lib/active_scaffold/marked_model.rb
 - lib/active_scaffold/extensions/action_controller_rendering.rb
@@ -359,40 +324,46 @@ files:
 - lib/active_scaffold/extensions/unsaved_associated.rb
 - lib/active_scaffold/extensions/unsaved_record.rb
 - lib/active_scaffold/extensions/usa_state.rb
-- lib/active_scaffold/extensions/action_view_resolver.rb
+- lib/active_scaffold/extensions/cache_association.rb
 - lib/active_scaffold/extensions/action_controller_rendering.rb~
 - lib/active_scaffold/extensions/action_view_rendering.rb~
 - lib/active_scaffold/extensions/cache_association.rb~
 - lib/active_scaffold/extensions/reverse_associations.rb~
 - lib/active_scaffold/extensions/routing_mapper.rb~
-- lib/active_scaffold/extensions/unsaved_associated.rb~
-- lib/active_scaffold/extensions/active_association_reflection.rb~
 - lib/active_scaffold/paginator.rb
 - lib/active_scaffold/responds_to_parent.rb
+- lib/active_scaffold/engine.rb
 - lib/active_scaffold/attribute_params.rb~
 - lib/active_scaffold/finder.rb~
-- lib/active_scaffold/constraints.rb~
 - lib/generators/active_scaffold/USAGE
 - lib/generators/active_scaffold/active_scaffold_generator.rb
 - lib/generators/active_scaffold_controller/USAGE
 - lib/generators/active_scaffold_controller/active_scaffold_controller_generator.rb
 - lib/generators/active_scaffold_controller/templates/controller.rb
 - lib/generators/active_scaffold_controller/templates/helper.rb
-- lib/generators/active_scaffold_setup/USAGE
-- lib/generators/active_scaffold_setup/active_scaffold_setup_generator.rb
-- lib/active_scaffold_assets.rb
-- lib/active_scaffold.rb~
 - public/blank.html
 - shoulda_macros/macros.rb
 - MIT-LICENSE
 - CHANGELOG
 - README
 - test/bridges/bridge_test.rb
+- test/bridges/active_scaffold_dependent_protect_test.rb
+- test/bridges/company.rb
+- test/bridges/paperclip_test.rb
+- test/bridges/tiny_mce_test.rb
+- test/bridges/unobtrusive_date_picker_test.rb
+- test/bridges/validation_reflection_test.rb
 - test/config/base_test.rb
 - test/config/create_test.rb
 - test/config/list_test.rb
 - test/config/show_test.rb
 - test/config/update_test.rb
+- test/config/core_test.rb
+- test/config/delete_test.rb
+- test/config/field_search_test.rb
+- test/config/nested_test.rb
+- test/config/search_test.rb
+- test/config/subform_test.rb
 - test/const_mocker.rb
 - test/data_structures/action_columns_test.rb
 - test/data_structures/action_link_test.rb
@@ -486,14 +457,26 @@ rubyforge_project:
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: Rails 3 Version of activescaffold supporting prototype and jquery
+summary: Rails 3.1 Version of activescaffold supporting prototype and jquery
 test_files: 
 - test/bridges/bridge_test.rb
+- test/bridges/active_scaffold_dependent_protect_test.rb
+- test/bridges/company.rb
+- test/bridges/paperclip_test.rb
+- test/bridges/tiny_mce_test.rb
+- test/bridges/unobtrusive_date_picker_test.rb
+- test/bridges/validation_reflection_test.rb
 - test/config/base_test.rb
 - test/config/create_test.rb
 - test/config/list_test.rb
 - test/config/show_test.rb
 - test/config/update_test.rb
+- test/config/core_test.rb
+- test/config/delete_test.rb
+- test/config/field_search_test.rb
+- test/config/nested_test.rb
+- test/config/search_test.rb
+- test/config/subform_test.rb
 - test/const_mocker.rb
 - test/data_structures/action_columns_test.rb
 - test/data_structures/action_link_test.rb