xmlrpc 0.3.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b25bc2795f9797698050df21c2edb45762495b2b
-  data.tar.gz: b365ee841e1778e048c3d8487634450e4966f332
+SHA256:
+  metadata.gz: beb82c31668a9eac6cc5fec044fd06335c42126ce3d4f1f6defda2c987b42ac7
+  data.tar.gz: 216663d8c70e048ad6522be02c15e737da9bb4f29ffb268cd65fd8e270d52f15
 SHA512:
-  metadata.gz: 104b7bc31e9dc7c700ea986e4e1b9ff76988f376d5ba00c98b17c542c036991ddc8af2110712f4635d75cc9f20ff9550ade7be94c32a2163838115e4cb5a90a6
-  data.tar.gz: ce6dc27e9a22fb3b3c185ca1415ea5dd92c8bacf8447f4a52ce0d81cf8a04dec066ec6591f4095b58824e78879e130920e05732b695da0888e8b2277ab849a3c
+  metadata.gz: f2bc2b1c23323a22e37b5cde407ce06440f16d7b4a7ad733aa996616f04524de93e56b4e4deb37a1bf8a7793234011f4bf88141e4146c1aa5940ffb851de272f
+  data.tar.gz: 151dc29ed010ce4610c20d6673dea4ce939fdea3bcf287e7eebf728959768c868afe45a0fa8b0c4393754845efe14d0cf7e86b2c1ce046225aee1c8ca123860e

data/.github/workflows/test.yml

@@ -0,0 +1,36 @@
+name: Test
+
+on:
+  - push
+  - pull_request
+
+jobs:
+  test:
+    name: >-
+      ${{ matrix.os }} ${{ matrix.ruby }}
+    runs-on: ${{ matrix.os }}-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - ubuntu
+          - macos
+          - windows
+        ruby:
+          - "2.5"
+          - "2.6"
+          - "2.7"
+          - "3.0"
+          - head
+        include:
+          - { os: windows , ruby: mingw }
+          - { os: windows , ruby: mswin }
+        exclude:
+          - { os: windows , ruby: head }
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+      - run: bundle install
+      - run: rake

data/NEWS.md

@@ -0,0 +1,39 @@
+# News
+
+## 0.3.2
+
+### Improvements
+
+  * Added support for Ruby 3.0.
+    [GitHub#27][Reported by Herwin Weststrate]
+
+### Thanks
+
+  * Herwin Weststrate
+
+## 0.3.1
+
+### Improvements
+
+  * Added support for comparing `XMLRPC::Base64`.
+    [GitHub#14][Patch by Herwin Weststrate]
+
+  * Added support for `application/xml` as `Content-Type`.
+    [GitHub#24][Reported by Reiermeyer]
+
+  * Added `XMLRPC::Server#port`.
+    [GitHub#17][Reported by Harald Sitter]
+    [GitHub#18][Patch by Herwin Weststrate]
+
+### Fixes
+
+  * Fixed a bug that unexpected exception is raised on no data.
+    [GitHub#25][Patch by Herwin Weststrate]
+
+### Thanks
+
+  * Herwin Weststrate
+
+  * Reiermeyer
+
+  * Harald Sitter

data/lib/xmlrpc.rb

@@ -289,5 +289,5 @@
 #
 # You can change the XML-writer by calling method ParserWriterChooseMixin#set_writer.
 module XMLRPC
-  VERSION = "0.3.0"
+  VERSION = "0.3.2"
 end

data/lib/xmlrpc/base64.rb

@@ -13,6 +13,7 @@ module XMLRPC # :nodoc:
 # You can use XMLRPC::Base64 on the client and server-side as a
 # parameter and/or return-value.
 class Base64
+  include Comparable
 
   # Creates a new XMLRPC::Base64 instance with string +str+ as the
   # internal string. When +state+ is +:dec+ it assumes that the
@@ -40,6 +41,11 @@ class Base64
     Base64.encode(@str)
   end
 
+  # Compare two base64 values, based on decoded string
+  def <=>(other)
+    return nil unless other.is_a?(self.class)
+    decoded <=> other.decoded
+  end
 
   # Decodes string +str+ with base64 and returns that value.
   def Base64.decode(str)

data/lib/xmlrpc/client.rb

@@ -512,16 +512,26 @@ module XMLRPC # :nodoc:
       # assume text/xml on instances where Content-Type header is not set
       ct_expected = resp["Content-Type"] || 'text/xml'
       ct = parse_content_type(ct_expected).first
-      if ct != "text/xml"
+      case ct
+      when "text/xml", "application/xml"
+        # OK
+      else
+        message =
+          "Wrong content-type " +
+          "(received '#{ct}' but expected 'text/xml' or 'application/xml')"
         if ct == "text/html"
-          raise "Wrong content-type (received '#{ct}' but expected 'text/xml'): \n#{data}"
+          raise "#{message}:\n#{data}"
         else
-          raise "Wrong content-type (received '#{ct}' but expected 'text/xml')"
+          raise message
         end
       end
 
+      if data.nil?
+        raise "No data"
+      end
+
       expected = resp["Content-Length"] || "<unknown>"
-      if data.nil? or data.bytesize == 0
+      if data.bytesize == 0
         raise "Wrong size. Was #{data.bytesize}, should be #{expected}"
       end
 

data/lib/xmlrpc/create.rb

@@ -12,7 +12,7 @@ module XMLRPC # :nodoc:
 
   module XMLWriter
 
-    class Abstract
+    module Element
       def ele(name, *children)
         element(name, nil, *children)
       end
@@ -23,7 +23,8 @@ module XMLRPC # :nodoc:
     end
 
 
-    class Simple < Abstract
+    class Simple
+      include Element
 
       def document_to_str(doc)
         doc
@@ -57,7 +58,8 @@ module XMLRPC # :nodoc:
     end # class Simple
 
 
-    class XMLParser < Abstract
+    class XMLParser
+      include Element
 
       def initialize
         require "xmltreebuilder"
@@ -219,8 +221,6 @@ module XMLRPC # :nodoc:
           @writer.ele("struct", *h)
 
         when Hash
-          # TODO: can a Hash be empty?
-
           h = param.collect do |key, value|
             @writer.ele("member",
               @writer.tag("name", key.to_s),
@@ -231,7 +231,6 @@ module XMLRPC # :nodoc:
           @writer.ele("struct", *h)
 
         when Array
-          # TODO: can an Array be empty?
           a = param.collect {|v| conv2value(v) }
 
           @writer.ele("array",

data/lib/xmlrpc/server.rb

@@ -594,6 +594,11 @@ class Server < WEBrickServlet
     @server.shutdown
   end
 
+  # Get the port of the server, useful when started with port=0
+  def port
+    @server.config[:Port]
+  end
+
 end
 
 

data/xmlrpc.gemspec

@@ -6,13 +6,13 @@ require 'xmlrpc'
 Gem::Specification.new do |spec|
   spec.name          = "xmlrpc"
   spec.version       = XMLRPC::VERSION
-  spec.authors       = ["SHIBATA Hiroshi"]
-  spec.email         = ["hsbt@ruby-lang.org"]
+  spec.authors       = ["SHIBATA Hiroshi", "Sutou Kouhei"]
+  spec.email         = ["hsbt@ruby-lang.org", "kou@cozmixng.org"]
 
   spec.summary       = %q{XMLRPC is a lightweight protocol that enables remote procedure calls over HTTP.}
   spec.description   = %q{XMLRPC is a lightweight protocol that enables remote procedure calls over HTTP.}
   spec.homepage      = "https://github.com/ruby/xmlrpc"
-  spec.license       = "Ruby"
+  spec.licenses      = ["Ruby", "BSD-2-Clause"]
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.bindir        = "exe"
@@ -20,6 +20,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = ">= 2.3"
 
+  spec.add_dependency "webrick"
+
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "test-unit"

metadata

@@ -1,15 +1,30 @@
 --- !ruby/object:Gem::Specification
 name: xmlrpc
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.2
 platform: ruby
 authors:
 - SHIBATA Hiroshi
+- Sutou Kouhei
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-16 00:00:00.000000000 Z
+date: 2021-02-04 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: webrick
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -56,14 +71,16 @@ description: XMLRPC is a lightweight protocol that enables remote procedure call
   over HTTP.
 email:
 - hsbt@ruby-lang.org
+- kou@cozmixng.org
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/test.yml"
 - ".gitignore"
-- ".travis.yml"
 - Gemfile
 - LICENSE.txt
+- NEWS.md
 - README.md
 - Rakefile
 - bin/console
@@ -82,6 +99,7 @@ files:
 homepage: https://github.com/ruby/xmlrpc
 licenses:
 - Ruby
+- BSD-2-Clause
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -98,8 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 3.3.0.dev
 signing_key: 
 specification_version: 4
 summary: XMLRPC is a lightweight protocol that enables remote procedure calls over

data/.travis.yml

@@ -1,6 +0,0 @@
-language: ruby
-rvm:
-  - 2.3.3
-  - 2.4.0
-  - ruby-head
-before_install: gem update bundler