lucarecord 0.2.14 → 0.2.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b2e7e80da19b8c0adaebc6272a05e26f66c2e6a989fa416bfd77951ac5f88a0
-  data.tar.gz: 699708346c68e5fa32105eec0d8a82aae8fd85c452f005a402f80a9ff7b19b95
+  metadata.gz: 3d7ac838f340b86b71208f40357ebbe7c4217b1ed6b69dcf012b773d8fa0a532
+  data.tar.gz: c0e706fe9e1eef4abbb5d9600a5100931cd9384d45459481142fb3c594dbfd32
 SHA512:
-  metadata.gz: 59217fdab9258c37ceab07e35118961ae3ac6d6d1587f84235b31169dacf8a82f968a2e8b00f0710c0f7e587836d7d4834f4bf8d2f51e5fbd6f30d1a3100ea7b
-  data.tar.gz: edbc54ec5c66e422a6975c8e53a33b32a063304d5c582ebf4f22596151d141de7d90404eaff8cdd7e8b10264f195da67803ba48a2e4426c6629d995f6cc03507
+  metadata.gz: 56f2f5575afb0a5e204a94ed66fa7b6ded3831316e9d71be17a02270f464b57551701c3938a447f479a4512255800d49bdc545e8f970f8d81f00c1be8caf5316
+  data.tar.gz: be5bf831649fb6d6ad74ca44ae18c9cbb4eabf26193926979776fb99f843c687a8dead90917dafeaa3e9289c2ec8eb83e78a2082fad50305df1f4b8bcaab96a9

data/lib/luca_record.rb

@@ -1,4 +1,7 @@
 # frozen_string_literal: true
+
+require 'luca_support'
+require 'luca_support/config'
 require 'luca_record/version'
 
 module LucaRecord

data/lib/luca_record/dict.rb

@@ -14,8 +14,8 @@ module LucaRecord
     include LucaSupport::Code
 
     def initialize(file = @filename)
-      @path = file
-      #@path = dict_path(file)
+      #@path = file
+      @path = self.class.dict_path(file)
       set_driver
     end
 

data/lib/luca_record/io.rb

@@ -20,12 +20,12 @@ module LucaRecord # :nodoc:
     end
 
     module ClassMethods
-      #-----------------------------------------------------------------
+      # ----------------------------------------------------------------
       # :section: Query Methods
       # Provide sematic search interfaces.
       # <tt>basedir</tt> is set by class instance variable <tt>@dirname</tt>
       # of each concrete class.
-      #-----------------------------------------------------------------
+      # ----------------------------------------------------------------
 
       # find ID based record. Support uuid and encoded date.
       def find(id, basedir = @dirname)
@@ -78,16 +78,16 @@ module LucaRecord # :nodoc:
       def all(basedir = @dirname)
         return enum_for(:all, basedir) unless block_given?
 
-        open_all(basedir) do |f| 
+        open_all(basedir) do |f|
           yield load_data(f)
         end
       end
 
-      #-----------------------------------------------------------------
+      # ----------------------------------------------------------------
       # :section: Write Methods
       # <tt>basedir</tt> is set by class instance variable <tt>@dirname</tt>
       # of each concrete class.
-      #-----------------------------------------------------------------
+      # ----------------------------------------------------------------
 
       # create hash based record
       def create(obj, basedir = @dirname)
@@ -114,29 +114,40 @@ module LucaRecord # :nodoc:
 
       def add_status!(id, status, basedir = @dirname)
         path = abs_path(basedir) / id2path(id)
-        origin = YAML.load_file(path, {})
+        origin = YAML.load_file(path, **{})
         newline = { status => DateTime.now.to_s }
         origin['status'] = [] if origin['status'].nil?
         origin['status'] << newline
         File.write(path, YAML.dump(origin.sort.to_h))
       end
 
-      #-----------------------------------------------------------------
+      # ----------------------------------------------------------------
       # :section: Path Utilities
-      #-----------------------------------------------------------------
+      # ----------------------------------------------------------------
 
-      # convert ID to file path. Normal argument is as follows:
+      # Convert ID to file directory/filename path.
+      # 1st element of Array is used as directory, the others as filename.
+      # String without '/' is converted as git-like structure.
+      # Normal argument is as follows:
       #
-      #   [2020H, V001]
-      #   "2020H/V001"
-      #   "a7b806d04a044c6dbc4ce72932867719"
+      #   ['2020H', 'V001', 'a7b806d04a044c6dbc4ce72932867719']
+      #     => '2020H/V001-a7b806d04a044c6dbc4ce72932867719'
+      #   'a7b806d04a044c6dbc4ce72932867719'
+      #     => 'a7b/806d04a044c6dbc4ce72932867719'
+      #   '2020H/V001'
+      #     => '2020H/V001'
       def id2path(id)
         if id.is_a?(Array)
-          id.join('/')
+          case id.length
+          when 0..2
+            id.join('/')
+          else
+            [id[0], id[1..-1].join('-')].join('/')
+          end
         elsif id.include?('/')
           id
         else
-          encode_hashed_path(id)
+          encode_hashed_path(id).join('/')
         end
       end
 

data/lib/luca_record/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module LucaRecord
-  VERSION = '0.2.14'
+  VERSION = '0.2.15'
 end

data/lib/luca_support/code.rb

@@ -12,7 +12,7 @@ module LucaSupport
     def encode_txid(num)
       txmap = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ'
       l = txmap.length
-      txmap[num / (l**2)] + txmap[(num%(l**2)) / l] + txmap[num % l]
+      txmap[num / (l**2)] + txmap[(num % (l**2)) / l] + txmap[num % l]
     end
 
     def decode_txid(id)
@@ -73,7 +73,8 @@ module LucaSupport
     end
 
     #
-    # convert effective/defunct data into current hash on @date
+    # convert effective/defunct data into current hash on @date.
+    # not parse nested children.
     #
     def parse_current(dat)
       {}.tap do |processed|
@@ -92,7 +93,7 @@ module LucaSupport
     #   - effective: 2020-1-1
     #     rank: 5
     #     point: 1000
-    #   => { 'effective' => 2020-1-1, 'rank' => 5, '' => 'point' => 1000 }
+    #   => { 'effective' => 2020-1-1, 'rank' => 5, 'point' => 1000 }
     #
     def take_current(dat, item)
       target = dat.dig(item)

data/lib/luca_support/config.rb

@@ -6,6 +6,6 @@
 module LucaSupport
   module Config
     # Project top directory.
-    Pjdir = Dir.pwd.freeze
+    Pjdir = ENV['LUCA_TEST_DIR'] || Dir.pwd.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lucarecord
 version: !ruby/object:Gem::Version
-  version: 0.2.14
+  version: 0.2.15
 platform: ruby
 authors:
 - Chuma Takahiro
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-07 00:00:00.000000000 Z
+date: 2020-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mail
@@ -28,44 +28,44 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.17'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.17'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.3.3
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.3.3
+        version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 12.3.3
 description: 'ERP File operation framework
 
 '