roxml 3.3.1 → 4.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: 0af38afb86b97b74c552f4ebd660722c4037154016838e4df2eb64626e2ab3fd
+  data.tar.gz: c95d035410a533947c04a41a772fdcbf778e0777bff5fbdf6a9515c97184afec
+SHA512:
+  metadata.gz: c48cd9e91df3ced0445098e6c191d5475ec61baa44f61ecc8023d9b6e812079e96d877e4398418e991217165563d2dd3091f2449060483edad558e958c854f93
+  data.tar.gz: c45ca74b5168bf80e1d2133d8cc7a9036cb6c2b60fedbbda23df96b920cc89c47a5e5f84728dc3412aba5a2892447d3797e2472f718b12ebec22ae510d4b2760

data/.travis.yml

@@ -0,0 +1,14 @@
+sudo: false
+language: ruby
+before_install:
+  - bundle update --bundler
+rvm:
+  - 2.5.3
+  - 2.6.1
+  - 2.7.1
+  - 3.0.0
+  - ruby-head
+
+matrix:
+  allow_failures:
+    - rvm: ruby-head

data/Gemfile

@@ -1,12 +1,16 @@
 source "http://rubygems.org"
 
-gem 'activesupport', '>= 2.3.0'
+gem 'activesupport', '>= 4.0'
 gem 'nokogiri', '>= 1.3.3'
 
 group :development, :test do
-  gem 'rake'
-  gem 'jeweler'
-  gem "rspec", '>= 2.0.0'
-  gem "sqlite3-ruby", '>= 1.2.4'
-  gem "activerecord", '>= 2.2.2'
+  gem 'rake', '~> 0.9'
+  gem 'juwelier'
+  gem 'minitest'
+  gem 'rexml'
+  gem 'rspec', '~> 3.7.0'
+  gem 'sqlite3', '>= 1.2.4'
+  gem 'activerecord', '>= 4.0'
+  gem 'rack', '< 2.0.0'
+  gem 'equivalent-xml', '>= 0.6.0'
 end

data/Gemfile.lock

@@ -1,50 +1,112 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.1.3)
-      activesupport (= 3.1.3)
-      builder (~> 3.0.0)
-      i18n (~> 0.6)
-    activerecord (3.1.3)
-      activemodel (= 3.1.3)
-      activesupport (= 3.1.3)
-      arel (~> 2.2.1)
-      tzinfo (~> 0.3.29)
-    activesupport (3.1.3)
-      multi_json (~> 1.0)
-    arel (2.2.1)
-    builder (3.0.0)
-    diff-lcs (1.1.3)
-    git (1.2.5)
-    i18n (0.6.0)
-    jeweler (1.6.4)
-      bundler (~> 1.0)
-      git (>= 1.2.5)
+    activemodel (6.0.3.1)
+      activesupport (= 6.0.3.1)
+    activerecord (6.0.3.1)
+      activemodel (= 6.0.3.1)
+      activesupport (= 6.0.3.1)
+    activesupport (6.0.3.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+      zeitwerk (~> 2.2, >= 2.2.2)
+    addressable (2.8.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    builder (3.2.4)
+    concurrent-ruby (1.1.6)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
+    diff-lcs (1.3)
+    equivalent-xml (0.6.0)
+      nokogiri (>= 1.4.3)
+    faraday (0.17.3)
+      multipart-post (>= 1.2, < 3)
+    git (1.7.0)
+      rchardet (~> 1.8)
+    github_api (0.18.2)
+      addressable (~> 2.4)
+      descendants_tracker (~> 0.0.4)
+      faraday (~> 0.8)
+      hashie (~> 3.5, >= 3.5.2)
+      oauth2 (~> 1.0)
+    hashie (3.6.0)
+    highline (2.0.3)
+    i18n (1.8.3)
+      concurrent-ruby (~> 1.0)
+    juwelier (2.4.9)
+      builder
+      bundler
+      git
+      github_api
+      highline
+      kamelcase (~> 0)
+      nokogiri
+      psych
       rake
-    multi_json (1.0.4)
-    nokogiri (1.5.0)
-    rake (0.9.2.2)
-    rspec (2.8.0)
-      rspec-core (~> 2.8.0)
-      rspec-expectations (~> 2.8.0)
-      rspec-mocks (~> 2.8.0)
-    rspec-core (2.8.0)
-    rspec-expectations (2.8.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.8.0)
-    sqlite3 (1.3.5)
-    sqlite3-ruby (1.3.3)
-      sqlite3 (>= 1.3.3)
-    tzinfo (0.3.31)
+      rdoc
+      semver2
+    jwt (2.2.1)
+    kamelcase (0.0.2)
+      semver2 (~> 3)
+    mini_portile2 (2.5.1)
+    minitest (5.14.4)
+    multi_json (1.14.1)
+    multi_xml (0.6.0)
+    multipart-post (2.1.1)
+    nokogiri (1.11.4)
+      mini_portile2 (~> 2.5.0)
+      racc (~> 1.4)
+    oauth2 (1.4.4)
+      faraday (>= 0.8, < 2.0)
+      jwt (>= 1.0, < 3.0)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (>= 1.2, < 3)
+    psych (3.1.0)
+    public_suffix (4.0.6)
+    racc (1.5.2)
+    rack (1.6.13)
+    rake (0.9.6)
+    rchardet (1.8.0)
+    rdoc (6.3.2)
+    rexml (3.2.5)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-core (3.7.1)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.7.0)
+    rspec-mocks (3.7.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.1)
+    semver2 (3.4.2)
+    sqlite3 (1.4.2)
+    thread_safe (0.3.6)
+    tzinfo (1.2.7)
+      thread_safe (~> 0.1)
+    zeitwerk (2.3.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (>= 2.2.2)
-  activesupport (>= 2.3.0)
-  jeweler
+  activerecord (>= 4.0)
+  activesupport (>= 4.0)
+  equivalent-xml (>= 0.6.0)
+  juwelier
+  minitest
   nokogiri (>= 1.3.3)
-  rake
-  rspec (>= 2.0.0)
-  sqlite3-ruby (>= 1.2.4)
+  rack (< 2.0.0)
+  rake (~> 0.9)
+  rexml
+  rspec (~> 3.7.0)
+  sqlite3 (>= 1.2.4)
+
+BUNDLED WITH
+   2.2.22

data/History.txt

@@ -1,3 +1,12 @@
+See github releases for versions > 3.3.1
+https://github.com/Empact/roxml/releases
+
+== 3.3.1 (February 10, 2012)
+
+* bug fix
+
+  * Fix reading of VERSION file - Jari Bakken (jarib)
+
 == 3.3.0 (February 9, 2012)
 
 * major enhancement

data/README.rdoc

@@ -1,10 +1,11 @@
 ROXML Ruby Object to XML mapping library.
 
+{<img src="https://travis-ci.org/Empact/roxml.svg?branch=master" alt="Build Status" />}[https://travis-ci.org/Empact/roxml]
+
 For more information visit:
 
     http://rdoc.info/projects/Empact/roxml
     http://empact.github.com/roxml/
-    http://rubyforge.org/projects/roxml/
 
 Please submit bugs here:
 
@@ -171,7 +172,7 @@ explicitly require one or the other, you may do the following:
 For more information on available annotations, see ROXML::ClassMethods::Declarations
 
 == Note on Patches/Pull Requests
- 
+
 * Fork the project.
 * Make your feature addition or bug fix.
 * Add specs for it. This is important so I don't break it in a

data/Rakefile

@@ -4,10 +4,9 @@ ENV['RUBY_FLAGS'] = '-W1'
 
 # Generate all the Rake tasks
 # Run 'rake -T' to see list of generated tasks (from gem root directory)
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
+require 'juwelier'
+Juwelier::Tasks.new do |gem|
   gem.name = 'roxml'
-  gem.rubyforge_project = "roxml"
   gem.summary = "Ruby Object to XML mapping library"
   gem.description = <<EOF
 ROXML is a Ruby library designed to make it easier for Ruby developers to work with XML.
@@ -17,12 +16,12 @@ building first-class Ruby classes. As a result, ROXML simplifies the development
 RESTful applications, Web Services, and XML-RPC.
 EOF
   gem.email = "ben.woosley@gmail.com"
-  gem.homepage = "http://roxml.rubyforge.org"
+  gem.homepage = "https://github.com/Empact/roxml"
   gem.authors = ["Ben Woosley", "Zak Mandhro", "Anders Engstrom", "Russ Olsen"]
 
   gem.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.rdoc"]
 end
-Jeweler::GemcutterTasks.new
+Juwelier::GemcutterTasks.new
 
 Dir['tasks/**/*.rake'].each { |t| load t }
 
@@ -68,10 +67,8 @@ end
 
 require 'rake/testtask'
 desc "Test ROXML using the default parser selection behavior"
-task :test do
-  require 'rake/runtest'
-  $LOAD_PATH << '.'
-  Rake.run_tests 'test/unit/*_test.rb'
+Rake::TestTask.new do |t|
+  t.test_files = FileList['test/**/*_test.rb']
 end
 
 namespace :test do

data/VERSION

@@ -1 +1 @@
-3.3.1
+4.2.0

data/examples/search_query.rb

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+require_relative './../spec/spec_helper'
+
+class SearchQuery  
+	include ROXML
+	xml_accessor :query
+	xml_accessor :max_results, :else => 20, :as => Integer
+	xml_accessor :language, :else => 'EN'
+end
+
+
+unless defined?(RSpec) 
+	q = SearchQuery.new
+	q.query = "Some random query string."
+	puts q.to_xml.to_s
+end
+

data/lib/roxml/definition.rb

@@ -60,7 +60,7 @@ module ROXML
         @sought_type = :namespace
       elsif opts[:from].to_s.starts_with?('@')
         @sought_type = :attr
-        opts[:from].sub!('@', '')
+        opts[:from] = opts[:from].sub('@', '')
       end
 
       @name = @attr_name = accessor.to_s.chomp('?')
@@ -140,12 +140,12 @@ module ROXML
         default
       end
     end
-    
+
     CORE_BLOCK_SHORTHANDS = {
       # Core Shorthands
       Integer  => lambda do |val|
         all(val) do |v|
-          Integer(v) unless v.blank?
+          v.to_i unless v.blank?
         end
       end,
       Float    => lambda do |val|
@@ -153,11 +153,6 @@ module ROXML
           Float(v) unless v.blank?
         end
       end,
-      Fixnum   => lambda do |val|
-        all(val) do |v|
-          v.to_i unless v.blank?
-        end
-      end,
       Time     => lambda do |val|
         all(val) {|v| Time.parse(v) unless v.blank? }
       end,
@@ -181,7 +176,7 @@ module ROXML
       CORE_BLOCK_SHORTHANDS.tap do |blocks|
         blocks.reverse_merge!(BigDecimal => lambda do |val|
           all(val) do |v|
-            BigDecimal.new(v) unless v.blank?
+            BigDecimal(v) unless v.blank?
           end
         end) if defined?(BigDecimal)
 

data/lib/roxml/xml/references.rb

@@ -1,5 +1,5 @@
 module ROXML
-  class RequiredElementMissing < Exception # :nodoc:
+  class RequiredElementMissing < ArgumentError # :nodoc:
   end
 
   #
@@ -32,8 +32,9 @@ module ROXML
     end
 
     def value_in(xml)
-      value = fetch_value(XML::Node.from(xml))
-      value = default if value.nil?
+      xml = XML::Node.from(xml)
+      value = fetch_value(xml)
+      value = default if default && (value.nil? || value.to_s.empty?)
 
       value = apply_blocks(value)
       value = freeze(value) if value && opts.frozen?
@@ -44,19 +45,33 @@ module ROXML
     def conventionize(what)
       convention ||= @instance.class.respond_to?(:roxml_naming_convention) && @instance.class.roxml_naming_convention
       if !what.blank? && convention.respond_to?(:call)
-        URI.unescape(convention.call(URI.escape(what, /\/|::/)))
+        URI.decode_www_form_component(convention.call(URI.encode_www_form_component(what)))
       else
         what
       end
     end
 
     def namespacify(what)
-      if what.to_s.present? && !what.to_s.include?(':') && opts.namespace != false
-        [opts.namespace, @instance.class.roxml_namespace, @default_namespace].each do |namespace|
-          return opts.namespace == '*' ? (what == '*' ? "*" : "*[local-name()='#{what}']") : "#{namespace}:#{what}" if namespace
+      if what.to_s.present? && opts.namespace != false && ns = [opts.namespace, @instance.class.roxml_namespace, @default_namespace].compact.map(&:to_s).first
+        require "rexml/xpath_parser"
+
+        parser = REXML::Parsers::XPathParser.new
+        parsed = parser.parse what
+
+        parsed.each_cons(4).with_index.each do |a,i|
+          if a[0..2] == [:child, :qname, ""]
+            if ns == "*"
+              parsed[i+1,3] = [:any, :predicate, [:eq, [:function, "local-name", []], [:literal, a[3]]]] if a[3] != "*"
+            else
+              a[2].replace ns
+            end
+          end
         end
+
+        parser.abbreviate parsed
+      else
+        what
       end
-      what
     end
 
     def apply_blocks(val)
@@ -87,7 +102,7 @@ module ROXML
     end
 
     def wrap(xml, opts = {:always_create => false})
-      wrap_with = @auto_vals ? auto_wrapper : wrapper
+      wrap_with = defined?(@auto_vals) && @auto_vals ? auto_wrapper : wrapper
 
       return xml if !wrap_with || xml.name == wrap_with
 

data/lib/roxml.rb

@@ -42,6 +42,9 @@ module ROXML # :nodoc:
             ref.update_xml(root, value)
           end
         end
+        if params[:namespaces]
+          params[:namespaces].each { |prefix, url| root.add_namespace_definition(prefix, url) }
+        end
       end
     end
   end
@@ -89,7 +92,7 @@ module ROXML # :nodoc:
       def xml_namespace(namespace)
         @roxml_namespace = namespace.to_s
       end
-      
+
       # Sets up a mapping of namespace prefixes to hrefs, to be used by this class.
       # These namespace prefixes are independent of what appears in the xml, only
       # the namespace hrefs themselves need to match
@@ -125,7 +128,11 @@ module ROXML # :nodoc:
       end
 
       def roxml_namespaces # :nodoc:
-        @roxml_namespaces || {}
+        if defined? @roxml_namespaces
+          @roxml_namespaces
+        else
+          {}
+        end
       end
 
       # Most xml documents have a consistent naming convention, for example, the node and
@@ -160,7 +167,7 @@ module ROXML # :nodoc:
       # Note that the xml_convention is also applied to the default root-level tag_name,
       # but in this case an underscored version of the name is applied, for convenience.
       def xml_convention(to_proc_able = nil, &block)
-        raise ArgumentError, "conventions are already set" if @roxml_naming_convention
+        raise ArgumentError, "conventions are already set" if defined?(@roxml_naming_convention)
         @roxml_naming_convention =
           if to_proc_able
             raise ArgumentError, "only one conventions can be set" if block_given?
@@ -171,8 +178,10 @@ module ROXML # :nodoc:
       end
 
       def roxml_naming_convention # :nodoc:
-        @roxml_naming_convention || begin
-          superclass.roxml_naming_convention if superclass.respond_to?(:roxml_naming_convention)
+        if defined? @roxml_naming_convention
+          @roxml_naming_convention
+        elsif superclass.respond_to?(:roxml_naming_convention)
+          superclass.roxml_naming_convention
         end
       end
 
@@ -260,7 +269,7 @@ module ROXML # :nodoc:
       #
       #  xml_reader(:count) {|val| Integer(val) unless val.empty? }
       #
-      # Such block shorthands for Integer, Float, Fixnum, BigDecimal, Date, Time, and DateTime
+      # Such block shorthands for Integer, Float, BigDecimal, Date, Time, and DateTime
       # are currently available, but only for non-Hash declarations.
       #
       # To reference many elements, put the desired type in a literal array. e.g.:
@@ -434,7 +443,7 @@ module ROXML # :nodoc:
       # === Other Options
       # [:in] An optional name of a wrapping tag for this XML accessor.
       #       This can include other xpath values, which will be joined with :from with a '/'
-      # [:else] Default value for attribute, if missing from the xml on .from_xml
+      # [:else] Default value for attribute, if missing from the xml (or it's there but its contents are blank) on .from_xml
       # [:required] If true, throws RequiredElementMissing when the element isn't present
       # [:frozen] If true, all results are frozen (using #freeze) at parse-time.
       # [:cdata] true for values which should be input from or output as cdata elements
@@ -479,6 +488,9 @@ module ROXML # :nodoc:
     private
       def add_reader(attr)
         define_method(attr.accessor) do
+          unless instance_variable_defined?(attr.instance_variable_name)
+            instance_variable_set(attr.instance_variable_name, attr.default)
+          end
           instance_variable_get(attr.instance_variable_name)
         end
       end
@@ -495,21 +507,25 @@ module ROXML # :nodoc:
       # do not work without one.
       def tag_name
         return roxml_tag_name if roxml_tag_name
-        
+
         if tag_name = name.split('::').last
           roxml_naming_convention ? roxml_naming_convention.call(tag_name.underscore) : tag_name.downcase
         end
       end
 
       def roxml_tag_name # :nodoc:
-        @roxml_tag_name || begin
-          superclass.roxml_tag_name if superclass.respond_to?(:roxml_tag_name)
+        if defined? @roxml_tag_name
+          @roxml_tag_name
+        elsif superclass.respond_to?(:roxml_tag_name)
+          superclass.roxml_tag_name
         end
       end
 
       def roxml_namespace # :nodoc:
-        @roxml_namespace || begin
-          superclass.roxml_namespace if superclass.respond_to?(:roxml_namespace)
+        if defined? @roxml_namespace
+          @roxml_namespace
+        elsif superclass.respond_to?(:roxml_namespace)
+          superclass.roxml_namespace
         end
       end
 
@@ -561,4 +577,3 @@ module ROXML # :nodoc:
     end
   end
 end
-