dir-to-xml 0.9.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 01a4b3aec17ca252dcbb382039fc1d524232d4ed
-  data.tar.gz: 323364e008498af01dae7f5dcca7c89814ecd943
+SHA256:
+  metadata.gz: d6496a0f8c9d61c424059f610d41ec4694af6b0978becff48d288fa69f6e92a1
+  data.tar.gz: 727f869e42d65809b44ae09fa8047d8489b861030545dfc4697823bf0803f7f0
 SHA512:
-  metadata.gz: ecfb0f041170061498a80f5d8d3ade3f328382051682b62e23d7d94eefcb799646e9186b1bab0f4f0d08a9c069eaadb499152b1f8e5ca8bc7fc4f60af7e8f1d3
-  data.tar.gz: 00ef273e6116280099c6f08a671bc314b009841980c79fe3451f308e5b35768e3250989619f1bef28d987ed54c0404935a0042ec6c1f9398333ba8d4868dbdfc
+  metadata.gz: 66b044181149d1560fe343c4de959667475322503ac124a522b33a2b6ad8625b2325d7c949ec1dca2adc01c0fc03413d8b273b35ae973297afec99cb9bb95beb
+  data.tar.gz: 2e04fe70291f883a0c165baa5dd4337841682f34888d36a3a57763e4b1867d1746650ae2375a525eece11c576b75bdbd5503b21b263be691b5f9e7384e241840

data.tar.gz.sig

@@ -1,2 +1,3 @@
-��!��Ý�1K‡��$Nη�����V��n�F�h+/��F�W�A)t����7�G��V���Z����
�#���(E��.qc���^
�lw���w6����\d/��!����x�h�Ec݋�� Ir}Wp�_;�U�7=�L?�b�c�N�%�̕�e
-�n���l�V���4�=�`�҃|E�I��sI�Srq!j
+<�򈎼�����H����?v:w��7v��^܇|�p
+0�7z�bݹ�[w�m*��LO�绝�x_�������V�զ@q�j��k��s�!��\�������������޸z0
+w7+=]$�UlBe&�7���N7D�Ѷ�l�����=y�L��5´՚�WNU��a��Z�}a��hH3+��TJTJ{�t�>�à�] :U=d�e��򭏱LČ�Boq�����`��/��2.Rш{:'ƣ�]�!7���u���z�1ۻ�� ��I�A1~���՜*]�M�?0�@��ڕ��jA=xy�K��޴VV�X��E��ľ�o-�⯿��,�m��g��r

data/lib/dir-to-xml.rb

@@ -2,18 +2,20 @@
 
 # file: dir-to-xml.rb
 
-require 'dynarex'
+require 'dxlite'
 
 
 class DirToXML
 
   attr_reader :dx
   
-  def initialize(x= '.', recursive: false, index: 'dir.xml')
-
+  def initialize(x= '.', recursive: false, index: 'dir.xml', debug: false)
+    
     super()
     
-    if x.is_a? Dynarex then
+    @debug = debug
+    
+    if x.is_a? DxLite then
       
       @dx = x      
       @a = @dx.to_a    
@@ -74,15 +76,19 @@ class DirToXML
     @dx.filter &blk
   end
   
-  def filter_by(pattern=/.*/, type: nil)
+  def filter_by(pattern=/.*/, type: nil, ext: nil)
     
     @object = @a.select do |x| 
             
       pattern_match = x[:name] =~ pattern
+      
       type_match = type ? x[:type] == type.to_s : true
+      ext_match = ext ? x[:ext] == ext.to_s : true
+
+      pattern_match and type_match and ext_match
 
     end
-    
+
     self
   end
     
@@ -113,12 +119,15 @@ class DirToXML
     @dx.save File.join(@path, @index)
   end
   
-  def select_by_ext(ext)
+  def select_by_ext(ext, &blk)
+    
+    @object = ext != '*' ? @a.select{|x| x[:ext][/#{ext}$/]} : @a
+    return if @object.empty?
     
-    @object = ext != '*' ? @a.select{|x| x[:ext][/#{ext}/]} : @a
-    dx = Dynarex.new json_out: false
+    dx = DxLite.new
     dx.import @object
-    DirToXML.new(dx)
+    dtx = DirToXML.new(dx)
+    block_given? ? dtx.dx.all.map(&:name).each(&blk) : dtx
   end
   
   def sort_by(sym)
@@ -149,16 +158,18 @@ class DirToXML
     @dx.clone
   end
   
+  alias to_dx to_dynarex
+  
   private
       
   def dxify(a)
     
-    dx = Dynarex.new('directory[title,file_path]/file(name, ' + \
+    dx = DxLite.new('directory[title, file_path, description]/file(name, ' + \
             'type, ext, ctime, mtime, atime, description, owner, ' + \
-                                        'group, permissions)', json_out: false)
+                                        'group, permissions)')
 
-    dx.title = 'Index of ' + @path
-    dx.file_path = @path
+    dx.title = 'Index of ' + File.expand_path(@path)
+    dx.file_path = File.expand_path(@path)
 
     dx.import a
 
@@ -170,14 +181,18 @@ class DirToXML
 
   def refresh(cur_files)
 
-    dx = Dynarex.new(File.join(@path, @index), json_out: false)
+    puts 'inside refresh' if @debug
+    dx = DxLite.new(File.join(@path, @index), debug: @debug)
 
     prev_files = dx.to_a
+    
+    #puts 'prev_files: ' + prev_files.inspect
+    #puts 'cur_files: ' + cur_files.inspect
             
     cur_files.each do |x|
 
       file = prev_files.find {|item| item[:name] == x[:name] }
-
+      #puts 'found : ' + file.inspect if @debug
       x[:description] = file[:description] if file and file[:description]
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dir-to-xml
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 1.0.0
 platform: ruby
 authors:
 - James Robertson
@@ -10,51 +10,55 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBIMRIwEAYDVQQDDAlnZW1t
-  YXN0ZXIxHjAcBgoJkiaJk/IsZAEZFg5qYW1lc3JvYmVydHNvbjESMBAGCgmSJomT
-  8ixkARkWAmV1MB4XDTE2MDczMTE1MDg0MFoXDTE3MDczMTE1MDg0MFowSDESMBAG
-  A1UEAwwJZ2VtbWFzdGVyMR4wHAYKCZImiZPyLGQBGRYOamFtZXNyb2JlcnRzb24x
-  EjAQBgoJkiaJk/IsZAEZFgJldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-  ggEBAKe0Tx9cyuP49OURT7IiCnuCaeFllrizfGPz71cWJwRwG3tTKgyahn929V6N
-  8ALUq10u1g3s1ZtOxhpv0UXj8DkqrV6Y7B37ASrKgfeN8+oKOOYldFlcP0Bixyfp
-  K7Y1O3xrd66O2qNjtTdD7uTEzOPhLw3SUkO0IkuF+Kqam81fsmAcAIWdROGiD9ax
-  DL4j7ykZ/AYmi6R8NKrYN637w2sOnkYXufIQ8wx9qibY3HMW5+X21L6gEaFUDeSW
-  2m//fkHlxmFN+IICo6DFc5VZKtwQmJVK1HnpKOVtWfsVN4bll7ANy54AxvyPsz0r
-  AO6/53uNtf6aJXGNkgAoSnRskXMCAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
-  DwQEAwIEsDAdBgNVHQ4EFgQUaNTA8KT0NF8E1x4S7UJf8EzbHJYwJgYDVR0RBB8w
-  HYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1h
-  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEAC6wZQVPx
-  H8PVmazVDwrxyllTrkeVFSgr3qVyigcBGpm+/sGyTDYnYWhV2GH9vYHM/OI1pJup
-  0q2bFjmKFR1xSHtlMzCTulPY+OpKY403Wg0VZepzTjh9ZDS19/0tQQoaFRd6Y0CT
-  y8cHVYq+Ij6Ug16AA5KRuViQ1vaanElSlRKEmoWom3gkt5fkZ3SMVu/I/Bpx2j6u
-  wqDD24RYravGp0su86eLBFeVjwF8kMUx1VA64kCz8FDTws+tozgFi2HMWPO/B603
-  KsWUx1RJXP2nrd/DuPwuyaNM0fcsnnqFnbAO7RjbYXWS96dGA0WVmxdO7PcMnJ9K
-  PneSyA3VrnMuNQ==
+  MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjEwMTIzMTgwNTQ4WhcN
+  MjIwMTIzMTgwNTQ4WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQC3/Li6
+  /b2XI6+wLVA57zxSEu6RtQqu94GlPisH87ziQS+xYDYq8MqrlqHwA2O6GyK+dnCS
+  V0pdXagOSMj27drmy9j6AhdOGxZTvB4M+q2uxxSt1AU8jAlKVBhRiKt15sbSF43K
+  3cY/PrccN4XpJT1YD44WU4+FwaGatFwcAsHtPpxYZgYMZj1sY+wnlKklqBrcWo6H
+  21+fRAVgHi5dqypH6Yez5Rc2rUKEg72OIU76iSjyx9XP8CiX4sxSqw+HRwyCkjKx
+  d5Onb6vhlSyWpBwRmPRP1bbiztxho4Pla28HM+qVvLIqHpCYoWZi2xmKBoJ5oKPx
+  cUj1ThI5nucnixrbg5dUjhJF9Ews4PukHtG2uIc/7WG+vCbZHn2CZNqH4HfB8cW5
+  yoeD4sBFEJwzK8nfGZuAwJ0yOi8yZTqcW8HyK/IVXH+fqC1NsQVEL5yYhnaCCVvx
+  ShG2g5rh48kNN5CsIQb87WP3J/YnsXhIz3+dwJPmLt+QuWE6sI1NkGWHQFECAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUEmUqvmku
+  azMk41rHySinmAUmae8wJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
+  BgkqhkiG9w0BAQsFAAOCAYEAUyL0Sh3Ld6sK0fldg057McECcaOIyB/nKJApz1er
+  ET9qYthBvhpcaNNo19NFuf9W9UyaE6RI9Eb07DvGYyVP/b0yTrIKyzXzSAwFmrek
+  3VUVAhdqOIrIrf16Zpm4NoOGTOst+6sXZ9KQ52DPPwxdLbRCL7HkUFBMIVf2x2LV
+  XflA8IOlSUPH2vmHJnE0yfs7Lzd5+xYpKeOzQSHo0p+SBDzIim3mOZ3ryf4IZQhv
+  wh0fYGJ2iC/w3rPA78Awm6FNPlGCPjgPIz4mliMicRI/sZmFQvn8+2HYWEzDDOO8
+  zYvUB7rkjDGXYqN1Ft3N6EOuNworOFjUlcPrDFCQHf4UgPjD6Z8WbYkI9c7LWtjc
+  HJCyl/PVyS0Srbl8IPn7JsgUCS7S02KOnVzukQ7PTc1wBlAZ4mNb7N9EOp90GP9a
+  YSREEphg3phQsU9LV4Dlc2Id4gB3W+//c1Ek6TFieKoVemKMkbtB1lgqsEpTCfwh
+  oNUg84DlSmZ2z9LKagBVAlDy
   -----END CERTIFICATE-----
-date: 2017-06-11 00:00:00.000000000 Z
+date: 2021-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: dynarex
+  name: dxlite
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.22
+        version: 0.3.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.22
+        version: 0.3.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
 description: 
-email: james@jamesrobertson.eu
+email: digital.robertson@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -72,7 +76,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.2
+      version: 2.5.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -80,7 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.10
 signing_key: 
 specification_version: 4
 summary: Dir-to-xml saves a directory listing in the Dynarex XML format