acts_as_indexed 0.7.5 → 0.7.6

data/CHANGELOG

@@ -1,4 +1,7 @@
-===0.7.4 [14th October 2011]
+===0.7.6 [24th October 2011]
+ - Removed support for atomic writes under Windows. Fixes issue #15.
+
+===0.7.5 [14th October 2011]
  - Screwup fix release.
 
 ===0.7.4 [13th October 2011]

data/VERSION

@@ -1 +1 @@
-0.7.5
+0.7.6

data/acts_as_indexed.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{acts_as_indexed}
-  s.version = "0.7.5"
+  s.version = "0.7.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Douglas F Shearer}]
-  s.date = %q{2011-10-13}
+  s.date = %q{2011-10-24}
   s.description = %q{Acts As Indexed is a plugin which provides a pain-free way to add fulltext search to your Ruby on Rails app}
   s.email = %q{dougal.s@gmail.com}
   s.extra_rdoc_files = [

data/lib/acts_as_indexed/storage.rb

@@ -79,9 +79,9 @@ module ActsAsIndexed #:nodoc:
 
       atoms_sorted.each do |e_p, atoms|
         path = @path.join(e_p.to_s + INDEX_FILE_EXTENSION)
-        
+
         lock_file(path) do
-        
+
           if path.exist?
             from_file = path.open do |f|
               Marshal.load(f)
@@ -96,7 +96,7 @@ module ActsAsIndexed #:nodoc:
             Marshal.dump(atoms,f)
           end
         end # end lock.
-        
+
       end
     end
 
@@ -121,7 +121,7 @@ module ActsAsIndexed #:nodoc:
 
       else
         @path.mkpath
-        
+
         # Do we need to lock for this? I don't think so as it is only ever
         # creating, not modifying.
         write_file(version_path) do |f|
@@ -157,11 +157,15 @@ module ActsAsIndexed #:nodoc:
       new_file = file_path.to_s
       tmp_file = new_file + TEMP_FILE_EXTENSION
 
+      # Windows doesn't seem to play nice with writing then moving the file.
+      # https://github.com/dougal/acts_as_indexed/issues/15
+      writeable_file = windows? ? new_file : tmp_file
+
       File.open(tmp_file, 'w+') do |f|
         yield(f)
       end
 
-      FileUtils.mv(tmp_file, new_file)
+      FileUtils.mv(tmp_file, new_file) unless windows?
     end
 
     # Borrowed from Rails' ActiveSupport FileStore. Also under MIT licence.
@@ -182,6 +186,8 @@ module ActsAsIndexed #:nodoc:
       end
     end
 
+    # Checking for windows all the time seems costly.
+    # Write a separate windows storage class, and use it at runtime?
     def windows?
       @@is_windows ||= RUBY_PLATFORM[/mswin32|mingw|cygwin/]
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: acts_as_indexed
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: 
   segments: 
   - 0
   - 7
-  - 5
-  version: 0.7.5
+  - 6
+  version: 0.7.6
 platform: ruby
 authors: 
 - Douglas F Shearer
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-13 00:00:00 Z
+date: 2011-10-24 00:00:00 Z
 dependencies: []
 
 description: Acts As Indexed is a plugin which provides a pain-free way to add fulltext search to your Ruby on Rails app