second_level_cache 2.1.16 → 2.2.1

data/lib/second_level_cache/record_marshal.rb

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 module RecordMarshal
   class << self
     # dump ActiveRecord instace with only attributes.
@@ -10,52 +9,38 @@ module RecordMarshal
     # ]
 
     def dump(record)
-      [
-       record.class.name,
-       record.attributes
-      ]
+      [record.class.name, record.attributes]
     end
 
     # load a cached record
     def load(serialized)
       return unless serialized
-      #fix issues 19
-      #fix 2.1.2 object.changed? ActiveRecord::SerializationTypeMismatch: Attribute was supposed to be a Hash, but was a String. -- "{:a=>\"t\", :b=>\"x\"}"
-      #fix 2.1.4 object.changed? is true
-      #fix Rails 4.2 is deprecating `serialized_attributes` without replacement to Rails 5 is deprecating `serialized_attributes` without replacement
-      klass, attributes = serialized[0].constantize, serialized[1]
-      if ::ActiveRecord::VERSION::STRING < '4.2.0'
-        klass.serialized_attributes.each do |k, v|
-          next if attributes[k].nil? || attributes[k].is_a?(String)
-          if attributes[k].respond_to?(:unserialize)
-            if attributes[k].serialized_value.is_a?(String)
-              attributes[k] = attributes[k].serialized_value
-              next
-            end
+      # fix issues 19
+      # fix 2.1.2 object.changed? ActiveRecord::SerializationTypeMismatch: Attribute was supposed to be a Hash, but was a String. -- "{:a=>\"t\", :b=>\"x\"}"
+      # fix 2.1.4 object.changed? is true
+      # fix Rails 4.2 is deprecating `serialized_attributes` without replacement to Rails 5 is deprecating `serialized_attributes` without replacement
+      klass = serialized[0].constantize
+      attributes = serialized[1]
 
-            if ::ActiveRecord::VERSION::STRING >= '4.1.0' && attributes[k].coder == ActiveRecord::Coders::JSON
-              attributes[k] = attributes[k].serialized_value.to_json
-            else
-              attributes[k] = attributes[k].serialized_value
-            end
-          end
-        end
-      else
-        klass.columns.select{|t| t.cast_type.is_a?(::ActiveRecord::Type::Serialized) }.each do |c|
-          name, coder = c.name, c.cast_type.coder
-          next if attributes[name].nil? || attributes[name].is_a?(String)
-          if coder.is_a?(ActiveRecord::Coders::YAMLColumn)
-            attributes[name] = coder.dump(attributes[name]) if attributes[name].is_a?(coder.object_class)
-          elsif coder == ActiveRecord::Coders::JSON
-            attributes[name] = attributes[name].to_json
-          end
+      # for ActiveRecord 5.0.0
+      klass.columns.each do |c|
+        name = c.name
+        cast_type = klass.attribute_types[name]
+        next unless cast_type.is_a?(::ActiveRecord::Type::Serialized)
+        coder = cast_type.coder
+        next if attributes[name].nil? || attributes[name].is_a?(String)
+        if coder.is_a?(::ActiveRecord::Coders::YAMLColumn)
+          attributes[name] = coder.dump(attributes[name]) if attributes[name].is_a?(coder.object_class)
+        elsif coder == ::ActiveRecord::Coders::JSON
+          attributes[name] = attributes[name].to_json
         end
       end
+
       klass.instantiate(attributes)
     end
 
     def load_multi(serializeds)
-      serializeds.map{|serialized| load(serialized)}
+      serializeds.map { |serialized| load(serialized) }
     end
   end
 end

data/lib/second_level_cache/version.rb

@@ -1,4 +1,4 @@
-# -*- encoding : utf-8 -*-
+# frozen_string_literal: true
 module SecondLevelCache
-  VERSION = "2.1.16"
+  VERSION = '2.2.1'.freeze
 end

data/lib/second_level_cache.rb

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 require 'active_support/all'
 require 'second_level_cache/config'
 require 'second_level_cache/record_marshal'
@@ -9,7 +8,7 @@ module SecondLevelCache
   end
 
   class << self
-    delegate :logger, :cache_store, :cache_key_prefix, :to => Config
+    delegate :logger, :cache_store, :cache_key_prefix, to: Config
   end
 
   module Mixin
@@ -18,39 +17,30 @@ module SecondLevelCache
     module ClassMethods
       attr_reader :second_level_cache_options
 
+      delegate :logger, :cache_store, :cache_key_prefix, to: SecondLevelCache
+
       def acts_as_cached(options = {})
         @second_level_cache_enabled = true
         @second_level_cache_options = options
         @second_level_cache_options[:expires_in] ||= 1.week
         @second_level_cache_options[:version] ||= 0
-        relation.class.send :include, SecondLevelCache::ActiveRecord::FinderMethods
-        include SecondLevelCache::ActiveRecord::Core if /^4\.2\./.match(::ActiveRecord.version.version)
+        relation.class.send :prepend, SecondLevelCache::ActiveRecord::FinderMethods
+        prepend SecondLevelCache::ActiveRecord::Core
       end
 
       def second_level_cache_enabled?
-        !!@second_level_cache_enabled
+        @second_level_cache_enabled == true
       end
 
       def without_second_level_cache
-        old, @second_level_cache_enabled = @second_level_cache_enabled, false
+        old = @second_level_cache_enabled
+        @second_level_cache_enabled = false
 
         yield if block_given?
       ensure
         @second_level_cache_enabled = old
       end
 
-      def cache_store
-        Config.cache_store
-      end
-
-      def logger
-        Config.logger
-      end
-
-      def cache_key_prefix
-        Config.cache_key_prefix
-      end
-
       def cache_version
         second_level_cache_options[:version]
       end
@@ -60,11 +50,13 @@ module SecondLevelCache
       end
 
       def read_second_level_cache(id)
-        RecordMarshal.load(SecondLevelCache.cache_store.read(second_level_cache_key(id))) if self.second_level_cache_enabled?
+        return unless second_level_cache_enabled?
+        RecordMarshal.load(SecondLevelCache.cache_store.read(second_level_cache_key(id)))
       end
 
       def expire_second_level_cache(id)
-        SecondLevelCache.cache_store.delete(second_level_cache_key(id)) if self.second_level_cache_enabled?
+        return unless second_level_cache_enabled?
+        SecondLevelCache.cache_store.delete(second_level_cache_key(id))
       end
     end
 
@@ -73,13 +65,15 @@ module SecondLevelCache
     end
 
     def expire_second_level_cache
-      SecondLevelCache.cache_store.delete(second_level_cache_key) if self.class.second_level_cache_enabled?
+      return unless self.class.second_level_cache_enabled?
+      SecondLevelCache.cache_store.delete(second_level_cache_key)
     end
 
     def write_second_level_cache
-      if self.class.second_level_cache_enabled?
-        SecondLevelCache.cache_store.write(second_level_cache_key, RecordMarshal.dump(self), :expires_in => self.class.second_level_cache_options[:expires_in])
-      end
+      return unless self.class.second_level_cache_enabled?
+      marshal = RecordMarshal.dump(self)
+      expires_in = self.class.second_level_cache_options[:expires_in]
+      SecondLevelCache.cache_store.write(second_level_cache_key, marshal, expires_in: expires_in)
     end
 
     alias update_second_level_cache write_second_level_cache

data/second_level_cache.gemspec

@@ -4,9 +4,9 @@ lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
-  gem.authors       = ["Hooopo"]
-  gem.email         = ["hoooopo@gmail.com"]
-  gem.description   = %q{Write Through and Read Through caching library inspired by CacheMoney and cache_fu, support  ActiveRecord 4.}
+  gem.authors       = ['Hooopo']
+  gem.email         = ['hoooopo@gmail.com']
+  gem.description   = 'Write Through and Read Through caching library inspired by CacheMoney and cache_fu, support  ActiveRecord 4.'
   gem.summary       = <<-SUMMARY
   SecondLevelCache is a write-through and read-through caching library inspired by Cache Money and cache_fu, support only Rails3 and ActiveRecord.
 
@@ -15,26 +15,27 @@ Gem::Specification.new do |gem|
   Write-Through: As objects are created, updated, and deleted, all of the caches are automatically kept up-to-date and coherent.
   SUMMARY
 
-  gem.homepage      = "https://github.com/csdn-dev/second_level_cache"
+  gem.homepage      = 'https://github.com/csdn-dev/second_level_cache'
 
-  gem.files         = Dir.glob("lib/**/*.rb") + [
-    "README.md",
-    "Rakefile",
-    "Gemfile",
-    "CHANGELOG.md",
-    "second_level_cache.gemspec"
+  gem.files         = Dir.glob('lib/**/*.rb') + [
+    'README.md',
+    'Rakefile',
+    'Gemfile',
+    'CHANGELOG.md',
+    'second_level_cache.gemspec'
   ]
-  gem.test_files    = Dir.glob("test/**/*.rb")
+  gem.test_files    = Dir.glob('test/**/*.rb')
   gem.executables   = gem.files.grep(%r{^bin/})
-  gem.name          = "second_level_cache"
-  gem.require_paths = ["lib"]
+  gem.name          = 'second_level_cache'
+  gem.require_paths = ['lib']
   gem.version       = SecondLevelCache::VERSION
 
-  gem.add_runtime_dependency "activesupport", ["> 4.0.0", "< 5.0"]
+  gem.add_runtime_dependency 'activesupport', ['>= 5.0.0.beta1', '< 5.1.0']
+  gem.add_runtime_dependency 'activerecord', ['>= 5.0.0.beta1', '< 5.1.0']
 
-  gem.add_runtime_dependency "activerecord", ["> 4.0.0", "< 5.0"]
-  gem.add_development_dependency "sqlite3", "~> 1.3.6"
-  gem.add_development_dependency "rake"
+  gem.add_development_dependency 'sqlite3'
+  gem.add_development_dependency 'rake'
   gem.add_development_dependency 'pry'
-  gem.add_development_dependency "database_cleaner", "~> 1.3.0"
+  gem.add_development_dependency 'database_cleaner', '~> 1.3.0'
+  gem.add_development_dependency 'rubocop', '~> 0.36.0'
 end

data/test/active_record_test_case_helper.rb

@@ -37,9 +37,9 @@ module ActiveRecordTestCaseHelper
   ensure
     failed_patterns = []
     patterns_to_match.each do |pattern|
-      failed_patterns << pattern unless SQLCounter.log_all.any?{ |sql| pattern === sql }
+      failed_patterns << pattern unless SQLCounter.log_all.any? { |sql| pattern === sql }
     end
-    assert failed_patterns.empty?, "Query pattern(s) #{failed_patterns.map{ |p| p.inspect }.join(', ')} not found.#{SQLCounter.log.size == 0 ? '' : "\nQueries:\n#{SQLCounter.log.join("\n")}"}"
+    assert failed_patterns.empty?, "Query pattern(s) #{failed_patterns.map(&:inspect).join(', ')} not found.#{SQLCounter.log.empty? ? '' : "\nQueries:\n#{SQLCounter.log.join("\n")}"}"
   end
 
   def assert_queries(num = 1, options = {})
@@ -48,9 +48,9 @@ module ActiveRecordTestCaseHelper
     x = yield
     the_log = ignore_none ? SQLCounter.log_all : SQLCounter.log
     if num == :any
-      assert_operator the_log.size, :>=, 1, "1 or more queries expected, but none were executed."
+      assert_operator the_log.size, :>=, 1, '1 or more queries expected, but none were executed.'
     else
-      mesg = "#{the_log.size} instead of #{num} queries were executed.#{the_log.size == 0 ? '' : "\nQueries:\n#{the_log.join("\n")}"}"
+      mesg = "#{the_log.size} instead of #{num} queries were executed.#{the_log.empty? ? '' : "\nQueries:\n#{the_log.join("\n")}"}"
       assert_equal num, the_log.size, mesg
     end
     x
@@ -61,15 +61,15 @@ module ActiveRecordTestCaseHelper
     assert_queries(0, options, &block)
   end
 
-  def assert_column(model, column_name, msg=nil)
-    assert has_column?(model, column_name), msg
+  def assert_column(model, column_name, msg = nil)
+    assert exists_column?(model, column_name), msg
   end
 
-  def assert_no_column(model, column_name, msg=nil)
-    assert_not has_column?(model, column_name), msg
+  def assert_no_column(model, column_name, msg = nil)
+    assert_not exists_column?(model, column_name), msg
   end
 
-  def has_column?(model, column_name)
+  def exists_column?(model, column_name)
     model.reset_column_information
     model.column_names.include?(column_name.to_s)
   end
@@ -77,10 +77,13 @@ module ActiveRecordTestCaseHelper
   class SQLCounter
     class << self
       attr_accessor :ignored_sql, :log, :log_all
-      def clear_log; self.log = []; self.log_all = []; end
+      def clear_log
+        self.log = []
+        self.log_all = []
+      end
     end
 
-    self.clear_log
+    clear_log
 
     self.ignored_sql = [/^PRAGMA/, /^SELECT currval/, /^SELECT CAST/, /^SELECT @@IDENTITY/, /^SELECT @@ROWCOUNT/, /^SAVEPOINT/, /^ROLLBACK TO SAVEPOINT/, /^RELEASE SAVEPOINT/, /^SHOW max_identifier_length/, /^BEGIN/, /^COMMIT/]
 
@@ -102,7 +105,7 @@ module ActiveRecordTestCaseHelper
       @ignore = ignore
     end
 
-    def call(name, start, finish, message_id, values)
+    def call(_name, _start, _finish, _message_id, values)
       sql = values[:sql]
 
       # FIXME: this seems bad. we should probably have a better way to indicate

data/test/base_test.rb

@@ -1,13 +1,12 @@
-# -*- encoding : utf-8 -*-
 require 'test_helper'
 
 class BaseTest < ActiveSupport::TestCase
   def setup
-    @user = User.create :name => 'csdn', :email => 'test@csdn.com'
+    @user = User.create name: 'csdn', email: 'test@csdn.com'
   end
 
   def test_should_update_cache_when_update_attributes
-    @user.update_attributes :name => 'change'
+    @user.update_attributes name: 'change'
     assert_equal @user.name, User.read_second_level_cache(@user.id).name
   end
 

data/test/belongs_to_association_test.rb

@@ -1,16 +1,15 @@
-# -*- encoding : utf-8 -*-
 require 'test_helper'
 
 class BelongsToAssociationTest < ActiveSupport::TestCase
   def setup
-    @user = User.create :name => 'csdn', :email => 'test@csdn.com'
+    @user = User.create name: 'csdn', email: 'test@csdn.com'
   end
 
   def test_should_get_cache_when_use_belongs_to_association
     book = @user.books.create
 
     @user.write_second_level_cache
-    book.clear_association_cache
+    book.send(:clear_association_cache)
     assert_no_queries do
       assert_equal @user, book.user
     end

data/test/fetch_by_uniq_key_test.rb

@@ -1,43 +1,42 @@
-# -*- encoding : utf-8 -*-
 require 'test_helper'
 
 class FetchByUinqKeyTest < ActiveSupport::TestCase
   def setup
-    @user = User.create :name => 'hooopo', :email => 'hoooopo@gmail.com'
-    @post = Post.create :slug => "foobar", :topic_id => 2
+    @user = User.create name: 'hooopo', email: 'hoooopo@gmail.com'
+    @post = Post.create slug: 'foobar', topic_id: 2
   end
 
   def test_cache_uniq_key
-    assert_equal User.send(:cache_uniq_key, { :name => "hooopo" } ), "uniq_key_User_name_hooopo"
-    assert_equal User.send(:cache_uniq_key, { :foo => 1, :bar => 2 } ), "uniq_key_User_foo_1,bar_2"
-    assert_equal User.send(:cache_uniq_key, { :foo => 1, :bar => nil } ), "uniq_key_User_foo_1,bar_"
-    long_val = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
-    assert_equal User.send(:cache_uniq_key, { :foo => 1, :bar => long_val } ), "uniq_key_User_foo_1,bar_#{Digest::MD5.hexdigest(long_val)}"
+    assert_equal User.send(:cache_uniq_key, name: 'hooopo'), 'uniq_key_User_name_hooopo'
+    assert_equal User.send(:cache_uniq_key, foo: 1, bar: 2), 'uniq_key_User_foo_1,bar_2'
+    assert_equal User.send(:cache_uniq_key, foo: 1, bar: nil), 'uniq_key_User_foo_1,bar_'
+    long_val = 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'
+    assert_equal User.send(:cache_uniq_key, foo: 1, bar: long_val), "uniq_key_User_foo_1,bar_#{Digest::MD5.hexdigest(long_val)}"
   end
 
   def test_should_query_from_db_using_primary_key
-    Post.fetch_by_uniq_keys(:topic_id => 2, :slug => "foobar")
+    Post.fetch_by_uniq_keys(topic_id: 2, slug: 'foobar')
     @post.expire_second_level_cache
-    assert_sql(/SELECT\s+"posts".* FROM "posts"\s+WHERE "posts"."id" = \? LIMIT 1/) do
-      Post.fetch_by_uniq_keys(:topic_id => 2, :slug => "foobar")
+    assert_sql(/SELECT\s+"posts".* FROM "posts"\s+WHERE "posts"."id" = \? LIMIT ?/) do
+      Post.fetch_by_uniq_keys(topic_id: 2, slug: 'foobar')
     end
   end
 
   def test_should_not_hit_db_using_fetch_by_uniq_key_twice
-    post = Post.fetch_by_uniq_keys(:topic_id => 2, :slug => "foobar")
+    post = Post.fetch_by_uniq_keys(topic_id: 2, slug: 'foobar')
     assert_equal post, @post
     assert_no_queries do
-      Post.fetch_by_uniq_keys(:topic_id => 2, :slug => "foobar")
+      Post.fetch_by_uniq_keys(topic_id: 2, slug: 'foobar')
     end
   end
 
   def test_should_fail_when_fetch_by_uniq_key_with_bang_method
     assert_raises(ActiveRecord::RecordNotFound) do
-      Post.fetch_by_uniq_keys!(:topic_id => 2, :slug => "foobar1")
+      Post.fetch_by_uniq_keys!(topic_id: 2, slug: 'foobar1')
     end
 
     assert_raises(ActiveRecord::RecordNotFound) do
-      User.fetch_by_uniq_key!("xxxxx", :name)
+      User.fetch_by_uniq_key!('xxxxx', :name)
     end
   end
 

data/test/finder_methods_test.rb

@@ -1,10 +1,8 @@
-# -*- encoding : utf-8 -*-
 require 'test_helper'
 
 class FinderMethodsTest < ActiveSupport::TestCase
   def setup
-    @user = User.create :name => 'csdn', :email => 'test@csdn.com'
-    @other_user = User.create :name => 'shopper+', :email => 'test@shopperplus.com'
+    @user = User.create name: 'csdn', email: 'test@csdn.com'
   end
 
   def test_should_find_without_cache
@@ -22,61 +20,24 @@ class FinderMethodsTest < ActiveSupport::TestCase
   def test_should_find_with_condition
     @user.write_second_level_cache
     assert_no_queries do
-      assert_equal @user, User.where(:name => @user.name).find(@user.id)
+      assert_equal @user, User.where(name: @user.name).find(@user.id)
     end
   end
 
-  def test_should_NOT_find_from_cache_when_select_speical_columns
+  def test_should_not_find_from_cache_when_select_speical_columns
     @user.write_second_level_cache
-    only_id_user = User.select("id").find(@user.id)
+    only_id_user = User.select('id').find(@user.id)
     assert_raises(ActiveModel::MissingAttributeError) do
       only_id_user.name
     end
   end
 
   def test_without_second_level_cache
-    @user.name = "NewName"
+    @user.name = 'NewName'
     @user.write_second_level_cache
     User.without_second_level_cache do
       @from_db = User.find(@user.id)
     end
     refute_equal @user.name, @from_db.name
   end
-
-  def test_find_some_record
-    @users = User.find(@user.id, @other_user.id)
-    assert_equal 2, @users.size
-  end
-
-  def test_find_some_record_without_second_level_cache
-    User.without_second_level_cache do
-      @users = User.find(@user.id, @other_user.id)
-    end
-    assert_equal 2, @users.size
-  end
-
-  def test_missing_id_will_raise_for_find_some
-    assert_raises(ActiveRecord::RecordNotFound) do
-      @users = User.find(@user.id, User.last.id + 10000)
-    end
-  end
-
-  def test_filter_works_fine_for_find_some
-    assert_raises(ActiveRecord::RecordNotFound) do
-      @users = User.where("name is null").find(@user.id, @other_user.id)
-    end
-  end
-
-  def test_half_in_cache_for_find_some
-    @user.expire_second_level_cache
-    @users = User.find(@user.id, @other_user.id)
-    assert_equal 2, @users.size
-  end
-
-  def test_no_record_in_cache_for_find_some
-    @user.expire_second_level_cache
-    @other_user.expire_second_level_cache
-    @users = User.find(@user.id, @other_user.id)
-    assert_equal 2, @users.size
-  end
 end

data/test/has_one_association_test.rb

@@ -1,9 +1,8 @@
-# -*- encoding : utf-8 -*-
 require 'test_helper'
 
 class HasOneAssociationTest < ActiveSupport::TestCase
   def setup
-    @user = User.create :name => 'hooopo', :email => 'hoooopo@gmail.com'
+    @user = User.create name: 'hooopo', email: 'hoooopo@gmail.com'
     @account = @user.create_account
   end
 
@@ -15,7 +14,7 @@ class HasOneAssociationTest < ActiveSupport::TestCase
   end
 
   def test_should_fetch_has_one_through
-    user = User.create :name => 'hooopo', :email => 'hoooopo@gmail.com', forked_from_user: @user
+    user = User.create name: 'hooopo', email: 'hoooopo@gmail.com', forked_from_user: @user
     clean_user = user.reload
     assert_equal User, clean_user.forked_from_user.class
     assert_equal @user.id, user.forked_from_user.id
@@ -27,15 +26,11 @@ class HasOneAssociationTest < ActiveSupport::TestCase
 
   def test_has_one_with_conditions
     user = User.create name: 'hooopo', email: 'hoooopo@gmail.com'
-    group_namespace1 = Namespace.create(user_id: user.id, name: 'ruby-china', kind: 'group')
+    Namespace.create(user_id: user.id, name: 'ruby-china', kind: 'group')
     user.create_namespace(name: 'hooopo')
-    group_namespace2 = Namespace.create(user_id: user.id, name: 'rails', kind: 'group')
+    Namespace.create(user_id: user.id, name: 'rails', kind: 'group')
     assert_not_equal user.namespace, nil
-    assert_equal user.reload.namespace.name, 'hooopo'
-    clear_user = user.reload
-    assert_no_queries do
-      clear_user.namespace
-    end
+    clear_user = User.find(user.id)
     assert_equal clear_user.namespace.name, 'hooopo'
   end
 end

data/test/model/account.rb

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 ActiveRecord::Base.connection.create_table(:accounts, force: true) do |t|
   t.integer :age
   t.string :site
@@ -7,6 +6,6 @@ ActiveRecord::Base.connection.create_table(:accounts, force: true) do |t|
 end
 
 class Account < ActiveRecord::Base
-  acts_as_cached(expires_in: 3.day)
+  acts_as_cached expires_in: 3.days
   belongs_to :user
 end

data/test/model/animal.rb

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 ActiveRecord::Base.connection.create_table(:animals, force: true) do |t|
   t.string  :type
   t.string  :name

data/test/model/book.rb

@@ -1,14 +1,13 @@
-# -*- encoding : utf-8 -*-
-ActiveRecord::Base.connection.create_table(:books, :force => true) do |t|
+ActiveRecord::Base.connection.create_table(:books, force: true) do |t|
   t.string  :title
   t.string  :body
   t.integer :user_id
-  t.integer :images_count, :default => 0
+  t.integer :images_count, default: 0
 end
 
 class Book < ActiveRecord::Base
   acts_as_cached
 
-  belongs_to :user, :counter_cache => true
-  has_many :images, :as => :imagable
+  belongs_to :user, counter_cache: true
+  has_many :images, as: :imagable
 end

data/test/model/image.rb

@@ -1,5 +1,4 @@
-# -*- encoding : utf-8 -*-
-ActiveRecord::Base.connection.create_table(:images, :force => true) do |t|
+ActiveRecord::Base.connection.create_table(:images, force: true) do |t|
   t.string  :url
   t.string  :imagable_type
   t.integer :imagable_id
@@ -8,6 +7,5 @@ end
 class Image < ActiveRecord::Base
   acts_as_cached
 
-  belongs_to :imagable, :polymorphic => true, :counter_cache => true
+  belongs_to :imagable, polymorphic: true, counter_cache: true
 end
-

data/test/model/post.rb

@@ -1,11 +1,10 @@
-# -*- encoding : utf-8 -*-
-ActiveRecord::Base.connection.create_table(:posts, :force => true) do |t|
-  t.text  :body
+ActiveRecord::Base.connection.create_table(:posts, force: true) do |t|
+  t.text :body
   t.string :slug
   t.integer :topic_id
 end
 
 class Post < ActiveRecord::Base
   acts_as_cached
-  belongs_to :topic, :touch => true
+  belongs_to :topic, touch: true
 end

data/test/model/topic.rb

@@ -1,7 +1,6 @@
-# -*- encoding : utf-8 -*-
-ActiveRecord::Base.connection.create_table(:topics, :force => true) do |t|
+ActiveRecord::Base.connection.create_table(:topics, force: true) do |t|
   t.string  :title
-  t.text  :body
+  t.text :body
 
   t.timestamps null: false
 end