xdr 3.0.2 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f0a7d79379430aafb61eed9de69792863eae9f09d6879b9c45a6dfdf4899423
-  data.tar.gz: 4077d91ba3482d12749dfebfd8af588c8ed8a71ed0ffbc84328752f18bc6099c
+  metadata.gz: 5e73176f8adac880de7eb0ed3761730773c9dadac9f572e9a9fd1f75ff396488
+  data.tar.gz: ea7c2d4f8fc312f33d4fb81be7a9074a6ed2f6e5dec2cccb41f7c00cdabff248
 SHA512:
-  metadata.gz: '087033c3d5e43816556e6265b76892f64c193764af9342eec0e15e1ff615c2f1bed2ef1900d02fc6cd54afb3e158fe081b1a4b966fba019275d48e6c66cb14ac'
-  data.tar.gz: 01b99345355417827e4087075724186082f713c807612a4ac481a9d84bfefeb6bac31abc9819f0c807ce0d31296f2854dd055f03b4b17c1257c27feb0151e442
+  metadata.gz: 9f6825750389ef2f19882533f169c9de4c05a264fa19228fcdbed3f3276196473d6e6e2cac75c420926a097f2543a71100cc17ad0784864e1c18c24da66aa455
+  data.tar.gz: 3c04035a3532da2c732aa47664a9bf4cfe79616806f3193948d5c8c37aa2c2862153cb2a74fe13b0afcb30d25f2f1f39729f510ac67655891a9d466de767ba64

data/CHANGELOG.md

@@ -5,24 +5,29 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased](https://github.com/stellar/ruby-xdr/compare/v3.0.2...master)
+### [3.0.3](https://github.com/astroband/ruby-xdr/compare/v3.0.2...v3.0.3) (2022-02-18)
+### Bug Fixes
+- make `XDR::Option` write empty strings as values ([#15](https://github.com/astroband/ruby-xdr/issues/15)) ([ccab229](https://github.com/astroband/ruby-xdr/commit/ccab22928a1104dee525211b51d1d567079d27ba))
 
-## [3.0.2](https://github.com/stellar/ruby-xdr/compare/v3.0.1...v3.0.2) - 2020-10-20
+
+## [3.0.2](https://github.com/astroband/ruby-xdr/compare/v3.0.1...v3.0.2) - 2020-10-20
 ### Changed
-- Relax lower bound for ActiveSupport dependency to support usage in Rails 4.2 ((#12)[https://github.com/stellar/ruby-xdr/pull/12])
+- Relax lower bound for ActiveSupport dependency to support usage in Rails 4.2 ([#12](https://github.com/astroband/ruby-xdr/pull/12))
+
+### Bug Fixes
+- Fix non-bang arm accessors for XDR::Union ([#13](https://github.com/astroband/ruby-xdr/pull/13))
+- Fix .from_xdr encoding param to accept symbols ([#14](https://github.com/astroband/ruby-xdr/pull/14))
 
-### Fixed
-- Fix non-bang arm accessors for XDR::Union ((#13)[https://github.com/stellar/ruby-xdr/pull/13])
-- Fix .from_xdr encoding param to accept symbols ((#14)[https://github.com/stellar/ruby-xdr/pull/14])
 
-## [3.0.1](https://github.com/stellar/ruby-xdr/compare/v3.0.0...v3.0.1) - 2020-06-10
+## [3.0.1](https://github.com/astroband/ruby-xdr/compare/v3.0.0...v3.0.1) - 2020-06-10
 ### Added
-- Add encoding parameter to Union#to_xdr ((#7)[https://github.com/stellar/ruby-xdr/pull/7]).
+- Add encoding parameter to Union#to_xdr ([#7](https://github.com/astroband/ruby-xdr/pull/7)).
 
-### Fixed
+### Bug Fixes
 - Padding bytes are now properly validated when reading xdr values.  According to the XDR spec, padding must be zeros.
 
-## [1.0.0](https://github.com/stellar/ruby-xdr/compare/v0.1.0...v1.0.0) - 2015-10-02
+
+## [1.0.0](https://github.com/astroband/ruby-xdr/compare/v0.1.0...v1.0.0) - 2015-10-02
 ### Added
 - the `to_xdr` helpers can take a second parameter that will encode the resulting output to hex or base64 when requested.
 - the `from_xdr` helpers can take a second parameter that will trigger a decode from hex or base64 of the provided string before decoding from xdr.

data/README.md

@@ -3,7 +3,9 @@
 [![Build Status](https://travis-ci.org/stellar/ruby-xdr.svg?branch=master)](https://travis-ci.org/stellar/ruby-xdr)
 [![Code Climate](https://codeclimate.com/github/stellar/ruby-xdr/badges/gpa.svg)](https://codeclimate.com/github/stellar/ruby-xdr)
 
-XDR is an open data format, specified in [RFC 4506](http://tools.ietf.org/html/rfc4506.html).  This library provides a way to read and write XDR data from ruby.  It can read/write all of the primitive XDR types and also provides facilities to define readers for the compound XDR types (enums, structs and unions)
+XDR is an open data format, specified in [RFC 4506](http://tools.ietf.org/html/rfc4506.html). This library provides a
+way to read and write XDR data from ruby. It can read/write all of the primitive XDR types and also provides facilities
+to define readers for the compound XDR types (enums, structs and unions)
 
 ## Installation
 
@@ -15,28 +17,28 @@ gem 'xdr'
 
 And then execute:
 
-    $ bundle
+    bundle
 
 Or install it yourself as:
 
-    $ gem install xdr
+    gem install xdr
 
 ## Usage
 
 ```ruby
 # Reading/writing a primitive values
-XDR::Bool.to_xdr(false)                # => "\x00\x00\x00\x00"
+XDR::Bool.to_xdr(false) # => "\x00\x00\x00\x00"
 XDR::Bool.from_xdr("\x00\x00\x00\x01") # => true
 
 # Reading/writing arrays
-XDR::Array[XDR::Int,2].to_xdr([1,2]) # => "\x00\x00\x00\x01\x00\x00\x00\x02"
-XDR::Array[XDR::Int,2].from_xdr("\x00\x00\x00\x03\x00\x00\x00\x04") # => [3,4]
+XDR::Array[XDR::Int, 2].to_xdr([1, 2]) # => "\x00\x00\x00\x01\x00\x00\x00\x02"
+XDR::Array[XDR::Int, 2].from_xdr("\x00\x00\x00\x03\x00\x00\x00\x04") # => [3,4]
 
 # Defining an enum
 
 class ResultType < XDR::Enum
-  member :ok,       0
-  member :error,    1
+  member :ok, 0
+  member :error, 1
   seal
 end
 
@@ -88,24 +90,22 @@ Result.from_xdr("\x00\x00\x00\x00") # => #<Result ...>
 
 ## Thread safety
 
-Code generated by `xdrgen`, which targets this library, uses autoload extensively.
-Since autoloading is not thread-safe, neither is code generated from xdrgen. To
-work around this, any module including `XDR::Namespace` can be forced to load
+Code generated by `xdrgen`, which targets this library, uses autoload extensively. Since autoloading is not thread-safe,
+neither is code generated from xdrgen. To work around this, any module including `XDR::Namespace` can be forced to load
 all of it's children by calling `load_all!` on the module.
 
 ## Code generation
 
-ruby-xdr by itself does not have any ability to parse XDR IDL files and produce a parser for your custom 
-data types.  Instead, that is the responsibility of [xdrgen](http://github.com/stellar/xdrgen). `xdrgen` will 
-take your `.x` files and produce a set of ruby files that target this library to allow for your own custom types.
+ruby-xdr by itself does not have any ability to parse XDR IDL files and produce a parser for your custom data types.
+Instead, that is the responsibility of [xdrgen](http://github.com/stellar/xdrgen). `xdrgen` will take your `.x` files
+and produce a set of ruby files that target this library to allow for your own custom types.
 
 See [ruby-stellar-base](http://github.com/astroband/ruby-stellar-sdk/tree/master/base/generated) for an example.
 
 ## Contributing
 
-1. Sign the [Contributor License Agreement](http://goo.gl/forms/6r7I4S0K4z)
-2. Fork it ( https://github.com/stellar/ruby-xdr/fork )
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create a new Pull Request
+1. Fork the repo ( https://github.com/astroband/ruby-xdr/fork )
+1. Create your feature branch (`git checkout -b my-new-feature`)
+1. Commit your changes (`git commit -am 'Add some feature'`)
+1. Push to the branch (`git push origin my-new-feature`)
+1. Create a new Pull Request

data/lib/xdr/array.rb

@@ -6,7 +6,7 @@ class XDR::Array
 
   def initialize(child_type, length)
     @child_type = child_type
-    @length     = length
+    @length = length
   end
 
   def write(val, io)
@@ -19,10 +19,10 @@ class XDR::Array
   end
 
   def read(io)
-    @length.times.map{ @child_type.read(io) }
+    @length.times.map { @child_type.read(io) }
   end
 
   def valid?(val)
     super(val) && val.length == @length
   end
-end
+end

data/lib/xdr/bool.rb

@@ -3,22 +3,22 @@ module XDR::Bool
 
   def self.write(val, io)
     case val
-    when true  ; XDR::Int.write(1, io)
-    when false ; XDR::Int.write(0, io)
-    else ; raise XDR::WriteError, "Invalid bool value: #{val}"
+    when true then XDR::Int.write(1, io)
+    when false then XDR::Int.write(0, io)
+    else; raise XDR::WriteError, "Invalid bool value: #{val}"
     end
   end
 
   def self.read(io)
     val = XDR::Int.read(io)
     case val
-    when 0 ; false
-    when 1 ; true
-    else ; raise XDR::ReadError, "Invalid bool value: #{val}"
+    when 0 then false
+    when 1 then true
+    else; raise XDR::ReadError, "Invalid bool value: #{val}"
     end
   end
 
   def self.valid?(val)
     val == true || val == false
   end
-end
+end

data/lib/xdr/concerns/array_converter.rb

@@ -1,5 +1,5 @@
 module XDR::Concerns::ArrayConverter
   def valid?(val)
-    val.is_a?(Array) && val.all?{|v| @child_type.valid?(v)}
+    val.is_a?(Array) && val.all? { |v| @child_type.valid?(v) }
   end
-end
+end

data/lib/xdr/concerns/converts_to_xdr.rb

@@ -1,9 +1,9 @@
-require 'base64'
+require "base64"
 
 module XDR::Concerns::ConvertsToXDR
   include XDR::Concerns::ReadsBytes
 
-  # 
+  #
   # Serialized the provided `val` to xdr and writes it to `io`
   #
   # @abstract
@@ -14,7 +14,7 @@ module XDR::Concerns::ConvertsToXDR
     raise NotImplementedError, "implement in including class"
   end
 
-  # 
+  #
   # Reads from the provided IO an instance of the implementing class
   #
   # @abstract
@@ -35,7 +35,7 @@ module XDR::Concerns::ConvertsToXDR
 
   # Serialized the provided val to xdr, returning a string
   # of the serialized data
-  # 
+  #
   # @param val [Object] the value to serialize
   # @param encoding [:raw|:hex|:base64] encode the result with specified codec
   # @return [String] the produced bytes
@@ -46,7 +46,7 @@ module XDR::Concerns::ConvertsToXDR
 
     case String(encoding)
     when "raw" then raw
-    when "hex" then raw.unpack("H*").first
+    when "hex" then raw.unpack1("H*")
     when "base64" then Base64.strict_encode64(raw)
     else
       raise ArgumentError, "Invalid encoding #{encoding.inspect}: must be 'raw', 'base64', or 'hex'"
@@ -65,13 +65,13 @@ module XDR::Concerns::ConvertsToXDR
           when "base64" then Base64.strict_decode64(string)
           else
             raise ArgumentError, "Invalid encoding #{encoding.inspect}: must be 'raw', 'base64', or 'hex'"
-          end
+    end
 
     io = StringIO.new(raw)
     result = read(io)
 
     if io.pos != io.length
-      raise  ArgumentError, "Input string not fully consumed! are you decoding the right xdr type?"
+      raise ArgumentError, "Input string not fully consumed! are you decoding the right xdr type?"
     end
 
     result
@@ -81,10 +81,10 @@ module XDR::Concerns::ConvertsToXDR
 
   def padding_for(length)
     case length % 4
-    when 0 ; 0
-    when 1 ; 3
-    when 2 ; 2
-    when 3 ; 1
+    when 0 then 0
+    when 1 then 3
+    when 2 then 2
+    when 3 then 1
     end
   end
 end

data/lib/xdr/concerns/float_converter.rb

@@ -2,4 +2,4 @@ module XDR::Concerns::FloatConverter
   def valid?(val)
     val.is_a?(Float)
   end
-end
+end

data/lib/xdr/concerns/integer_converter.rb

@@ -2,4 +2,4 @@ module XDR::Concerns::IntegerConverter
   def valid?(val)
     val.is_a?(Integer)
   end
-end
+end

data/lib/xdr/concerns/reads_bytes.rb

@@ -1,5 +1,6 @@
 module XDR::Concerns::ReadsBytes
   private
+
   def read_bytes(io, length)
     io.read(length).tap do |bytes|
       raise EOFError if bytes.nil? || bytes.length != length
@@ -13,4 +14,4 @@ module XDR::Concerns::ReadsBytes
 
     nil
   end
-end
+end

data/lib/xdr/concerns/string_converter.rb

@@ -2,4 +2,4 @@ module XDR::Concerns::StringConverter
   def valid?(val)
     val.is_a?(String)
   end
-end
+end

data/lib/xdr/double.rb

@@ -8,7 +8,6 @@ module XDR::Double
   end
 
   def self.read(io)
-    read_bytes(io, 8).unpack("G").first
+    read_bytes(io, 8).unpack1("G")
   end
-
-end
+end

data/lib/xdr/dsl/enum.rb

@@ -1,17 +1,16 @@
 module XDR::DSL::Enum
-
   def member(name, value)
-    raise ArgumentError, "#{self} is sealed" if self.sealed
-    raise ArgumentError, "#{value} is not Integer" unless value.is_a?(Integer)
-    raise ArgumentError, "#{value} is already used" unless 
-
     name = name.to_s.underscore
 
+    raise ArgumentError, "#{self} is sealed" if sealed
+    raise ArgumentError, "#{value} is not Integer" unless value.is_a?(Integer)
+    raise ArgumentError, "#{value} is already used" if members.key?(name)
+
     instance = new(name, value)
-    self.members = self.members.merge(name => instance)
-    self.by_value = self.by_value.merge(instance.value => instance)
+    self.members = members.merge(name => instance)
+    self.by_value = by_value.merge(instance.value => instance)
 
-    class_eval <<-EOS, __FILE__, __LINE__
+    class_eval <<-EOS, __FILE__, __LINE__ + 1
       def self.#{name}
         members["#{name}"]
       end
@@ -21,4 +20,4 @@ module XDR::DSL::Enum
   def seal
     self.sealed = true
   end
-end
+end

data/lib/xdr/dsl/struct.rb

@@ -1,11 +1,10 @@
 module XDR::DSL::Struct
   def attribute(name, type)
-
     unless type.is_a?(XDR::Concerns::ConvertsToXDR)
       raise ArgumentError, "#{type} does not convert to xdr"
     end
 
-    self.fields = self.fields.merge(name => type)
+    self.fields = fields.merge(name => type)
 
     define_method name do
       read_attribute(name)

data/lib/xdr/dsl/union.rb

@@ -1,39 +1,39 @@
 module XDR::DSL::Union
   def switch_on(type, name)
-    raise ArgumentError if self.switch_type.present?
+    raise ArgumentError if switch_type.present?
     self.switch_type = type
     self.switch_name = name
 
     alias_method name, :switch
   end
 
-  def switch(switch, arm=nil)
-    raise ArgumentError, "`switch_on` not defined yet" if self.switch_type.nil?
+  def switch(switch, arm = nil)
+    raise ArgumentError, "`switch_on` not defined yet" if switch_type.nil?
 
     switch = normalize_switch_declaration(switch)
-    self.switches = self.switches.merge(switch => arm)
+    self.switches = switches.merge(switch => arm)
   end
 
   def attribute(name, type)
     raise ArgumentError, "#{type} does not convert to xdr" unless type.is_a?(XDR::Concerns::ConvertsToXDR)
 
-    self.arms = self.arms.merge(name => type)
+    self.arms = arms.merge(name => type)
     define_attribute_methods name
   end
 
   private
+
   def normalize_switch_declaration(switch)
-    case
-    when switch.is_a?(self.switch_type)
+    if switch.is_a?(switch_type)
       switch
-    when self.switch_type.valid?(switch)
+    elsif switch_type.valid?(switch)
       switch
-    when switch == :default
+    elsif switch == :default
       switch
-    when self.switch_type.respond_to?(:from_name)
-      self.switch_type.from_name(switch)
+    elsif switch_type.respond_to?(:from_name)
+      switch_type.from_name(switch)
     else
-      raise ArgumentError, "Cannot normalize switch: #{switch.inspect} to type: #{self.switch_type}"
+      raise ArgumentError, "Cannot normalize switch: #{switch.inspect} to type: #{switch_type}"
     end
   end
 end

data/lib/xdr/dsl.rb

@@ -4,4 +4,4 @@ module XDR::DSL
   autoload :Struct
   autoload :Union
   autoload :Enum
-end
+end

data/lib/xdr/enum.rb

@@ -7,7 +7,7 @@ class XDR::Enum
   class_attribute :sealed
   self.members = ActiveSupport::OrderedHash.new.with_indifferent_access
   self.by_value = ActiveSupport::OrderedHash.new
-  self.sealed  = false
+  self.sealed = false
 
   def self.write(val, io)
     raise XDR::WriteError, "Invalid enum value: #{val.inspect}" unless val.is_a?(self)
@@ -21,14 +21,14 @@ class XDR::Enum
       raise XDR::EnumValueError, "Unknown #{name} member: #{value}" if result.blank?
     end
   end
-  
+
   def self.valid?(val)
     val.is_a?(self)
   end
 
   def self.from_name(name)
     normalized = name.to_s.underscore
-    members[normalized].tap do |r|      
+    members[normalized].tap do |r|
       raise XDR::EnumNameError, "#{name} is not a member of #{self.name}" if r.blank?
     end
   end
@@ -37,12 +37,12 @@ class XDR::Enum
   attr_reader :value
 
   def initialize(name, value)
-    raise ArgumentError, "#{self.class} is sealed" if self.sealed
-    @name  = name
+    raise ArgumentError, "#{self.class} is sealed" if sealed
+    @name = name
     @value = value
   end
 
   def to_s
     "#{self.class.name}.#{@name}(#{@value})"
   end
-end
+end

data/lib/xdr/float.rb

@@ -8,7 +8,6 @@ module XDR::Float
   end
 
   def self.read(io)
-    read_bytes(io, 4).unpack("g").first
+    read_bytes(io, 4).unpack1("g")
   end
-
-end
+end

data/lib/xdr/hyper.rb

@@ -9,6 +9,6 @@ module XDR::Hyper
   end
 
   def self.read(io)
-    read_bytes(io, 8).unpack("q>").first
+    read_bytes(io, 8).unpack1("q>")
   end
-end
+end

data/lib/xdr/int.rb

@@ -9,6 +9,6 @@ module XDR::Int
   end
 
   def self.read(io)
-    read_bytes(io, 4).unpack("l>").first
+    read_bytes(io, 4).unpack1("l>")
   end
-end
+end

data/lib/xdr/namespace.rb

@@ -1,9 +1,9 @@
-# 
+#
 # A thin wrapper around ActiveSupport::Autoload configured to always eager_load
 # a child.  By calling `load_all!` on the namespace module, all children will
 # be eager loaded, allowing us to more easily operate in a multi-threaded
 # environment.
-# 
+#
 module XDR::Namespace
   extend ActiveSupport::Concern
 
@@ -14,13 +14,11 @@ module XDR::Namespace
   module ClassMethods
     def load_all!
       constants.each do |const_name|
-        begin
-          const = const_get const_name
-          const.public_send :load_all! if const.respond_to? :load_all!
-        rescue NameError => e
-          raise e unless e.message =~ /uninitialized constant #{const_name}/
-        end
+        const = const_get const_name
+        const.public_send :load_all! if const.respond_to? :load_all!
+      rescue NameError => e
+        raise e unless /uninitialized constant #{const_name}/.match?(e.message)
       end
     end
   end
-end
+end

data/lib/xdr/opaque.rb

@@ -12,17 +12,17 @@ class XDR::Opaque
   def read(io)
     # read and return @length bytes
     # throw away @padding bytes
-    read_bytes(io, @length).tap{ read_zeros(io, @padding) }
+    read_bytes(io, @length).tap { read_zeros(io, @padding) }
   end
 
-  def write(val,io)
+  def write(val, io)
     length = val.bytesize
-    
+
     if val.length != @length
-      raise XDR::WriteError, "Value length is #{length}, must be #{@length}" 
+      raise XDR::WriteError, "Value length is #{length}, must be #{@length}"
     end
 
     io.write val
     io.write "\x00" * @padding
   end
-end
+end

data/lib/xdr/option.rb

@@ -6,16 +6,16 @@ class XDR::Option
   attr_reader :child_type
 
   def initialize(child_type)
-    #TODO, raise an error if child_type is not ConvertToXDR
+    # TODO, raise an error if child_type is not ConvertToXDR
     @child_type = child_type
   end
 
   def write(val, io)
-    if val.present?
+    if val.nil?
+      XDR::Bool.write(false, io)
+    else
       XDR::Bool.write(true, io)
       @child_type.write(val, io)
-    else
-      XDR::Bool.write(false, io)
     end
   end
 
@@ -27,4 +27,4 @@ class XDR::Option
   def valid?(val)
     val.nil? || @child_type.valid?(val)
   end
-end
+end

data/lib/xdr/quadruple.rb

@@ -2,4 +2,4 @@ module XDR::Quadruple
   extend XDR::Concerns::ConvertsToXDR
 
   # No support for quads, so we don't overide read/write
-end
+end

data/lib/xdr/rpc/record.rb

@@ -2,6 +2,6 @@ XDR::RPC::Record = Struct.new(:last, :length, :content)
 
 XDR::RPC::Record.class_eval do
   def last?
-    self.last
+    last
   end
-end
+end

data/lib/xdr/rpc/record_reader.rb

@@ -1,16 +1,16 @@
 class XDR::RPC::RecordReader
   include XDR::Concerns::ReadsBytes
 
-  LAST_MASK   = 0x80000000
+  LAST_MASK = 0x80000000
   LENGTH_MASK = 0x7FFFFFFF
 
   def read(io)
-    header      = read_bytes(io, 4).unpack("L>").first
-    length      = header & LENGTH_MASK
-    last        = (header & LAST_MASK) > 0
+    header = read_bytes(io, 4).unpack1("L>")
+    length = header & LENGTH_MASK
+    last = (header & LAST_MASK) > 0
     raw_content = read_bytes(io, length)
-    content     = StringIO.new(raw_content)
-    
+    content = StringIO.new(raw_content)
+
     XDR::RPC::Record.new(last, length, content)
   end
-end
+end

data/lib/xdr/string.rb

@@ -3,8 +3,8 @@ class XDR::String
   include XDR::Concerns::StringConverter
 
   singleton_class.send(:alias_method, :[], :new)
-  
-  def initialize(length=XDR::MAX_SIZE)
+
+  def initialize(length = XDR::MAX_SIZE)
     @length = length
   end
 
@@ -31,6 +31,6 @@ class XDR::String
 
     # read and return length bytes
     # throw away padding bytes
-    read_bytes(io, length).tap{ read_zeros(io, padding) }
+    read_bytes(io, length).tap { read_zeros(io, padding) }
   end
-end
+end

data/lib/xdr/struct.rb

@@ -1,4 +1,4 @@
-require 'base64'
+require "base64"
 
 class XDR::Struct
   include ActiveModel::Model
@@ -7,8 +7,8 @@ class XDR::Struct
   extend XDR::Concerns::ConvertsToXDR
   extend XDR::DSL::Struct
 
-  attribute_method_prefix 'read_'
-  attribute_method_suffix 'write_'
+  attribute_method_prefix "read_"
+  attribute_method_suffix "write_"
 
   class_attribute :fields
   self.fields = ActiveSupport::OrderedHash.new
@@ -36,26 +36,25 @@ class XDR::Struct
     val.is_a?(self)
   end
 
-  def initialize(attributes={})
+  def initialize(attributes = {})
     @attributes = {}
     super
   end
 
-
   #
   # Serializes struct to xdr, return a string of bytes
   #
-  # @param format=:raw [Symbol] The encoding used for the bytes produces, one of (:raw, :hex, :base64)
+  # @param format [:raw, :hex, :base64] The encoding used for the bytes produces, one of (:raw, :hex, :base64)
   #
   # @return [String] The encoded bytes of this struct
-  def to_xdr(format=:raw)
+  def to_xdr(format = :raw)
     raw = self.class.to_xdr(self)
 
     case format
-    when :raw ;     raw
-    when :hex ;     raw.unpack("H*").first
-    when :base64 ;  Base64.strict_encode64(raw)
-    else ;
+    when :raw then raw
+    when :hex then raw.unpack1("H*")
+    when :base64 then Base64.strict_encode64(raw)
+    else
       raise ArgumentError, "Invalid format #{format.inspect}; must be :raw, :hex, or :base64"
     end
   end
@@ -63,18 +62,18 @@ class XDR::Struct
   #
   # Compares two structs for equality
   #
-  def == (other)
+  def ==(other)
     return false unless other.is_a?(self.class)
-    other.attributes == self.attributes
+    other.attributes == attributes
   end
 
-  def eql? (other)
+  def eql?(other)
     return false unless other.is_a?(self.class)
-    other.attributes.eql? self.attributes
+    other.attributes.eql? attributes
   end
 
   def hash
-    [self.class, self.attributes].hash
+    [self.class, attributes].hash
   end
 
   def read_attribute(attr)

data/lib/xdr/struct_validator.rb

@@ -3,4 +3,4 @@ class XDR::StructValidator < ActiveModel::Validator
     # validate each field
     # TODO
   end
-end
+end

data/lib/xdr/union.rb

@@ -5,20 +5,19 @@ class XDR::Union
   extend XDR::Concerns::ConvertsToXDR
   extend XDR::DSL::Union
 
-
   class_attribute :arms
   class_attribute :switches
   class_attribute :switch_type
   class_attribute :switch_name
-  attr_reader     :switch
-  attr_reader     :arm
+  attr_reader :switch
+  attr_reader :arm
 
-  self.arms        = ActiveSupport::OrderedHash.new
-  self.switches    = ActiveSupport::OrderedHash.new
+  self.arms = ActiveSupport::OrderedHash.new
+  self.switches = ActiveSupport::OrderedHash.new
   self.switch_type = nil
   self.switch_name = nil
 
-  attribute_method_suffix '!'
+  attribute_method_suffix "!"
 
   def self.arm_for_switch(switch)
     begin
@@ -38,56 +37,55 @@ class XDR::Union
   end
 
   def self.normalize_switch(switch)
-    case
-    when switch.is_a?(self.switch_type)
+    if switch.is_a?(switch_type)
       switch
-    when self.switch_type.valid?(switch)
+    elsif switch_type.valid?(switch)
       switch
-    when self.switch_type.respond_to?(:from_name)
-      self.switch_type.from_name(switch)
+    elsif switch_type.respond_to?(:from_name)
+      switch_type.from_name(switch)
     else
-      raise ArgumentError, "Cannot normalize switch: #{switch.inspect} to type: #{self.switch_type}"
+      raise ArgumentError, "Cannot normalize switch: #{switch.inspect} to type: #{switch_type}"
     end
   end
 
   def self.read(io)
-    switch   = switch_type.read(io)
-    arm      = arm_for_switch(switch)
+    switch = switch_type.read(io)
+    arm = arm_for_switch(switch)
     arm_type = arms[arm] || XDR::Void
-    value    = arm_type.read(io)
+    value = arm_type.read(io)
     new(switch, value)
   end
 
   def self.write(val, io)
     switch_type.write(val.switch, io)
     arm_type = arms[val.arm] || XDR::Void
-    arm_type.write(val.get,io)
+    arm_type.write(val.get, io)
   end
 
   def self.valid?(val)
     val.is_a?(self)
   end
 
-  def initialize(switch=:__unset__, value=:void)
-    @switch   = nil
-    @arm      = nil
-    @value    = nil
+  def initialize(switch = :__unset__, value = :void)
+    @switch = nil
+    @arm = nil
+    @value = nil
     set(switch, value) unless switch == :__unset__
   end
 
   #
   # Serializes struct to xdr, return a string of bytes
   #
-  # @param format=:raw [Symbol] The encoding used for the bytes produces, one of (:raw, :hex, :base64)
+  # @param format [:raw, :hex, :base64] The encoding used for the bytes produces, one of (:raw, :hex, :base64)
   #
   # @return [String] The encoded bytes of this struct
-  def to_xdr(format=:raw)
+  def to_xdr(format = :raw)
     self.class.to_xdr(self, format)
   end
 
-  def set(switch, value=:void)
+  def set(switch, value = :void)
     @switch = self.class.normalize_switch switch
-    @arm    = self.class.arm_for_switch @switch
+    @arm = self.class.arm_for_switch @switch
 
     raise XDR::InvalidValueError unless valid_for_arm_type(value, @arm)
 
@@ -100,7 +98,7 @@ class XDR::Union
     @value unless @value == :void
   end
 
-  alias get value
+  alias_method :get, :value
 
   def attribute(attr)
     return nil unless @arm.to_s == attr
@@ -117,23 +115,24 @@ class XDR::Union
   #
   # Compares two unions for equality
   #
-  def == (other)
+  def ==(other)
     return false unless other.is_a?(self.class)
-    return false unless other.switch == self.switch
-    other.value == self.value
+    return false unless other.switch == switch
+    other.value == value
   end
 
   def eql?(other)
     return false unless other.is_a?(self.class)
-    return false unless other.switch.eql? self.switch
-    other.value.eql? self.value
+    return false unless other.switch.eql? switch
+    other.value.eql? value
   end
-  
+
   def hash
-    [self.class, self.switch, self.value].hash
+    [self.class, switch, value].hash
   end
 
   private
+
   def valid_for_arm_type(value, arm)
     arm_type = arms[@arm]
 

data/lib/xdr/union_validator.rb

@@ -4,4 +4,4 @@ class XDR::UnionValidator < ActiveModel::Validator
     # validate the arm is compatible with the set discriminant
     # TODO
   end
-end
+end

data/lib/xdr/unsigned_hyper.rb

@@ -9,6 +9,6 @@ module XDR::UnsignedHyper
   end
 
   def self.read(io)
-    read_bytes(io, 8).unpack("Q>").first
+    read_bytes(io, 8).unpack1("Q>")
   end
-end
+end

data/lib/xdr/unsigned_int.rb

@@ -9,6 +9,6 @@ module XDR::UnsignedInt
   end
 
   def self.read(io)
-    read_bytes(io, 4).unpack("L>").first
+    read_bytes(io, 4).unpack1("L>")
   end
-end
+end

data/lib/xdr/var_array.rb

@@ -4,8 +4,8 @@ class XDR::VarArray
 
   singleton_class.send(:alias_method, :[], :new)
 
-  def initialize(child_type, length=XDR::MAX_SIZE)
-    @child_type   = child_type
+  def initialize(child_type, length = XDR::MAX_SIZE)
+    @child_type = child_type
     @length = length
   end
 
@@ -29,10 +29,10 @@ class XDR::VarArray
       raise XDR::ReadError, "VarArray length #{length} is greater than max #{@length}"
     end
 
-    length.times.map{ @child_type.read(io) }
+    length.times.map { @child_type.read(io) }
   end
 
   def valid?(val)
     super(val) && val.length <= @length
   end
-end
+end

data/lib/xdr/var_opaque.rb

@@ -4,7 +4,7 @@ class XDR::VarOpaque
 
   singleton_class.send(:alias_method, :[], :new)
 
-  def initialize(length=XDR::MAX_SIZE)
+  def initialize(length = XDR::MAX_SIZE)
     @length = length
   end
 
@@ -31,6 +31,6 @@ class XDR::VarOpaque
 
     # read and return length bytes
     # throw away padding bytes
-    read_bytes(io, length).tap{ read_zeros(io, padding) }
+    read_bytes(io, length).tap { read_zeros(io, padding) }
   end
-end
+end

data/lib/xdr/version.rb

@@ -1,3 +1,3 @@
 module XDR
-  VERSION = "3.0.2"
+  VERSION = "3.0.3"
 end

data/lib/xdr/void.rb

@@ -11,4 +11,4 @@ module XDR::Void
   def self.valid?(val)
     val == :void
   end
-end
+end

data/lib/xdr.rb

@@ -56,17 +56,23 @@ module XDR
     autoload :ArrayConverter
   end
 
-  class Error < StandardError ; end
-  class ReadError < Error ; end
-  class EnumValueError < ReadError ; end
-  class EnumNameError < ReadError ; end
-  class WriteError < Error ; end
+  class Error < StandardError; end
 
-  class InvalidSwitchError < Error ; end
-  class InvalidValueError < Error ; end
-  class ArmNotSetError < Error ; end
+  class ReadError < Error; end
+
+  class EnumValueError < ReadError; end
+
+  class EnumNameError < ReadError; end
+
+  class WriteError < Error; end
+
+  class InvalidSwitchError < Error; end
+
+  class InvalidValueError < Error; end
+
+  class ArmNotSetError < Error; end
 
   mattr_accessor :logger
-  self.logger = ActiveSupport::Logger.new(STDOUT)
-  self.logger.level = Logger::WARN
+  self.logger = ActiveSupport::Logger.new($stdout)
+  logger.level = Logger::WARN
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xdr
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.3
 platform: ruby
 authors:
 - Scott Fleckenstein
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-10-20 00:00:00.000000000 Z
+date: 2022-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -19,7 +19,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '8.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '8.0'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
@@ -39,7 +39,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '8.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,49 +49,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.19'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.19'
+        version: '8.0'
 description:
 email:
 - scott@stellar.org
@@ -141,14 +99,15 @@ files:
 - lib/xdr/var_opaque.rb
 - lib/xdr/version.rb
 - lib/xdr/void.rb
-homepage: https://github.com/stellar/ruby-xdr
+homepage: https://github.com/astroband/ruby-xdr
 licenses:
 - Apache-2.0
 metadata:
-  bug_tracker_uri: https://github.com/stellar/ruby-xdr/issues
-  changelog_uri: https://github.com/stellar/ruby-xdr/blob/v3.0.2/CHANGELOG.md
-  documentation_uri: https://rubydoc.info/gems/xdr/3.0.2/
-  source_code_uri: https://github.com/stellar/ruby-xdr/tree/v3.0.2
+  bug_tracker_uri: https://github.com/astroband/ruby-xdr/issues
+  changelog_uri: https://github.com/astroband/ruby-xdr/blob/v3.0.3/CHANGELOG.md
+  documentation_uri: https://rubydoc.info/gems/xdr/3.0.3/
+  github_repo: https://github.com/astroband/ruby-xdr
+  source_code_uri: https://github.com/astroband/ruby-xdr/tree/v3.0.3
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -164,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.3.5
 signing_key:
 specification_version: 4
 summary: XDR Helper Library