dynarex-tags 0.3.2 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e7df7566e93224127b7b98989296542da0bb9b37430c6b661e077c4c4dd09b6f
-  data.tar.gz: 823a2356aad3577df4fe21c78fee692c37535d1882973cf4b7732418341d4982
+  metadata.gz: 1ed697129ddcfd3a2cbfc650bc7e4828f6df0ade942a39640fc55fb764daae4f
+  data.tar.gz: 8e0671fcdfcd675e60030133618b63d3ea289c0a154c03a57e2d99120c3e2a6c
 SHA512:
-  metadata.gz: ebac2e9b912fde57986cbcb31f2921d3d18d1a2b7b6d07bfff79c26dcfd93816760333cab370a370d7771eff691002e026e1569be8a491fef3d794e1cf0fac54
-  data.tar.gz: 5e76d89817d1c23a8f6eae98a76b250faacd530c638807e0eaafeb80243fe0cf49a4cc2bc112900d231855d32aafc7ca06c414a60c8e9e5439b9d08347a75bef
+  metadata.gz: 26d3a75760b83cf8dcc3758c6061b6b354e84c43ed94b3010d11b3c62898ecb43af42056c8b144fc109da175917c708a1ead7be521e0dff23bdc08a653fbed07
+  data.tar.gz: 698fba777462534e8caf14bdcd523816f75701ac0a028d29d04f49bd6cc860f76cc3540fc39e35751348cc41f0743afdbe9d8eab6f05915feea79a9b3318a8e2

data/lib/dynarex-tags.rb

@@ -3,50 +3,109 @@
 # file: dynarex-tags.rb
 
 require 'dynarex'
-require 'fileutils'
+require 'rxfreadwrite'
 
 
 class DynarexTags
-  include RXFHelperModule
+  include RXFReadWriteModule
   using ColouredText
 
-  def initialize(tags_parent_path, tagfile_xslt: nil, indexfile_xslt: nil, 
+  def initialize(tags_parent_path, tagfile_xslt: nil, indexfile_xslt: nil,
                  debug: false)
 
     puts ('tags_parent_path: '  + tags_parent_path).debug if debug
     @filepath = tags_parent_path
-    
-    @tagfile_xslt, @indexfile_xslt, @debug = tagfile_xslt, 
+
+    @tagfile_xslt, @indexfile_xslt, @debug = tagfile_xslt,
         indexfile_xslt, debug
-    
+
     @tags_path = File.join(tags_parent_path, 'tags')
     FileX.mkdir_p @tags_path
-    @index_filename = File.join(tags_parent_path, 'dxtags.xml')        
+    @index_filename = File.join(tags_parent_path, 'dxtags.xml')
 
     s = FileX.exists?(@index_filename) ? \
-                                @index_filename : 'tags/tag(keyword,count)'    
+                                @index_filename : 'tags/tag(keyword,count)'
 
     puts ('dxtags filepath: ' + s.inspect).debug if debug
-    @dxindex = Dynarex.new s, json_out: false    
-    @dxindex.xslt = @indexfile_xslt if @indexfile_xslt    
-    
+    @dxtags = Dynarex.new s, json_out: false
+    @dxtags.xslt = @indexfile_xslt if @indexfile_xslt
+
+  end
+
+  def add(title: nil, url: nil)
+
+
+    puts ('title: ' + title.inspect).debug if @debug
+    puts ('url: ' + url.inspect).debug if @debug
+
+    h = @dxtags.all.inject({}) {|r,x|  r.merge(x.keyword.downcase => x.count) }
+
+    a = title.scan(/(?<=\B#)[\w_]+/).uniq
+
+    a.each do |tag|
+
+      t = tag.downcase
+
+      h[t] = save_tag(h[t], t, title, url)
+
+      if @dxtags.record_exists? tag then
+        @dxtags.update(tag, {count: h[t]})
+      else
+        @dxtags.create({keyword: tag, count: h[t]}, id: t)
+      end
+
+    end
+
+    @dxtags.save @index_filename
+
+  end
+
+  def delete(title)
+
+    # find the title in each of the tags file directory
+    a = title.downcase.scan(/(?<=#)[\w_]+/)
+
+    a.each do |tag|
+
+      puts ("deleting tag: %s for title: %s" % [tag, title]).debug if @debug
+      tagfile = File.join(@tags_path, tag + '.xml')
+      dx = Dynarex.new(tagfile, json_out: false, autosave: true)
+      rx = dx.find_by_title title
+      rx.delete
+      dx.rm if dx.all.empty?
+
+      # find the title in dxtags.xml and delete it
+      entry = @dxtags.find tag
+
+      next unless entry
+
+      if entry.count == '1' then
+        entry.delete
+      else
+        entry.count = entry.count.to_i - 1
+      end
+
+    end
+
+    @dxtags.save @index_filename
+
   end
 
   def find(tag)
 
-    rx = @dxindex.find tag.downcase
+    rx = @dxtags.find tag.downcase
     puts ('rx: ' + rx.inspect).debug if @debug
-    
+
     if rx then
 
       tagfile = File.join(@tags_path, tag.downcase + '.xml')
       dx = Dynarex.new(tagfile, json_out: false)
       r = dx.all
-      
+
       def r.to_md()
         self.map {|x| "* [%s](%s)" % [x.title, x.url]}.join("\n")
       end
-      
+
       return r
 
     end
@@ -54,13 +113,13 @@ class DynarexTags
   end
 
   def generate(indexfilename=File.join(@filepath, 'index.xml'), &blk)
-       
+
     dx = Dynarex.new indexfilename
 
-    h = @dxindex.all.inject({}) {|r,x|  r.merge(x.keyword => x.count) }    
-    
+    h = @dxtags.all.inject({}) {|r,x|  r.merge(x.keyword.downcase => x.count) }
+
     dx.all.each do |x|
-      
+
       a = if block_given? then
         blk.call(x)
       else
@@ -68,38 +127,58 @@ class DynarexTags
                         .map{|tag| [tag, x.title, x.url]}
       end
 
-      a.each {|tag, title, url| save_tag(h, tag.downcase, title, url)}
+      a.each do |tag, title, url|
+
+        t = tag.downcase
+
+        h[t] = save_tag(h[t], t, title, url)
+
+      end
     end
 
-    
-    h.each do |tag,count| 
-      
-      if @dxindex.record_exists? tag then
-        @dxindex.update(tag, {count: count.to_s})
+
+    h.each do |tag, count|
+
+      if @dxtags.record_exists? tag then
+        @dxtags.update(tag, {count: count.to_s})
       else
-        @dxindex.create({keyword: tag, count: count.to_s}, id: tag)
+        @dxtags.create({keyword: tag, count: count.to_s}, id: tag.downcase)
       end
-      
+
+    end
+
+    @dxtags.save @index_filename
+
+  end
+
+  def tags()
+
+    @dxtags.all.inject({}) do |r, x|
+      tagfile = File.join(@tags_path, x.keyword.downcase + '.xml')
+      dx = Dynarex.new(tagfile, json_out: false)
+      r.merge({x.keyword.downcase => dx.all.map(&:to_h)})
     end
 
-    @dxindex.save @index_filename    
+
   end
 
 
   private
 
 
-  def save_tag(h, tag, title, url)
-    
+  def save_tag(tag_count, tag, title, url)
+
+    puts ('tag_count: ' + tag_count.inspect).debug if @debug
     tagfile = File.join(@tags_path, tag + '.xml')
-    buffer, h[tag] = h[tag] ? [tagfile, h[tag].succ] \
-                                             : ['items/item(title,url)', '1']
+    buffer = tag_count ? tagfile : 'items/item(title,url)'
+
     dx = Dynarex.new(buffer, json_out: false)
 
     dx.xslt = @tagfile_xslt if @tagfile_xslt
     dx.create(url: url, title: title)
 
     dx.save tagfile
+    dx.all.length
   end
-  
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynarex-tags
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.6.0
 platform: ruby
 authors:
 - James Robertson
@@ -11,31 +11,31 @@ cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
   MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
-  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMTgxMTAyMTIyNDM5WhcN
-  MTkxMTAyMTIyNDM5WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
-  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDDuUWY
-  Hmg4WszzkCFXr5Khc2Sq8qDw4PS2Ai1hHFWhthD9/JrOGtsm7jbf9LfuXEs31NLP
-  0jxJG8rg6Svm/k8IJzEb93gEkWdXKIxpKxLCoXijgkCBjuoPOJYQSDEz+WGBzCL2
-  nFCwyPc6SCO1vDYxpk11rwq4JN43MszhC+RGK4MY3tbUAkSqITsFREDHWp51U81X
-  hO8MbBISCfOs9u75B5+Fh7kUh20efc8mfihmbko3dIvEfj5Lunvx/loGZ0BNXtwm
-  mglkfeVaQYZV45Hxcl00qQ9ftgHYnzptFJ/abLAIu5RSu4Hyx0V3RvWho+R4ThkP
-  Uy6OmF82u9v7jjCHRAKcxZb6tVnxLvBL92DUxXtXNxhftWdteobojw28kERmDNnh
-  KEPeRjqUCmnQ/rfkya1igJTNlaG1BxRcy2m9IwRsDNQcvi7YmQw+ma863tjwBHYW
-  NTund8l9SI+iG8pnYDLffigHiUPaxze2fN62sut+G0xRbpwf3WzcB9It1zECAwEA
-  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUJrhK0kPj
-  1LnQ0NLjhKV3OelIe/MwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjIwMjIzMTk0MjA3WhcN
+  MjMwMjIzMTk0MjA3WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDEplt/
+  LsdiR1h5neKpHsqzxvzSmsMHAK8Z64ZWny00yB389RNIXh2QT3kR3kdJDDUGXw8/
+  NzCAMHzRL5pursOVraSKAO2yev5wTXwKTtA+c9RU4CluZnFQqwTDOj7NX1iAK3l9
+  mgx0Cr1bNkDv4c4nLNBI7D/XpOz95EcD5r+T/gOitBPGa6P14ll2mJHb2JckCe9n
+  RQ4iSgfGS0UVvIn2LuQhEelvlWulPgglrMAFrN2FPLqUhNDqTfOEcSWQdL/JJ7/8
+  rPFgqjFabPqWSEU23fCp2UHrVDbzPn2gjkiXkhjReKmGYXxcCFkodDN8Xx3a1zOL
+  EW+EIzQjcMOL5zFxaNU3YntLyidlXavwxf0QAjvL86WKMMw45TN/cQ1SLEgkXYXP
+  KO9bfnLc/JwOjcFzcTcT0BRWbbTmXtMEmdHqxIF+EfEJEp2sO6/hB5bgIyiinlKp
+  qaJNWYi8zCRXONn3lcJNQA2Ly0cVO6QwRpFg0XQLo/qkF4BEoKYg4GhAMJECAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUsHWsQnZT
+  SEzBzLVOKmCJy5j3ikMwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
   c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
-  BgkqhkiG9w0BAQsFAAOCAYEAw3jHLsTnKPD8PSegSDSN1fOT4Fec75ocGriB9Dpx
-  kqq5rxbPPdkkEj5y/Gj3bAdVw38dEN9Ts2qTEWp3g0W5ZkhDASHrBN5E/6NfDMgt
-  tK2Y9y+iTK3qWCNMtWvbDPzDp6SaZ/h0LfRs05ytuUt+filQ+/jJHh26SfpwzwuX
-  BYkCZylW9+To9mHxXszWE9gUZnfPHz6+uAUNOvVfsQ8pmQ8wOOKyS3EYk6LKaIyR
-  ftprJ8Ncgf27HM7NI2g5+3mCd0gYPEaheYR/KMvkFdyoXPHOQEVHKFuatmc4Ck/B
-  tKVPkKWF1ZC1D62PogcWfw2GT1mO2mGaQlc6mg2zmnF0b/5p6zbsVlB+EjfY5zKP
-  mrhp4VTn6wlZr/M57tZbFIXbMiiBSUgOwlryzN9MzRGRp+eiFqZxUNiUHlaeeWay
-  DWmhPViInQPjQftcVmbEJ7cSh3MAHLmEde9WXtfuVrqm7bLx2cT6gGph4MUs2CuA
-  WkefAv1RxMCo/1hDjM5UvmJx
+  BgkqhkiG9w0BAQsFAAOCAYEAE6VTWAXk+ij9rjtjlzRvSIcMRHtjmvLhh8Ino6Wf
+  NjvKY1N3GXWVaykBpM7HGQsw2nHqw995nrqeeFEVaxoB5f8DVH0byH9KySryLuat
+  JZkYT+ZK4m4UompdPSN5OTcOgr7gu4oF6kGgQAMLXF3lHiM25fJhVdwBwxnZjvAg
+  iGM2su3faAmg4477LueW05d6cbCJ+iDHROf/PYSe9QQ4hbPrju00S8KfIDg9zOOj
+  A64uzZRvsfKMs8Fx2vall7sDqHcU3FhMRDZuy1OuMfQC45s7OwEE6sCjPfqvF3j0
+  yhIEw9ItCiYHhE6DxO518tdr6x8HgvLAjNwE2/v73Mj0gHOeMGBD5CfymYltB15y
+  hkZHVlLGEUPCTPfxYmdrxudsEcvYjlv8eRqwIT34hb8q/SvZ4UQ5Ep3h66ny2fBt
+  Gn0CkDQj+j/nOYRHXZh5P4U5CbL9ZrhpNi02sMwBYOGAfy8xGTIaDErxymeFV95A
+  eWFHlR8BTtTjZAXezxMFrlqp
   -----END CERTIFICATE-----
-date: 2018-11-03 00:00:00.000000000 Z
+date: 2022-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynarex
@@ -43,22 +43,22 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.7
+        version: 1.9.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.7
+        version: 1.9.6
 description: 
-email: james@jamesrobertson.eu
+email: digital.robertson@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -83,9 +83,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
-summary: dynarex-tags
+summary: Uses hashtags to help reference 1 or more records from an index file.
 test_files: []