🚀 💣

amatsuda · amatsuda · commit af65bdd35d52 · 2015-12-19T06:46:57.000+09:00
diff --git a/Rakefile b/Rakefile
@@ -5,6 +5,6 @@ require 'rspec/core'
 require 'rspec/core/rake_task'
 
 task :noop do; end
-task :default => :spec
+task default: :spec
 
-RSpec::Core::RakeTask.new(:spec => :noop)
+RSpec::Core::RakeTask.new(spec: :noop)
diff --git a/gemfiles/Gemfile.rails-3.0 b/gemfiles/Gemfile.rails-3.0
@@ -10,4 +10,4 @@ gem 'capybara', '~> 2.0.0'
 gem 'mime-types', '< 2'
 gem 'rubyzip', '< 1'
 
-gemspec :path => '..'
+gemspec path: '..'
diff --git a/gemfiles/Gemfile.rails-3.1 b/gemfiles/Gemfile.rails-3.1
@@ -13,4 +13,4 @@ gem 'capybara', '~> 2.0.0'
 gem 'mime-types', '< 2'
 gem 'rubyzip', '< 1'
 
-gemspec :path => '..'
+gemspec path: '..'
diff --git a/gemfiles/Gemfile.rails-3.2 b/gemfiles/Gemfile.rails-3.2
@@ -13,4 +13,4 @@ gem 'capybara', '~> 2.0.0'
 gem 'mime-types', '< 2'
 gem 'rubyzip', '< 1'
 
-gemspec :path => '..'
+gemspec path: '..'
diff --git a/gemfiles/Gemfile.rails-4.0 b/gemfiles/Gemfile.rails-4.0
@@ -3,4 +3,4 @@ source 'https://rubygems.org'
 gem 'railties', '~> 4.0.0'
 gem 'activerecord', '~> 4.0.0'
 
-gemspec :path => '..'
+gemspec path: '..'
diff --git a/gemfiles/Gemfile.rails-4.1 b/gemfiles/Gemfile.rails-4.1
@@ -3,4 +3,4 @@ source 'https://rubygems.org'
 gem 'railties', '~> 4.1.0'
 gem 'activerecord', '~> 4.1.0'
 
-gemspec :path => '..'
+gemspec path: '..'
diff --git a/gemfiles/Gemfile.rails-4.2 b/gemfiles/Gemfile.rails-4.2
@@ -3,4 +3,4 @@ source 'https://rubygems.org'
 gem 'railties', '~> 4.2.0'
 gem 'activerecord', '~> 4.2.0'
 
-gemspec :path => '..'
+gemspec path: '..'
diff --git a/gemfiles/Gemfile.rails-edge b/gemfiles/Gemfile.rails-edge
@@ -1,8 +1,8 @@
 source 'https://rubygems.org'
 
-gem 'railties', :git => 'git://github.com/rails/rails.git'
+gem 'railties', git: 'git://github.com/rails/rails.git'
 gem 'rack', git: 'git://github.com/rack/rack.git'
-gem 'activerecord', :git => 'git://github.com/rails/rails.git'
-gem 'arel', :git => 'git://github.com/rails/arel.git'
+gem 'activerecord', git: 'git://github.com/rails/rails.git'
+gem 'arel', git: 'git://github.com/rails/arel.git'
 
-gemspec :path => '..'
+gemspec path: '..'
diff --git a/lib/html5_validators/active_model/initializer_monkey_patches.rb b/lib/html5_validators/active_model/initializer_monkey_patches.rb
@@ -14,7 +14,7 @@ def initialize(options)
       end
 
       def validate_each_with_default_tokenizer(record, attribute, value)
-        @options = (options || {}).reverse_merge(:tokenizer => DEFAULT_TOKENIZER).freeze
+        @options = (options || {}).reverse_merge(tokenizer: DEFAULT_TOKENIZER).freeze
         validate_each_without_default_tokenizer record, attribute, value
       end
       alias_method_chain :validate_each, :default_tokenizer
diff --git a/lib/html5_validators/active_model/validations.rb b/lib/html5_validators/active_model/validations.rb
@@ -3,7 +3,7 @@ module ActiveModelExtension
     extend ActiveSupport::Concern
 
     included do
-      cattr_accessor :auto_html5_validation, :instance_accessor => false, :instance_reader => false, :instance_writer => false
+      cattr_accessor :auto_html5_validation, instance_accessor: false, instance_reader: false, instance_writer: false
     end
   end
 end
diff --git a/lib/html5_validators/active_record/base.rb b/lib/html5_validators/active_record/base.rb
@@ -8,15 +8,15 @@ module ClassMethods
       def inherited(kls)
         super
         kls.class_eval do
-          cattr_accessor :auto_html5_validation, :instance_accessor => false, :instance_reader => false, :instance_writer => false
+          cattr_accessor :auto_html5_validation, instance_accessor: false, instance_reader: false, instance_writer: false
         end if kls.superclass == ActiveRecord::Base
       end
     end
 
     included do
       # Existing subclasses pick up the model extension as well
       self.descendants.each do |kls|
-        cattr_accessor :auto_html5_validation, :instance_accessor => false, :instance_reader => false, :instance_writer => false if kls.superclass == ActiveRecord::Base
+        cattr_accessor :auto_html5_validation, instance_accessor: false, instance_reader: false, instance_writer: false if kls.superclass == ActiveRecord::Base
       end
     end
   end
diff --git a/spec/fake_app.rb b/spec/fake_app.rb
@@ -2,24 +2,24 @@
 require 'action_controller/railtie'
 
 # config
-ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => ':memory:')
+ActiveRecord::Base.establish_connection(adapter: 'sqlite3', database: ':memory:')
 
 app = Class.new(Rails::Application)
 app.config.secret_token = "You know I'm born to lose, and gambling's for fools, But that's the way I like it baby, I don't wanna live for ever, And don't forget the joker!"
-app.config.session_store :cookie_store, :key => '_myapp_session'
+app.config.session_store :cookie_store, key: '_myapp_session'
 app.config.active_support.deprecation = :log
 app.config.eager_load = false
 app.initialize!
 
 # routes
 app.routes.draw do
-  resources :people, :only => [:new, :create] do
+  resources :people, only: [:new, :create] do
     collection do
       get :new_without_html5_validation
       get :new_with_required_true
     end
   end
-  resources :items, :only => [:new, :create] do
+  resources :items, only: [:new, :create] do
     collection do
       get :new_without_html5_validation
       get :new_with_required_true
@@ -47,7 +47,7 @@ class ApplicationController < ActionController::Base; end
 class PeopleController < ApplicationController
   def new
     @person = Person.new
-    render :inline => <<-ERB
+    render inline: <<-ERB
 <%= form_for @person do |f| %>
 <%= f.text_field :name %>
 <%= f.text_area :bio %>
@@ -57,8 +57,8 @@ def new
 
   def new_without_html5_validation
     @person = Person.new
-    render :inline => <<-ERB
-<%= form_for @person, :auto_html5_validation => false do |f| %>
+    render inline: <<-ERB
+<%= form_for @person, auto_html5_validation: false do |f| %>
 <%= f.text_field :name %>
 <%= f.text_field :email %>
 <% end %>
@@ -67,17 +67,17 @@ def new_without_html5_validation
 
   def new_with_required_true
     @person = Person.new
-    render :inline => <<-ERB
+    render inline: <<-ERB
 <%= form_for @person do |f| %>
-<%= f.text_field :email, :required => true %>
+<%= f.text_field :email, required: true %>
 <% end %>
     ERB
   end
 end
 class ItemsController < ApplicationController
   def new
     @item = Item.new
-    render :inline => <<-ERB
+    render inline: <<-ERB
 <%= form_for @item do |f| %>
 <%= f.text_field :name %>
 <%= f.text_area :description %>
@@ -87,8 +87,8 @@ def new
 
   def new_without_html5_validation
     @item = Item.new
-    render :inline => <<-ERB
-<%= form_for @item, :auto_html5_validation => false do |f| %>
+    render inline: <<-ERB
+<%= form_for @item, auto_html5_validation: false do |f| %>
 <%= f.text_field :name %>
 <%= f.text_area :description %>
 <% end %>
@@ -97,9 +97,9 @@ def new_without_html5_validation
 
   def new_with_required_true
     @item = Item.new
-    render :inline => <<-ERB
+    render inline: <<-ERB
 <%= form_for @item do |f| %>
-<%= f.text_field :name, :required => true %>
+<%= f.text_field :name, required: true %>
 <% end %>
     ERB
   end
diff --git a/spec/features/validation_spec.rb b/spec/features/validation_spec.rb
@@ -75,8 +75,8 @@
 
   context 'with maxlength validation' do
     background do
-      Person.validates_length_of :name, {:maximum => 20}
-      Person.validates_length_of :bio, {:maximum => 100}
+      Person.validates_length_of :name, maximum: 20
+      Person.validates_length_of :bio, maximum: 100
     end
 
     scenario 'new form' do
@@ -89,8 +89,8 @@
 
   context 'with minlength validation' do
     background do
-      Person.validates_length_of :name, {:minimum => 3}
-      Person.validates_length_of :bio, {:minimum => 10}
+      Person.validates_length_of :name, minimum: 3
+      Person.validates_length_of :bio, minimum: 10
     end
 
     scenario 'new form' do
@@ -177,8 +177,8 @@
 
   context 'with maxlength validation' do
     background do
-      Item.validates_length_of :name, {:maximum => 20 }
-      Item.validates_length_of :description, {:maximum => 100}
+      Item.validates_length_of :name, maximum: 20
+      Item.validates_length_of :description, maximum: 100
     end
 
     scenario 'new form' do
@@ -191,8 +191,8 @@
 
   context 'with minlength validation' do
     background do
-      Item.validates_length_of :name, {:minimum => 3}
-      Item.validates_length_of :description, {:minimum => 10}
+      Item.validates_length_of :name, minimum: 3
+      Item.validates_length_of :description, minimum: 10
     end
 
     scenario 'new form' do
