dir-to-xml 0.7.4 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1fb015a4e5fa5d7de496e78649405a81c88c7fb6
-  data.tar.gz: c9088c0c0f04ff6e2985d5e311d07fd491aa5b53
+  metadata.gz: 30753497dc3cb89192e2b16e2830a26ce5fef29c
+  data.tar.gz: fce05e271fa0d471391284a2218ca863e21135f5
 SHA512:
-  metadata.gz: 4550171299f88f05832c7acceb6e3599c536248ac8e8aa3aa4df4309de10fe75271c64cc62c3055d66d31d4388103ab067dee7b2e7d1ed13f32272093d81f2d6
-  data.tar.gz: 77747dcd0719ed898c7eacf72e8b942976f955cf387ccfec0b73efe20366a230b029990e7e0ee19e87fe264ac6f3ad9b28c7eaf2d619f71e507bb8adf96634ea
+  metadata.gz: 6790149b80e859dcd6486c79266a940be2d87eea37d076bf6008842d0a7e42ebe362f5a4bc3fcd45c9b92e858f9aac4915401190521fdf7f97469aab8e7e3d5d
+  data.tar.gz: 48f055d6452018949ddcc81ee853ea4bf9e2c233397f8d03ec2d69dd74c2bc4c6f57728f81d36d4303da4341e8c8ac2621183d339a2ff0df0677f66787dfd67f

data/lib/dir-to-xml.rb

@@ -7,7 +7,8 @@ require 'dynarex'
 
 class DirToXML
 
-
+  attr_reader :dx
+  
   def initialize(path= '.', recursive: false, index: 'dir.xml')
     
     super()
@@ -35,20 +36,27 @@ class DirToXML
 
     end    
 
-    command = File.exists?(index) ? :refresh : :dxify
+    command = File.exists?(File.join(path, index)) ? :refresh : :dxify
     
     @dx  = self.method(command).call a2
     
-    @h = @dx.to_h
-    @object = @h    
+    @a = @dx.to_a    
+    @object = @a
 
   end
   
-  def filter(pattern=/.*/)
-    @object = @h.select {|x| x[:name] =~ pattern }
+  def filter_by(pattern=/.*/, type: nil)
+    
+    @object = @a.select do |x| 
+            
+      pattern_match = x[:name] =~ pattern
+      type_match = type ? x[:type] == type.to_s : true
+
+    end
+    
     self
   end
-  
+    
   def find_by_filename(s)
     @dx.all.find {|item| item.name == s}
   end
@@ -58,7 +66,7 @@ class DirToXML
   def last_modified(ext=nil)
     
     if ext and ext != '*' then
-      @object = @h.select{|x| x[:ext][/#{ext}/] or x[:type] == 'directory'}
+      @object = @a.select{|x| x[:ext][/#{ext}/] or x[:type] == 'directory'}
     end
     
     a = sort_by :mtime
@@ -78,7 +86,7 @@ class DirToXML
   
   def select_by_ext(ext)
     
-    @object = ext != '*' ? @h.select{|x| x[:ext][/#{ext}/]} : @h
+    @object = ext != '*' ? @a.select{|x| x[:ext][/#{ext}/]} : @a
     self
   end
   
@@ -94,8 +102,12 @@ class DirToXML
   
   alias sort_by_lastmodified sort_by_last_modified
   
-  def to_h
-    @object || @h
+  def to_a
+    @object || @a
+  end
+  
+  def to_h()
+    self.to_a.inject({}){|r,x| r.merge(x[:name] => x)}
   end
   
   def to_xml(options=nil)
@@ -120,19 +132,21 @@ class DirToXML
     dx.import a
 
     dx.save File.join(@path, @index)
-    
+
     return dx
 
   end
 
   def refresh(cur_files)
 
-    dx = Dynarex.new @index
+    dx = Dynarex.new File.join(@path, @index)
 
     prev_files = dx.to_a
             
     cur_files.each do |x|
+
       file = prev_files.find {|item| item[:name] == x[:name] }
+
       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.7.4
+  version: 0.8.0
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   iqgRYucyTfq3VLTy6wrGN2HJj8unXh4JIFjyEvR3yvcCYl6IaHxuDfgoDfBI6MeQ
   Em7HctRLQorltw==
   -----END CERTIFICATE-----
-date: 2015-12-19 00:00:00.000000000 Z
+date: 2015-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynarex