Skip to content

Commit

Permalink
Fix "in memory" where it should be "in-memory".
Browse files Browse the repository at this point in the history
  • Loading branch information
chuyeow committed Nov 11, 2011
1 parent b9aaa31 commit e34e4d4
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions activerecord/test/cases/nested_attributes_test.rb
Expand Up @@ -937,13 +937,13 @@ def setup
@trinket = @part.trinkets.create!(:name => "Necklace")
end

test "if association is not loaded and association record is saved and then in memory record attributes should be saved" do
test "if association is not loaded and association record is saved and then in-memory record attributes should be saved" do
@ship.parts_attributes=[{:id => @part.id,:name =>'Deck'}]
assert_equal 1, @ship.association(:parts).target.size
assert_equal 'Deck', @ship.parts[0].name
end

test "if association is not loaded and child doesn't change and I am saving a grandchild then in memory record should be used" do
test "if association is not loaded and child doesn't change and I am saving a grandchild then in-memory record should be used" do
@ship.parts_attributes=[{:id => @part.id,:trinkets_attributes =>[{:id => @trinket.id, :name => 'Ruby'}]}]
assert_equal 1, @ship.association(:parts).target.size
assert_equal 'Mast', @ship.parts[0].name
Expand Down
2 changes: 1 addition & 1 deletion activerecord/test/cases/relation_scoping_test.rb
Expand Up @@ -527,7 +527,7 @@ def test_default_scope_include_with_count

def test_default_scope_is_threadsafe
if in_memory_db?
skip "in memory db can't share a db between threads"
skip "in-memory db can't share a db between threads"
end

threads = []
Expand Down
2 changes: 1 addition & 1 deletion activesupport/lib/active_support/cache/file_store.rb
Expand Up @@ -8,7 +8,7 @@ module Cache
# A cache store implementation which stores everything on the filesystem.
#
# FileStore implements the Strategy::LocalCache strategy which implements
# an in memory cache inside of a block.
# an in-memory cache inside of a block.
class FileStore < Store
attr_reader :cache_path

Expand Down
2 changes: 1 addition & 1 deletion activesupport/lib/active_support/cache/mem_cache_store.rb
Expand Up @@ -21,7 +21,7 @@ module Cache
# server goes down, then MemCacheStore will ignore it until it comes back up.
#
# MemCacheStore implements the Strategy::LocalCache strategy which implements
# an in memory cache inside of a block.
# an in-memory cache inside of a block.
class MemCacheStore < Store
module Response # :nodoc:
STORED = "STORED\r\n"
Expand Down
Expand Up @@ -4,9 +4,9 @@
module ActiveSupport
module Cache
module Strategy
# Caches that implement LocalCache will be backed by an in memory cache for the
# Caches that implement LocalCache will be backed by an in-memory cache for the
# duration of a block. Repeated calls to the cache for the same key will hit the
# in memory cache for faster access.
# in-memory cache for faster access.
module LocalCache
# Simple memory backed cache. This cache is not thread safe and is intended only
# for serving as a temporary memory cache for a single thread.
Expand Down

0 comments on commit e34e4d4

Please sign in to comment.