xml-smart 0.3.6 → 0.3.7

data/lib/xml/smart.rb

@@ -1,6 +1,5 @@
 require 'rubygems'
 require 'nokogiri'
-require 'lockfile'
 require 'tempfile'
 
 require File.expand_path(File.dirname(__FILE__) + '/smart_qname')
@@ -112,12 +111,7 @@ module XML
   module Smart
     VERSION        = File.read(File.expand_path(File.dirname(__FILE__) + '/../../xml-smart.gemspec')).match(/\.version\s*=[^\n]+?([\d\.]+)[^\n]+\n/)[1]
     LIBXML_VERSION = Nokogiri::VERSION_INFO['libxml']['loaded']
-    LOCKFILE = {
-      :min_sleep => 0.25,
-      :max_sleep => 5,
-      :sleep_inc => 0.25,
-      :max_age => 5
-    }
+    MUTEX = Mutex.new
     COPY = 0
     MOVE = 1
 
@@ -126,15 +120,35 @@ module XML
     def self::modify(name,default=nil,&block)
       raise Error, 'first parameter has to be a filename or filehandle' unless name.is_a?(String) || name.is_a?(IO) || name.is_a?(Tempfile)
       raise Error, 'a block is mandatory' unless block_given?
-      lfname = name.is_a?(String) ? name : name.fileno.to_s
-      lockfile = Lockfile.new(lfname + '.lock',LOCKFILE)
+      dom = io = nil
       begin
-        lockfile.lock
-        so = Smart::open_unprotected(name,default)
-        block.call(so)
-        so.save_as(name)
+        if name.is_a?(String) && File.exists?(name)
+          MUTEX.synchronize do
+            io = ::Kernel::open(name,'r+')
+            io.flock(File::LOCK_EX)
+          end  
+          dom = Dom.new Nokogiri::XML::parse(io){|config| config.noblanks.noent.nsclean.strict }
+          io.rewind
+        elsif name.is_a?(String) && !File.exists?(name)
+          MUTEX.synchronize do
+            io = ::Kernel::open(name,'w')
+            io.flock(File::LOCK_EX)
+          end  
+          dom = Smart::string(default)
+        elsif name.is_a?(IO) || name.is_a?(Tempfile)  
+          MUTEX.synchronize do
+            io = name
+            io.flock(File::LOCK_EX)
+          end
+          dom = Dom.new Nokogiri::XML::parse(io){|config| config.noblanks.noent.nsclean.strict }
+        end
+        block.call(dom)
+        dom.save_as(io)
+      rescue => e
+        puts e.message
+        raise Error, "could not open #{name}"
       ensure
-        lockfile.unlock
+        io.flock(File::LOCK_UN) if io
       end
       nil
     end
@@ -142,15 +156,7 @@ module XML
     def self::open(name,default=nil)
       raise Error, 'first parameter has to be a filename or filehandle' unless name.is_a?(String) || name.is_a?(IO) || name.is_a?(Tempfile)
       raise Error, 'second parameter has to be an xml string' unless default.is_a?(String) || default.nil?
-      lfname = name.is_a?(String) ? name : name.fileno.to_s
-      lockfile = Lockfile.new(lfname + '.lock',LOCKFILE)
-      dom = nil
-      begin
-        lockfile.lock
-        dom = Smart::open_unprotected(name,default)
-      ensure  
-        lockfile.unlock
-      end
+      dom = Smart::open_unprotected(name,default,true)
       if dom && block_given?
         yield dom
         nil
@@ -159,14 +165,20 @@ module XML
       end
     end
 
-    def self::open_unprotected(name,default=nil)
+    def self::open_unprotected(name,default=nil,lock=false)
       raise Error, 'first parameter has to be a filename or filehandle' unless name.is_a?(String) || name.is_a?(IO) || name.is_a?(Tempfile)
       raise Error, 'second parameter has to be an xml string' unless default.is_a?(String) || default.nil?
       dom = begin
-        io =  name.is_a?(String) ? ::Kernel::open(name) : name
-        Dom.new Nokogiri::XML::parse(io){|config| config.noblanks.noent.nsclean.strict }
-      rescue
+        io = name.is_a?(String) ? ::Kernel::open(name) : name
+        begin
+          io.flock(File::LOCK_EX) if lock
+          Dom.new Nokogiri::XML::parse(io){|config| config.noblanks.noent.nsclean.strict }
+        ensure
+          io.flock(File::LOCK_UN)
+        end
+      rescue => e
         if default.nil?
+          puts e.message
           raise Error, "could not open #{name}"
         else
           Smart::string(default)

data/lib/xml/smart_dom.rb

@@ -46,7 +46,7 @@ module XML
       end
 
       def save_as(name)
-        raise Error, 'first parameter has to be a filename or filehandle' unless name.is_a?(String) || name.is_a?(IO)
+        raise Error, 'first parameter has to be a filename or filehandle' unless name.is_a?(String) || name.is_a?(IO) || name.is_a?(Tempfile)
         begin
           io = name.is_a?(String) ? ::Kernel::open(name,'w') : name
         rescue
@@ -58,7 +58,7 @@ module XML
           @dom.root.serialize(:encoding => 'UTF-8', :save_with => Nokogiri::XML::Node::SaveOptions::FORMAT | Nokogiri::XML::Node::SaveOptions::AS_XML)
         end
         io.write ftext
-        io.close
+        io.close unless name == io
       end
 
       def save_unformated=(val); @save_unformated = (val.is_a?(TrueClass) ? true : false); end

data/test/EXAMPLE.xml

@@ -1,6 +1,6 @@
 <test xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xml:lang="de">
   <names>
-    <name team="0" a="3">2013-07-03 00:34:13 +0200</name>
+    <name team="0" a="3">2013-07-31 19:41:52 +0200</name>
     <name team="1">Jürgen</name>
     <name team="1">Michel</name>
     <name team="1">Raphi</name>
@@ -14,4 +14,4 @@
     <green taint="true"/>
   </colors>
   <soap:hallo/>
-</test>
+</test>

data/test/concurrent.xml

@@ -1 +1,7 @@
-<solutions><solution matnr="9906264" name="mangler" secid="1" assessment="16"><question block="1" question="2"/><question block="2" question="4"/><question block="3" question="6"/></solution></solutions>
+<solutions>
+  <solution matnr="9906264" name="mangler" secid="1" when="2013-07-31T19:41:48+02:00" assessment="16">
+    <question block="1" question="2"/>
+    <question block="2" question="4"/>
+    <question block="3" question="6"/>
+  </solution>
+</solutions>

data/test/tc_pi.rb

@@ -16,7 +16,6 @@ class TestPi < MiniTest::Unit::TestCase
 
     doc.root.add_before('?xsl-stylesheet', 'a="3" b="7"')
     doc.root.children.delete_all!
-    puts doc.to_s
     assert doc.to_s == "<?xml version=\"1.0\"?>\n<?xsl-stylesheet a=\"3\" b=\"7\"?>\n<test xmlns:soap=\"http://schemas.xmlsoap.org/wsdl/soap/\" xml:lang=\"de\">\n  <?tobias vj?>\n</test>\n"
   end   
 end  

data/xml-smart.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name                  = "xml-smart"
-  s.version               = "0.3.6"
+  s.version               = "0.3.7"
   s.platform              = Gem::Platform::RUBY
   s.license               = "LGPL-3"
   s.summary               = "An xml library that doesn't suck - since 2004."
@@ -19,7 +19,6 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>=1.9.3'
 
   s.add_runtime_dependency 'nokogiri'
-  s.add_runtime_dependency 'lockfile'
   s.add_runtime_dependency 'term-ansicolor'
   s.add_runtime_dependency 'minitest', '=4.7.4'
 end

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: xml-smart
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
+  prerelease: 
 platform: ruby
 authors:
 - Juergen eTM Mangler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-02 00:00:00.000000000 Z
+date: 2013-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -20,20 +22,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: lockfile
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -41,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -48,6 +38,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -55,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -62,6 +54,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -74,19 +67,19 @@ extensions: []
 extra_rdoc_files:
 - README.rdoc
 files:
+- lib/xml/smart_qname.rb
 - lib/xml/smart_domnamespaceset.rb
-- lib/xml/smart_domattribute.rb
+- lib/xml/smart_dom.rb
 - lib/xml/smart_domnamespace.rb
-- lib/xml/smart_domnodeset.rb
+- lib/xml/smart_processinginstruction.rb
 - lib/xml/smart_domtext.rb
-- lib/xml/smart_dom.rb
-- lib/xml/smart_domelement.rb
 - lib/xml/smart_domother.rb
-- lib/xml/smart_processinginstruction.rb
-- lib/xml/smart_qname.rb
 - lib/xml/XSDtoRNG.xsl
-- lib/xml/smart_domattributeset.rb
 - lib/xml/smart.rb
+- lib/xml/smart_domelement.rb
+- lib/xml/smart_domnodeset.rb
+- lib/xml/smart_domattributeset.rb
+- lib/xml/smart_domattribute.rb
 - example/EXAMPLE.xml
 - example/xpath_visual.rb
 - COPYING
@@ -94,122 +87,123 @@ files:
 - xml-smart.gemspec
 - README.rdoc
 - AUTHORS
-- test/tc_delete.rb
-- test/tc_xpath_attrs.rb
-- test/tc_xpath_functions.rb
-- test/tc_sort.rb
-- test/tc_xmlschema.rb
-- test/tc_move_elements.rb
-- test/tc_add.rb
+- test/tc_nested.rb
 - test/tc_namespace_detailed.rb
+- test/tc_xpath.rb
+- test/tc_basic.rb
+- test/tc_xinclude.rb
+- test/tc_sort.rb
 - test/tc_copy.rb
-- test/tc_namespace_default.rb
-- test/tc_string.rb
-- test/tc_set_or_replace.rb
-- test/tc_write.rb
 - test/tc_xsl.rb
-- test/tc_create.rb
-- test/tc_nested.rb
 - test/tc_root.rb
-- test/tc_xpath_root.rb
-- test/tc_qname.rb
-- test/tc_todoc.rb
-- test/tc_concurrent.rb
+- test/tc_xpath_attrs.rb
+- test/tc_xmlschema.rb
 - test/tc_pi.rb
-- test/tc_basic.rb
 - test/tc_namespace_find.rb
+- test/tc_add.rb
+- test/tc_delete.rb
+- test/tc_string.rb
+- test/tc_qname.rb
+- test/tc_namespace_default.rb
+- test/tc_set_or_replace.rb
+- test/tc_xpath_functions.rb
+- test/tc_move_elements.rb
 - test/tc_relaxng.rb
-- test/tc_xinclude.rb
-- test/tc_xpath.rb
 - test/tc_version.rb
-- test/HELLO.xml
-- test/EXAMPLE.tmp.xml
+- test/tc_concurrent.rb
+- test/tc_xpath_root.rb
+- test/tc_todoc.rb
+- test/tc_write.rb
+- test/tc_create.rb
+- test/3.xml
 - test/2.xml
-- test/HELLO-MORE.xml
-- test/EXAMPLE-NSE.xml
 - test/EXAMPLE.xml
+- test/EXAMPLE-NSE.xml
+- test/EXAMPLE.tmp.xml
+- test/XSL_DOCUMENT.xml
 - test/EXAMPLE.str.xml
 - test/concurrent.xml
-- test/EXAMPLE-NS.xml
-- test/XSL_DOCUMENT.xml
 - test/1.xml
+- test/HELLO-MORE.xml
 - test/XSL_BASE.xml
-- test/3.xml
+- test/EXAMPLE-NS.xml
+- test/HELLO.xml
 - test/HELLO.rng
 - test/HELLO.xsd
-- test/XSL_BASE.xml.test
 - test/EXAMPLE.str.xml.test
+- test/XSL_BASE.xml.test
 - test/EXAMPLE.tmp.xml.test
 - test/smartrunner.rb
 homepage: http://www.wst.univie.ac.at/~mangler/xml-smart/
 licenses:
 - LGPL-3
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: An xml library that doesn't suck - since 2004.
 test_files:
-- test/tc_delete.rb
-- test/tc_xpath_attrs.rb
-- test/tc_xpath_functions.rb
-- test/tc_sort.rb
-- test/tc_xmlschema.rb
-- test/tc_move_elements.rb
-- test/tc_add.rb
+- test/tc_nested.rb
 - test/tc_namespace_detailed.rb
+- test/tc_xpath.rb
+- test/tc_basic.rb
+- test/tc_xinclude.rb
+- test/tc_sort.rb
 - test/tc_copy.rb
-- test/tc_namespace_default.rb
-- test/tc_string.rb
-- test/tc_set_or_replace.rb
-- test/tc_write.rb
 - test/tc_xsl.rb
-- test/tc_create.rb
-- test/tc_nested.rb
 - test/tc_root.rb
-- test/tc_xpath_root.rb
-- test/tc_qname.rb
-- test/tc_todoc.rb
-- test/tc_concurrent.rb
+- test/tc_xpath_attrs.rb
+- test/tc_xmlschema.rb
 - test/tc_pi.rb
-- test/tc_basic.rb
 - test/tc_namespace_find.rb
+- test/tc_add.rb
+- test/tc_delete.rb
+- test/tc_string.rb
+- test/tc_qname.rb
+- test/tc_namespace_default.rb
+- test/tc_set_or_replace.rb
+- test/tc_xpath_functions.rb
+- test/tc_move_elements.rb
 - test/tc_relaxng.rb
-- test/tc_xinclude.rb
-- test/tc_xpath.rb
 - test/tc_version.rb
-- test/HELLO.xml
-- test/EXAMPLE.tmp.xml
+- test/tc_concurrent.rb
+- test/tc_xpath_root.rb
+- test/tc_todoc.rb
+- test/tc_write.rb
+- test/tc_create.rb
+- test/3.xml
 - test/2.xml
-- test/HELLO-MORE.xml
-- test/EXAMPLE-NSE.xml
 - test/EXAMPLE.xml
+- test/EXAMPLE-NSE.xml
+- test/EXAMPLE.tmp.xml
+- test/XSL_DOCUMENT.xml
 - test/EXAMPLE.str.xml
 - test/concurrent.xml
-- test/EXAMPLE-NS.xml
-- test/XSL_DOCUMENT.xml
 - test/1.xml
+- test/HELLO-MORE.xml
 - test/XSL_BASE.xml
-- test/3.xml
+- test/EXAMPLE-NS.xml
+- test/HELLO.xml
 - test/HELLO.rng
 - test/HELLO.xsd
-- test/XSL_BASE.xml.test
 - test/EXAMPLE.str.xml.test
+- test/XSL_BASE.xml.test
 - test/EXAMPLE.tmp.xml.test
 - test/smartrunner.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: c6fe50c915c3a7d81224157afde21def4d21db00
-  data.tar.gz: b1a6f82dc3175d7116a3ea227073bf6d34459015
-SHA512:
-  metadata.gz: 5beb33b3d760bbc9ae90b49bf254846a6c4ae36f0d27113759a4ca6defc580c04a9d14d9368ec844d0004ea7ee427537b75d947259991d7a96917041f5d2ae06
-  data.tar.gz: cedc50fdeea34258c2c0f4ebdae0ba2c79c2d0e82c4841a7b12a34e31f95583452145e22c184f37bb2f2bbec04f3866c652cb4d14a97bb9a83ea0611c118dd4d