roxml 3.1.0 → 3.1.1

data/History.txt

@@ -1,3 +1,9 @@
+== 3.1.1 (October 17, 2009)
+
+* bug fix
+
+  * Fix bad load paths
+
 == 3.1 (October 16, 2009)
 
 * major enhancements

data/Rakefile

@@ -36,60 +36,7 @@ end
 
 Dir['tasks/**/*.rake'].each { |t| load t }
 
-task :default => [:test, :spec]
-task :all => [:libxml, :nokogiri]
+task :default => [:test, :spec, 'test:load']
+task :all => [:libxml, :nokogiri, 'test:load']
 task :libxml => ['test:libxml', 'spec:libxml']
 task :nokogiri => ['test:nokogiri', 'spec:nokogiri']
-
-# $hoe = Hoe.new('roxml', ROXML::VERSION) do |p|
-#   p.changes              = File.read("History.txt").split(/^==/)[1].strip
-# 
-#   p.test_globs = 'test/unit/*_test.rb'
-#   p.clean_globs |= %w[**/.DS_Store tmp *.log]
-#   path = (p.rubyforge_name == p.name) ? p.rubyforge_name : "\#{p.rubyforge_name}/\#{p.name}"
-#   p.remote_rdoc_dir = File.join(path.gsub(/^#{p.rubyforge_name}\/?/,''), 'rdoc')
-#   p.rsync_args = '-av --delete --ignore-errors'
-# end
-
-## Provide the username used to upload website etc.
-#RubyForgeConfig = {
-#  :unix_name=>"roxml",
-#  :user_name=>"zakmandhro"
-#}
-
-#Rake::RDocTask.new do |rd|
-#  rd.rdoc_dir = "doc"
-#  rd.rdoc_files.include('MIT-LICENSE', 'README.rdoc', "lib/**/*.rb")
-#  rd.options << '--main' << 'README.rdoc' << '--title' << 'ROXML Documentation'
-#end
-#
-#desc "Publish Ruby on Rails plug-in on RubyForge"
-#task :release_plugin=>:rails_plugin do |task|
-#  pub = Rake::SshDirPublisher.new("#{RubyForgeConfig[:user_name]}@rubyforge.org",
-#      "/var/www/gforge-projects/#{RubyForgeConfig[:unix_name]}",
-#      "pkg/rails_plugin")
-#  pub.upload()
-#end
-#
-#desc "Publish and plugin site on RubyForge"
-#task :publish do |task|
-#  pub = Rake::RubyForgePublisher.new(RubyForgeConfig[:unix_name], RubyForgeConfig[:user_name])
-#  pub.upload()
-#end
-#
-#desc "Create the ZIP package"
-#Rake::PackageTask.new(spec.name, spec.version) do |p|
-#  p.need_zip = true
-#  p.package_files = FileList[
-#    "lib/**/*.rb", "*.txt", "README.rdoc", "Rakefile",
-#    "rake/**/*","test/**/*.rb", "test/**/*.xml", "html/**/*"]
-#end
-#
-#task :package=>:rdoc
-#task :rdoc=>:test
-#
-#desc "Create a RubyGem project"
-#Rake::GemPackageTask.new(spec).define
-#
-#desc "Clobber generated files"
-#task :clobber=>[:clobber_package, :clobber_rdoc]

data/VERSION

@@ -1 +1 @@
-3.1.0
+3.1.1

data/lib/roxml.rb

@@ -1,11 +1,11 @@
 require 'uri'
 require 'active_support'
 
-require 'lib/roxml/definition'
-require 'lib/roxml/xml'
+require 'roxml/definition'
+require 'roxml/xml'
 
 module ROXML # :nodoc:
-  VERSION = '3.1.0'
+  VERSION = '3.1.1'
 
   def self.included(base) # :nodoc:
     base.class_eval do

data/lib/roxml/definition.rb

@@ -1,4 +1,4 @@
-require 'lib/roxml/hash_definition'
+require 'roxml/hash_definition'
 
 class Module
   def bool_attr_reader(*attrs)

data/lib/roxml/xml.rb

@@ -1,21 +1,18 @@
 module ROXML
+  PARSERS = %w[nokogiri libxml].freeze
   unless const_defined? 'XML_PARSER'
-    PREFERRED_PARSERS = %w[nokogiri libxml].freeze
-    parsers = PREFERRED_PARSERS.dup
+    parsers = PARSERS.dup
     begin
       require parsers.first
       XML_PARSER = parsers.first # :nodoc:
     rescue LoadError
-      if parsers.size > 1
-        parsers.shift
-        retry
-      else
-        raise "Could not load either nokogiri or libxml"
-      end
+      parsers.shift
+      retry unless parsers.empty?
+      raise "Could not load a parser. Tried #{PARSERS.to_sentence}"
     end
   end
 
-  require File.join('lib/roxml/xml/parsers', XML_PARSER)
+  require File.join('roxml/xml/parsers', XML_PARSER)
 
   module XML
     class Node
@@ -40,4 +37,4 @@ module ROXML
   end
 end
 
-require 'lib/roxml/xml/references'
+require 'roxml/xml/references'

data/roxml.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{roxml}
-  s.version = "3.1.0"
+  s.version = "3.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Woosley", "Zak Mandhro", "Anders Engstrom", "Russ Olsen"]
-  s.date = %q{2009-10-16}
+  s.date = %q{2009-10-17}
   s.description = %q{ROXML is a Ruby library designed to make it easier for Ruby developers to work with XML.
 Using simple annotations, it enables Ruby classes to be mapped to XML. ROXML takes care
 of the marshalling and unmarshalling of mapped attributes so that developers can focus on
@@ -103,6 +103,7 @@ RESTful applications, Web Services, and XML-RPC.
      "test/fixtures/person.xml",
      "test/fixtures/person_with_guarded_mothers.xml",
      "test/fixtures/person_with_mothers.xml",
+     "test/load_test.rb",
      "test/mocks/dictionaries.rb",
      "test/mocks/mocks.rb",
      "test/support/fixtures.rb",
@@ -147,6 +148,7 @@ RESTful applications, Web Services, and XML-RPC.
      "spec/xml/namespace_spec.rb",
      "spec/xml/namespaces_spec.rb",
      "spec/xml/parser_spec.rb",
+     "test/load_test.rb",
      "test/mocks/dictionaries.rb",
      "test/mocks/mocks.rb",
      "test/support/fixtures.rb",

data/tasks/test.rake

@@ -28,6 +28,11 @@ namespace :test do
     Rake::Task["test"].invoke
   end
 
+  task :load do
+    `ruby test/load_test.rb`
+    puts "Load Success!" if $?.success?
+  end
+
   desc "Runs tests under RCOV"
   task :rcov do
     system "rcov -T --no-html -x '^/'  #{FileList['test/unit/*_test.rb']}"

data/test/load_test.rb

@@ -0,0 +1,6 @@
+require 'fileutils'
+FileUtils.cd(File.dirname(__FILE__))
+
+require 'rubygems'
+require 'roxml'
+puts ROXML::VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: roxml
 version: !ruby/object:Gem::Version 
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors: 
 - Ben Woosley
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-16 00:00:00 -04:00
+date: 2009-10-17 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -162,6 +162,7 @@ files:
 - test/fixtures/person.xml
 - test/fixtures/person_with_guarded_mothers.xml
 - test/fixtures/person_with_mothers.xml
+- test/load_test.rb
 - test/mocks/dictionaries.rb
 - test/mocks/mocks.rb
 - test/support/fixtures.rb
@@ -227,6 +228,7 @@ test_files:
 - spec/xml/namespace_spec.rb
 - spec/xml/namespaces_spec.rb
 - spec/xml/parser_spec.rb
+- test/load_test.rb
 - test/mocks/dictionaries.rb
 - test/mocks/mocks.rb
 - test/support/fixtures.rb