rfid-usb-gom-sensor 0.1.4 → 0.1.5

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/lib/rfid-usb-gom-sensor/node.rb

@@ -156,10 +156,19 @@ module RfidUsbGomSensor
       #  11 BCC  XOR[1..10]
       #  12 ETX  0x03
       #
-      def decode blk, hex_id = false
+      #   :legacy => true -> makes this compatible to the tag id readout code
+      #   in: rfid-readers/app/models/rfid_reader.rb
+      #
+      def decode blk, opts = { }
+        opts = ({:hex_id => false, :legacy => false }.merge opts)
         #validate 
         rec = (blk.unpack 'c2Qc*')
-        if hex_id
+
+        if opts[:legacy]
+          id = rec[2]
+          rec[2] = Integer("0x#{(([id].pack 'q').unpack 'H*').first}")
+        end
+        if opts[:hex_id]
           id = rec[2]
           rec[2] = "0x#{([id].pack 'Q').unpack 'H*'}"
         end

data/spec/rfid-usb-gom-sensor/node_spec.rb

@@ -7,12 +7,28 @@ describe RfidUsbGomSensor::Node do
     Node.should_not == nil
   end
 
-  it "should fail on a wronk checksum" do
+  it "should fail on a wrong checksum" do
     ref_rec = [2, 1, 12616128551217792992, 0, 77, 3]
     blk = ref_rec.pack "ccQccc"
     lambda { rec = (Node.decode blk) }.should raise_error
   end
 
+  it "should decode tag id into hex string" do
+    ref_rec = [2, 1, 12616128551217792992, 0, 49, 3]
+    blk = ref_rec.pack "ccQccc"
+    rec = (Node.decode blk, :hex_id => true)
+    ref_rec[2] = "0xe0070000137e15af"
+    rec.should == ref_rec
+  end
+
+  it "should decode a record with legacy mode" do 
+    ref_rec = [2, 1, 12616128551217792992, 0, 49, 3]
+    blk = ref_rec.pack "ccQccc"
+    rec = (Node.decode blk, :legacy => true)
+    ref_rec[2] = 16142871389659862447
+    rec.should == ref_rec
+  end
+
   it "should decode a record" do
     ref_rec = [2, 1, 12616128551217792992, 0, 49, 3]
     blk = ref_rec.pack "ccQccc"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rfid-usb-gom-sensor
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors: 
 - art+com/dirk luesebrink
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-11 00:00:00 +01:00
+date: 2010-01-12 00:00:00 +01:00
 default_executable: rfid-usb-gom-sensor
 dependencies: 
 - !ruby/object:Gem::Dependency