lucarecord 0.2.17 → 0.2.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25005e140ff2445d9a7c39bb8805f94373d0cf5fdc74996248537c8493996a76
-  data.tar.gz: 675eb686f9565bf73319117f41f6ea0f4e1a0202250cc8987f67aaa7a7cf677a
+  metadata.gz: 63ac71426bdf4eb871884b8b28c5aa363db9d51ef3ca0d84ab92a3fcf127ecde
+  data.tar.gz: 2bc0d6ecde974a2f9ca9c901af5ac714c909f40dd84986746948065a4efb4ed7
 SHA512:
-  metadata.gz: fb805203d9ff072caf90e281e5dbf4b062455b1707925cd16a319735dea95c346c6b959c2c4633c59630fcbc99209bfb7477e6764453dcad5bfac6bd68e68302
-  data.tar.gz: b374ae84672a08400ed074f6a150780da0ae29558941178db941b99e0074c6e51e34245aeb4865fac0252a601d5f677b094f3e827e5bb91030e6cd88468096b1
+  metadata.gz: 1f9cf84bfb09080f6f3e8cf15c8fb3cea0d6eca9d69acc10c23cd9b6a681daae9ab641181a928f438c870a438a0c4525c61bfad6a1832a2d148b7a3d37b3d6d3
+  data.tar.gz: be35bd6b0a993b5fde415ba5e1a7b59228106c443594b164fa5df26f1eb284ae0556277b99b25f7697283ac194f6c25ffa7d7d8d3e1bfe2e22b128130f3f9cec

data/CHANGELOG.md

@@ -0,0 +1,8 @@
+## LucaRecord 0.2.18
+
+* `find()`, `create()`, `save()` now supports both of uuid / historical records. If specified `date:` keyword option to `create()`, then generate historical record. `find()`, `save()` identifies with 'id' attribute.
+
+## LucaRecord 0.2.17
+
+* Change internal number format to BigDecimal.
+* Number of Decimal is configurable through `decimal_number` in config.yml(default = 2). `country` setting can also affect.

data/lib/luca_record/io.rb

@@ -36,9 +36,9 @@ module LucaRecord # :nodoc:
           open_hashed(basedir, id) do |f|
             yield load_data(f)
           end
-        elsif id.length >= 9
-          # TODO: need regexp match for more flexible coding(after AD9999)
-          open_records(basedir, id[0, 5], id[5, 6]) do |f, path|
+        elsif id.length >= 7
+          parts = id.split('/')
+          open_records(basedir, parts[0], parts[1]) do |f, path|
             yield load_data(f, path)
           end
         else
@@ -90,26 +90,23 @@ module LucaRecord # :nodoc:
       # of each concrete class.
       # ----------------------------------------------------------------
 
-      # create hash based record
-      def create(obj, basedir = @dirname)
+      # create record both of uuid/date identified.
+      #
+      def create(obj, date: nil, codes: nil, basedir: @dirname)
         validate_keys(obj)
-        id = LucaSupport::Code.issue_random_id
-        obj['id'] = id
-        open_hashed(basedir, id, 'w') do |f|
-          f.write(YAML.dump(LucaSupport::Code.readable(obj.sort.to_h)))
-        end
-        id
-      end
-
-      # define new transaction ID & write data at once
-      def create_record!(obj, date_obj, codes = nil, basedir = @dirname)
-        gen_record_file!(basedir, date_obj, codes) do |f|
-          f.write(YAML.dump(LucaSupport::Code.readable(obj.sort.to_h)))
+        if date
+          create_record(obj, date, codes, basedir)
+        else
+          obj['id'] = LucaSupport::Code.issue_random_id
+          open_hashed(basedir, obj['id'], 'w') do |f|
+            f.write(YAML.dump(LucaSupport::Code.readable(obj.sort.to_h)))
+          end
+          obj['id']
         end
       end
 
       def prepare_dir!(basedir, date_obj)
-        dir_name = (Pathname(basedir) + encode_dirname(date_obj)).to_s
+        dir_name = (Pathname(basedir) + LucaSupport::Code.encode_dirname(date_obj)).to_s
         FileUtils.mkdir_p(dir_name) unless Dir.exist?(dir_name)
         dir_name
       end
@@ -129,8 +126,17 @@ module LucaRecord # :nodoc:
           create(obj, basedir)
         else
           validate_keys(obj)
-          open_hashed(basedir, obj['id'], 'w') do |f|
-            f.write(YAML.dump(LucaSupport::Code.readable(obj.sort.to_h)))
+          if obj['id'].length < 40
+            parts = obj['id'].split('/')
+            raise 'invalid ID' if parts.length != 2
+
+            open_records(basedir, parts[0], parts[1], nil, 'w') do |f, path|
+              f.write(YAML.dump(LucaSupport::Code.readable(obj.sort.to_h)))
+            end
+          else
+            open_hashed(basedir, obj['id'], 'w') do |f|
+              f.write(YAML.dump(LucaSupport::Code.readable(obj.sort.to_h)))
+            end
           end
         end
         obj['id']
@@ -182,10 +188,6 @@ module LucaRecord # :nodoc:
         end
       end
 
-      def encode_dirname(date_obj)
-        date_obj.year.to_s + LucaSupport::Code.encode_month(date_obj)
-      end
-
       # test if having required dirs/files under exec path
       def valid_project?(path = LucaSupport::Config::Pjdir)
         project_dir = Pathname(path)
@@ -198,6 +200,29 @@ module LucaRecord # :nodoc:
 
       private
 
+      # define new transaction ID & write data at once
+      # ID format is like '2020H/A001', which means record no.1 of 2020/10/10.
+      # Any data format can be written with block.
+      #
+      def create_record(obj, date_obj, codes = nil, basedir = @dirname)
+        FileUtils.mkdir_p(abs_path(basedir)) unless Dir.exist?(abs_path(basedir))
+        subdir = "#{date_obj.year}#{LucaSupport::Code.encode_month(date_obj)}"
+        filename = LucaSupport::Code.encode_date(date_obj) + new_record_id(basedir, date_obj)
+        obj['id'] = "#{subdir}/#{filename}" if obj.is_a? Hash
+        filename += '-' + codes.join('-') if codes
+        Dir.chdir(abs_path(basedir)) do
+          FileUtils.mkdir_p(subdir) unless Dir.exist?(subdir)
+            File.open(Pathname(subdir) / filename, 'w') do |f|
+              if block_given?
+                yield(f)
+              else
+                f.write(YAML.dump(LucaSupport::Code.readable(obj.sort.to_h)))
+              end
+            end
+        end
+        "#{subdir}/#{filename}"
+      end
+
       # open records with 'basedir/month/date-code' path structure.
       # Glob pattern can be specified like folloing examples.
       #
@@ -213,6 +238,7 @@ 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|
             next if skip_on_unmatch_code(subpath, code)
 
@@ -270,16 +296,6 @@ module LucaRecord # :nodoc:
         end
       end
 
-      def gen_record_file!(basedir, date_obj, codes = nil)
-        d = prepare_dir!(abs_path(basedir), date_obj)
-        filename = LucaSupport::Code.encode_date(date_obj) + new_record_id(abs_path(basedir), date_obj)
-        if codes
-          filename += codes.inject('') { |fragment, code| "#{fragment}-#{code}" }
-        end
-        path = Pathname(d) + filename
-        File.open(path.to_s, 'w') { |f| yield(f) }
-      end
-
       # TODO: replace with data_dir method
       def abs_path(base_dir)
         Pathname(LucaSupport::Config::Pjdir) / 'data' / base_dir
@@ -297,8 +313,10 @@ module LucaRecord # :nodoc:
 
       # AUTO INCREMENT
       def new_record_no(basedir, date_obj)
-        dir_name = (Pathname(basedir) + encode_dirname(date_obj)).to_s
-        raise 'No target dir exists.' unless Dir.exist?(dir_name)
+        raise 'No target dir exists.' unless Dir.exist?(abs_path(basedir))
+
+        dir_name = (Pathname(abs_path(basedir)) / LucaSupport::Code.encode_dirname(date_obj)).to_s
+        return 1 unless Dir.exist?(dir_name)
 
         Dir.chdir(dir_name) do
           last_file = Dir.glob("#{LucaSupport::Code.encode_date(date_obj)}*").max

data/lib/luca_record/version.rb

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

data/lib/luca_support/code.rb

@@ -45,7 +45,12 @@ module LucaSupport
       num.to_s.reverse.gsub!(/(\d{3})(?=\d)/, '\1,').reverse!
     end
 
+    # encode directory name from year and month.
     #
+    def encode_dirname(date_obj)
+      date_obj.year.to_s + encode_month(date_obj)
+    end
+
     # Month to code conversion.
     # Date, DateTime, String, Integer is valid input. If nil, returns empty String for consistency.
     #

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lucarecord
 version: !ruby/object:Gem::Version
-  version: 0.2.17
+  version: 0.2.18
 platform: ruby
 authors:
 - Chuma Takahiro
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-11-07 00:00:00.000000000 Z
+date: 2020-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mail