iostreams 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 48ec90a51a7475ae218a9758190fe4916d3af4a6
-  data.tar.gz: 6d5d33b93ab5b17884fdd79ae8e7d00adbe8adc9
+  metadata.gz: 4c229181098f8b4aedf3ce542477dc44554f94f4
+  data.tar.gz: 866c35496433dbd255865b322a61bd50272b5ea5
 SHA512:
-  metadata.gz: 99d8654a734acc8af11acaaba49c61904f71d055695279ebb912d0501c20ad812e8e8ba1a906f84586e8c72e67dcae590922fb5d9df100487e1c87ac72d533f7
-  data.tar.gz: 708bcf9a33706391aa38a3314e668149bd14c86964dd235281c1ec512f4ac1ff11a80a232ba996789d7d04dae08cf70541637837965ec10ac92b8152f8b87539
+  metadata.gz: d91a975d92b3ab08d2d0185a927f6403ccdd362b63dd07871f7322219d07ea088e84ff401c9bd6ec3cb8227e29a7d7702aec6d35dbe863a2764ebda83e5e3dc9
+  data.tar.gz: 7204cf47a99466b5818b462f3cffbc303f129e277793c3fda1ec8ef1c5f697145bcda34d69ea859d674789cb3f500afcd29fcacad76963c173bdd9768757f057

data/lib/io_streams/delimited/reader.rb

@@ -1,7 +1,7 @@
 module IOStreams
   module Delimited
     class Reader
-      attr_accessor :delimiter
+      attr_accessor :delimiter, :buffer_size, :encoding, :strip_non_printable
 
       # Read from a file or stream
       def self.open(file_name_or_io, options={}, &block)
@@ -54,8 +54,7 @@ module IOStreams
         @delimiter           = options.delete(:delimiter)
         @buffer_size         = options.delete(:buffer_size) || 65536
         @encoding            = options.has_key?(:encoding) ? options.delete(:encoding) : UTF8_ENCODING
-        @strip_non_printable = options.delete(:strip_non_printable)
-        @strip_non_printable = @strip_non_printable.nil? && (@encoding == UTF8_ENCODING)
+        @strip_non_printable = options.delete(:strip_non_printable) || false
         raise ArgumentError.new("Unknown IOStreams::Delimited::Reader#initialize options: #{options.inspect}") if options.size > 0
 
         @delimiter.force_encoding(UTF8_ENCODING) if @delimiter && @encoding

data/lib/io_streams/io_streams.rb

@@ -32,7 +32,7 @@ module IOStreams
   #   => [ :file ]
   def self.streams_for_file_name(file_name)
     raise ArgumentError.new('File name cannot be nil') if file_name.nil?
-    raise ArgumentError.new("RocketJob Cannot detect file format when uploading to stream: #{file_name.inspect}") if file_name.respond_to?(:read)
+    raise ArgumentError.new("File name must be a string: #{file_name.inspect}, class: #{file_name.class}") unless file_name.is_a?(String)
     parts      = file_name.split('.')
     extensions = []
     while extension = parts.pop

data/lib/io_streams/version.rb

@@ -1,3 +1,3 @@
 module IOStreams #:nodoc
-  VERSION = '0.9.0'
+  VERSION = '0.9.1'
 end

data/lib/io_streams/zip/reader.rb

@@ -17,6 +17,15 @@ module IOStreams
         buffer_size = options.delete(:buffer_size) || 65536
         raise(ArgumentError, "Unknown IOStreams::Zip::Reader option: #{options.inspect}") if options.size > 0
 
+        if !defined?(JRuby) && !defined?(::Zip)
+          # MRI needs Ruby Zip, since it only has native support for GZip
+          begin
+            require 'zip'
+          rescue LoadError => exc
+            raise(LoadError, "Install gem 'rubyzip' to read and write Zip files: #{exc.message}")
+          end
+        end
+
         # File name supplied
         return read_file(file_name_or_io, &block) unless IOStreams.reader_stream?(file_name_or_io)
 
@@ -50,13 +59,6 @@ module IOStreams
         end
 
       else
-        # MRI needs Ruby Zip, since it only has native support for GZip
-        begin
-          require 'zip'
-        rescue LoadError => exc
-          puts 'Please install gem rubyzip so that RocketJob can read Zip files in Ruby MRI'
-          raise(exc)
-        end
 
         # Read from a zip file or stream, decompressing the contents as it is read
         # The input stream from the first file found in the zip file is passed

data/lib/io_streams/zip/writer.rb

@@ -32,6 +32,15 @@ module IOStreams
         zip_file_name = file_name_or_io.to_s[0..-5] if zip_file_name.nil? && !file_name_or_io.respond_to?(:write) && (file_name_or_io =~ /\.(zip)\z/)
         zip_file_name ||= 'file'
 
+        if !defined?(JRuby) && !defined?(::Zip)
+          # MRI needs Ruby Zip, since it only has native support for GZip
+          begin
+            require 'zip'
+          rescue LoadError => exc
+            raise(LoadError, "Install gem 'rubyzip' to read and write Zip files: #{exc.message}")
+          end
+        end
+
         # File name supplied
         return write_file(file_name_or_io, zip_file_name, &block) unless IOStreams.writer_stream?(file_name_or_io)
 
@@ -64,14 +73,6 @@ module IOStreams
         end
 
       else
-        # MRI needs Ruby Zip, since it only has native support for GZip
-        begin
-          require 'zip'
-        rescue LoadError => exc
-          puts 'Please install gem rubyzip so that RocketJob can read Zip files in Ruby MRI'
-          raise(exc)
-        end
-
         def self.write_file(file_name, zip_file_name, &block)
           zos = ::Zip::OutputStream.new(file_name)
           zos.put_next_entry(zip_file_name)

data/test/delimited_reader_test.rb

@@ -14,6 +14,40 @@ module Streams
         end
       end
 
+      describe '#initialize' do
+        it 'does not strip invalid characters' do
+          bad_lines = [
+            "New M\xE9xico,NE",
+            'good line',
+            "New M\xE9xico,SF"
+          ]
+          input     = StringIO.new(bad_lines.join("\n"))
+          lines     = []
+          IOStreams::Delimited::Reader.open(input) do |io|
+            assert_equal false, io.strip_non_printable
+            assert_raises ArgumentError do
+              io.each { |line| lines << line }
+            end
+          end
+        end
+
+        it 'strips invalid characters' do
+          bad_lines   = [
+            "New M\xE9xico,NE",
+            'good line',
+            "New M\xE9xico,SF"
+          ]
+          fixed_lines = bad_lines.collect { |line| line.force_encoding('BINARY').gsub(/[^[:print:]|\r|\n]/, '') }
+          input       = StringIO.new(bad_lines.join("\n"))
+          lines       = []
+          IOStreams::Delimited::Reader.open(input, strip_non_printable: true) do |io|
+            assert_equal true, io.strip_non_printable
+            io.each { |line| lines << line }
+          end
+          assert_equal fixed_lines, lines
+        end
+      end
+
       describe '#each' do
         it 'each_line file' do
           lines = []
@@ -71,7 +105,7 @@ module Streams
           result = IOStreams::Delimited::Reader.open(@file_name) do |io|
             io.read
           end
-          file = File.read(@file_name)
+          file   = File.read(@file_name)
           assert_equal file, result
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iostreams
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Reid Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-29 00:00:00.000000000 Z
+date: 2016-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: symmetric-encryption
@@ -82,7 +82,7 @@ files:
 - test/zip_writer_test.rb
 homepage: https://github.com/rocketjob/streams
 licenses:
-- Apache License V2.0
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []