active_scaffold 3.3.3 → 3.4.0

data/test/mock_app/app/controllers/addresses_controller.rb

@@ -0,0 +1,4 @@
+class AddressesController < ApplicationController
+  active_scaffold do |conf|
+  end
+end

data/test/mock_app/app/controllers/buildings_controller.rb

@@ -0,0 +1,4 @@
+class BuildingsController < ApplicationController
+  active_scaffold do |conf|
+  end
+end

data/test/mock_app/app/controllers/cars_controller.rb

@@ -0,0 +1,4 @@
+class CarsController < ApplicationController
+  active_scaffold do |conf|
+  end
+end

data/test/mock_app/app/controllers/contacts_controller.rb

@@ -0,0 +1,4 @@
+class ContactsController < ApplicationController
+  active_scaffold do |conf|
+  end
+end

data/test/mock_app/app/controllers/floors_controller.rb

@@ -0,0 +1,6 @@
+class FloorsController < ApplicationController
+  active_scaffold do |conf|
+    conf.columns << :number_required
+    conf.subform.columns << :number_required
+  end
+end

data/test/mock_app/app/controllers/people_controller.rb

@@ -0,0 +1,4 @@
+class PeopleController < ApplicationController
+  active_scaffold do |conf|
+  end
+end

data/test/mock_app/app/models/address.rb

@@ -0,0 +1,3 @@
+class Address < ActiveRecord::Base
+  belongs_to :addressable, :polymorphic => true
+end

data/test/mock_app/app/models/building.rb

@@ -0,0 +1,8 @@
+class Building < ActiveRecord::Base
+  belongs_to :owner, :class_name => 'Person'
+  has_many :floors, :dependent => :delete_all
+
+  has_one :address, :as => :addressable
+
+  has_many :tenants, :through => :floors, :class_name => 'Person'
+end

data/test/mock_app/app/models/car.rb

@@ -0,0 +1,3 @@
+class Car < ActiveRecord::Base
+  belongs_to :person
+end

data/test/mock_app/app/models/contact.rb

@@ -0,0 +1,3 @@
+class Contact < ActiveRecord::Base
+  belongs_to :contactable, :polymorphic => true
+end

data/test/mock_app/app/models/file_model.rb

@@ -0,0 +1,19 @@
+class FileModel < ActiveScaffold::Tableless
+  column :name, :string
+  column :person_id, :integer
+  self.primary_key = :name
+  
+  belongs_to :person
+  
+  def self.find_all(relation)
+    []
+  end
+
+  def self.find_one(id, relation)
+    nil
+  end
+
+  def destroy
+    true
+  end
+end

data/test/mock_app/app/models/floor.rb

@@ -0,0 +1,8 @@
+class Floor < ActiveRecord::Base
+  belongs_to :building
+  belongs_to :tenant, :class_name => 'Person'
+  has_one :address, :through => :building
+
+  attr_accessor :number_required
+  validates :number, :presence => true, :if => :number_required
+end

data/test/mock_app/app/models/person.rb

@@ -0,0 +1,11 @@
+class Person < ActiveRecord::Base
+  has_many :buildings, :foreign_key => :owner_id
+  has_one :floor, :foreign_key => :tenant_id
+  has_one :address, :through => :floor
+  has_one :home, :through => :floor, :source => :building
+
+  has_many :contacts, :as => :contactable
+  has_one :car, :dependent => :destroy
+  
+  has_many :files, :dependent => :destroy, :class_name => 'FileModel'
+end

data/test/mock_app/config/application.rb

@@ -2,10 +2,12 @@ require File.expand_path('../boot', __FILE__)
 
 require "rails/all"
 require "rails/test_unit/railtie"
+require 'active_scaffold'
 
 module RailsApp
   class Application < Rails::Application
     config.filter_parameters << :password
     config.action_mailer.default_url_options = { :host => "localhost:3000" }
+    I18n.enforce_available_locales = false
   end
 end

data/test/mock_app/config/environments/test.rb

@@ -5,7 +5,7 @@ RailsApp::Application.configure do
   # test suite.  You never need to work with it otherwise.  Remember that
   # your test database is "scratch space" for the test suite and is wiped
   # and recreated between test runs.  Don't rely on the data there!
-  config.cache_classes = true
+  config.cache_classes = false
   config.eager_load = false
 
   # Show full error reports and disable caching

data/test/mock_app/config/initializers/secret_token.rb

@@ -4,4 +4,8 @@
 # If you change this key, all old signed cookies will become invalid!
 # Make sure the secret is at least 30 characters and all random,
 # no regular words or you'll be exposed to dictionary attacks.
-RailsApp::Application.config.secret_token = 'e997edf9d7eba5cf89a76a046fa53f5d66261d22cfcf29e3f538c75ad2d175b106bd5d099f44f6ce34ad3b3162d71cfaa37d2d4f4b38645288331427b4c2a607'
+if RailsApp::Application.config.respond_to? :secret_key_base
+  RailsApp::Application.config.secret_key_base = 'e997edf9d7eba5cf89a76a046fa53f5d66261d22cfcf29e3f538c75ad2d175b106bd5d099f44f6ce34ad3b3162d71cfaa37d2d4f4b38645288331427b4c2a607'
+else
+  RailsApp::Application.config.secret_token = 'e997edf9d7eba5cf89a76a046fa53f5d66261d22cfcf29e3f538c75ad2d175b106bd5d099f44f6ce34ad3b3162d71cfaa37d2d4f4b38645288331427b4c2a607'
+end

data/test/mock_app/config/routes.rb

@@ -1,3 +1,3 @@
 RailsApp::Application.routes.draw do
-  match ':controller(/:action(/:id))'
+  match ':controller(/:action(/:id))', :via => :any
 end

data/test/mock_app/db/schema.rb

@@ -0,0 +1,51 @@
+ActiveRecord::Schema.define do
+  create_table 'addresses' do |t|
+    t.integer 'addressable_id'
+    t.string 'addressable_type'
+    t.string 'street'
+    t.string 'city'
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table 'buildings' do |t|
+    t.string 'name'
+    t.integer 'owner_id'
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table 'cars' do |t|
+    t.integer 'person_id'
+    t.string 'brand'
+    t.string 'model'
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table 'contacts' do |t|
+    t.integer 'contactable_id'
+    t.string 'contactable_type'
+    t.string 'first_name'
+    t.string 'last_name'
+    t.date 'birthday'
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table 'floors' do |t|
+    t.integer 'number'
+    t.integer 'building_id'
+    t.integer 'tenant_id'
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table 'people' do |t|
+    t.string 'first_name'
+    t.string 'last_name'
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+end

data/test/model_stub.rb

@@ -9,8 +9,8 @@ class ModelStub < ActiveRecord::Base
   @@nested_scope_calls = []
   cattr_accessor :nested_scope_calls
   
-  scope :a_is_defined, :conditions => "a is not null"
-  scope :b_like, lambda {|pattern| {:conditions => ["b like ?", pattern]}}
+  scope :a_is_defined, lambda { where.not(:a => nil) }
+  scope :b_like, lambda { |pattern| where("b like ?", pattern) }
   
   def self.a_is_defined
     @@nested_scope_calls << :a_is_defined
@@ -37,7 +37,7 @@ class ModelStub < ActiveRecord::Base
   end
 
   def self.columns
-    @columns ||= self.stubbed_columns.map{|c| ActiveRecord::ConnectionAdapters::Column.new(c.to_s, '', 'varchar(255)') }
+    @columns ||= self.stubbed_columns.map{|c| ColumnMock.new(c.to_s, '', 'varchar(255)') }
   end
 
   def self.columns_hash

data/test/test_helper.rb

@@ -1,10 +1,12 @@
-require 'simplecov'
-SimpleCov.start { add_filter 'test' }
+if RUBY_VERSION >= '1.9' && RUBY_ENGINE == 'ruby' # remove RUBY_ENGINE test when rubinius-coverage fix is released
+  require 'simplecov'
+  SimpleCov.start { add_filter 'test' }
+end
 
 ENV['RAILS_ENV'] = 'test'
 require "mock_app/config/environment"
 require 'rails/test_help'
-require 'active_scaffold'
+require 'minitest/autorun'
 
 require 'mocha/setup'
 begin
@@ -15,16 +17,10 @@ end
 def load_schema
   stdout = $stdout
   $stdout = StringIO.new # suppress output while building the schema
-  load File.join(ENV['RAILS_ROOT'], 'db', 'schema.rb')
+  load File.join(Rails.root, 'db', 'schema.rb')
   $stdout = stdout
 end
-
-def silence_stderr(&block)
-  stderr = $stderr
-  $stderr = StringIO.new
-  yield
-  $stderr = stderr
-end
+load_schema
 
 for file in %w[model_stub const_mocker company]
   require File.join(File.dirname(__FILE__), file)
@@ -32,10 +28,17 @@ end
 
 I18n.backend.store_translations :en, YAML.load_file(File.expand_path('../../config/locales/en.yml', __FILE__))["en"]
 
-class Test::Unit::TestCase
+unless defined? Minitest::Test
+  class Minitest::Test < MiniTest::Unit::TestCase
+  end
+end
+
+class MiniTest::Test
   protected
   def config_for(klass, namespace = nil)
     ActiveScaffold::Config::Core.new("#{namespace}#{klass.to_s.underscore.downcase}")
   end
 end
+
 Object.send :remove_const, :Config
+class ColumnMock < ActiveScaffold::Tableless::Column; end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold
 version: !ruby/object:Gem::Version
-  version: 3.3.3
+  version: 3.4.0
 platform: ruby
 authors:
 - Many, see README
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-09 00:00:00.000000000 Z
+date: 2014-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
@@ -56,16 +56,22 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 3.2.18
+    - - <
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 3.2.18
+    - - <
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '5'
 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
@@ -87,6 +93,7 @@ files:
 - app/assets/images/active_scaffold/indicator-small.gif
 - app/assets/images/active_scaffold/indicator.gif
 - app/assets/images/active_scaffold/magnifier.png
+- app/assets/images/active_scaffold/refresh.png
 - app/assets/javascripts/active_scaffold.js.erb
 - app/assets/javascripts/jquery/active_scaffold.js
 - app/assets/javascripts/jquery/active_scaffold_chosen.js
@@ -250,6 +257,7 @@ files:
 - lib/active_scaffold/config/update.rb
 - lib/active_scaffold/configurable.rb
 - lib/active_scaffold/constraints.rb
+- lib/active_scaffold/core.rb
 - lib/active_scaffold/data_structures/action_columns.rb
 - lib/active_scaffold/data_structures/action_link.rb
 - lib/active_scaffold/data_structures/action_links.rb
@@ -261,12 +269,11 @@ 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/delayed_setup.rb
 - lib/active_scaffold/engine.rb
 - lib/active_scaffold/extensions/action_controller_rendering.rb
 - lib/active_scaffold/extensions/action_controller_rescueing.rb
 - 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
@@ -276,7 +283,6 @@ files:
 - 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
@@ -293,7 +299,6 @@ files:
 - lib/active_scaffold/responds_to_parent.rb
 - lib/active_scaffold/tableless.rb
 - lib/active_scaffold/version.rb
-- lib/active_scaffold_env.rb
 - lib/generators/active_scaffold/USAGE
 - lib/generators/active_scaffold/active_scaffold_generator.rb
 - lib/generators/active_scaffold_controller/USAGE
@@ -354,20 +359,35 @@ files:
 - test/data_structures/validation_reflection_test.rb
 - test/data_structures/virtual_column_test.rb
 - test/extensions/active_record_test.rb
-- test/extensions/array_test.rb
 - test/helpers/form_column_helpers_test.rb
 - test/helpers/list_column_helpers_test.rb
 - test/helpers/pagination_helpers_test.rb
 - test/misc/active_record_permissions_test.rb
 - test/misc/attribute_params_test.rb
+- test/misc/calculation_test.rb
 - test/misc/configurable_test.rb
 - test/misc/constraints_test.rb
+- test/misc/convert_numbers_format_test.rb
 - test/misc/finder_test.rb
 - test/misc/lang_test.rb
+- test/misc/tableless_test.rb
 - test/mock_app/.gitignore
 - test/mock_app/Rakefile
+- test/mock_app/app/controllers/addresses_controller.rb
 - test/mock_app/app/controllers/application_controller.rb
+- test/mock_app/app/controllers/buildings_controller.rb
+- test/mock_app/app/controllers/cars_controller.rb
+- test/mock_app/app/controllers/contacts_controller.rb
+- test/mock_app/app/controllers/floors_controller.rb
+- test/mock_app/app/controllers/people_controller.rb
 - test/mock_app/app/helpers/application_helper.rb
+- test/mock_app/app/models/address.rb
+- test/mock_app/app/models/building.rb
+- test/mock_app/app/models/car.rb
+- test/mock_app/app/models/contact.rb
+- test/mock_app/app/models/file_model.rb
+- test/mock_app/app/models/floor.rb
+- test/mock_app/app/models/person.rb
 - test/mock_app/config.ru
 - test/mock_app/config/application.rb
 - test/mock_app/config/boot.rb
@@ -384,25 +404,8 @@ files:
 - test/mock_app/config/initializers/wrap_parameters.rb
 - test/mock_app/config/locales/en.yml
 - test/mock_app/config/routes.rb
+- test/mock_app/db/schema.rb
 - test/mock_app/db/test.sqlite3
-- test/mock_app/public/blank.html
-- test/mock_app/public/images/active_scaffold/DO_NOT_EDIT
-- test/mock_app/public/images/active_scaffold/default/add.gif
-- test/mock_app/public/images/active_scaffold/default/arrow_down.gif
-- test/mock_app/public/images/active_scaffold/default/arrow_up.gif
-- test/mock_app/public/images/active_scaffold/default/close.gif
-- test/mock_app/public/images/active_scaffold/default/cross.png
-- test/mock_app/public/images/active_scaffold/default/indicator-small.gif
-- test/mock_app/public/images/active_scaffold/default/indicator.gif
-- test/mock_app/public/images/active_scaffold/default/magnifier.png
-- test/mock_app/public/javascripts/active_scaffold/DO_NOT_EDIT
-- test/mock_app/public/javascripts/active_scaffold/default/active_scaffold.js
-- test/mock_app/public/javascripts/active_scaffold/default/dhtml_history.js
-- test/mock_app/public/javascripts/active_scaffold/default/form_enhancements.js
-- test/mock_app/public/javascripts/active_scaffold/default/rico_corner.js
-- test/mock_app/public/stylesheets/active_scaffold/DO_NOT_EDIT
-- test/mock_app/public/stylesheets/active_scaffold/default/stylesheet-ie.css
-- test/mock_app/public/stylesheets/active_scaffold/default/stylesheet.css
 - test/model_stub.rb
 - test/run_all.rb
 - test/test_helper.rb
@@ -426,10 +429,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
-summary: Rails 3.1 Version of activescaffold supporting prototype and jquery
+summary: Rails 3.2 and 4.0 version of activescaffold supporting prototype and jquery
 test_files:
 - test/bridges/bridge_test.rb
 - test/bridges/date_picker_test.rb
@@ -462,20 +465,35 @@ test_files:
 - test/data_structures/validation_reflection_test.rb
 - test/data_structures/virtual_column_test.rb
 - test/extensions/active_record_test.rb
-- test/extensions/array_test.rb
 - test/helpers/form_column_helpers_test.rb
 - test/helpers/list_column_helpers_test.rb
 - test/helpers/pagination_helpers_test.rb
 - test/misc/active_record_permissions_test.rb
 - test/misc/attribute_params_test.rb
+- test/misc/calculation_test.rb
 - test/misc/configurable_test.rb
 - test/misc/constraints_test.rb
+- test/misc/convert_numbers_format_test.rb
 - test/misc/finder_test.rb
 - test/misc/lang_test.rb
+- test/misc/tableless_test.rb
 - test/mock_app/.gitignore
 - test/mock_app/Rakefile
+- test/mock_app/app/controllers/addresses_controller.rb
 - test/mock_app/app/controllers/application_controller.rb
+- test/mock_app/app/controllers/buildings_controller.rb
+- test/mock_app/app/controllers/cars_controller.rb
+- test/mock_app/app/controllers/contacts_controller.rb
+- test/mock_app/app/controllers/floors_controller.rb
+- test/mock_app/app/controllers/people_controller.rb
 - test/mock_app/app/helpers/application_helper.rb
+- test/mock_app/app/models/address.rb
+- test/mock_app/app/models/building.rb
+- test/mock_app/app/models/car.rb
+- test/mock_app/app/models/contact.rb
+- test/mock_app/app/models/file_model.rb
+- test/mock_app/app/models/floor.rb
+- test/mock_app/app/models/person.rb
 - test/mock_app/config.ru
 - test/mock_app/config/application.rb
 - test/mock_app/config/boot.rb
@@ -492,25 +510,8 @@ test_files:
 - test/mock_app/config/initializers/wrap_parameters.rb
 - test/mock_app/config/locales/en.yml
 - test/mock_app/config/routes.rb
+- test/mock_app/db/schema.rb
 - test/mock_app/db/test.sqlite3
-- test/mock_app/public/blank.html
-- test/mock_app/public/images/active_scaffold/DO_NOT_EDIT
-- test/mock_app/public/images/active_scaffold/default/add.gif
-- test/mock_app/public/images/active_scaffold/default/arrow_down.gif
-- test/mock_app/public/images/active_scaffold/default/arrow_up.gif
-- test/mock_app/public/images/active_scaffold/default/close.gif
-- test/mock_app/public/images/active_scaffold/default/cross.png
-- test/mock_app/public/images/active_scaffold/default/indicator-small.gif
-- test/mock_app/public/images/active_scaffold/default/indicator.gif
-- test/mock_app/public/images/active_scaffold/default/magnifier.png
-- test/mock_app/public/javascripts/active_scaffold/DO_NOT_EDIT
-- test/mock_app/public/javascripts/active_scaffold/default/active_scaffold.js
-- test/mock_app/public/javascripts/active_scaffold/default/dhtml_history.js
-- test/mock_app/public/javascripts/active_scaffold/default/form_enhancements.js
-- test/mock_app/public/javascripts/active_scaffold/default/rico_corner.js
-- test/mock_app/public/stylesheets/active_scaffold/DO_NOT_EDIT
-- test/mock_app/public/stylesheets/active_scaffold/default/stylesheet-ie.css
-- test/mock_app/public/stylesheets/active_scaffold/default/stylesheet.css
 - test/model_stub.rb
 - test/run_all.rb
 - test/test_helper.rb