xml-mixup 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74f33a7307a517d3447e6cc3e41b79a964d7002dcd41118f20f77854ad20c7c9
-  data.tar.gz: c0fe7162ce9a6b6d0b27880b6127e783bbe2f340358be29e2cc9386345ef6cff
+  metadata.gz: 52f06d4fa85d31f07ed928b7d1c0106e62f10931f1292464314a95bb9a77e276
+  data.tar.gz: 54a0f85692dc6e558009550094aeccecbbdfda6c286977eaccd312c6042e438c
 SHA512:
-  metadata.gz: c50bb0074170d8b936bf83084d5d471ab3f6f70703ec87e4c7e1b3f8d02bff4bb557986367f648bfec14f62cdb0a6b7b0ddaa7b88cdc3308e6922eb377b8619d
-  data.tar.gz: 86e2f6b2ba2f89808215e1176031bc2079ff254f425d5c3a8e2d6f9a8f81506e9bc921b9605d531b3708fca92cf3dc18cb3f8ceca6dd8615b76b2eeed1f7deee
+  metadata.gz: 737ca243a7a520a59968bc8613e31dda5a7f7e859bf06fcdfe9352f268a417dc95fee7e8b7e458cca9337b1d19f79795a97c28da133929e4f0ef236c5bc38352
+  data.tar.gz: 5767a7fd2688e3242ea9f42030b8cb926eed8e7b1c90c5b8478487ee9b1143931f23493eeb79c53101a3fad40e4987591d2d496f31d0651415d880004806dd49

data/lib/xml/mixup/version.rb

@@ -1,5 +1,5 @@
 module XML
   module Mixup
-    VERSION = "0.1.10"
+    VERSION = "0.1.11"
   end
 end

data/lib/xml/mixup.rb

@@ -174,35 +174,36 @@ module XML::Mixup
           else 
             name = x
           end
-        elsif (compact = spec.select { |k, _|
-                 k.respond_to?(:to_a) or k.is_a?(Nokogiri::XML::Node)}) and
-            not compact.empty?
+        elsif (compact = spec.select { |k, _| k.respond_to?(:to_a) or
+                   k.is_a?(Nokogiri::XML::Node)}) and !compact.empty?
           # compact syntax eliminates the `nil` key
           raise %q{Spec can't have duplicate compact keys} if compact.count > 1
           children, name = compact.first
-          children = children.respond_to?(:to_a) ? children.to_a : [children]
-        elsif (special = spec.select { |k, _|
-                 k.respond_to? :to_s and k.to_s.start_with? '#' }) and
-            not special.empty?
+          children = children.is_a?(Hash) ||
+            children.is_a?(Nokogiri::XML::Node) ? [children] : children.to_a 
+        elsif (special = spec.select { |k, _| k.respond_to? :to_s and
+                   k.to_s.start_with? ?# }) and !special.empty?
           # these are special keys 
           raise %q{Spec can't have multiple special keys} if special.count > 1
           name, children = special.first
 
-          if %w{# #elem #element #tag}.any? name
+          if %w{# #elem #element #tag}.include? name
             # then the name is in the `children` slot
             raise "Value of #{name} shorthand formulation" +
-              "must be a valid element name" unless children.to_s
+              "must be a valid element name" unless children.respond_to? :to_s
             name = children
             # set children to empty array
             children = []
           elsif not RESERVED.any? name
             # then the name is encoded into the key and we have to
             # remove the octothorpe
-            name = name[1..name.length]
+            name = name.delete_prefix ?#
+            # note we assign because the object is input and may be frozen
           end
 
           # don't forget to reset the child nodes
-          children = children.respond_to?(:to_a) ? children.to_a : [children]
+          children = children.is_a?(Hash) || !children.respond_to?(:to_a) ?
+            [children] : children.to_a 
         end
 
         # note the name can be nil because it can be inferred
@@ -245,7 +246,7 @@ module XML::Mixup
           # attach it
           ADJACENT[adj].call node, nodes[adj]
 
-        elsif name == '#dtd' or name == '#doctype'
+        elsif %w[#dtd #doctype].include? name
           # now doctype declarations
           if children.empty?
             raise "DTD node must have a root element declaration"

data/xml-mixup.gemspec

@@ -14,16 +14,6 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/doriantaylor/rb-xml-mixup"
   spec.required_ruby_version = "~> 2.0"
 
-  # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
-  # to allow pushing to a single host or delete this section to allow pushing to any host.
-
-  # if spec.respond_to?(:metadata)
-  #   spec.metadata["allowed_push_host"] = "TODO: Set to 'http://mygemserver.com'"
-  # else
-  #   raise "RubyGems 2.0 or newer is required to protect against " \
-  #     "public gem pushes."
-  # end
-
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
@@ -35,5 +25,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
 
-  spec.add_dependency "nokogiri", "~> 1.8"
+  spec.add_dependency "nokogiri", "~> 1.10.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xml-mixup
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors:
 - Dorian Taylor
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-06 00:00:00.000000000 Z
+date: 2019-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: 1.10.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: 1.10.4
 description: XML::Mixup uses declarative data structures to incrementally generate
   XML.
 email:
@@ -104,8 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A mixin for (XML) markup