xdr 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 338a81fa5cb0c2cc1f5db4449c4b7794a6e96083
-  data.tar.gz: dee4b7e4edc80cebe761a8ea2588936abb559d56
+  metadata.gz: bc2054a14c8b40897a81b9758fe8f7d48fa5be07
+  data.tar.gz: 3bddeb7f3628cb88feae1800467e060080b8b942
 SHA512:
-  metadata.gz: c9ffd4fcccdcb2cd41a4992cad1900add89645e54c164d4a5879374625e0c3e77701bc8cf94cfb8bef6e1d12a1ec155d7dce4708b4e8df074b0cc3554062ad50
-  data.tar.gz: c82033a24062fcbfd46ac04b9fc7dd0a650bcd5e734bcc42f04c1ac2f2af6c54270687b6f33bdc7ad86f50f038ce56ccc84f105b63cf1d198b600cbe260cdb4e
+  metadata.gz: b22b70f5094869e0f09d9819b63746eab3416416eb4a7c2128043888e587dc4e7a5e7a7452e9df925d302d9f771883ca72b76615c9588059c15d9fec793ff59d
+  data.tar.gz: 6d8bdbafec1e37e2a6a9ade6d139ebd94cf297277e9ff25b676560d6f1d85f70fd8e7e71123d01170e5fcc09a285253a9ce56c303b1fb4f2d84f08e52082c329

data/.gitignore

@@ -12,3 +12,4 @@
 *.o
 *.a
 mkmf.log
+.DS_Store

data/examples/union.rb

@@ -27,10 +27,3 @@ r.get # => nil
 
 r.set(:nonsense)
 r.get # => nil
-
-
-# TODO
-case r
-when ResultType::OK ; puts "i'm ok!"
-when ResultType::ERROR ; puts "broken!"
-end

data/lib/xdr/dsl/union.rb

@@ -10,7 +10,7 @@ module XDR::DSL::Union
   def switch(switch, arm=nil)
     raise ArgumentError, "`switch_on` not defined yet" if self.switch_type.nil?
 
-    switch = normalize_switch(switch)
+    switch = normalize_switch_declaration(switch)
     self.switches = self.switches.merge(switch => arm)
   end
 
@@ -22,11 +22,18 @@ module XDR::DSL::Union
   end
 
   private
-  def normalize_switch(switch)
-    case switch
-    when self.switch_type ; switch
-    when :default ;         switch
-    else ;                  self.switch_type.from_name(switch)
+  def normalize_switch_declaration(switch)
+    case
+    when switch.is_a?(self.switch_type)
+      switch
+    when self.switch_type.valid?(switch)
+      switch
+    when switch == :default
+      switch
+    when self.switch_type.respond_to?(:from_name)
+      self.switch_type.from_name(switch)
+    else
+      raise ArgumentError, "Cannot normalize switch: #{switch.inspect} to type: #{self.switch_type}"
     end
   end
-end
+end

data/lib/xdr/union.rb

@@ -21,7 +21,11 @@ class XDR::Union
   attribute_method_suffix '!'
 
   def self.arm_for_switch(switch)
-    raise XDR::InvalidSwitchError unless switch.is_a?(switch_type)
+    begin
+      switch = normalize_switch switch
+    rescue ArgumentError => e
+      raise XDR::InvalidSwitchError, e.message
+    end
 
     result = switches.fetch(switch, :switch_not_found)
     result = switches.fetch(:default, :switch_not_found) if result == :switch_not_found
@@ -33,6 +37,19 @@ class XDR::Union
     result
   end
 
+  def self.normalize_switch(switch)
+    case
+    when switch.is_a?(self.switch_type)
+      switch
+    when self.switch_type.valid?(switch)
+      switch
+    when self.switch_type.respond_to?(:from_name)
+      self.switch_type.from_name(switch)
+    else
+      raise ArgumentError, "Cannot normalize switch: #{switch.inspect} to type: #{self.switch_type}"
+    end
+  end
+
   def self.read(io)
     switch   = switch_type.read(io)
     arm      = arm_for_switch(switch)
@@ -51,11 +68,11 @@ class XDR::Union
     val.is_a?(self)
   end
 
-  def initialize(switch=nil, value=:void)
+  def initialize(switch=:__unset__, value=:void)
     @switch   = nil
     @arm      = nil
     @value    = nil
-    set(switch, value) if switch
+    set(switch, value) unless switch == :__unset__
   end
 
   def to_xdr
@@ -63,7 +80,7 @@ class XDR::Union
   end
 
   def set(switch, value=:void)
-    @switch = switch.is_a?(switch_type) ? switch : switch_type.from_name(switch)
+    @switch = self.class.normalize_switch switch
     @arm    = self.class.arm_for_switch @switch
 
     raise XDR::InvalidValueError unless valid_for_arm_type(value, @arm)

data/lib/xdr/version.rb

@@ -1,3 +1,3 @@
 module XDR
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/lib/xdr/dsl/union_spec.rb

@@ -19,4 +19,51 @@ describe XDR::DSL::Union, "#switch" do
     member :error, 1
     seal
   end
-end
+end
+
+describe XDR::DSL::Union, "#switch_on" do
+  klass = nil
+
+  it "allows int types" do
+    expect do
+      klass = Class.new(XDR::Union) do
+        switch_on XDR::Int, :type
+        switch 0
+        switch 1
+      end
+    end.to_not raise_error
+
+    expect{ klass.new(0) }.to_not raise_error
+    expect{ klass.new(1) }.to_not raise_error
+    expect{ klass.new(2) }.to raise_error(XDR::InvalidSwitchError)
+  end
+
+  it "allows unsigned int types" do
+    expect do
+      klass = Class.new(XDR::Union) do
+        switch_on XDR::UnsignedInt, :type
+        switch 0
+        switch 1
+      end
+    end.to_not raise_error
+
+    expect{ klass.new(0) }.to_not raise_error
+    expect{ klass.new(1) }.to_not raise_error
+    expect{ klass.new(2) }.to raise_error(XDR::InvalidSwitchError)
+    expect{ klass.new(-1) }.to raise_error(XDR::InvalidSwitchError)
+  end
+
+  it "allows bool types", :focus do
+    klass = nil
+
+    expect do
+      klass = Class.new(XDR::Union) do
+        switch_on XDR::Bool, :type
+        switch true
+      end
+    end.to_not raise_error
+
+    expect{ klass.new(true) }.to_not raise_error
+    expect{ klass.new(false) }.to raise_error(XDR::InvalidSwitchError)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xdr
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Scott Fleckenstein
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-11 00:00:00.000000000 Z
+date: 2015-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport