grizzly_ber 1.0.1 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f53d7ab07529b15d9aa734970098be59d26c0f5f
-  data.tar.gz: 6c9400a6562e683cf4fecddd5ffc5e914efa85c3
+  metadata.gz: d3a8c80071b42ae32018e13afe33c1d0669891a8
+  data.tar.gz: bfb24420adc9aeef6f73a8d08a6b739c0791f833
 SHA512:
-  metadata.gz: 70872c91a78a71d23f812ddc3c8c6620d306373a4359216a00b88e2db59fd7efeff117b355c30a1530ef26cadad3d16cf54278b4f9cf3482b07e2d3a013db707
-  data.tar.gz: d0fb5e0ac7d558892ab2481958a6f4333aca695f2bde1d07138ef7f96773745e4a7c243586ad48f3e3c5bcc7718c64c02408489189a84ffef45f62f5fb30b419
+  metadata.gz: 6ce15399e53924e379619676b5ec11dcc2f76300cd510e8b016ed9d3fffcdf046c57eb86838767172cd3a57d83a89d1898446111226c5d1528ea0afabb0345a4
+  data.tar.gz: 3e4699be345997b37e1cc0924d4ce2755b437869e30a772482f59ae55129180d6b4efe40fd9c5c3aedd7c7149876ad34195e81286579095a971acc8519f1c6bb

data/lib/grizzly_ber.rb

@@ -12,6 +12,7 @@ class GrizzlyBerElement
 
   def tag=(tag)
     raise ArgumentError, "tag must be a valid hex string" unless tag.is_a? String and tag.size.even? and tag =~ /^[0-9A-F]*$/
+    raise ArgumentError, "tag #{tag} must be a valid BER tag" unless tag_is_valid? tag
     @tag = tag
   end
 
@@ -39,6 +40,20 @@ class GrizzlyBerElement
 
   private
 
+  def tag_is_valid?(tag_string)
+    tag_byte_array = [tag_string].pack("H*").unpack("C*")
+    return false if tag_byte_array.size < 1
+
+    first_byte = tag_byte_array.shift
+    return false if tag_byte_array.size > 0 and (first_byte & 0x1F) != 0x1F 
+
+    last_byte = tag_byte_array.pop || 0x00
+    return false if (last_byte & 0x80) != 0x00
+
+    tag_byte_array.each {|byte| return false if (byte & 0x80) != 0x80 }
+    true
+  end
+
   def byte_to_hex(byte)
     byte.to_s(16).rjust(2,'0').upcase
   end
@@ -145,12 +160,11 @@ class GrizzlyBer
   end
 
   def set_value_for_tag(tag, value)
-    tag.upcase!
-    first_tagged_element = @elements.find {|element| tag == element.tag}
-    first_tagged_element ||= @elements.find {|element| element.tag == GrizzlyTag.named(tag)[:tag]} if GrizzlyTag.named(tag)
+    real_tag = GrizzlyTag.named(tag) ? GrizzlyTag.named(tag)[:tag] : tag.upcase
+    first_tagged_element = @elements.find {|element| real_tag == element.tag}
     if first_tagged_element.nil?
       first_tagged_element = GrizzlyBerElement.new
-      first_tagged_element.tag = tag
+      first_tagged_element.tag = real_tag
       @elements << first_tagged_element
     end
     first_tagged_element.value = value

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grizzly_ber
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.3
 platform: ruby
 authors:
 - Ryan Balsdon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-11 00:00:00.000000000 Z
+date: 2015-01-26 00:00:00.000000000 Z
 dependencies: []
 description: CODEC for EMV TLV-BER encoded strings.
 email: ryan.balsdon@shopify.com
@@ -28,12 +28,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []