sql-server-raw-file 0.0.1 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea75b306d331a3e23df7a321c868778e60266a13
-  data.tar.gz: b79c539f190cc42633fbca1dd980a7a878e60b88
+  metadata.gz: 41f203edbad49fe5604df8564fe39edc4f70aef3
+  data.tar.gz: 6a9215a1fd7c64097ec3e50c3d08649aa76db7d3
 SHA512:
-  metadata.gz: ad451f419c448ca2bc864875c4141c6931457e0bdf73113f1e5fb9ec170e2f30a882c9358dc9e0868d19bca2df7e627ae3bcbb36838eb746b324aef7ef36fe39
-  data.tar.gz: f415ea6b1439db87d8a930dec480d5eb33bb2fe74d1f982e79944af80dd1abad365edc34025b2bad2cef3fd6651096a119ee3bd027b4f290334a5b7fc1a67cb7
+  metadata.gz: 1a3d9a2c0760386dc63e4286b8a77b4830da2bcaaa0d303f0e7594cf810cde1409e8fb622e5208992832c5f71623a38cef9761bc7115257a6fd546520bb68068
+  data.tar.gz: d4bbae1b9efd3934109b051b87893ef4a7d4cb1cebf84e78cedd5dab5d2454765bddfd41d10c498e518dac7b76f2669d901b442f5b72b665acc76090199bc009

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+## 0.1.1 (Jan 20, 2016)
+
+Features:
+
+  - added SqlServerDts::RawFile#eof?
+    * check io-stream eof
+  - added SqlServerDts::RawFile#pos
+    * get current position in inner io-stream object
+
+Bugfixes:
+
+  - missing method SqlServerDts::RawFile#close
+    * is need to close inner io-stream object in some cases
+
 ## 0.0.1 (Jan 5, 2016)
 
 Features:

data/README.md

@@ -1,6 +1,6 @@
 # sql-server-raw-file: sql-server-raw-file lib
 
-Converts SQL Server Dts Raw File source to hash.
+Converts SQL Server Integration Services Raw File source to hash.
 
 ### Installation and usage
 
@@ -42,6 +42,8 @@ SqlServerDts::RawFile.new('/path/to/sql/raw/file') { |raw_obj, raw_io|
   # ...
 }
 # end example 2
+
+3) more detailed examples in ./test/test_sql_data_and_header.rb
 ```
 
 ### Troubleshooting

data/fixtures/current_sql_index

@@ -1 +1 @@
-2
+1

data/lib/sql_server_dts_ns.rb

@@ -1,5 +1,7 @@
+# coding: utf-8
+
 # SqlServerDts module
 module SqlServerDts
   # current version
-  VERSION = '0.0.1'
+  VERSION = '0.1.1'
 end

data/lib/sql_server_raw_file.rb

@@ -1,5 +1,6 @@
 # coding: utf-8
-require "#{File.dirname(__FILE__)}/sql_server_dts_ns"
+
+require(File.expand_path('../sql_server_dts_ns.rb',__FILE__))
 
 # SqlServerDts::RawFile class
 class SqlServerDts::RawFile
@@ -38,19 +39,19 @@ class SqlServerDts::RawFile
   #   in other side returns self
   def initialize(io,init_pos=nil)
     if io.is_a?(IO)
-      @raw_file = io
-      @raw_file.binmode unless @raw_file.binmode?
+      @raw_io = io
+      @raw_io.binmode unless @raw_io.binmode?
       read_header
-      @raw_file.seek(init_pos || @data_pos)
+      @raw_io.seek(init_pos || @data_pos)
     else
-      @raw_file = File.new(io,'rb')
+      @raw_io = File.new(io,'rb')
       read_header
-      @raw_file.seek(init_pos || @data_pos)
+      @raw_io.seek(init_pos || @data_pos)
       if block_given?
         begin
-          yield [self,@raw_file]
+          yield [self,@raw_io]
         ensure
-          @raw_file.close
+          @raw_io.close
         end
       else
         self
@@ -60,21 +61,21 @@ class SqlServerDts::RawFile
 
   # read metadata (header) raw file and fill inner array of metadata
   def read_header
-    raise IOError, 'Stream is closed' if @raw_file.closed?
+    raise IOError, 'Stream is closed' if @raw_io.closed?
     begin
-      @raw_file.rewind
-      @version = @raw_file.read(4).unpack('H2H2H2H2').join('.')
+      @raw_io.rewind
+      @version = @raw_io.read(4).unpack('H2H2H2H2').join('.')
       raise UnsupportedRawVersionError, "Version #{@version} unsupported " unless SUPPORTED_RAW_VERSIONS.include?(@version)
       @fields_info = []
-      fields_count = @raw_file.read(4).unpack('I')[0]
+      fields_count = @raw_io.read(4).unpack('I')[0]
       raise FieldsNotExistsError, 'Fields not exists (fields_count=0)' if fields_count==0
       @nil_mask_len = fields_count/8+(fields_count-fields_count/8*8>0?1:0)
       fields_count.times {
-        name_len = @raw_file.read(4).unpack('I')[0]
-        field_name = @raw_file.read(name_len*2).encode(DEFAULT_ENCODING,DEFAULT_RAW_FILE_ENCODING,{ invalid: :replace, undef: :replace })
+        name_len = @raw_io.read(4).unpack('I')[0]
+        field_name = @raw_io.read(name_len*2).encode(DEFAULT_ENCODING,DEFAULT_RAW_FILE_ENCODING,{ invalid: :replace, undef: :replace })
         (@version == '00.10.01.00') ?
-            values_arr = @raw_file.read(40).unpack('I4iI5') :
-            values_arr = @raw_file.read(32).unpack('I4iI3')
+            values_arr = @raw_io.read(40).unpack('I4iI5') :
+            values_arr = @raw_io.read(32).unpack('I4iI3')
         field_info = {
           name: field_name,
           data_type: values_arr[0],
@@ -93,7 +94,7 @@ class SqlServerDts::RawFile
     rescue
       raise
     else
-      @data_pos = @raw_file.pos
+      @data_pos = @raw_io.pos
     end
   end
 
@@ -101,9 +102,9 @@ class SqlServerDts::RawFile
   #
   # @return [Hash] Hash of converted raw data (one line)
   def read_line
-    raise IOError, 'Stream is closed' if @raw_file.closed?
+    raise IOError, 'Stream is closed' if @raw_io.closed?
     begin
-      nil_mask = @raw_file.read(@nil_mask_len).unpack('b*')[0].each_char.to_a
+      nil_mask = @raw_io.read(@nil_mask_len).unpack('b*')[0].each_char.to_a
       data_row = []
       @fields_info.each_with_index { |field_info, index|
         field_value =
@@ -112,28 +113,28 @@ class SqlServerDts::RawFile
           else
             case field_info[:data_type]
               when 3 # int, NULL w/o cast
-                @raw_file.read(field_info[:max_length]).unpack('I')[0]
+                @raw_io.read(field_info[:max_length]).unpack('I')[0]
               when 5 # float
-                @raw_file.read(field_info[:max_length]).unpack('D')[0]
+                @raw_io.read(field_info[:max_length]).unpack('D')[0]
               when 11 # bit
-                (@raw_file.read(field_info[:max_length]).unpack('B')[0] == '1') ? true : false
+                (@raw_io.read(field_info[:max_length]).unpack('B')[0] == '1') ? true : false
               when 20 # bigint
-                @raw_file.read(field_info[:max_length]).unpack('L')[0]
+                @raw_io.read(field_info[:max_length]).unpack('L')[0]
               when 129 # varchar, char
-                data_len = @raw_file.read(4).unpack('I')[0]
-                @raw_file.read(data_len).encode({invalid: :replace, undef: :replace})
+                data_len = @raw_io.read(4).unpack('I')[0]
+                @raw_io.read(data_len).encode({invalid: :replace, undef: :replace})
               when 130 # nvarchar, nchar
-                data_len = @raw_file.read(4).unpack('I')[0]
-                @raw_file.read(data_len*2).encode(DEFAULT_ENCODING, DEFAULT_RAW_FILE_ENCODING, {invalid: :replace, undef: :replace})
+                data_len = @raw_io.read(4).unpack('I')[0]
+                @raw_io.read(data_len*2).encode(DEFAULT_ENCODING, DEFAULT_RAW_FILE_ENCODING, {invalid: :replace, undef: :replace})
               when 131 # numeric, decimal
                 # precision, scale, sign, value
-                values_arr = @raw_file.read(field_info[:max_length]).unpack('C3Q')
+                values_arr = @raw_io.read(field_info[:max_length]).unpack('C3Q')
                 "#{('-' if values_arr[2] == 0)}#{values_arr[3].to_s.insert((values_arr[3].to_s.length-values_arr[1]), '.')}"
               when 135 # datetime
-                values_arr = @raw_file.read(field_info[:max_length]).unpack('S6I')
+                values_arr = @raw_io.read(field_info[:max_length]).unpack('S6I')
                 Time.local(values_arr[0], values_arr[1], values_arr[2], values_arr[3], values_arr[4], values_arr[5], (values_arr[6].to_f/1000.0)).strftime('%F %T.%L')
               when 304 # datetime2
-                values_arr = @raw_file.read(field_info[:max_length]).unpack('S6I')
+                values_arr = @raw_io.read(field_info[:max_length]).unpack('S6I')
                 Time.local(values_arr[0], values_arr[1], values_arr[2], values_arr[3], values_arr[4], values_arr[5], (values_arr[6].to_f/1000.0)).strftime("%F %T.%#{field_info[:scale]}N")
               else
                 raise UnknownDataTypeError, "Unknown data type #{field_info[:data_type]}"
@@ -159,4 +160,19 @@ class SqlServerDts::RawFile
   def version
     @version
   end
+
+  # close io-stream
+  def close
+    @raw_io.close unless @raw_io.closed?
+  end
+
+  # check io-stream eof
+  def eof?
+    @raw_io.eof?
+  end
+
+  # get current position in inner io-stream object
+  def pos
+    @raw_io.pos
+  end
 end

data/sql-server-raw-file.gemspec

@@ -1,6 +1,9 @@
+# coding: utf-8
+
 require 'rubygems'
 
-require "#{File.dirname(__FILE__)}/lib/sql_server_dts_ns"
+#require "#{File.dirname(__FILE__)}/lib/sql_server_dts_ns"
+require(File.expand_path('../lib/sql_server_dts_ns.rb',__FILE__))
 
 Gem::Specification.new do |s|
   s.name        = 'sql-server-raw-file'

data/test/test_sql_data_and_header.rb

@@ -1,30 +1,49 @@
 # coding: utf-8
+
 require 'csv'
 require 'json'
 
-require "#{File.dirname(__FILE__)}/../lib/sql_server_raw_file"
+require(File.expand_path('../../lib/sql_server_raw_file.rb',__FILE__))
 
-fixtures_path = "#{File.dirname(__FILE__)}/../fixtures/"
-raw_path = %w(sql09.raw sql10.raw sql11.raw)
+fixtures_path = File.expand_path('../../fixtures',__FILE__)+'/'
+raw_file_name = %w(sql09.raw sql10.raw sql11.raw)
 
 # current_fixture_index = 0
 current_fixture_index = File.read(fixtures_path+'/current_sql_index').to_i
+raw_path = fixtures_path+raw_file_name[current_fixture_index]
 
-# show header of raw file and convert it hash and put it json-file
-File.open(fixtures_path+raw_path[current_fixture_index]) { |raw_io|
+# show version of raw file
+# signature: new(io)
+# @param io [IO] IO-stream
+# @return [SqlServerDts::RawFile]
+File.open(raw_path) { |raw_io|
   raw_obj = SqlServerDts::RawFile.new(raw_io)
   puts "RAW VERSION: #{raw_obj.version}"
-  puts '=== BEGIN HEADER ==='
-  puts raw_obj.header
-  File.open("#{fixtures_path+File.basename(raw_io.path, '.*')}_header.json",'wt') { |json_io|
-    header_json = JSON.pretty_generate(raw_obj.header)
-    json_io.write(header_json)
-  }
-  puts '=== END HEADER ==='
 }
 
-# show data of raw file in rows table and convert it hash and put it csv-file
-SqlServerDts::RawFile.new(fixtures_path+raw_path[current_fixture_index]) { |raw_obj, raw_io|
+# show header of raw file and convert it into hash and save it as json-file
+# signature: new(path)
+# @param path [String] Path to raw file
+# @return [SqlServerDts::RawFile]
+raw_obj = SqlServerDts::RawFile.new(raw_path)
+puts '=== BEGIN HEADER ==='
+puts raw_obj.header
+File.open("#{fixtures_path+File.basename(raw_path, '.*')}_header.json",'wt') { |json_io|
+  header_json = JSON.pretty_generate(raw_obj.header)
+  json_io.write(header_json)
+}
+puts '=== END HEADER ==='
+# get current position into inner IO-stream object for further using
+init_pos = raw_obj.pos
+# need to close inner IO-stream object
+raw_obj.close
+
+# show data of raw file in rows table and convert it into hash and save it as csv-file
+# signature: new(path,init_pos)
+# @param path [String] Path to raw file
+# @param init_pos [String] Init pos in raw file where data rows from
+# @return [ [SqlServerDts::RawFile,IO] ] block_given? == true
+SqlServerDts::RawFile.new(raw_path,init_pos) { |raw_obj, raw_io|
   puts '=== BEGIN DATA ==='
   i=0
   fields_arr = []

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sql-server-raw-file
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.1
 platform: ruby
 authors:
 - Dmitriy Mullo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-14 00:00:00.000000000 Z
+date: 2016-01-20 00:00:00.000000000 Z
 dependencies: []
 description: Converts SQL Server Integration Services Raw File source to hash.
 email: