lucarecord 0.5.3 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf1f2de4d31ac30fa0e7e2a54d2391c04a0aec3008f0d141fd5d887b39f1e8eb
-  data.tar.gz: f50d14c026db0bd94007bff1e35ab0ff65b6e6a34f97ce282fa8b2dd53adc909
+  metadata.gz: 4574038ef165ecd098bd37897f77a16edb5917aa6c157ce45a005598bc540af2
+  data.tar.gz: a2f22d1d3c9899e3c84c7662cb8859794541e31cbd116eae343deb4d4db3e415
 SHA512:
-  metadata.gz: 152215ed2b331ea30afc08b137b938231d6b40c3254bc8ea99f6cb540bba5727cf3e7b043b5002872ce8c814716c266a2f6f536880f2fdb01d674af6da1e76c7
-  data.tar.gz: 951a08656f3f50e95d58ad724c5f998f23e34d45c8453e79ff297ba059e4ed9e9f176455c1f335d8ed1a52e7545fbb7c5224a1a5862af81c4072ae4c66ac6900
+  metadata.gz: 05dccaddb053508040dfab00cd9451b20b10d3a9b78a5317609ab8e71a548109cee9c4ff2579132f2e7380bb470d8639e6ddfb80ffdb23e324c2971e89d596d0
+  data.tar.gz: e33237c779d1450bd6c1b9a1c208382a8eda87848da74117b36bc973b93c44b965e1970d8eea60eb0d83698361406700c4dbe1480d511bc0130ece78cf7c6cf3

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## LucaRecord 0.5.5
+
+* support JSON for `LucaRecord::Base.load_data()` w/ `@record_type = 'json'`
+
+## LucaRecord 0.5.4
+
+* add `upsert()`
+* `open_records()` supports git-like id sub directories
+* Regard zero-prefixed code like '00123' as not BigDecimal but String on YAML load
+* Add support table columns order to `LucaSupport::View.nushell()`
+* Breaking change: `LucaSupport::View.nushell()` takes Ruby Array. YAML is not accepted anymore.
+
 ## LucaRecord 0.5.3
 
 * add `find_secure()` for partial data encryption.

data/lib/luca_record/io.rb

@@ -4,6 +4,7 @@ require 'bigdecimal'
 require 'csv'
 require 'date'
 require 'fileutils'
+require 'json'
 require 'yaml'
 require 'pathname'
 require 'luca_support/code'
@@ -148,6 +149,26 @@ module LucaRecord # :nodoc:
         end
       end
 
+      # update uuid keyed record based on 'id' field.
+      # If not found, just create
+      #
+      def upsert(obj, basedir: @dirname)
+        return nil if obj['id'].nil?
+
+        validate_keys(obj)
+        merged = begin
+                    open_hashed(basedir, obj['id'], 'r') do |f|
+                      load_data(f).merge(obj)
+                    end
+                  rescue
+                    obj
+                  end
+        open_hashed(basedir, obj['id'], 'w') do |f|
+          f.write(YAML.dump(LucaSupport::Code.readable(merged.sort.to_h)))
+        end
+        obj['id']
+      end
+
       # If multiple ID matched, return short ID and human readable label.
       #
       def id_completion(phrase, label: 'name', basedir: @dirname)
@@ -333,7 +354,16 @@ module LucaRecord # :nodoc:
         file_pattern = filename.nil? ? '*' : "#{filename}*"
         Dir.chdir(abs_path(basedir)) do
           FileUtils.mkdir_p(subdir) if mode == 'w' && !Dir.exist?(subdir)
-          Dir.glob("#{subdir}*/#{file_pattern}").sort.each do |subpath|
+          records = Dir.glob("#{subdir}*/#{file_pattern}", sort: false)
+          records = case records.find_index { |path| FileTest.file?(path) }
+                    when nil
+                      # TODO: file_pattern is not valid
+                      Dir.glob("#{subdir}*/*/#{file_pattern}", sort: false)
+                    else
+                      records.sort
+                    end
+          records.each do |subpath|
+            next if FileTest.directory?(subpath)
             next if skip_on_unmatch_code(subpath, code)
 
             id_set = subpath.split('/').map { |str| str.split('-') }.flatten
@@ -398,14 +428,16 @@ module LucaRecord # :nodoc:
       # If specific decode is needed, override this method in each class.
       #
       def load_data(io, path = nil)
-        if @record_type
-          case @record_type
-          when 'json'
-            # TODO: implement JSON parse
-          end
-        else
-          LucaSupport::Code.decimalize(YAML.safe_load(io.read, permitted_classes: [Date])).tap { |obj| validate_keys(obj) }
-        end
+        raw_obj = if @record_type
+                    case @record_type
+                    when 'json'
+                      JSON.parse(io.read)
+                    end
+                  else
+                    YAML.safe_load(io.read, permitted_classes: [Date])
+                  end
+        LucaSupport::Code.decimalize(raw_obj)
+          .tap { |obj| validate_keys(obj) }
       end
 
       def validate_keys(obj)

data/lib/luca_record/version.rb

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

data/lib/luca_support/code.rb

@@ -153,6 +153,7 @@ module LucaSupport # :nodoc:
       when 'Integer'
         BigDecimal(obj.to_s)
       when 'String'
+        return obj if /^0[0-9]+$/.match(obj) # zero-prefixed code
         /^[0-9\.]+$/.match(obj) ? BigDecimal(obj) : obj
       when 'Float'
         raise 'already float'

data/lib/luca_support/enc.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'fileutils'
+
+module LucaSupport # :nodoc:
+  # Encrypt/Decrypt directory with openssl command
+  #
+  module Enc
+    module_function
+
+    # TODO: check if openssl/tar exists
+    # TODO: handle multiple directories
+    # TODO: check space in dir string
+    # TODO: check if origin exists
+    def encrypt(dir, iter: 10000, cleanup: false)
+      Dir.chdir(Pathname(PJDIR) / 'data') do
+        system "tar -czf - #{dir} | openssl enc -e -aes256 -iter #{iter} -out #{dir}.tar.gz"
+        return if ! cleanup
+
+        FileUtils.rm_rf dir
+      end
+    end
+
+    # TODO: check space in dir string
+    def decrypt(dir, iter: 10000)
+      Dir.chdir(Pathname(PJDIR) / 'data') do
+        system "openssl enc -d -aes256 -iter #{iter} -in #{dir}.tar.gz | tar xz"
+      end
+    end
+  end
+end

data/lib/luca_support/view.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'erb'
+require 'json'
 require 'open3'
 require 'pathname'
 
@@ -47,9 +48,16 @@ module LucaSupport
       nil
     end
 
-    def nushell(yml)
+    def nushell(records, columns=[])
+      return nil if records.is_a?(String)
+
       require 'open3'
-      Open3.pipeline_w(%(nu -c 'cat - | from yaml')) { |stdin| stdin.puts yml }
+      select = if columns.empty?
+                 ''
+               else
+                 '| select --ignore-errors ' + columns.map { |col| col.gsub(/[^a-zA-Z0-9_-]/, '') }.join(' ')
+               end
+      Open3.pipeline_w(%(nu -c 'cat - | from json #{select}')) { |stdin| stdin.puts JSON.dump(records) }
     end
   end
 end

data/lib/luca_support.rb

@@ -2,6 +2,7 @@
 
 module LucaSupport
   autoload :Code, 'luca_support/code'
+  autoload :Enc, 'luca_support/enc'
   autoload :CONFIG, 'luca_support/config'
   autoload :Config, 'luca_support/config'
   autoload :Mail, 'luca_support/mail'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lucarecord
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.5
 platform: ruby
 authors:
 - Chuma Takahiro
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-01-18 00:00:00.000000000 Z
+date: 2023-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -71,6 +71,7 @@ files:
 - lib/luca_support.rb
 - lib/luca_support/code.rb
 - lib/luca_support/config.rb
+- lib/luca_support/enc.rb
 - lib/luca_support/mail.rb
 - lib/luca_support/range.rb
 - lib/luca_support/view.rb
@@ -96,7 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
+rubygems_version: 3.3.5
 signing_key: 
 specification_version: 4
 summary: ERP File operation framework