active_scaffold 3.4.17 → 3.4.18

data/test/misc/tableless_test.rb

@@ -4,15 +4,14 @@ class TablelessTest < MiniTest::Test
   def test_find_all
     assert FileModel.all.to_a.empty?
   end
-  
+
   def test_find_by_id
     assert_raises ActiveRecord::RecordNotFound do
       FileModel.find('filename')
     end
   end
-  
+
   def test_find_with_association
     assert Person.new.files.empty?
   end
 end
-  

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

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

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

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

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

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

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

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

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

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

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

@@ -2,9 +2,9 @@ class FileModel < ActiveScaffold::Tableless
   column :name, :string
   column :person_id, :integer
   self.primary_key = :name
-  
+
   belongs_to :person
-  
+
   def self.find_all(relation)
     []
   end

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

@@ -7,6 +7,6 @@ class Person < ActiveRecord::Base
   has_many :contacts, :as => :contactable
   has_one :car, :dependent => :destroy
   has_and_belongs_to_many :roles
-  
+
   has_many :files, :dependent => :destroy, :class_name => 'FileModel'
 end

data/test/mock_app/config/application.rb

@@ -1,13 +1,13 @@
 require File.expand_path('../boot', __FILE__)
 
-require "rails/all"
-require "rails/test_unit/railtie"
+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" }
+    config.action_mailer.default_url_options = {:host => 'localhost:3000'}
     I18n.enforce_available_locales = false
   end
 end

data/test/mock_app/config/boot.rb

@@ -1,5 +1,5 @@
 begin
-  require File.expand_path("../../../../.bundle/environment", __FILE__)
+  require File.expand_path('../../../../.bundle/environment', __FILE__)
 rescue LoadError
   require 'rubygems'
   require 'bundler'

data/test/mock_app/config/environment.rb

@@ -2,4 +2,5 @@
 require File.expand_path('../application', __FILE__)
 
 # Initialize the rails application
+RailsApp::Application.config.root = File.expand_path('../..', __FILE__)
 RailsApp::Application.initialize!

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

@@ -22,4 +22,3 @@ RailsApp::Application.configure do
   # Only use best-standards-support built into browsers
   config.action_dispatch.best_standards_support = :builtin
 end
-

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

@@ -10,7 +10,7 @@ RailsApp::Application.configure do
   config.action_controller.perform_caching = true
 
   # Specifies the header that your server uses for sending files
-  config.action_dispatch.x_sendfile_header = "X-Sendfile"
+  config.action_dispatch.x_sendfile_header = 'X-Sendfile'
 
   # For nginx:
   # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect'

data/test/mock_app/db/schema.rb

@@ -4,24 +4,24 @@ ActiveRecord::Schema.define do
     t.string 'addressable_type'
     t.string 'street'
     t.string 'city'
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime 'created_at'
+    t.datetime 'updated_at'
   end
 
   create_table 'buildings' do |t|
     t.string 'name'
     t.integer 'owner_id'
     t.integer 'floors_count', :null => false, :default => 0
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    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"
+    t.datetime 'created_at'
+    t.datetime 'updated_at'
   end
 
   create_table 'contacts' do |t|
@@ -30,16 +30,16 @@ ActiveRecord::Schema.define do
     t.string 'first_name'
     t.string 'last_name'
     t.date 'birthday'
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    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"
+    t.datetime 'created_at'
+    t.datetime 'updated_at'
   end
 
   create_table 'people' do |t|
@@ -49,19 +49,18 @@ ActiveRecord::Schema.define do
     t.integer 'floors_count', :null => false, :default => 0
     t.integer 'contacts_count', :null => false, :default => 0
     t.boolean 'adult', :null => false, :default => false
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime 'created_at'
+    t.datetime 'updated_at'
   end
 
   create_table 'roles' do |t|
     t.string 'name'
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime 'created_at'
+    t.datetime 'updated_at'
   end
 
   create_table 'people_roles', :id => false do |t|
     t.integer 'person_id'
     t.integer 'role_id'
   end
-
 end

data/test/model_stub.rb

@@ -1,47 +1,44 @@
 class ModelStub < ActiveRecord::Base
+  validates :b, :presence => true
   has_one :other_model, :class_name => 'ModelStub'
   has_many :other_models, :class_name => 'ModelStub'
-  
+
   cattr_accessor :stubbed_columns
   self.stubbed_columns = [:a, :b, :c, :d, :id]
-  attr_accessor *self.stubbed_columns
-  
+  attr_accessor *stubbed_columns
+
   @@nested_scope_calls = []
   cattr_accessor :nested_scope_calls
-  
-  scope :a_is_defined, lambda { where.not(:a => nil) }
-  scope :b_like, lambda { |pattern| where("b like ?", pattern) }
-  
+
+  scope :a_is_defined, -> { where.not(:a => nil) }
+  scope :b_like, ->(pattern) { where('b like ?', pattern) }
+
   def self.a_is_defined
     @@nested_scope_calls << :a_is_defined
     self
   end
-  
+
   def self.b_like(pattern)
     @@nested_scope_calls << :b_like
     self
   end
 
-  def other_model=(val)
-    @other_model = val
-  end
+  attr_writer :other_model
   def other_model
     @other_model || nil
   end
 
-  def other_models=(val)
-    @other_models = val
-  end
+  attr_writer :other_models
   def other_models
     @other_models || []
   end
 
   def self.columns
-    @columns ||= self.stubbed_columns.map{|c| ColumnMock.new(c.to_s, '', 'varchar(255)') }
+    @columns ||= stubbed_columns.map { |c| ColumnMock.new(c.to_s, '', 'varchar(255)') }
   end
 
   def self.columns_hash
-    @columns_hash ||= columns.inject({}) { |hash, column| hash[column.name.to_s] = column; hash }
+    @columns_hash ||= columns.each_with_object({}) { |column, hash| hash[column.name.to_s] = column }
   end
 
   # column-level security methods, used for testing

data/test/run_all.rb

@@ -1,8 +1,6 @@
-test_folders = %w[bridges config data_structures extensions misc]
+test_folders = %w(bridges config data_structures extensions misc)
 
-all_tests = test_folders.inject([]) {|output, folder|
-  output + Dir[File.join(File.dirname(__FILE__), "#{folder}/**/*.rb")] 
-}
-all_tests.each{|filename|
-  require filename
-}
+all_tests = test_folders.inject([]) do |folder, output|
+  output << Dir[File.join(File.dirname(__FILE__), "#{folder}/**/*.rb")]
+end
+all_tests.each { |filename| require filename }

data/test/test_helper.rb

@@ -2,15 +2,16 @@ require 'simplecov'
 SimpleCov.start { add_filter 'test' }
 
 ENV['RAILS_ENV'] = 'test'
-require "mock_app/config/environment"
+require 'mock_app/config/environment'
 require 'rails/test_help'
 require 'minitest/autorun'
-
 require 'mocha/setup'
-begin
-  require 'redgreen'
-rescue LoadError
-end
+
+require 'minitest/reporters'
+Minitest::Reporters.use!
+
+require 'codeclimate-test-reporter'
+CodeClimate::TestReporter.start
 
 def load_schema
   stdout = $stdout
@@ -20,11 +21,11 @@ def load_schema
 end
 load_schema
 
-for file in %w[model_stub const_mocker company]
+%w(model_stub const_mocker company).each do |file|
   require File.join(File.dirname(__FILE__), file)
 end
 
-I18n.backend.store_translations :en, YAML.load_file(File.expand_path('../../config/locales/en.yml', __FILE__))["en"]
+I18n.backend.store_translations :en, YAML.load_file(File.expand_path('../../config/locales/en.yml', __FILE__))['en']
 
 unless defined? Minitest::Test
   class Minitest::Test < MiniTest::Unit::TestCase
@@ -33,10 +34,12 @@ 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
+Config = RbConfig # HACK needed some comments
+
 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.4.17
+  version: 3.4.18
 platform: ruby
 authors:
 - Many, see README
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-05 00:00:00.000000000 Z
+date: 2015-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
@@ -58,6 +58,20 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: '5'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 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
@@ -303,6 +317,7 @@ files:
 - shoulda_macros/macros.rb
 - test/bridges/bridge_test.rb
 - test/bridges/date_picker_test.rb
+- test/bridges/paper_trail_test.rb
 - test/bridges/paperclip_test.rb
 - test/bridges/tiny_mce_test.rb
 - test/company.rb
@@ -404,7 +419,7 @@ files:
 - vendor/assets/javascripts/jquery-ui-timepicker-addon.js
 - vendor/assets/stylesheets/jquery-ui-theme.css.erb
 - vendor/assets/stylesheets/jquery-ui.css
-homepage: http://activescaffold.com
+homepage: https://github.com/activescaffold/active_scaffold
 licenses:
 - MIT
 metadata: {}
@@ -431,6 +446,7 @@ summary: Rails 3.2 and 4.0 version of activescaffold supporting prototype and jq
 test_files:
 - test/bridges/bridge_test.rb
 - test/bridges/date_picker_test.rb
+- test/bridges/paper_trail_test.rb
 - test/bridges/paperclip_test.rb
 - test/bridges/tiny_mce_test.rb
 - test/company.rb