fine_print 1.3.0 → 1.4.1

data/spec/controllers/contracts_controller_spec.rb

@@ -11,12 +11,12 @@ module FinePrint
     end
 
     it "won't get index unless authorized" do
-      get :index, :use_route => :fine_print
-      assert_redirected_to FinePrint.redirect_path
+      expect { get :index, :use_route => :fine_print }
+             .to raise_error(FinePrint::SecurityTransgression)
       
       sign_in @user
-      get :index, :use_route => :fine_print
-      assert_redirected_to FinePrint.redirect_path
+      expect { get :index, :use_route => :fine_print }
+             .to raise_error(FinePrint::SecurityTransgression)
     end
     
     it 'must get index if authorized' do
@@ -26,12 +26,12 @@ module FinePrint
     end
     
     it "won't get new unless authorized" do
-      get :new, :use_route => :fine_print
-      assert_redirected_to FinePrint.redirect_path
+      expect { get :new, :use_route => :fine_print }
+             .to raise_error(FinePrint::SecurityTransgression)
       
       sign_in @user
-      get :new, :use_route => :fine_print
-      assert_redirected_to FinePrint.redirect_path
+      expect { get :new, :use_route => :fine_print }
+      .to raise_error(FinePrint::SecurityTransgression)
     end
     
     it 'must get new if authorized' do
@@ -46,13 +46,13 @@ module FinePrint
       attributes[:title] = 'Some title'
       attributes[:content] = 'Some content'
       
-      post :create, :contract => attributes, :use_route => :fine_print
-      assert_redirected_to FinePrint.redirect_path
+      expect { post :create, :contract => :attributes, :use_route => :fine_print }
+             .to raise_error(FinePrint::SecurityTransgression)
       expect(assigns(:contract)).to be_nil
       
       sign_in @user
-      post :create, :contract => attributes, :use_route => :fine_print
-      assert_redirected_to FinePrint.redirect_path
+      expect { post :create, :contract => :attributes, :use_route => :fine_print }
+             .to raise_error(FinePrint::SecurityTransgression)
       expect(assigns(:contract)).to be_nil
     end
     
@@ -72,12 +72,12 @@ module FinePrint
     end
     
     it "won't edit unless authorized" do
-      get :edit, :id => @contract.id, :use_route => :fine_print
-      assert_redirected_to FinePrint.redirect_path
+      expect { get :edit, :id => @contract.id, :use_route => :fine_print }
+             .to raise_error(FinePrint::SecurityTransgression)
       
       sign_in @user
-      get :edit, :id => @contract.id, :use_route => :fine_print
-      assert_redirected_to FinePrint.redirect_path
+      expect { get :edit, :id => @contract.id, :use_route => :fine_print }
+             .to raise_error(FinePrint::SecurityTransgression)
     end
     
     it 'must edit if authorized' do
@@ -95,16 +95,18 @@ module FinePrint
       title = @contract.title
       content = @contract.content
       
-      put :update, :id => @contract.id, :contract => attributes, :use_route => :fine_print
-      assert_redirected_to FinePrint.redirect_path
+      expect { post :update, :id => @contract.id,
+                    :contract => attributes, :use_route => :fine_print }
+             .to raise_error(FinePrint::SecurityTransgression)
       @contract.reload
       expect(@contract.name).to eq name
       expect(@contract.title).to eq title
       expect(@contract.content).to eq content
       
       sign_in @user
-      put :update, :id => @contract.id, :contract => attributes, :use_route => :fine_print
-      assert_redirected_to FinePrint.redirect_path
+      expect { post :update, :id => @contract.id,
+        :contract => attributes, :use_route => :fine_print }
+      .to raise_error(FinePrint::SecurityTransgression)
       @contract.reload
       expect(@contract.name).to eq name
       expect(@contract.title).to eq title
@@ -128,13 +130,13 @@ module FinePrint
     end
 
     it "won't destroy unless authorized" do
-      delete :destroy, :id => @contract.id, :use_route => :fine_print
-      assert_redirected_to FinePrint.redirect_path
+      expect { delete :destroy, :id => @contract.id, :use_route => :fine_print }
+             .to raise_error(FinePrint::SecurityTransgression)
       expect(Contract.find(@contract.id)).to eq @contract
       
       sign_in @user
-      delete :destroy, :id => @contract.id, :use_route => :fine_print
-      assert_redirected_to FinePrint.redirect_path
+      expect { delete :destroy, :id => @contract.id, :use_route => :fine_print }
+             .to raise_error(FinePrint::SecurityTransgression)
       expect(Contract.find(@contract.id)).to eq @contract
     end
     
@@ -147,14 +149,14 @@ module FinePrint
 
     it "won't publish unless authorized" do
       expect(@contract.is_published?).to eq false
-      put :publish, :id => @contract.id, :use_route => :fine_print
-      assert_redirected_to FinePrint.redirect_path
+      expect { put :publish, :id => @contract.id, :use_route => :fine_print }
+             .to raise_error(FinePrint::SecurityTransgression)
       @contract.reload
       expect(@contract.is_published?).to eq false
       
       sign_in @user
-      put :publish, :id => @contract.id, :use_route => :fine_print
-      assert_redirected_to FinePrint.redirect_path
+      expect { put :publish, :id => @contract.id, :use_route => :fine_print }
+             .to raise_error(FinePrint::SecurityTransgression)
       @contract.reload
       expect(@contract.is_published?).to eq false
     end
@@ -172,14 +174,14 @@ module FinePrint
     it "won't unpublish unless authorized" do
       @contract.publish
       expect(@contract.is_published?).to eq true
-      put :unpublish, :id => @contract.id, :use_route => :fine_print
-      assert_redirected_to FinePrint.redirect_path
+      expect { put :unpublish, :id => @contract.id, :use_route => :fine_print }
+             .to raise_error(FinePrint::SecurityTransgression)
       @contract.reload
       expect(@contract.is_published?).to eq true
       
       sign_in @user
-      put :unpublish, :id => @contract.id, :use_route => :fine_print
-      assert_redirected_to FinePrint.redirect_path
+      expect { put :unpublish, :id => @contract.id, :use_route => :fine_print }
+             .to raise_error(FinePrint::SecurityTransgression)
       @contract.reload
       expect(@contract.is_published?).to eq true
     end
@@ -199,13 +201,13 @@ module FinePrint
       @contract.publish
       expect(@contract.is_published?).to eq true
       
-      put :new_version, :id => @contract.id, :use_route => :fine_print
-      assert_redirected_to FinePrint.redirect_path
+      expect { put :new_version, :id => @contract.id, :use_route => :fine_print }
+             .to raise_error(FinePrint::SecurityTransgression)
       expect(assigns(:contract)).to be_nil
       
       sign_in @user
-      put :new_version, :id => @contract.id, :use_route => :fine_print
-      assert_redirected_to FinePrint.redirect_path
+      expect { put :new_version, :id => @contract.id, :use_route => :fine_print }
+             .to raise_error(FinePrint::SecurityTransgression)
       expect(assigns(:contract)).to be_nil
     end
     

data/spec/controllers/home_controller_spec.rb

@@ -7,12 +7,12 @@ module FinePrint
     end
 
     it "won't get index unless authorized" do
-      get :index, :use_route => :fine_print
-      assert_response :redirect
+      expect { get :index, :use_route => :fine_print }
+             .to raise_error(FinePrint::SecurityTransgression)
       
       sign_in @user
-      get :index, :use_route => :fine_print
-      assert_response :redirect
+      expect { get :index, :use_route => :fine_print }
+             .to raise_error(FinePrint::SecurityTransgression)
     end
     
     it 'must get index if authorized' do

data/spec/controllers/signatures_controller_spec.rb

@@ -11,12 +11,12 @@ module FinePrint
     end
 
     it "won't get index unless authorized" do
-      get :index, :use_route => :fine_print
-      assert_redirected_to FinePrint.redirect_path
+      expect { get :index, :use_route => :fine_print }
+             .to raise_error(FinePrint::SecurityTransgression)
       
       sign_in @user
-      get :index, :use_route => :fine_print
-      assert_redirected_to FinePrint.redirect_path
+      expect { get :index, :use_route => :fine_print }
+             .to raise_error(FinePrint::SecurityTransgression)
     end
     
     it 'must get index if authorized' do
@@ -26,13 +26,13 @@ module FinePrint
     end
 
     it "won't destroy unless authorized" do
-      delete :destroy, :id => @signature.id, :use_route => :fine_print
-      assert_redirected_to FinePrint.redirect_path
+      expect { delete :destroy, :id => @signature.id, :use_route => :fine_print }
+             .to raise_error(FinePrint::SecurityTransgression)
       expect(Signature.find(@signature.id)).to eq @signature
       
       sign_in @user
-      delete :destroy, :id => @signature.id, :use_route => :fine_print
-      assert_redirected_to FinePrint.redirect_path
+      expect { delete :destroy, :id => @signature.id, :use_route => :fine_print }
+             .to raise_error(FinePrint::SecurityTransgression)
       expect(Signature.find(@signature.id)).to eq @signature
     end
     

data/spec/dummy/Rakefile

@@ -1,4 +1,3 @@
-#!/usr/bin/env rake
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 

data/spec/dummy/app/assets/javascripts/application.js

@@ -5,11 +5,9 @@
 // or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
 //
 // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// the compiled file.
+// compiled file.
 //
-// WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
-// GO AFTER THE REQUIRES BELOW.
+// Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
+// about supported directives.
 //
-//= require jquery
-//= require jquery_ujs
 //= require_tree .

data/spec/dummy/app/views/layouts/application.html.erb

@@ -2,8 +2,8 @@
 <html>
 <head>
   <title>Dummy</title>
-  <%= stylesheet_link_tag    "application", :media => "all" %>
-  <%= javascript_include_tag "application" %>
+  <%= stylesheet_link_tag    "application", media: "all", "data-turbolinks-track" => true %>
+  <%= javascript_include_tag "application", "data-turbolinks-track" => true %>
   <%= csrf_meta_tags %>
 </head>
 <body>

data/spec/dummy/bin/bundle

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+load Gem.bin_path('bundler', 'bundle')

data/spec/dummy/bin/rails

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+APP_PATH = File.expand_path('../../config/application',  __FILE__)
+require_relative '../config/boot'
+require 'rails/commands'

data/spec/dummy/bin/rake

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+require_relative '../config/boot'
+require 'rake'
+Rake.application.run

data/spec/dummy/config/application.rb

@@ -2,8 +2,8 @@ require File.expand_path('../boot', __FILE__)
 
 require 'rails/all'
 
-Bundler.require
-require 'fine_print'
+Bundler.require(*Rails.groups)
+require "fine_print"
 
 module Dummy
   class Application < Rails::Application
@@ -11,16 +11,6 @@ module Dummy
     # Application configuration should go into files in config/initializers
     # -- all .rb files in that directory are automatically loaded.
 
-    # Custom directories with classes and modules you want to be autoloadable.
-    # config.autoload_paths += %W(#{config.root}/extras)
-
-    # Only load the plugins named here, in the order given (default is alphabetical).
-    # :all can be used as a placeholder for all plugins not explicitly named.
-    # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
-
-    # Activate observers that should always be running.
-    # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
-
     # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
     # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
     # config.time_zone = 'Central Time (US & Canada)'
@@ -29,31 +19,7 @@ module Dummy
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
     # config.i18n.default_locale = :de
 
-    # Configure the default encoding used in templates for Ruby 1.9.
-    config.encoding = 'utf-8'
-
-    # Configure sensitive parameters which will be filtered from the log file.
-    config.filter_parameters += [:password]
-
-    # Enable escaping HTML in JSON.
-    config.active_support.escape_html_entities_in_json = true
-
-    # Use SQL instead of Active Record's schema dumper when creating the database.
-    # This is necessary if your schema can't be completely dumped by the schema dumper,
-    # like if you have constraints or database-specific column types
-    # config.active_record.schema_format = :sql
-
-    # Enforce whitelist mode for mass assignment.
-    # This will create an empty whitelist of attributes available for mass-assignment for all models
-    # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
-    # parameters by using an attr_accessible or attr_protected declaration.
-    config.active_record.whitelist_attributes = true
-
-    # Enable the asset pipeline
-    config.assets.enabled = true
-
-    # Version of your assets, change this if you want to expire all your assets
-    config.assets.version = '1.0'
+    config.i18n.enforce_available_locales = true
   end
 end
 

data/spec/dummy/config/boot.rb

@@ -1,10 +1,5 @@
-require 'rubygems'
-gemfile = File.expand_path('../../../../Gemfile', __FILE__)
+# Set up gems listed in the Gemfile.
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../../Gemfile', __FILE__)
 
-if File.exist?(gemfile)
-  ENV['BUNDLE_GEMFILE'] = gemfile
-  require 'bundler'
-  Bundler.setup
-end
-
-$:.unshift File.expand_path('../../../../lib', __FILE__)
+require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
+$LOAD_PATH.unshift File.expand_path('../../../../lib', __FILE__)

data/spec/dummy/config/environment.rb

@@ -1,5 +1,5 @@
-# Load the rails application
+# Load the Rails application.
 require File.expand_path('../application', __FILE__)
 
-# Initialize the rails application
+# Initialize the Rails application.
 Dummy::Application.initialize!

data/spec/dummy/config/environments/development.rb

@@ -1,37 +1,29 @@
 Dummy::Application.configure do
-  # Settings specified here will take precedence over those in config/application.rb
+  # Settings specified here will take precedence over those in config/application.rb.
 
   # In the development environment your application's code is reloaded on
   # every request. This slows down response time but is perfect for development
   # since you don't have to restart the web server when you make code changes.
   config.cache_classes = false
 
-  # Log error messages when you accidentally call methods on nil.
-  config.whiny_nils = true
+  # Do not eager load code on boot.
+  config.eager_load = false
 
-  # Show full error reports and disable caching
+  # Show full error reports and disable caching.
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
 
-  # Don't care if the mailer can't send
+  # Don't care if the mailer can't send.
   config.action_mailer.raise_delivery_errors = false
 
-  # Print deprecation notices to the Rails logger
+  # Print deprecation notices to the Rails logger.
   config.active_support.deprecation = :log
 
-  # Only use best-standards-support built into browsers
-  config.action_dispatch.best_standards_support = :builtin
+  # Raise an error on page load if there are pending migrations
+  config.active_record.migration_error = :page_load
 
-  # Raise exception on mass assignment protection for Active Record models
-  config.active_record.mass_assignment_sanitizer = :strict
-
-  # Log the query plan for queries taking more than this (works
-  # with SQLite, MySQL, and PostgreSQL)
-  config.active_record.auto_explain_threshold_in_seconds = 0.5
-
-  # Do not compress assets
-  config.assets.compress = false
-
-  # Expands the lines which load the assets
+  # Debug mode disables concatenation and preprocessing of assets.
+  # This option may cause significant delays in view rendering with a large
+  # number of complex assets.
   config.assets.debug = true
 end

data/spec/dummy/config/environments/production.rb

@@ -1,67 +1,80 @@
 Dummy::Application.configure do
-  # Settings specified here will take precedence over those in config/application.rb
+  # Settings specified here will take precedence over those in config/application.rb.
 
-  # Code is not reloaded between requests
+  # Code is not reloaded between requests.
   config.cache_classes = true
 
-  # Full error reports are disabled and caching is turned on
+  # Eager load code on boot. This eager loads most of Rails and
+  # your application in memory, allowing both thread web servers
+  # and those relying on copy on write to perform better.
+  # Rake tasks automatically ignore this option for performance.
+  config.eager_load = true
+
+  # Full error reports are disabled and caching is turned on.
   config.consider_all_requests_local       = false
   config.action_controller.perform_caching = true
 
-  # Disable Rails's static asset server (Apache or nginx will already do this)
+  # Enable Rack::Cache to put a simple HTTP cache in front of your application
+  # Add `rack-cache` to your Gemfile before enabling this.
+  # For large-scale production use, consider using a caching reverse proxy like nginx, varnish or squid.
+  # config.action_dispatch.rack_cache = true
+
+  # Disable Rails's static asset server (Apache or nginx will already do this).
   config.serve_static_assets = false
 
-  # Compress JavaScripts and CSS
-  config.assets.compress = true
+  # Compress JavaScripts and CSS.
+  config.assets.js_compressor = :uglifier
+  # config.assets.css_compressor = :sass
 
-  # Don't fallback to assets pipeline if a precompiled asset is missed
+  # Do not fallback to assets pipeline if a precompiled asset is missed.
   config.assets.compile = false
 
-  # Generate digests for assets URLs
+  # Generate digests for assets URLs.
   config.assets.digest = true
 
-  # Defaults to nil and saved in location specified by config.assets.prefix
-  # config.assets.manifest = YOUR_PATH
+  # Version of your assets, change this if you want to expire all your assets.
+  config.assets.version = '1.0'
 
-  # Specifies the header that your server uses for sending files
+  # Specifies the header that your server uses for sending files.
   # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache
   # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx
 
   # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
   # config.force_ssl = true
 
-  # See everything in the log (default is :info)
-  # config.log_level = :debug
+  # Set to :debug to see everything in the log.
+  config.log_level = :info
 
-  # Prepend all log lines with the following tags
+  # Prepend all log lines with the following tags.
   # config.log_tags = [ :subdomain, :uuid ]
 
-  # Use a different logger for distributed setups
+  # Use a different logger for distributed setups.
   # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
 
-  # Use a different cache store in production
+  # Use a different cache store in production.
   # config.cache_store = :mem_cache_store
 
-  # Enable serving of images, stylesheets, and JavaScripts from an asset server
+  # Enable serving of images, stylesheets, and JavaScripts from an asset server.
   # config.action_controller.asset_host = "http://assets.example.com"
 
-  # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
+  # Precompile additional assets.
+  # application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
   # config.assets.precompile += %w( search.js )
 
-  # Disable delivery errors, bad email addresses will be ignored
+  # Ignore bad email addresses and do not raise email delivery errors.
+  # Set this to true and configure the email server for immediate delivery to raise delivery errors.
   # config.action_mailer.raise_delivery_errors = false
 
-  # Enable threaded mode
-  # config.threadsafe!
-
   # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
-  # the I18n.default_locale when a translation can not be found)
+  # the I18n.default_locale when a translation can not be found).
   config.i18n.fallbacks = true
 
-  # Send deprecation notices to registered listeners
+  # Send deprecation notices to registered listeners.
   config.active_support.deprecation = :notify
 
-  # Log the query plan for queries taking more than this (works
-  # with SQLite, MySQL, and PostgreSQL)
-  # config.active_record.auto_explain_threshold_in_seconds = 0.5
+  # Disable automatic flushing of the log to improve performance.
+  # config.autoflush_log = false
+
+  # Use default logging formatter so that PID and timestamp are not suppressed.
+  config.log_formatter = ::Logger::Formatter.new
 end

data/spec/dummy/config/environments/test.rb

@@ -1,5 +1,5 @@
 Dummy::Application.configure do
-  # Settings specified here will take precedence over those in config/application.rb
+  # Settings specified here will take precedence over those in config/application.rb.
 
   # The test environment is used exclusively to run your application's
   # test suite. You never need to work with it otherwise. Remember that
@@ -7,31 +7,30 @@ Dummy::Application.configure do
   # and recreated between test runs. Don't rely on the data there!
   config.cache_classes = true
 
-  # Configure static asset server for tests with Cache-Control for performance
-  config.serve_static_assets = true
-  config.static_cache_control = "public, max-age=3600"
+  # Do not eager load code on boot. This avoids loading your whole application
+  # just for the purpose of running a single test. If you are using a tool that
+  # preloads Rails for running tests, you may have to set it to true.
+  config.eager_load = false
 
-  # Log error messages when you accidentally call methods on nil
-  config.whiny_nils = true
+  # Configure static asset server for tests with Cache-Control for performance.
+  config.serve_static_assets  = true
+  config.static_cache_control = "public, max-age=3600"
 
-  # Show full error reports and disable caching
+  # Show full error reports and disable caching.
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
 
-  # Raise exceptions instead of rendering exception templates
+  # Raise exceptions instead of rendering exception templates.
   config.action_dispatch.show_exceptions = false
 
-  # Disable request forgery protection in test environment
-  config.action_controller.allow_forgery_protection    = false
+  # Disable request forgery protection in test environment.
+  config.action_controller.allow_forgery_protection = false
 
   # Tell Action Mailer not to deliver emails to the real world.
   # The :test delivery method accumulates sent emails in the
   # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :test
 
-  # Raise exception on mass assignment protection for Active Record models
-  config.active_record.mass_assignment_sanitizer = :strict
-
-  # Print deprecation notices to the stderr
+  # Print deprecation notices to the stderr.
   config.active_support.deprecation = :stderr
 end

data/spec/dummy/config/initializers/filter_parameter_logging.rb

@@ -0,0 +1,4 @@
+# Be sure to restart your server when you modify this file.
+
+# Configure sensitive parameters which will be filtered from the log file.
+Rails.application.config.filter_parameters += [:password]

data/spec/dummy/config/initializers/fine_print.rb

@@ -1,37 +1,4 @@
-# Change the settings below to suit your needs
-# All settings are initially set to their default values
+# Configuration file for the dummy app
 FinePrint.configure do |config|
-  # Engine Configuration
-
-  # Proc called with controller as argument that returns the current user.
-  # Default: lambda { |controller| controller.current_user }
-  config.current_user_proc = lambda { |controller| controller.current_user }
-
-  # Proc called with user as argument that returns true iif the user is an admin.
-  # Admins can create and edit agreements and terminate accepted agreements.
-  # Default: lambda { |user| false } (no admins)
   config.user_admin_proc = lambda { |user| user.is_admin }
-
-  # Proc called with user as argument that returns true iif the argument is a user
-  # who can sign a contract.  In many systems, a non-logged-in user is represented by nil.
-  # However, some systems use something like an AnonymousUser class to represent this state.
-  # If this proc returns false, FinePrint will not ask for signatures and will allow access
-  # to any page, so it's up to the developer to make sure that unsigned users can't access
-  # pages that require a contract signature to use.
-  # Default: lambda { |user| user }
-  config.can_sign_contracts_proc = lambda { |user| user }
-
-  # Path to redirect users to when an error occurs (e.g. permission denied on admin pages).
-  # Default: '/'
-  config.redirect_path = '/'
-
-  # Signature (fine_print_get_signatures) Configuration
-
-  # Path to redirect users to when they need to agree to contract(s).
-  # A list of contract names that must be agreed to will be available in the 'contracts' parameter.
-  # Your code doesn't have to deal with all of them at once, e.g. you can get
-  # the user to agree to the first one and then they'll just eventually be
-  # redirected back to this page with the remaining contract names.
-  # Default: '/'
-  config.pose_contracts_path = '/'
 end

data/spec/dummy/config/initializers/inflections.rb

@@ -1,15 +1,16 @@
 # Be sure to restart your server when you modify this file.
 
-# Add new inflection rules using the following format
-# (all these examples are active by default):
-# ActiveSupport::Inflector.inflections do |inflect|
+# Add new inflection rules using the following format. Inflections
+# are locale specific, and you may define rules for as many different
+# locales as you wish. All of these examples are active by default:
+# ActiveSupport::Inflector.inflections(:en) do |inflect|
 #   inflect.plural /^(ox)$/i, '\1en'
 #   inflect.singular /^(ox)en/i, '\1'
 #   inflect.irregular 'person', 'people'
 #   inflect.uncountable %w( fish sheep )
 # end
-#
+
 # These inflection rules are supported but not enabled by default:
-# ActiveSupport::Inflector.inflections do |inflect|
+# ActiveSupport::Inflector.inflections(:en) do |inflect|
 #   inflect.acronym 'RESTful'
 # end