roxml 4.1.1 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 27c567c0681f6d38e5b3741668cde44eee9b32f150d9a11d52ea5d0c1c8a4551
-  data.tar.gz: 8f964263300741e8973287b94a7496050e2432a436bab8064b41ac2b07050860
+  metadata.gz: 0af38afb86b97b74c552f4ebd660722c4037154016838e4df2eb64626e2ab3fd
+  data.tar.gz: c95d035410a533947c04a41a772fdcbf778e0777bff5fbdf6a9515c97184afec
 SHA512:
-  metadata.gz: 77d2448797f6c7055531b4ced3df08bf0012dbcc3d93042583aaaad4b593a46bbd765cfeb0738c6e5630b78528058f60d35fe9f7d4ce6bd6ce65355961c916bc
-  data.tar.gz: '08e0090edc8a2090a39d0f3675e363ae92983581cdfe9449a7c12eb9228b178ef750a56addcfb6bcd1a90c07d924b5faa73a6bb8b60729ba14f87ca5fef366a4'
+  metadata.gz: c48cd9e91df3ced0445098e6c191d5475ec61baa44f61ecc8023d9b6e812079e96d877e4398418e991217165563d2dd3091f2449060483edad558e958c854f93
+  data.tar.gz: c45ca74b5168bf80e1d2133d8cc7a9036cb6c2b60fedbbda23df96b920cc89c47a5e5f84728dc3412aba5a2892447d3797e2472f718b12ebec22ae510d4b2760

data/.travis.yml

@@ -6,6 +6,7 @@ rvm:
   - 2.5.3
   - 2.6.1
   - 2.7.1
+  - 3.0.0
   - ruby-head
 
 matrix:

data/Gemfile

@@ -7,6 +7,7 @@ group :development, :test do
   gem 'rake', '~> 0.9'
   gem 'juwelier'
   gem 'minitest'
+  gem 'rexml'
   gem 'rspec', '~> 3.7.0'
   gem 'sqlite3', '>= 1.2.4'
   gem 'activerecord', '>= 4.0'

data/Gemfile.lock

@@ -12,7 +12,7 @@ GEM
       minitest (~> 5.1)
       tzinfo (~> 1.1)
       zeitwerk (~> 2.2, >= 2.2.2)
-    addressable (2.7.0)
+    addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     builder (3.2.4)
     concurrent-ruby (1.1.6)
@@ -50,13 +50,14 @@ GEM
     jwt (2.2.1)
     kamelcase (0.0.2)
       semver2 (~> 3)
-    mini_portile2 (2.4.0)
-    minitest (5.14.1)
+    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.10.9)
-      mini_portile2 (~> 2.4.0)
+    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)
@@ -64,11 +65,13 @@ GEM
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
     psych (3.1.0)
-    public_suffix (4.0.5)
+    public_suffix (4.0.6)
+    racc (1.5.2)
     rack (1.6.13)
     rake (0.9.6)
     rchardet (1.8.0)
-    rdoc (6.2.1)
+    rdoc (6.3.2)
+    rexml (3.2.5)
     rspec (3.7.0)
       rspec-core (~> 3.7.0)
       rspec-expectations (~> 3.7.0)
@@ -101,8 +104,9 @@ DEPENDENCIES
   nokogiri (>= 1.3.3)
   rack (< 2.0.0)
   rake (~> 0.9)
+  rexml
   rspec (~> 3.7.0)
   sqlite3 (>= 1.2.4)
 
 BUNDLED WITH
-   1.17.3
+   2.2.22

data/VERSION

@@ -1 +1 @@
-4.1.1
+4.2.0

data/lib/roxml/xml/references.rb

@@ -1,5 +1,3 @@
-require "rexml/xpath_parser"
-
 module ROXML
   class RequiredElementMissing < ArgumentError # :nodoc:
   end
@@ -47,7 +45,7 @@ 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
@@ -55,6 +53,8 @@ module ROXML
 
     def namespacify(what)
       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
 
@@ -102,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

@@ -92,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
@@ -128,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
@@ -163,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?
@@ -174,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
 
@@ -482,7 +488,7 @@ module ROXML # :nodoc:
     private
       def add_reader(attr)
         define_method(attr.accessor) do
-          if instance_variable_get(attr.instance_variable_name).nil?
+          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)
@@ -501,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
 
@@ -567,4 +577,3 @@ module ROXML # :nodoc:
     end
   end
 end
-

data/roxml.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: roxml 4.1.1 ruby lib
+# stub: roxml 4.2.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "roxml".freeze
-  s.version = "4.1.1"
+  s.version = "4.2.0"
 
   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 = "2020-07-06"
+  s.date = "2021-09-09"
   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 = [
@@ -133,7 +133,7 @@ Gem::Specification.new do |s|
     "website/index.html"
   ]
   s.homepage = "https://github.com/Empact/roxml".freeze
-  s.rubygems_version = "3.1.2".freeze
+  s.rubygems_version = "3.2.15".freeze
   s.summary = "Ruby Object to XML mapping library".freeze
 
   if s.respond_to? :specification_version then
@@ -146,6 +146,7 @@ Gem::Specification.new do |s|
     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<rexml>.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"])
@@ -157,6 +158,7 @@ Gem::Specification.new do |s|
     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<rexml>.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"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roxml
 version: !ruby/object:Gem::Version
-  version: 4.1.1
+  version: 4.2.0
 platform: ruby
 authors:
 - Ben Woosley
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-06 00:00:00.000000000 Z
+date: 2021-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -83,6 +83,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rexml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -296,7 +310,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.15
 signing_key: 
 specification_version: 4
 summary: Ruby Object to XML mapping library