midos 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef79a2c068ab89c33c044396d6df49dd63427fe8
-  data.tar.gz: 2d3dcfbfc0103915d72b7d98bf2d7ea09085f356
+  metadata.gz: 79286b082089c1f7ac2a8cd369752b9dfb06eb4e
+  data.tar.gz: 7014f16b3fa6e1bd72ef18f8a0cf8982cbaa1f23
 SHA512:
-  metadata.gz: 7dbbe596aef26fa2cd0cbd71b1c44bc6b8832537bf77adbe6f1dd7d9fc05b6884daf05eb77e1585253f0c75139208de63a1f2799313f74739f2dc8b7df88ce23
-  data.tar.gz: 58a1a871fcf95d2b8d3bdcd9d661919df44fb373f8964b58761d5c4849c25e132daa9dbd9f6e394cfba0c4f4d65c180f090fac05ab2118956084a3a8867ec212
+  metadata.gz: a0703932d02f3414ea401e6fb0e3873ff240dab5a4287c69e3504d116735a110145f44409abcf49b9f155cacb4243470136026b428a70944c3ac0ee9529a993c
+  data.tar.gz: 4850fb5181fb670af4615a8b793db0bb96b905d76a5d41700f8d1fa52ce68f57464d05f07d9dbf9da9e86cc3948c2dc2bf9def3c70572bd4923c62b38e605c20

data/ChangeLog

@@ -2,6 +2,12 @@
 
 = Revision history for midos
 
+== 0.2.0 [2015-10-02]
+
+* Added +sort+ option to Midos::Writer.
+* Added Midos::Writer#[]= convenience method.
+* Fixed Midos::Writer.transform to recognize any combination of CR/LF.
+
 == 0.1.1 [2015-06-11]
 
 * Fixed replacement of special characters in Midos::Reader.

data/README

@@ -2,7 +2,7 @@
 
 == VERSION
 
-This documentation refers to midos version 0.1.1
+This documentation refers to midos version 0.2.0
 
 
 == DESCRIPTION

data/Rakefile

@@ -13,7 +13,7 @@ begin
       email:        %q{jens.wille@gmail.com},
       license:      %q{AGPL-3.0},
       homepage:     :blackwinter,
-      dependencies: %w[nuggets],
+      dependencies: { nuggets: '~> 1.4' },
 
       required_ruby_version: '>= 1.9.3'
     }

data/lib/midos.rb

@@ -26,6 +26,8 @@
 ###############################################################################
 #++
 
+require 'nuggets/file/open_file'
+
 module Midos
 
   # Record separator
@@ -44,7 +46,7 @@ module Midos
   DEFAULT_LE = "\r\n"
 
   # Default file encoding
-  DEFAULT_ENCODING = 'iso-8859-1'
+  DEFAULT_ENCODING = 'ISO-8859-1'
 
   class << self
 
@@ -60,7 +62,7 @@ module Midos
 
     def filter_file(source_file, target_file, source_options = {}, target_options = source_options, &block)
       open_file(source_file, source_options) { |source|
-        open_file(target_file, target_options, 'w') { |target|
+        open_file(target_file, target_options, 'wb') { |target|
           filter(source, target, source_options, target_options, &block)
         }
       }
@@ -82,17 +84,9 @@ module Midos
       uniq_wrapper { |block| filter_file(*args, &block) }
     end
 
-    def open_file(file, options = {}, mode = 'r', &block)
-      encoding = options[:encoding] ||= DEFAULT_ENCODING
-
-      if file =~ /\.gz\z/i
-        require 'zlib'
-
-        gzip = mode.include?('w') ? Zlib::GzipWriter : Zlib::GzipReader
-        gzip.open(file, encoding: encoding, &block)
-      else
-        File.open(file, mode, encoding: encoding, &block)
-      end
+    def open_file(filename, options = {}, mode = 'rb', &block)
+      options[:encoding] ||= DEFAULT_ENCODING
+      File.open_file(filename, options, mode, &block)
     end
 
     private
@@ -111,3 +105,4 @@ end
 require_relative 'midos/base'
 require_relative 'midos/reader'
 require_relative 'midos/writer'
+require_relative 'midos/version'

data/lib/midos/base.rb

@@ -26,6 +26,8 @@
 ###############################################################################
 #++
 
+require 'nuggets/array/extract_options'
+
 module Midos
 
   class Base
@@ -45,10 +47,6 @@ module Midos
         args.map { |a| "%#{a.bytes.map { |b| b.to_s(16) }.join.upcase}" }
       end
 
-      def extract_options!(args)
-        args.last.is_a?(Hash) ? args.pop : {}
-      end
-
     end
 
     def initialize(options = {}, &block)

data/lib/midos/reader.rb

@@ -35,7 +35,7 @@ module Midos
     class << self
 
       def parse(*args, &block)
-        reader = new(extract_options!(args)).parse(*args, &block)
+        reader = new(args.extract_options!).parse(*args, &block)
         block ? reader : reader.records
       end
 

data/lib/midos/version.rb

@@ -3,8 +3,8 @@ module Midos
   module Version
 
     MAJOR = 0
-    MINOR = 1
-    TINY  = 1
+    MINOR = 2
+    TINY  = 0
 
     class << self
 

data/lib/midos/writer.rb

@@ -37,15 +37,15 @@ module Midos
     class << self
 
       def write(*args, &block)
-        new(extract_options!(args), &block).write(*args)
+        new(args.extract_options!, &block).write(*args)
       end
 
       def write_file(*args, &block)
-        file_method(:write, 'w', *args, &block)
+        file_method(:write, 'wb', *args, &block)
       end
 
       def open(*args, &block)
-        file_method(nil, 'w', *args, &block)
+        file_method(nil, 'wb', *args, &block)
       end
 
       def transform(value, vs, nl)
@@ -56,13 +56,18 @@ module Midos
           value.map { |v| v.gsub(vs, rvs) }.join(vs)
 
         value.gsub!(nl, rnl)
-        value.gsub!("\n", nl)
+        value.gsub!(/\r\n?|\n/, nl)
 
         value
       end
 
     end
 
+    def initialize(options = {})
+      @sort = options[:sort]
+      super
+    end
+
     def vs=(vs)
       vs.is_a?(String) ? @vs = vs : raise(TypeError,
         "wrong argument type #{vs.class} (expected String)")
@@ -86,6 +91,10 @@ module Midos
 
     alias_method :<<, :put
 
+    def []=(id, record)
+      write_i(id, record)
+    end
+
     private
 
     def write_i(id, record, io = io())
@@ -93,7 +102,7 @@ module Midos
 
       record[key] = id || auto_id.call if key && !record.key?(key)
 
-      record.each { |k, v|
+      (@sort ? Hash[record.sort] : record).each { |k, v|
         k ? io << k << fs << transform(v) << le :
          Array(v).each { |w| io << w.to_s << le } if v
       }
@@ -159,7 +168,7 @@ module Midos
       class << self
 
         def write(*args, &block)
-          new(extract_options!(args), &block)
+          new(args.extract_options!, &block)
             .instruct! { |mth| mth.write(*args) }
         end
 

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: midos
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Jens Wille
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-11 00:00:00.000000000 Z
+date: 2015-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nuggets
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: hen
   requirement: !ruby/object:Gem::Requirement
@@ -33,7 +33,7 @@ dependencies:
         version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.8.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
         version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.8.3
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -82,13 +82,15 @@ licenses:
 metadata: {}
 post_install_message: |2+
 
-  midos-0.1.1 [2015-06-11]:
+  midos-0.2.0 [2015-10-02]:
 
-  * Fixed replacement of special characters in Midos::Reader.
+  * Added +sort+ option to Midos::Writer.
+  * Added Midos::Writer#[]= convenience method.
+  * Fixed Midos::Writer.transform to recognize any combination of CR/LF.
 
 rdoc_options:
 - "--title"
-- midos Application documentation (v0.1.1)
+- midos Application documentation (v0.2.0)
 - "--charset"
 - UTF-8
 - "--line-numbers"