roxml 3.3.1 → 4.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: f6db0b451a8408f13f1808198314c035d29036ee
+  data.tar.gz: 40c00914faeefbd26f607f741adbe3da1c526269
+SHA512:
+  metadata.gz: e68b91c1d62f2373a7d259c04877eb5e085dde92a87ecf05ffc2ffd08582019516d2c0ada379439a8f735593147a853abbee90e03666ed19e5b4eb72e0406f96
+  data.tar.gz: 0eedbf0fffc5cceab877fff629e51a98c223cdddf3d83e74899dbe6a116239459da9f6aeaa3f325809911577b1ce0ce5a3c8a484121e68f0300506d7c3fda712

data/.travis.yml

@@ -0,0 +1,7 @@
+sudo: false
+language: ruby
+rvm:
+  - 2.2.8
+  - 2.3.5
+  - 2.4.2
+  - ruby-head

data/Gemfile

@@ -1,12 +1,15 @@
 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 '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,106 @@
 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 (5.1.4)
+      activesupport (= 5.1.4)
+    activerecord (5.1.4)
+      activemodel (= 5.1.4)
+      activesupport (= 5.1.4)
+      arel (~> 8.0)
+    activesupport (5.1.4)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
+    arel (8.0.0)
+    builder (3.2.3)
+    concurrent-ruby (1.0.5)
+    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.12.2)
+      multipart-post (>= 1.2, < 3)
+    git (1.3.0)
+    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.5.6)
+    highline (1.7.10)
+    i18n (0.9.1)
+      concurrent-ruby (~> 1.0)
+    juwelier (2.4.7)
+      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 (1.5.6)
+    kamelcase (0.0.1)
+      semver2 (~> 3)
+    mini_portile2 (2.3.0)
+    minitest (5.10.3)
+    multi_json (1.12.2)
+    multi_xml (0.6.0)
+    multipart-post (2.0.0)
+    nokogiri (1.8.1)
+      mini_portile2 (~> 2.3.0)
+    oauth2 (1.4.0)
+      faraday (>= 0.8, < 0.13)
+      jwt (~> 1.0)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (>= 1.2, < 3)
+    psych (3.0.0)
+    public_suffix (3.0.1)
+    rack (1.6.8)
+    rake (0.9.6)
+    rdoc (5.1.0)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-core (3.7.0)
+      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.0)
+    semver2 (3.4.2)
+    sqlite3 (1.3.13)
+    thread_safe (0.3.6)
+    tzinfo (1.2.4)
+      thread_safe (~> 0.1)
 
 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)
+  rspec (~> 3.7.0)
+  sqlite3 (>= 1.2.4)
+
+BUNDLED WITH
+   1.16.0

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.0.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.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
@@ -260,7 +263,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 +437,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 +482,9 @@ module ROXML # :nodoc:
     private
       def add_reader(attr)
         define_method(attr.accessor) do
+          if instance_variable_get(attr.instance_variable_name).nil?
+            instance_variable_set(attr.instance_variable_name, attr.default)
+          end
           instance_variable_get(attr.instance_variable_name)
         end
       end

data/lib/roxml/definition.rb

@@ -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,

data/lib/roxml/xml/references.rb

@@ -1,5 +1,7 @@
+require "rexml/xpath_parser"
+
 module ROXML
-  class RequiredElementMissing < Exception # :nodoc:
+  class RequiredElementMissing < ArgumentError # :nodoc:
   end
 
   #
@@ -32,8 +34,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?
@@ -51,12 +54,24 @@ module ROXML
     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
+        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)

data/roxml.gemspec

@@ -1,17 +1,19 @@
-# Generated by jeweler
+# Generated by juwelier
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+# stub: roxml 4.0.0 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = "roxml"
-  s.version = "3.3.1"
+  s.name = "roxml".freeze
+  s.version = "4.0.0"
 
-  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 = "2012-02-10"
-  s.description = "ROXML is a Ruby library designed to make it easier for Ruby developers to work with XML.\nUsing simple annotations, it enables Ruby classes to be mapped to XML. ROXML takes care\nof the marshalling and unmarshalling of mapped attributes so that developers can focus on\nbuilding first-class Ruby classes. As a result, ROXML simplifies the development of\nRESTful applications, Web Services, and XML-RPC.\n"
-  s.email = "ben.woosley@gmail.com"
+  s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib".freeze]
+  s.authors = ["Ben Woosley".freeze, "Zak Mandhro".freeze, "Anders Engstrom".freeze, "Russ Olsen".freeze]
+  s.date = "2017-12-01"
+  s.description = "ROXML is a Ruby library designed to make it easier for Ruby developers to work with XML.\nUsing simple annotations, it enables Ruby classes to be mapped to XML. ROXML takes care\nof the marshalling and unmarshalling of mapped attributes so that developers can focus on\nbuilding first-class Ruby classes. As a result, ROXML simplifies the development of\nRESTful applications, Web Services, and XML-RPC.\n".freeze
+  s.email = "ben.woosley@gmail.com".freeze
   s.extra_rdoc_files = [
     "History.txt",
     "README.rdoc"
@@ -19,6 +21,7 @@ Gem::Specification.new do |s|
   s.files = [
     ".gitmodules",
     ".rspec",
+    ".travis.yml",
     "Gemfile",
     "Gemfile.lock",
     "History.txt",
@@ -35,6 +38,7 @@ Gem::Specification.new do |s|
     "examples/person.rb",
     "examples/posts.rb",
     "examples/rails.rb",
+    "examples/search_query.rb",
     "examples/twitter.rb",
     "examples/xml/active_record.xml",
     "examples/xml/amazon.xml",
@@ -61,6 +65,7 @@ Gem::Specification.new do |s|
     "spec/examples/library_with_fines_spec.rb",
     "spec/examples/person_spec.rb",
     "spec/examples/post_spec.rb",
+    "spec/examples/search_query_spec.rb",
     "spec/examples/twitter_spec.rb",
     "spec/reference_spec.rb",
     "spec/regression_spec.rb",
@@ -127,40 +132,47 @@ Gem::Specification.new do |s|
     "test/unit/xml_text_test.rb",
     "website/index.html"
   ]
-  s.homepage = "http://roxml.rubyforge.org"
-  s.require_paths = ["lib"]
-  s.rubyforge_project = "roxml"
-  s.rubygems_version = "1.8.10"
-  s.summary = "Ruby Object to XML mapping library"
+  s.homepage = "https://github.com/Empact/roxml".freeze
+  s.rubygems_version = "2.6.11".freeze
+  s.summary = "Ruby Object to XML mapping library".freeze
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activesupport>, [">= 2.3.0"])
-      s.add_runtime_dependency(%q<nokogiri>, [">= 1.3.3"])
-      s.add_development_dependency(%q<rake>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, [">= 2.0.0"])
-      s.add_development_dependency(%q<sqlite3-ruby>, [">= 1.2.4"])
-      s.add_development_dependency(%q<activerecord>, [">= 2.2.2"])
+      s.add_runtime_dependency(%q<activesupport>.freeze, [">= 4.0"])
+      s.add_runtime_dependency(%q<nokogiri>.freeze, [">= 1.3.3"])
+      s.add_development_dependency(%q<rake>.freeze, ["~> 0.9"])
+      s.add_development_dependency(%q<juwelier>.freeze, [">= 0"])
+      s.add_development_dependency(%q<minitest>.freeze, [">= 0"])
+      s.add_development_dependency(%q<rspec>.freeze, ["~> 3.7.0"])
+      s.add_development_dependency(%q<sqlite3>.freeze, [">= 1.2.4"])
+      s.add_development_dependency(%q<activerecord>.freeze, [">= 4.0"])
+      s.add_development_dependency(%q<rack>.freeze, ["< 2.0.0"])
+      s.add_development_dependency(%q<equivalent-xml>.freeze, [">= 0.6.0"])
     else
-      s.add_dependency(%q<activesupport>, [">= 2.3.0"])
-      s.add_dependency(%q<nokogiri>, [">= 1.3.3"])
-      s.add_dependency(%q<rake>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<rspec>, [">= 2.0.0"])
-      s.add_dependency(%q<sqlite3-ruby>, [">= 1.2.4"])
-      s.add_dependency(%q<activerecord>, [">= 2.2.2"])
+      s.add_dependency(%q<activesupport>.freeze, [">= 4.0"])
+      s.add_dependency(%q<nokogiri>.freeze, [">= 1.3.3"])
+      s.add_dependency(%q<rake>.freeze, ["~> 0.9"])
+      s.add_dependency(%q<juwelier>.freeze, [">= 0"])
+      s.add_dependency(%q<minitest>.freeze, [">= 0"])
+      s.add_dependency(%q<rspec>.freeze, ["~> 3.7.0"])
+      s.add_dependency(%q<sqlite3>.freeze, [">= 1.2.4"])
+      s.add_dependency(%q<activerecord>.freeze, [">= 4.0"])
+      s.add_dependency(%q<rack>.freeze, ["< 2.0.0"])
+      s.add_dependency(%q<equivalent-xml>.freeze, [">= 0.6.0"])
     end
   else
-    s.add_dependency(%q<activesupport>, [">= 2.3.0"])
-    s.add_dependency(%q<nokogiri>, [">= 1.3.3"])
-    s.add_dependency(%q<rake>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<rspec>, [">= 2.0.0"])
-    s.add_dependency(%q<sqlite3-ruby>, [">= 1.2.4"])
-    s.add_dependency(%q<activerecord>, [">= 2.2.2"])
+    s.add_dependency(%q<activesupport>.freeze, [">= 4.0"])
+    s.add_dependency(%q<nokogiri>.freeze, [">= 1.3.3"])
+    s.add_dependency(%q<rake>.freeze, ["~> 0.9"])
+    s.add_dependency(%q<juwelier>.freeze, [">= 0"])
+    s.add_dependency(%q<minitest>.freeze, [">= 0"])
+    s.add_dependency(%q<rspec>.freeze, ["~> 3.7.0"])
+    s.add_dependency(%q<sqlite3>.freeze, [">= 1.2.4"])
+    s.add_dependency(%q<activerecord>.freeze, [">= 4.0"])
+    s.add_dependency(%q<rack>.freeze, ["< 2.0.0"])
+    s.add_dependency(%q<equivalent-xml>.freeze, [">= 0.6.0"])
   end
 end