xdr 2.0.0 → 3.0.3

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_bytes(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,50 +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
 
-  def to_xdr
-    self.class.to_xdr self
+  #
+  # Serializes struct to xdr, return a string of bytes
+  #
+  # @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)
+    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)
 
@@ -94,37 +98,41 @@ class XDR::Union
     @value unless @value == :void
   end
 
-  alias get value
+  alias_method :get, :value
 
-  def attribute!(attr)
-    if @arm.to_s != attr
-      raise XDR::ArmNotSetError, "#{attr} is not the set arm"
-    end
+  def attribute(attr)
+    return nil unless @arm.to_s == attr
 
     get
   end
 
+  def attribute!(attr)
+    raise XDR::ArmNotSetError, "#{attr} is not the set arm" unless @arm.to_s == attr
+
+    get
+  end
 
   #
   # 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_bytes(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 = "2.0.0"
+  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: 2.0.0
+  version: 3.0.3
 platform: ruby
 authors:
 - Scott Fleckenstein
-autorequire: 
-bindir: bin
+autorequire:
+bindir: exe
 cert_chain: []
-date: 2017-02-02 00:00:00.000000000 Z
+date: 2022-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,117 +16,53 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.7
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+        version: '4.2'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 4.2.7
-- !ruby/object:Gem::Dependency
-  name: activemodel
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.2.7
+        version: '8.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.7
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+        version: '4.2'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '8.0'
 - !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.1'
-- !ruby/object:Gem::Dependency
-  name: guard-rspec
+  name: activemodel
   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: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+        version: '4.2'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: '8.0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-description: 
+        version: '4.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8.0'
+description:
 email:
 - scott@stellar.org
 executables: []
 extensions: []
-extra_rdoc_files: []
+extra_rdoc_files:
+- README.md
+- LICENSE.txt
+- CHANGELOG.md
 files:
-- ".gitignore"
-- ".travis.yml"
-- ".yardopts"
 - CHANGELOG.md
-- Gemfile
-- Guardfile
 - LICENSE.txt
 - README.md
-- Rakefile
-- examples/enum.rb
-- examples/struct.rb
-- examples/union.rb
 - lib/xdr.rb
 - lib/xdr/array.rb
 - lib/xdr/bool.rb
@@ -163,38 +99,16 @@ files:
 - lib/xdr/var_opaque.rb
 - lib/xdr/version.rb
 - lib/xdr/void.rb
-- spec/lib/xdr/array_spec.rb
-- spec/lib/xdr/bool_spec.rb
-- spec/lib/xdr/concerns/converts_to_xdr_spec.rb
-- spec/lib/xdr/concerns/reads_bytes_spec.rb
-- spec/lib/xdr/double_spec.rb
-- spec/lib/xdr/dsl/enum_spec.rb
-- spec/lib/xdr/dsl/struct_spec.rb
-- spec/lib/xdr/dsl/union_spec.rb
-- spec/lib/xdr/enum_spec.rb
-- spec/lib/xdr/float_spec.rb
-- spec/lib/xdr/hyper_spec.rb
-- spec/lib/xdr/int_spec.rb
-- spec/lib/xdr/opaque_spec.rb
-- spec/lib/xdr/option_spec.rb
-- spec/lib/xdr/quadruple_spec.rb
-- spec/lib/xdr/rpc/record_reader_spec.rb
-- spec/lib/xdr/string_spec.rb
-- spec/lib/xdr/struct_spec.rb
-- spec/lib/xdr/union_spec.rb
-- spec/lib/xdr/unsigned_hyper_spec.rb
-- spec/lib/xdr/unsigned_int_spec.rb
-- spec/lib/xdr/var_array_spec.rb
-- spec/lib/xdr/var_opaque_spec.rb
-- spec/lib/xdr/void_spec.rb
-- spec/spec_helper.rb
-- spec/support/matchers/eq_bytes.rb
-- xdr.gemspec
-homepage: https://github.com/stellar/ruby-xdr
+homepage: https://github.com/astroband/ruby-xdr
 licenses:
-- Apache 2.0
-metadata: {}
-post_install_message: 
+- Apache-2.0
+metadata:
+  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:
 - lib
@@ -202,42 +116,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.0
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.2
-signing_key: 
+rubygems_version: 3.3.5
+signing_key:
 specification_version: 4
 summary: XDR Helper Library
-test_files:
-- spec/lib/xdr/array_spec.rb
-- spec/lib/xdr/bool_spec.rb
-- spec/lib/xdr/concerns/converts_to_xdr_spec.rb
-- spec/lib/xdr/concerns/reads_bytes_spec.rb
-- spec/lib/xdr/double_spec.rb
-- spec/lib/xdr/dsl/enum_spec.rb
-- spec/lib/xdr/dsl/struct_spec.rb
-- spec/lib/xdr/dsl/union_spec.rb
-- spec/lib/xdr/enum_spec.rb
-- spec/lib/xdr/float_spec.rb
-- spec/lib/xdr/hyper_spec.rb
-- spec/lib/xdr/int_spec.rb
-- spec/lib/xdr/opaque_spec.rb
-- spec/lib/xdr/option_spec.rb
-- spec/lib/xdr/quadruple_spec.rb
-- spec/lib/xdr/rpc/record_reader_spec.rb
-- spec/lib/xdr/string_spec.rb
-- spec/lib/xdr/struct_spec.rb
-- spec/lib/xdr/union_spec.rb
-- spec/lib/xdr/unsigned_hyper_spec.rb
-- spec/lib/xdr/unsigned_int_spec.rb
-- spec/lib/xdr/var_array_spec.rb
-- spec/lib/xdr/var_opaque_spec.rb
-- spec/lib/xdr/void_spec.rb
-- spec/spec_helper.rb
-- spec/support/matchers/eq_bytes.rb
+test_files: []

data/.gitignore

@@ -1,15 +0,0 @@
-/.bundle/
-/.yardoc
-/Gemfile.lock
-/_yardoc/
-/coverage/
-/doc/generated
-/pkg/
-/spec/reports/
-/tmp/
-*.bundle
-*.so
-*.o
-*.a
-mkmf.log
-.DS_Store

data/.travis.yml

@@ -1,9 +0,0 @@
-language: ruby
-rvm:
-- 2.2.6
-- 2.3.3
-- 2.4.0
-- jruby
-notifications:
-  slack:
-    secure: fXYggrDRoLB/4yvyW0kWwyrV5yWa/GC0btPyGu7Hx6ZOaXDC+ejiXSfx7nRyY+uZBs5UF12O4gkUXwBbnWDT5JtQRxzZd5s0cyeGQfAakALexI+FuR2jDcV1prCCaYI4IYoUt61MlfDmuCYVm8hGZ3qsgk/GPHHPnZ8a1FBd2ls=