carton_db 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d16d6802fee28aa151d8eee4811d17d3a5dc00a5
-  data.tar.gz: 22cb133e4202c80ef89109a24163c41b666ec89c
+  metadata.gz: b0569eb04a7231087ac8ba262cc56330a1c61912
+  data.tar.gz: aaae82f45cfdeb14e4dea5110e9a09c3b062ab5e
 SHA512:
-  metadata.gz: 3ff1b4d0a6a5582d5903093e80051600e119f8c857b9ba32821081113b3cf90b3802c3f10f83a4fba0173b987ef55f699d3ae6289b1dfda47934b5105eb92b15
-  data.tar.gz: 04747d51836cc9864fc5e5245f884d42c585cb434ba7ce66441f19836c87d841ed74a60765d5b93a5767f13279ae93b3c81da2b59ec853fbda5082961841472e
+  metadata.gz: e07e734b21b74e9988654549060f615897fb9b5e57763a61d392bf58ef0ff46845ba43118c805766f9177a117d0c4f7d49d1fa52e13e8e2042f410dd385b18a3
+  data.tar.gz: 5c818326762c092a868e9abc642ce1baa3a1b9a2fbe38a17c7932f0ebbbde99a1e0a8d72cd7479a98e61a5c97cc1516968f92e9c655cb0e1758333f02a778b2d

data/lib/carton_db/datum.rb

@@ -1,3 +1,6 @@
+# -*- coding: UTF-8 -*-
+# frozen_string_literal: true
+
 require 'digest'
 
 module CartonDb
@@ -5,20 +8,22 @@ module CartonDb
   module Datum
 
     def self.for_plain(plain_text, auto_placeholder: false)
-      return plain_text if plain_text.is_a?(Datum::Base)
-      if auto_placeholder && plain_text.nil?
+      if auto_placeholder && (! plain_text) && plain_text.nil?
         Datum::Placeholder
+      elsif plain_text.is_a?(Datum::Base)
+        plain_text
       else
-        Datum::ForPlain.new(plain_text)
+        Datum::ForPlain.new(plain_text.to_s)
       end
     end
 
     def self.for_escaped(escaped_text, auto_placeholder: false)
-      return escaped_text if escaped_text.is_a?(Datum::Base)
-      if auto_placeholder && escaped_text.nil?
+      if auto_placeholder && (! escaped_text) && escaped_text.nil?
         Datum::Placeholder
+      elsif escaped_text.is_a?(Datum::Base)
+        escaped_text
       else
-        Datum::ForEscaped.new(escaped_text)
+        Datum::ForEscaped.new(escaped_text.to_s)
       end
     end
 
@@ -58,8 +63,9 @@ module CartonDb
     class ForPlain < Datum::Base
       attr_reader :plain
 
+
       def initialize(plain)
-        if plain.nil?
+        if (! plain) && plain.nil?
           raise ArgumentError "A non-nil 'plain' value is required."
         end
         @plain = plain
@@ -90,7 +96,7 @@ module CartonDb
       attr_reader :escaped
 
       def initialize(escaped)
-        if escaped.nil?
+        if (! escaped) && escaped.nil?
           raise ArgumentError "A non-nil 'escaped' value is required."
         end
         @escaped = escaped

data/lib/carton_db/escaping.rb

@@ -1,42 +1,45 @@
+# -*- coding: UTF-8 -*-
+# frozen_string_literal: true
+
 module CartonDb
 
   module Escaping
 
     ESCAPING_MAP = {
-      "\u0000".freeze => '\x00'.freeze,
-      "\u0001".freeze => '\x01'.freeze,
-      "\u0002".freeze => '\x02'.freeze,
-      "\u0003".freeze => '\x03'.freeze,
-      "\u0004".freeze => '\x04'.freeze,
-      "\u0005".freeze => '\x05'.freeze,
-      "\u0006".freeze => '\x06'.freeze,
-      "\u0007".freeze => '\a'.freeze,
-      "\u0008".freeze => '\b'.freeze,
-      "\u0009".freeze => '\t'.freeze,
-      "\u000A".freeze => '\n'.freeze,
-      "\u000B".freeze => '\v'.freeze,
-      "\u000C".freeze => '\f'.freeze,
-      "\u000D".freeze => '\r'.freeze,
-      "\u000E".freeze => '\x0E'.freeze,
-      "\u000F".freeze => '\x0F'.freeze,
-      "\u0010".freeze => '\x10'.freeze,
-      "\u0011".freeze => '\x11'.freeze,
-      "\u0012".freeze => '\x12'.freeze,
-      "\u0013".freeze => '\x13'.freeze,
-      "\u0014".freeze => '\x14'.freeze,
-      "\u0015".freeze => '\x15'.freeze,
-      "\u0016".freeze => '\x16'.freeze,
-      "\u0017".freeze => '\x17'.freeze,
-      "\u0018".freeze => '\x18'.freeze,
-      "\u0019".freeze => '\x19'.freeze,
-      "\u001A".freeze => '\x1A'.freeze,
-      "\u001B".freeze => '\x1B'.freeze,
-      "\u001C".freeze => '\x1C'.freeze,
-      "\u001D".freeze => '\x1D'.freeze,
-      "\u001E".freeze => '\x1E'.freeze,
-      "\u001F".freeze => '\x1F'.freeze,
-      "\u007F".freeze => '\x7F'.freeze,
-      "\\".freeze     => "\\\\".freeze,
+      "\u0000" => '\x00',
+      "\u0001" => '\x01',
+      "\u0002" => '\x02',
+      "\u0003" => '\x03',
+      "\u0004" => '\x04',
+      "\u0005" => '\x05',
+      "\u0006" => '\x06',
+      "\u0007" => '\a',
+      "\u0008" => '\b',
+      "\u0009" => '\t',
+      "\u000A" => '\n',
+      "\u000B" => '\v',
+      "\u000C" => '\f',
+      "\u000D" => '\r',
+      "\u000E" => '\x0E',
+      "\u000F" => '\x0F',
+      "\u0010" => '\x10',
+      "\u0011" => '\x11',
+      "\u0012" => '\x12',
+      "\u0013" => '\x13',
+      "\u0014" => '\x14',
+      "\u0015" => '\x15',
+      "\u0016" => '\x16',
+      "\u0017" => '\x17',
+      "\u0018" => '\x18',
+      "\u0019" => '\x19',
+      "\u001A" => '\x1A',
+      "\u001B" => '\x1B',
+      "\u001C" => '\x1C',
+      "\u001D" => '\x1D',
+      "\u001E" => '\x1E',
+      "\u001F" => '\x1F',
+      "\u007F" => '\x7F',
+      "\\"     => "\\\\",
     }.freeze
 
     UNESCAPING_MAP = ESCAPING_MAP.invert.freeze

data/lib/carton_db/list_map_db/segment.rb

@@ -1,5 +1,8 @@
 # -*- coding: UTF-8 -*-
+# frozen_string_literal: true
+
 require 'fileutils'
+require 'set'
 
 module CartonDb
   class ListMapDb
@@ -58,6 +61,55 @@ module CartonDb
         ! content?
       end
 
+      def key_count
+        return 0 if empty?
+        key_d_set.length
+      end
+
+      def touch_d(key_d, optimization)
+        if optimization == :small && content?
+          each_entry_element_line do |kd, _ed, _line|
+            return if kd == key_d
+          end
+        end
+
+        open_append do |io|
+          io << key_d.escaped << "\n"
+        end
+      end
+
+      def key_d_set
+        result = Set.new
+        each_entry_element_line do |kd, _ed, _line|
+          result << kd
+        end
+        result
+      end
+
+      def key_d?(key_d)
+        each_entry_element_line do |kd, _ed, _line|
+          return true if kd = key_d
+        end
+        false
+      end
+
+      def element_d?(key_d, element_d)
+        each_entry_element_line do |kd, ed, _line|
+          return true if kd == key_d && ed == element_d
+        end
+        false
+      end
+
+      def collect_content(key_d, collection_class)
+        result = nil
+        each_entry_element_line do |kd, ed, _line|
+          next unless kd == key_d
+          result ||= collection_class.new
+          result << ed.plain unless ed.placeholder?
+        end
+        result
+      end
+
       def each_entry
         entries = nil
         each_entry_element_line do |key_d, elem_d, _line|
@@ -71,6 +123,13 @@ module CartonDb
         end
       end
 
+      def each_element_for_d(key_d)
+        each_entry_element_line do |kd, ed, _line|
+          next unless kd == key_d
+          yield ed
+        end
+      end
+
       def each_first_element
         first_entries = nil
         each_entry_element_line do |key_d, elem_d, _line|
@@ -94,6 +153,41 @@ module CartonDb
         end
       end
 
+      def replace
+        replacement = self.class.new(
+          segment_group, "#{segment_filename}.txt"
+        )
+        begin
+          yield replacement
+        rescue StandardError
+          File.unlink replacement.filename
+          raise
+        end
+        File.unlink filename
+        File.rename replacement.filename, filename
+      end
+
+      def write_key_element_d(key_d, element_d)
+        open_append do |io|
+          io << "#{key_d.escaped}\t#{element_d.escaped}\n"
+        end
+      end
+
+      def write_key_d_elements(key_d, elements)
+        open_append do |io|
+          elements.each do |element|
+            element_d = CartonDb::Datum.for_plain(element)
+            io<< "#{key_d.escaped}\t#{element_d.escaped}\n"
+          end
+        end
+      end
+
+      def copy_entries_except(key_d, to_io)
+        each_entry_element_line do |kd, _ed, line|
+          to_io << line unless kd == key_d
+        end
+      end
+
       def open_append
         touch_dir
         File.open filename, 'a', **FILE_ENCODING_OPTS do |io|

data/lib/carton_db/list_map_db/segment_group.rb

@@ -1,4 +1,6 @@
 # -*- coding: UTF-8 -*-
+# frozen_string_literal: true
+
 require 'fileutils'
 
 module CartonDb

data/lib/carton_db/list_map_db.rb

@@ -1,4 +1,6 @@
 # -*- coding: UTF-8 -*-
+# frozen_string_literal: true
+
 require 'forwardable'
 require 'fileutils'
 require 'carton_db/list_map_db/segment'
@@ -77,14 +79,7 @@ module CartonDb
     def [](key)
       key_d = CartonDb::Datum.for_plain(key)
       segment = segment_containing(key_d)
-
-      ary = nil
-      segment.each_entry_element_line do |kd, ed, _line|
-        next ary unless kd == key_d
-        ary ||= []
-        ary << ed.plain unless ed.placeholder?
-      end
-      ary
+      segment.collect_content(key_d, Array)
     end
 
     # Returns true if an entry with the given key exists.
@@ -97,11 +92,7 @@ module CartonDb
     def key?(key)
       key_d = CartonDb::Datum.for_plain(key)
       segment = segment_containing(key_d)
-
-      segment.each_entry_element_line do |kd, _ed, _line|
-        return true if kd = key_d
-      end
-      false
+      segment.key_d?(key_d)
     end
 
     # Returns trus if an entry with the given key exists and its
@@ -116,11 +107,7 @@ module CartonDb
       key_d = CartonDb::Datum.for_plain(key)
       element_d = CartonDb::Datum.for_plain(element)
       segment = segment_containing(key_d)
-
-      segment.each_entry_element_line do |kd, ed, _line|
-        return true if kd == key_d && ed == element_d
-      end
-      false
+      segment.element_d?(key_d, element_d)
     end
 
     # Returns true if the map has no entries.
@@ -143,14 +130,8 @@ module CartonDb
     # @return [Fixnum]
     def count
       key_count = 0
-      file_key_datum_set = Set.new
       ListMapDb::Segment.each_in_db name do |segment|
-        next if segment.empty?
-        file_key_datum_set.clear
-        segment.each_entry_element_line do |kd, _ed, _line|
-          file_key_datum_set << kd
-        end
-        key_count += file_key_datum_set.length
+        key_count += segment.key_count
       end
       key_count
     end
@@ -177,16 +158,7 @@ module CartonDb
 
       key_d = CartonDb::Datum.for_plain(key)
       segment = segment_containing(key_d)
-
-      if optimization == :small && segment.content?
-        segment.each_entry_element_line do |kd, _ed, _line|
-          return if kd == key_d
-        end
-      end
-
-      segment.open_append do |io|
-        io << key_d.escaped << "\n"
-      end
+      segment.touch_d key_d, optimization
     end
 
     # Removes all entries from the database, leaving it empty.
@@ -245,16 +217,11 @@ module CartonDb
       segment = segment_containing(key_d)
       return if segment.empty?
 
-      new_segment = ListMapDb::Segment.new(
-        segment.segment_group, "#{segment.segment_filename}.new")
-      new_segment.open_overwrite do |io|
-        segment.each_entry_element_line do |kd, _ed, line|
-          io << line unless kd == key_d
+      segment.replace do |replacement|
+        replacement.open_overwrite do |repl_io|
+          segment.copy_entries_except key_d, repl_io
         end
       end
-
-      File.unlink segment.filename
-      File.rename new_segment.filename, segment.filename
     end
 
     # Appends an element string to the content of an entry.
@@ -272,10 +239,7 @@ module CartonDb
       key_d = CartonDb::Datum.for_plain(key)
       element_d = CartonDb::Datum.for_plain(element)
       segment = segment_containing(key_d)
-      FileUtils.mkpath File.dirname(segment.filename)
-      segment.open_append do |io|
-        io << "#{key_d.escaped}\t#{element_d.escaped}\n"
-      end
+      segment.write_key_element_d key_d, element_d
     end
 
     # Appends any number of element strings to the content of an
@@ -313,12 +277,7 @@ module CartonDb
     def concat_any_elements(key, elements)
       key_d = CartonDb::Datum.for_plain(key)
       segment = segment_containing(key_d)
-      segment.open_append do |io|
-        elements.each do |element|
-          element_d = CartonDb::Datum.for_plain(element)
-          io<< "#{key_d.escaped}\t#{element_d.escaped}\n"
-        end
-      end
+      segment.write_key_d_elements key_d, elements
     end
 
     # Appends an element to the content of an entry if no
@@ -353,8 +312,7 @@ module CartonDb
         CartonDb::Datum.for_plain(el)
       }
       segment = segment_containing(key_d)
-      segment.each_entry_element_line do |kd, ed, _line|
-        next unless kd == key_d
+      segment.each_element_for_d key_d do |ed|
         eds_idx = element_ds.index(ed)
         element_ds.delete_at(eds_idx) if eds_idx
       end
@@ -367,24 +325,14 @@ module CartonDb
     attr_accessor :name
 
     def replace_entry_in_file(segment, key_d, content)
-      new_segment = ListMapDb::Segment.new(
-        segment.segment_group, "#{segment.segment_filename}.new")
-      new_segment.open_overwrite do |nf_io|
-        segment.each_entry_element_line do |kd, _ed, line|
-          nf_io.print line unless kd == key_d
-        end
-        element_count = 0
-        content.each do |element|
-          element_d = CartonDb::Datum.for_plain(element)
-          element_count += 1
-          nf_io.puts "#{key_d.escaped}\t#{element_d.escaped}"
-        end
-        if element_count.zero?
-          nf_io.puts key_d.escaped
+      segment.replace do |replacement|
+        replacement.open_overwrite do |repl_io|
+          segment.copy_entries_except key_d, repl_io
+          element_count = 0
+          count = write_key_elements(key_d, content, repl_io)
+          repl_io << "#{key_d.escaped}\n" if count.zero?
         end
       end
-      File.unlink segment.filename
-      File.rename new_segment.filename, segment.filename
     end
 
     def segment_containing(key)
@@ -399,6 +347,16 @@ module CartonDb
       ! occupied
     end
 
+    def write_key_elements(key_d, elements, to_io)
+      count = 0
+      elements.each do |element|
+        element_d = CartonDb::Datum.for_plain(element)
+        count += 1
+        to_io << "#{key_d.escaped}\t#{element_d.escaped}\n"
+      end
+      count
+    end
+
   end
 
 end

data/lib/carton_db/set_map_db.rb

@@ -1,3 +1,6 @@
+# -*- coding: UTF-8 -*-
+# frozen_string_literal: true
+
 require 'set'
 require 'forwardable'
 

data/lib/carton_db/simple_map_db.rb

@@ -1,3 +1,6 @@
+# -*- coding: UTF-8 -*-
+# frozen_string_literal: true
+
 require 'forwardable'
 
 module CartonDb

data/lib/carton_db/version.rb

@@ -1,4 +1,6 @@
 # -*- coding: UTF-8 -*-
+# frozen_string_literal: true
+
 module CartonDb
-  VERSION = "1.1.2"
+  VERSION = "1.1.3"
 end

data/lib/carton_db.rb

@@ -1,4 +1,6 @@
 # -*- coding: UTF-8 -*-
+# frozen_string_literal: true
+
 require "carton_db/version"
 require "carton_db/escaping"
 require "carton_db/datum"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carton_db
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Steve Jorgensen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-08 00:00:00.000000000 Z
+date: 2017-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler