xmlrpc 0.1.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7b3f1922edd931c783c840f45865c76b1f535a19
-  data.tar.gz: 12b38e9e3f0d94a73bec9fa2a02944c914b2f15b
+SHA256:
+  metadata.gz: '033781b41a00cd9ae6a6a5f82fe72f89a94cdfe724c38721c593fa28ee4002c6'
+  data.tar.gz: a6bc844abbc8e8829ebf1c6ca5884f176cbf1caf8d94b1530a2b0b6e60c3ebd7
 SHA512:
-  metadata.gz: 88ad59a4a1028d7912bff03208909c0009526fe1ec77a61ef140e3e82c143077f1573b00c246d6e953a15352857b7e803b2e27ac14b7e9afae9aeebe58b0705c
-  data.tar.gz: 1890b83eefe2fb6f3e0baf3c6a4afb221c8a164d9eb43d455aca46734c1912d16daaea41c854dae8ec395cbfe0a3fb4f003b7434af529dd988c87eaa3ee8eba4
+  metadata.gz: 0a1ebb33a2e8e9dbf8aabbdbf622f181687582d991acdd258db31a2430162f592393520b8cd73a7340b6bd8cac15bad731c6e7abc2beeffdaff32d4c59bbf72b
+  data.tar.gz: cfbff48a3ddf0af2ac256f1dd4596570d86cd65e10b4bef97b785fb4bf27074597e411749a9b919c6f72b9eb8cb2489f1c22368bcaa7dbcf9b99486f6b8693c2

data/.github/workflows/test.yml

@@ -0,0 +1,35 @@
+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
+          - 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,28 @@
+# News
+
+## 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/README.md

@@ -1,5 +1,7 @@
 # XMLRPC
 
+[![Build Status](https://travis-ci.org/ruby/xmlrpc.svg?branch=master)](https://travis-ci.org/ruby/xmlrpc)
+
 ## Overview
 
 XMLRPC is a lightweight protocol that enables remote procedure calls over

data/lib/xmlrpc.rb

@@ -289,5 +289,5 @@
 #
 # You can change the XML-writer by calling method ParserWriterChooseMixin#set_writer.
 module XMLRPC
-  VERSION = "0.1.0"
+  VERSION = "0.3.1"
 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

@@ -237,7 +237,7 @@ module XMLRPC # :nodoc:
     # Each parameter of +args+ must be of one of the following types,
     # where Hash, Struct and Array can contain any of these listed _types_:
     #
-    # * Fixnum, Bignum
+    # * Integer
     # * TrueClass, FalseClass, +true+, +false+
     # * String, Symbol
     # * Float
@@ -255,7 +255,7 @@ module XMLRPC # :nodoc:
     #
     # The type of the return-value is one of the types shown above.
     #
-    # A Bignum is only allowed when it fits in 32-bit. A XML-RPC
+    # An Integer is only allowed when it fits in 32-bit. A XML-RPC
     # +dateTime.iso8601+ type is always returned as a XMLRPC::DateTime object.
     # Struct is never returned, only a Hash, the same for a Symbol, where as a
     # String is always returned. XMLRPC::Base64 is returned as a String from
@@ -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"
@@ -176,15 +178,15 @@ module XMLRPC # :nodoc:
     def conv2value(param) # :doc:
 
         val = case param
-        when Fixnum, Bignum
-          # XML-RPC's int is 32bit int, and Fixnum also may be beyond 32bit
+        when Integer
+          # XML-RPC's int is 32bit int
           if Config::ENABLE_BIGINT
             @writer.tag("i4", param.to_s)
           else
             if param >= -(2**31) and param <= (2**31-1)
               @writer.tag("i4", param.to_s)
             else
-              raise "Bignum is too big! Must be signed 32-bit integer!"
+              raise "Integer is too big! Must be signed 32-bit integer!"
             end
           end
         when TrueClass, FalseClass
@@ -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/datetime.rb

@@ -24,7 +24,7 @@ class DateTime
   #
   # Raises ArgumentError if the given +value+ is out of range, or in the case
   # of XMLRPC::DateTime#year= if +value+ is not of type Integer.
-  def year= (value)
+  def year=(value)
     raise ArgumentError, "date/time out of range" unless value.is_a? Integer
     @year = value
   end
@@ -32,7 +32,7 @@ class DateTime
   # Set +value+ as the new date/time component.
   #
   # Raises an ArgumentError if the given +value+ isn't between 1 and 12.
-  def month= (value)
+  def month=(value)
     raise ArgumentError, "date/time out of range" unless (1..12).include? value
     @month = value
   end
@@ -40,7 +40,7 @@ class DateTime
   # Set +value+ as the new date/time component.
   #
   # Raises an ArgumentError if the given +value+ isn't between 1 and 31.
-  def day= (value)
+  def day=(value)
     raise ArgumentError, "date/time out of range" unless (1..31).include? value
     @day = value
   end
@@ -48,7 +48,7 @@ class DateTime
   # Set +value+ as the new date/time component.
   #
   # Raises an ArgumentError if the given +value+ isn't between 0 and 24.
-  def hour= (value)
+  def hour=(value)
     raise ArgumentError, "date/time out of range" unless (0..24).include? value
     @hour = value
   end
@@ -56,7 +56,7 @@ class DateTime
   # Set +value+ as the new date/time component.
   #
   # Raises an ArgumentError if the given +value+ isn't between 0 and 59.
-  def min= (value)
+  def min=(value)
     raise ArgumentError, "date/time out of range" unless (0..59).include? value
     @min = value
   end
@@ -64,7 +64,7 @@ class DateTime
   # Set +value+ as the new date/time component.
   #
   # Raises an ArgumentError if the given +value+ isn't between 0 and 59.
-  def sec= (value)
+  def sec=(value)
     raise ArgumentError, "date/time out of range" unless (0..59).include? value
     @sec = value
   end
@@ -87,16 +87,10 @@ class DateTime
   end
 
   # Return a Time object of the date/time which represents +self+.
-  # If the <code>@year</code> is below 1970, this method returns +nil+,
-  # because Time cannot handle years below 1970.
   #
   # The timezone used is GMT.
   def to_time
-    if @year >= 1970
-      Time.gm(*to_a)
-    else
-      nil
-    end
+    Time.gm(*to_a)
   end
 
   # Return a Date object of the date which represents +self+.

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

@@ -12,13 +12,13 @@ Gem::Specification.new do |spec|
   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"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
-  spec.required_ruby_version = ">= 2.4.0"
+  spec.required_ruby_version = ">= 2.3"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xmlrpc
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.1
 platform: ruby
 authors:
 - SHIBATA Hiroshi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-15 00:00:00.000000000 Z
+date: 2020-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -60,10 +60,11 @@ 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 +83,7 @@ files:
 homepage: https://github.com/ruby/xmlrpc
 licenses:
 - Ruby
+- BSD-2-Clause
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -91,15 +93,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 3.2.0.rc.2
 signing_key: 
 specification_version: 4
 summary: XMLRPC is a lightweight protocol that enables remote procedure calls over

data/.travis.yml

@@ -1,4 +0,0 @@
-language: ruby
-rvm:
-  - ruby-head
-before_install: gem install bundler -v 1.11.2