midos 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 458a44bc640c71ea6c086da53043c48701405b27
-  data.tar.gz: 95c8570bb1c9b8df64bc3778c403f90d81cb480d
+  metadata.gz: bc1114593359377788c5becae5330809e6d883b7
+  data.tar.gz: d04ec2c46112c7f0f722bedf1aeca80bbbbcedd9
 SHA512:
-  metadata.gz: 847e3ed9c95d1f6bacabd3413e0f72195bc2095898c37ac69b36657c39d3df8f585b9308eee8c723424ec186c17443ea00f05799422076c5172acc4dd60aaf5e
-  data.tar.gz: 4a82c243d4f4598ce400e8ae07863a5a55c6c332b2b36fe3e573cfa4cdb1c3f99291172f913006551d6bc6353f0c43978968b774318d24c07e0d2d02c5cd0244
+  metadata.gz: a923f3a6f6272f1c8d863f3bc9d232513481d7be3767abc9306232041614a8d61567a2bb93d72c97569f7f3dadcd02f0f5abae715c0519a4a680c71e70ef013f
+  data.tar.gz: 2c6342a4711a6a23c5894de3c1abad1a16fbc7635f2dfb7b77499f8028c7ca8892a6ede0f8a0645ab8103ab3a9662807cd08c6e2da593054fb6d23746e54f19a

data/ChangeLog

@@ -2,6 +2,12 @@
 
 = Revision history for midos
 
+== 0.1.0 [2015-04-28]
+
+* Percent-encode special characters <tt>^</tt> and <tt>|</tt>.
+* Added Gzip support to Midos.open_file.
+* Added Midos.uniq and Midos.uniq_file.
+
 == 0.0.3 [2015-04-10]
 
 * Ruby 2.2 compatibility.

data/README

@@ -2,7 +2,7 @@
 
 == VERSION
 
-This documentation refers to midos version 0.0.3
+This documentation refers to midos version 0.1.0
 
 
 == DESCRIPTION

data/lib/midos.rb

@@ -5,7 +5,7 @@
 #                                                                             #
 # midos -- A Ruby client for MIDOS databases                                  #
 #                                                                             #
-# Copyright (C) 2014 Jens Wille                                               #
+# Copyright (C) 2014-2015 Jens Wille                                          #
 #                                                                             #
 # Authors:                                                                    #
 #     Jens Wille <jens.wille@gmail.com>                                       #
@@ -49,7 +49,7 @@ module Midos
   class << self
 
     def filter(source, target, source_options = {}, target_options = source_options)
-      writer, size = Writer.new(target_options.merge(:io => target)),  0
+      writer, size = Writer.new(target_options.merge(io: target)), 0
 
       Reader.parse(source, source_options) { |*args|
         writer << args and size += 1 if yield(*args)
@@ -74,9 +74,34 @@ module Midos
       filter_file(*args) { |*| true }
     end
 
+    def uniq(*args)
+      uniq_wrapper { |block| filter(*args, &block) }
+    end
+
+    def uniq_file(*args)
+      uniq_wrapper { |block| filter_file(*args, &block) }
+    end
+
     def open_file(file, options = {}, mode = 'r', &block)
       encoding = options[:encoding] ||= DEFAULT_ENCODING
-      File.open(file, mode, :encoding => encoding, &block)
+
+      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
+    end
+
+    private
+
+    def uniq_wrapper
+      require 'nuggets/hash/seen'
+
+      seen = Hash.seen
+      yield lambda { |id, *| !seen[id] }
     end
 
   end

data/lib/midos/base.rb

@@ -5,7 +5,7 @@
 #                                                                             #
 # midos -- A Ruby client for MIDOS databases                                  #
 #                                                                             #
-# Copyright (C) 2014 Jens Wille                                               #
+# Copyright (C) 2014-2015 Jens Wille                                          #
 #                                                                             #
 # Authors:                                                                    #
 #     Jens Wille <jens.wille@gmail.com>                                       #
@@ -41,6 +41,10 @@ module Midos
         }
       end
 
+      def replacements_for(*args)
+        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
@@ -50,14 +54,15 @@ module Midos
     def initialize(options = {}, &block)
       self.key = options[:key]
 
-      self.rs = options[:rs] || DEFAULT_RS
-      self.fs = options[:fs] || DEFAULT_FS
-      self.vs = options[:vs] || DEFAULT_VS
-      self.nl = options[:nl] || DEFAULT_NL
-      self.le = options[:le] || DEFAULT_LE
-      self.io = options[:io] || self.class::DEFAULT_IO
+      self.rs = options.fetch(:rs, DEFAULT_RS)
+      self.fs = options.fetch(:fs, DEFAULT_FS)
+      self.vs = options.fetch(:vs, DEFAULT_VS)
+      self.nl = options.fetch(:nl, DEFAULT_NL)
+      self.le = options.fetch(:le, DEFAULT_LE)
+      self.io = options.fetch(:io, self.class::DEFAULT_IO)
+
+      @auto_id_block = options.fetch(:auto_id, block)
 
-      @auto_id_block = options[:auto_id] || block
       reset
     end
 

data/lib/midos/reader.rb

@@ -43,6 +43,17 @@ module Midos
         file_method(:parse, 'r', *args, &block)
       end
 
+      def transform(value, vs, nl)
+        rvs, rnl = replacements_for(vs, nl)
+
+        value.gsub!(nl, "\n")
+        value.gsub!(rvs, nl)
+
+        !value.index(vs) ?
+          value.gsub!(rnl, vs) || value :
+          value.split(vs).each { |v| v.gsub!(rnl, vs) }
+      end
+
     end
 
     attr_reader :records
@@ -63,8 +74,7 @@ module Midos
         }
       end
 
-      rs, fs, vs, nl, le, key, auto_id, id, record =
-        @rs, @fs, @vs, @nl, @le, @key, @auto_id, nil, {}
+      id, record = nil, {}
 
       io.each { |line|
         line = line.chomp(le)
@@ -74,17 +84,7 @@ module Midos
           id, record = nil, {}
         else
           k, v = line.split(fs, 2)
-
-          if k && v
-            if k == key
-              id = v
-            else
-              v.gsub!(nl, "\n")
-              v = v.split(vs) if v.index(vs)
-            end
-
-            record[k] = v
-          end
+          record[k] = k == key ? id = v : transform(v) if k && v
         end
       }
 
@@ -93,6 +93,10 @@ module Midos
 
     private
 
+    def transform(value)
+      self.class.transform(value, vs, nl)
+    end
+
     def amend_block(&block)
       return block unless $VERBOSE && k = @key
 

data/lib/midos/version.rb

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

data/lib/midos/writer.rb

@@ -48,6 +48,19 @@ module Midos
         file_method(nil, 'w', *args, &block)
       end
 
+      def transform(value, vs, nl)
+        rvs, rnl = replacements_for(vs, nl)
+
+        value = !value.is_a?(Array) ?
+          value.to_s.gsub(vs, rvs) :
+          value.map { |v| v.gsub(vs, rvs) }.join(vs)
+
+        value.gsub!(nl, rnl)
+        value.gsub!("\n", nl)
+
+        value
+      end
+
     end
 
     def vs=(vs)
@@ -56,21 +69,17 @@ module Midos
     end
 
     def write(records, *args)
-      if records.is_a?(Hash)
+      !records.is_a?(Hash) ?
+        records.each { |record| write_i(nil, record, *args) } :
         records.each { |id, record| write_i(id, record, *args) }
-      else
-        records.each { |record| write_i(nil, record, *args) }
-      end
 
       self
     end
 
     def put(record, *args)
-      if record.is_a?(Hash)
-        write_i(nil, record, *args)
-      else
+      record.is_a?(Hash) ?
+        write_i(nil, record, *args) :
         write_i(*args.unshift(*record))
-      end
 
       self
     end
@@ -82,67 +91,63 @@ module Midos
     def write_i(id, record, io = io())
       return if record.empty?
 
-      if @key && !record.key?(@key)
-        record[@key] = id || @auto_id.call
-      end
+      record[key] = id || auto_id.call if key && !record.key?(key)
 
       record.each { |k, v|
-        if v
-          if k
-            v = v.is_a?(Array) ? v.join(@vs) : v.to_s
-            io << k << @fs << v.gsub("\n", @nl) << @le
-          else
-            Array(v).each { |w| io << w.to_s << @le }
-          end
-        end
+        k ? io << k << fs << transform(v) << le :
+         Array(v).each { |w| io << w.to_s << le } if v
       }
 
-      io << @rs << @le << @le
+      io << rs << le << le
+    end
+
+    def transform(value)
+      self.class.transform(value, vs, nl)
     end
 
     class Thesaurus < self
 
       PROLOGUE = {
-        :PAR => '1011111111110000000010001000000000000010',
-        :DAT => '00000000',
-        :DES => 'DE',
-        :TOP => 'TP~TP',
-        :KLA => 'CC~CC',
-        :OBR => 'BT~BT',
-        :UTR => 'NT~NT',
-        :SYN => 'UF~USE',
-        :FRU => 'PT~PT für',
-        :VER => 'RT~RT',
-        :SP1 => 'ENG~ENG für',
-        :SP2 => 'FRA~FRA für',
-        :SP3 => 'SPA~SPA für',
-        :SP4 => 'ITA~ITA für',
-        :SP5 => 'GRI~GRI für',
-        :SP6 => 'RUS~RUS für',
-        :SP7 => 'POL~POL für',
-        :SP8 => 'UNG~UNG für',
-        :SP9 => 'TSC~TSC für',
-        :SN1 => 'SN1',
-        :SN2 => 'SN2',
-        :SN3 => 'SN3',
-        :SN4 => 'SN4',
-        :SN5 => 'SN5',
-        :DA1 => 'DATE1',
-        :DA2 => 'DATE2',
-        :DA3 => 'DATE3',
-        :DA4 => 'DATE4',
-        :KLD => 'MIDOS Thesaurus',
-        :KOM => ' / ',
-        :KO1 => 'UF',
-        :KO2 => 'USE',
-        :TLE => '  32000 Zeichen',
-        :PAW => '',
-        :ART => '00000',
-        :REL => ' 17  1  2  3  4  5  6  7  8  9 10 11 12 13 14 15 16 18 19 20 21 22 23 24 25'
+        PAR: '1011111111110000000010001000000000000010',
+        DAT: '00000000',
+        DES: 'DE',
+        TOP: 'TP~TP',
+        KLA: 'CC~CC',
+        OBR: 'BT~BT',
+        UTR: 'NT~NT',
+        SYN: 'UF~USE',
+        FRU: 'PT~PT für',
+        VER: 'RT~RT',
+        SP1: 'ENG~ENG für',
+        SP2: 'FRA~FRA für',
+        SP3: 'SPA~SPA für',
+        SP4: 'ITA~ITA für',
+        SP5: 'GRI~GRI für',
+        SP6: 'RUS~RUS für',
+        SP7: 'POL~POL für',
+        SP8: 'UNG~UNG für',
+        SP9: 'TSC~TSC für',
+        SN1: 'SN1',
+        SN2: 'SN2',
+        SN3: 'SN3',
+        SN4: 'SN4',
+        SN5: 'SN5',
+        DA1: 'DATE1',
+        DA2: 'DATE2',
+        DA3: 'DATE3',
+        DA4: 'DATE4',
+        KLD: 'MIDOS Thesaurus',
+        KOM: ' / ',
+        KO1: 'UF',
+        KO2: 'USE',
+        TLE: '  32000 Zeichen',
+        PAW: '',
+        ART: '00000',
+        REL: ' 17  1  2  3  4  5  6  7  8  9 10 11 12 13 14 15 16 18 19 20 21 22 23 24 25'
       }
 
       EPILOGUE = {
-        :DE => '*****NICHTDESKRIPTORRELATIONEN*****'
+        DE: '*****NICHTDESKRIPTORRELATIONEN*****'
       }
 
       RESOLVE_FROM = [:OBR, :UTR, :VER]
@@ -154,7 +159,8 @@ module Midos
       class << self
 
         def write(*args, &block)
-          new(extract_options!(args), &block).instruct! { |mth| mth.write(*args) }
+          new(extract_options!(args), &block)
+            .instruct! { |mth| mth.write(*args) }
         end
 
         def open(*args, &block)
@@ -187,14 +193,15 @@ module Midos
 
         records.each { |id, record|
           new_record = hash[id] = {}
-          record.each { |key, value| new_record[key] = resolve(key, value, *args) }
+
+          record.each { |key, value|
+            new_record[key] = resolve(key, value, *args) }
         }
       end
 
       def resolve_from_to(from = nil, to = prologue[RESOLVE_TO])
-        if from.nil? || from == true
-          from = prologue.values_at(*RESOLVE_FROM).map { |v| v.split('~').first }
-        end
+        from = prologue.values_at(*RESOLVE_FROM)
+          .map { |v| v.split('~').first } if from.nil? || from == true
 
         [from, to]
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: midos
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - Jens Wille
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-10 00:00:00.000000000 Z
+date: 2015-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nuggets
@@ -82,13 +82,15 @@ licenses:
 metadata: {}
 post_install_message: |2+
 
-  midos-0.0.3 [2015-04-10]:
+  midos-0.1.0 [2015-04-28]:
 
-  * Ruby 2.2 compatibility.
+  * Percent-encode special characters <tt>^</tt> and <tt>|</tt>.
+  * Added Gzip support to Midos.open_file.
+  * Added Midos.uniq and Midos.uniq_file.
 
 rdoc_options:
 - "--title"
-- midos Application documentation (v0.0.3)
+- midos Application documentation (v0.1.0)
 - "--charset"
 - UTF-8
 - "--line-numbers"