dir-to-xml 0.2.5 → 0.2.6

data/lib/dir-to-xml.rb

@@ -2,12 +2,10 @@
 
 # file: dir-to-xml.rb
 
-require 'rexml/document'
+require 'rexle'
 require 'dynarex'
 
 class DirToXML
-  #include PrettyXML
-  include REXML
 
   attr_reader :status
 
@@ -18,7 +16,7 @@ class DirToXML
 
     a = Dir.glob("*").sort
     command = a.include?('dir.xml') ? 'run' : 'new_run'      
-
+    
     @doc, @status = self.send command, a
     Dir.chdir old_path #File.expand_path('~')
   end
@@ -34,13 +32,13 @@ class DirToXML
   private
       
   def new_element(name, text=nil)
-    new_node = Element.new(name)
+    new_node = Rexle::Element.new(name)
     new_node.text = text if text
     new_node
   end
 
   def new_file(name, type, ext, ctime, mtime, atime)
-    node = Element.new('file')
+    node = Rexle::Element.new('file')
     node.add_element new_element('name', name)
     node.add_element new_element('type', type)
     node.add_element new_element('ext', ext)
@@ -59,31 +57,38 @@ class DirToXML
       [x, File.extname(x), File::ftype(x), File::ctime(x), File::mtime(x), File::atime(x)]
     end
 
+    records = doc.root.element('records')
+    i = '0'
     dir_files.each do |name, ext, type, ctime, mtime, atime|       
-      doc.root.elements['records'].add_element new_file(name, type, ext, ctime, mtime, atime)
+      records.add_element new_file(name, type, ext, ctime, mtime, atime)
+      i.succ!
     end
   end
 
   def new_run(a)
 
-    summary = "<summary><title>Index of %s</title><file_path>%s</file_path></summary>" % [File.basename(Dir.pwd), File.dirname(Dir.pwd)[/\/home\/james\/heroku\/(.*)/,1]]
-    #summary = "<summary/>"
-    buffer = "<?xml version='1.0' encoding='UTF-8'?><directory>%s<records/></directory>" % summary
-    doc = Document.new(buffer)
+summary = "
+<summary>
+  <title>Index of #{File.basename(Dir.pwd)}</title>
+  <file_path>#{File.dirname(Dir.pwd)}</file_path>
+  <recordx_type>dynarex</recordx_type>
+  <schema>directory[title,file_path]/file(name, type, ext, created, last_modified, last_accessed, description, owner, group, permissions)</schema>
+</summary>"
+
+    buffer = "<directory>%s<records/></directory>" % summary
+    doc = Rexle.new(buffer)
     add_files(doc, a)
 
-    doc.root.elements['records'].add_element new_file(name='dir.xml', type=nil, ext='.xml', *[Time.now] * 3)
+    doc.element('records').add_element new_file(name='dir.xml', type=nil, ext='.xml', *[Time.now] * 3)
 
-    #File.open('dir.xml','w'){|f| f.write pretty_xml(doc)}
-    File.open('dir.xml','w'){|f| doc.write f}
+    File.open('dir.xml','w'){|f| f.write doc.xml pretty: false}
     [doc, "created"]
   end
 
   def run(a)
 
-    doc = Document.new(File.open('dir.xml','r').read)   
-    #puts 'before a)dir'
-    a_dir = XPath.match(doc.root, 'records/file/name/text()').map {|x| x.to_s}.sort
+    doc = Rexle.new(File.open('dir.xml','r').read)   
+    a_dir = doc.xpath('records/file/name/text()').sort
 
     return [doc, "nothing new"] if a == a_dir
 
@@ -94,14 +99,11 @@ class DirToXML
     # files to delete
     files_to_delete = a_dir - a
     files_to_delete.each do |filename|
-      node = doc.root.elements["records/file[name='#{filename}']"]
-      node.parent.delete node
+      node = doc.element("records/file[name='#{filename}']")
+      node.delete
     end
 
-    #File.open('dir.xml','w'){|f| f.write pretty_xml(doc)}
     File.open('dir.xml','w'){|f| doc.write f}
     [doc, "updated"]
   end
 end
-
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dir-to-xml
 version: !ruby/object:Gem::Version 
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors: []
 
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-07 00:00:00 +01:00
+date: 2011-02-24 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency