data-writer 0.9.0 → 0.9.1

data/README.md

@@ -1,3 +1,5 @@
+[![Build Status](https://secure.travis-ci.org/kl/data-writer.png)](http://travis-ci.org/kl/data-writer)
+
 data-writer
 ===========
 

data/data-writer.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name        	= 'data-writer'
-  s.version     	= '0.9.0'
-  s.date        	= '2012-07-15'
+  s.version     	= '0.9.1'
+  s.date        	= '2012-07-18'
   s.summary     	= "Allows you to write to DATA"
   s.description 	= "Normally you can only read from DATA but with data-writer you can also write to it. This allows you to easily persist data in a source file."
   s.authors     	= ["Kalle Lindstrom"]

data/lib/data-writer.rb

@@ -12,20 +12,21 @@ class DATAWriter
   
   #
   # Factory method for DATA writers. Works simliar to File.new.
+  # mode can be both a string like "w" or a number like File::WRONLY
   #
   def self.file(mode, opt={})
     check_DATA_defined  # raises an exception if DATA is not defined.
     data_path = File.expand_path(DATA.path)
 
-    if mode =~ /w/      # if we have a "w" we first need to delete everything after __END__.
-      clear_end
-      mode.include?("b") ? m = "rb+" : m = "r+"   # the actual mode will be rb+ or r+.
-      file = create_file(data_path, m, opt)
+    if mode.is_a?(String)
+      valid_mode = get_valid_string_mode(mode)
     else
-      file = create_file(data_path, mode, opt)
+      valid_mode = get_valid_int_mode(mode)
     end
 
-    @data_start_pos = scan_data_pos   # remeber the current position of __END__.
+    file = create_file(data_path, valid_mode, opt)
+
+    @data_start_pos = scan_data_pos
     file.pos = @data_start_pos        # sets the file pos to the line after __END__.
     enhanced = enhance_file(file)     # adds specialized methods for this object.
 
@@ -38,13 +39,59 @@ class DATAWriter
   end
 
   #
-  # Helper method to create a file that works in both 1.8 and 1.9.
+  # If "w" was specifed as a mode we need to remove that (because it will truncate the whole file)
+  # 
+  def self.get_valid_string_mode(mode)
+    if mode =~ /w/
+      clear_end       # truncate after __END__ only.
+      valid_mode = 0
+      valid_mode |= mode.include?("+") ? File::RDWR : File::RDONLY
+      valid_mode |= File::BINARY if mode.include?("b")
+      valid_mode
+    else
+      mode
+    end
+  end
+  private_class_method :get_valid_string_mode
+
+  #
+  # Same as get_valid_string_mode but for the integer modes specifed in File::Constants.
+  #
+  def self.get_valid_int_mode(mode)
+    if (mode & File::TRUNC) == File::TRUNC        # mode includes TRUNC
+      clear_end                                   # truncate after __END__ only.
+      valid_mode = 0
+      File::Constants.constants.each do |const|   # build new mode excluding TRUNC
+        value = File::const_get(const)
+        next if value.is_a?(String)               # for example File::NULL
+        if (mode & value) == value && value != File::TRUNC
+          valid_mode |= value
+        end
+      end
+      valid_mode
+    else
+      mode
+    end
+  end
+  private_class_method :get_valid_int_mode
+
+  #
+  # Helper method to create a file that works in both 1.8 and 1.9 and different implementations.
   #
   def self.create_file(path, mode_string, opt = {})
-    if RUBY_VERSION =~ /(1\.9)|(19)/
-      File.new(path, mode_string, opt)
+    if RUBY_PLATFORM =~ /java/i
+      if RUBY_VERSION =~ /1\.9\.3/
+        File.new(path, mode_string, opt)    # Only JRuby 1.7 seem to implement this method the 1.9 way.
+      else
+        File.new(path, mode_string)
+      end
+
     else
-      File.new(path, mode_string)
+      if RUBY_VERSION =~ /1\.9/
+        File.new(path, mode_string, opt)
+      else
+        File.new(path, mode_string)
+      end
     end
   end
   private_class_method :create_file

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: data-writer
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-15 00:00:00.000000000 Z
+date: 2012-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake