nfc 2.1.0 → 3.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: dc2c9944d61cd728376a5378a2a0cfb715915016
+  data.tar.gz: ba8a58d9b55211a2898d03a3b37445b5000a9bae
+SHA512:
+  metadata.gz: b69c386aac1fde6be05e7f9cfe59d3e6ad4b06a8b73e49ef5391e99d755735fd5aa811b53917a00ceb3be2d2e5c7eb1362acdc7e1b49db468a6b656c5abbd5d3
+  data.tar.gz: 48841e7078653b6abc9e8604bf96ae821cdd0fe3432ffeb07e6d13cecfcd3486464afbd3d72294b101a9aa473099933a626d284fa1a842932d0f7ba0caacdb62

data/Manifest.txt

@@ -4,17 +4,16 @@ Manifest.txt
 README.rdoc
 Rakefile
 bin/nfc
+ext/nfc/context.c
 ext/nfc/extconf.rb
 ext/nfc/nfc.c
 ext/nfc/nfc.h
 ext/nfc/nfc_device.c
-ext/nfc/nfc_device.h
 ext/nfc/nfc_felica.c
-ext/nfc/nfc_felica.h
 ext/nfc/nfc_iso14443a.c
-ext/nfc/nfc_iso14443a.h
 lib/nfc.rb
 lib/nfc/device.rb
 lib/nfc/felica.rb
 lib/nfc/iso14443a.rb
-test/test_nfc.rb
+test/test_context.rb
+test/test_device.rb

data/README.rdoc

@@ -16,24 +16,20 @@ lets you read RFID tags.
 
   require 'nfc'
 
-  # Read your tag and print the info.
-  p NFC.instance.find
+  # Create a new context
+  ctx = NFC::Context.new
 
-  # NFC#find will return immidiately, which means you should have a tag
-  # sitting on the reader when running it.  If you'd like it to block until
-  # it detects a tag, give find a block like so:
+  # Open the first available USB device
+  dev = ctx.open nil
 
-  NFC.instance.find do |tag|
-    p tag
-  end
+  # Block until a tag is available, then print tag info
+  p dev.select
 
   # You can even run in an infinite loop if you'd like to continually find
   # tags:
 
   loop do
-    NFC.instance.find do |tag|
-      p tag
-    end
+    p dev.select
   end
 
 == REQUIREMENTS:
@@ -44,21 +40,21 @@ lets you read RFID tags.
 == INSTALL:
 
 First install libnfc[http://libnfc.org/].
-I installed libnfc via MacPorts[http://www.macports.org/] like this:
+I installed libnfc via homebrew:
 
-  $ sudo port install libnfc
+  $ brew install libnfc
 
 The install the gem:
 
   $ sudo gem install nfc
 
-NOTE!!!!  The nfc gem requires libnfc version 1.5.0 or greater!
+NOTE!!!!  The nfc gem requires libnfc version 1.7.0 or greater!
 
 == LICENSE:
 
 (The MIT License)
 
-Copyright (c) 2009-2011 Aaron Patterson
+Copyright (c) 2009-2013 Aaron Patterson
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -7,6 +7,7 @@ require "rake/extensiontask"
 
 Hoe.plugin :debugging
 Hoe.plugin :git
+Hoe.plugin :minitest
 
 HOE = Hoe.spec('nfc') do
   developer('Aaron Patterson', 'aaron@tenderlovemaking.com')
@@ -20,4 +21,9 @@ RET = Rake::ExtensionTask.new("nfc", HOE.spec) do |ext|
   ext.lib_dir = File.join('lib', 'nfc')
 end
 
+task :kill do
+  pid = `sudo launchctl list | grep pcscd`[/^\d+/]
+  `sudo kill #{pid}` if pid
+end
+
 # vim: syntax=Ruby

data/ext/nfc/context.c

@@ -0,0 +1,61 @@
+#include <nfc.h>
+
+static VALUE allocate(VALUE klass) {
+  nfc_context * context;
+  nfc_init(&context);
+  return Data_Wrap_Struct(klass, NULL, nfc_exit, context);
+}
+
+static VALUE open_dev(VALUE self, VALUE name)
+{
+  nfc_context * ctx;
+  nfc_device * dev;
+  VALUE device;
+
+  Data_Get_Struct(self, nfc_context, ctx);
+
+  if (NIL_P(name)) {
+    dev = nfc_open(ctx, NULL);
+  } else {
+    dev = nfc_open(ctx, StringValuePtr(name));
+  }
+
+  if (NULL == dev)
+    rb_raise(rb_eRuntimeError, "Unable to open the device");
+
+  if(nfc_initiator_init(dev) < 0)
+    rb_raise(rb_eRuntimeError, "Could not initialize device");
+
+  device = Data_Wrap_Struct(cNfcDevice, 0, nfc_close, dev);
+  rb_iv_set(device, "@context", self);
+  return device;
+}
+
+static VALUE devices(VALUE self, VALUE len)
+{
+  nfc_context *ctx;
+  nfc_connstring * strs;
+  size_t found, i;
+  VALUE devs;
+
+  Data_Get_Struct(self, nfc_context, ctx);
+
+  strs = malloc(sizeof(nfc_connstring) * len);
+
+  found = nfc_list_devices(ctx, strs, 10);
+  devs = rb_ary_new2(found);
+  for (i = 0; i < found; i++) {
+    rb_ary_push(devs, rb_str_new2(strs[i]));
+  }
+  free(strs);
+  return devs;
+}
+
+void init_context()
+{
+  VALUE cContext = rb_define_class_under(mNfc, "Context", rb_cObject);
+  rb_define_alloc_func(cContext, allocate);
+
+  rb_define_method(cContext, "devices", devices, 1);
+  rb_define_method(cContext, "open", open_dev, 1);
+}

data/ext/nfc/extconf.rb

@@ -1,21 +1,15 @@
-ENV['RC_ARCHS'] = '' if RUBY_PLATFORM =~ /darwin/
-
 # :stopdoc:
 
 require 'mkmf'
 
-LIBDIR      = Config::CONFIG['libdir']
-INCLUDEDIR  = Config::CONFIG['includedir']
-HEADER_DIRS = [ '/usr/local/include', INCLUDEDIR, '/usr/include', ]
-LIB_DIRS    = [ '/usr/local/lib', LIBDIR, '/usr/lib', ]
-
-nfc_dirs = dir_config('nfc', HEADER_DIRS, LIB_DIRS)
+dir_config 'libnfc'
+pkg_config 'libnfc'
 
 unless find_header('nfc/nfc.h')
   abort "libnfc is missing.  please install libnfc: http://libnfc.org/"
 end
 
-unless find_library('nfc', 'nfc_connect')
+unless find_library('nfc', 'nfc_init')
   abort "libnfc is missing.  please install libnfc: http://libnfc.org/"
 end
 

data/ext/nfc/nfc.c

@@ -1,12 +1,15 @@
 #include <nfc.h>
 
-VALUE cNfc;
+VALUE mNfc;
 
 void Init_nfc()
 {
-  cNfc = rb_define_class("NFC", rb_cObject);
+  mNfc = rb_define_module("NFC");
 
+  init_context();
   init_device();
   init_iso14443a();
+  /*
   init_felica();
+  */
 }

data/ext/nfc/nfc.h

@@ -4,10 +4,14 @@
 #include <ruby.h>
 #include <nfc/nfc.h>
 
-extern VALUE cNfc;
+extern VALUE mNfc;
+extern VALUE cNfcISO14443A;
+extern VALUE cNfcFelica;
+extern VALUE cNfcDevice;
 
-#include <nfc_device.h>
-#include <nfc_iso14443a.h>
-#include <nfc_felica.h>
+void init_context();
+void init_device();
+void init_iso14443a();
+void init_felica();
 
 #endif

data/ext/nfc/nfc_device.c

@@ -1,91 +1,75 @@
-#include <nfc_device.h>
+#include <nfc.h>
 
-static byte_t abtFelica[5] = { 0x00, 0xff, 0xff, 0x00, 0x00 };
+VALUE cNfcDevice;
 
 /*
  * call-seq:
- *  connect
+ *  select_passive_target(tag)
  *
- * Connect to the NFC device
+ * Select the +tag+ type from the device
  */
-static VALUE connect(VALUE klass)
+static VALUE select_passive_target(VALUE self, VALUE tag)
 {
-  nfc_device_t * dev = nfc_connect(NULL);
-  if(!dev)
-    rb_raise(rb_eRuntimeError, "could not find NFC device");
+  nfc_device * dev;
+  nfc_modulation * mod;
+  nfc_target * ti;
 
-  if(!nfc_initiator_init(dev))
-    rb_raise(rb_eRuntimeError, "oh snap, could not init");
+  Data_Get_Struct(self, nfc_device, dev);
+  Data_Get_Struct(tag, nfc_modulation, mod);
 
-  return Data_Wrap_Struct(klass, 0, 0, dev);
-}
+  ti = (nfc_target *)xmalloc(sizeof(nfc_target));
 
-/*
- * call-seq:
- *  disconnect
- *
- * Disconnect from the NFC device
- */
-static VALUE disconnect(VALUE self)
-{
-  nfc_device_t * dev;
-  Data_Get_Struct(self, nfc_device_t, dev);
-  nfc_disconnect(dev);
+  if (nfc_initiator_select_passive_target(dev, *mod, NULL, 0, ti) ) {
+    switch(mod->nmt) {
+      case NMT_ISO14443A:
+        return Data_Wrap_Struct(cNfcISO14443A, 0, xfree, ti);
+        break;
+      case NMT_FELICA:
+        /* return Data_Wrap_Struct(cNfcFelica, 0, free, ti); */
+        return Qnil;
+        break;
+      default:
+        rb_raise(rb_eRuntimeError, "untested type: %d", mod->nmt);
+    }
+  }
 
-  return self;
+  return Qfalse;
 }
 
 /*
  * call-seq:
- *  configure(option, value)
+ *  poll_target(tag, ms)
  *
- * Configure the Device with +option+ and +value+
+ * Poll the +tag+ type from the device
  */
-static VALUE configure(VALUE self, VALUE option, VALUE flag)
+static VALUE poll_target(VALUE self, VALUE tag, VALUE ms)
 {
-  nfc_device_t * dev;
-  Data_Get_Struct(self, nfc_device_t, dev);
-
-  nfc_configure(
-    dev,
-    (const nfc_device_option_t)NUM2INT(option),
-    (const bool)NUM2INT(flag)
-  );
+  nfc_device * dev;
+  nfc_modulation * mod;
+  nfc_target * ti;
+  int code;
 
-  return self;
-}
-
-/*
- * call-seq:
- *  select(tag)
- *
- * Select the +tag+ type from the device
- */
-static VALUE dev_select(VALUE self, VALUE tag)
-{
-  nfc_device_t * dev;
-  nfc_modulation_t * mod;
-  nfc_target_t * ti;
+  Data_Get_Struct(self, nfc_device, dev);
+  Data_Get_Struct(tag, nfc_modulation, mod);
 
-  Data_Get_Struct(self, nfc_device_t, dev);
-  Data_Get_Struct(tag, nfc_modulation_t, mod);
+  ti = (nfc_target *)xmalloc(sizeof(nfc_target));
 
-  ti = (nfc_target_t *)calloc(1, sizeof(nfc_target_t));
+  code = nfc_initiator_poll_target(dev, mod, 1, 0, 1, ti);
 
-  if (nfc_initiator_select_passive_target(dev, *mod, NULL, 0, ti) ) {
+  if (code > 0) {
     switch(mod->nmt) {
       case NMT_ISO14443A:
-        return Data_Wrap_Struct(cNfcISO14443A, 0, free, ti);
+        return Data_Wrap_Struct(cNfcISO14443A, 0, xfree, ti);
         break;
       case NMT_FELICA:
-        return Data_Wrap_Struct(cNfcFelica, 0, free, ti);
+        return Data_Wrap_Struct(cNfcFelica, 0, xfree, ti);
         break;
       default:
         rb_raise(rb_eRuntimeError, "untested type: %d", mod->nmt);
     }
   }
 
-  return Qfalse;
+  return INT2NUM(code);
 }
 
 /*
@@ -96,10 +80,10 @@ static VALUE dev_select(VALUE self, VALUE tag)
  */
 static VALUE name(VALUE self)
 {
-  nfc_device_t * dev;
-  Data_Get_Struct(self, nfc_device_t, dev);
+  nfc_device * dev;
+  Data_Get_Struct(self, nfc_device, dev);
 
-  return rb_str_new2(dev->acName);
+  return rb_str_new2(nfc_device_get_name(dev));
 }
 
 /*
@@ -110,8 +94,8 @@ static VALUE name(VALUE self)
  */
 static VALUE dev_deselect(VALUE self)
 {
-  nfc_device_t * dev;
-  Data_Get_Struct(self, nfc_device_t, dev);
+  nfc_device * dev;
+  Data_Get_Struct(self, nfc_device, dev);
 
   nfc_initiator_deselect_target(dev);
 
@@ -120,9 +104,9 @@ static VALUE dev_deselect(VALUE self)
 
 static VALUE mod_initialize(VALUE self, VALUE type, VALUE baud)
 {
-  nfc_modulation_t * mod;
+  nfc_modulation * mod;
 
-  Data_Get_Struct(self, nfc_modulation_t, mod);
+  Data_Get_Struct(self, nfc_modulation, mod);
   mod->nmt = NUM2INT(type);
   mod->nbr = NUM2INT(baud);
 
@@ -131,42 +115,54 @@ static VALUE mod_initialize(VALUE self, VALUE type, VALUE baud)
 
 static VALUE mod_alloc(VALUE klass)
 {
-  nfc_modulation_t * modulation;
+  nfc_modulation * modulation;
 
-  modulation = xcalloc(1, sizeof(nfc_modulation_t));
+  modulation = xcalloc(1, sizeof(nfc_modulation));
 
   return Data_Wrap_Struct(klass, NULL, xfree, modulation);
 }
 
 static VALUE mod_nmt(VALUE self)
 {
-  nfc_modulation_t * mod;
+  nfc_modulation * mod;
 
-  Data_Get_Struct(self, nfc_modulation_t, mod);
+  Data_Get_Struct(self, nfc_modulation, mod);
 
   return INT2NUM(mod->nmt);
 }
 
 static VALUE mod_nbr(VALUE self)
 {
-  nfc_modulation_t * mod;
+  nfc_modulation * mod;
 
-  Data_Get_Struct(self, nfc_modulation_t, mod);
+  Data_Get_Struct(self, nfc_modulation, mod);
 
   return INT2NUM(mod->nbr);
 }
 
+static VALUE initiator_init(VALUE self)
+{
+  nfc_device * dev;
+  int err;
+
+  Data_Get_Struct(self, nfc_device, dev);
+
+  err = nfc_initiator_init(dev);
+  if (0 == err)
+    return Qtrue;
+
+  return INT2NUM(err);
+}
+
 void init_device()
 {
   VALUE cNfcModulation;
-  VALUE cNfcDevice = rb_define_class_under(cNfc, "Device", rb_cObject);
-
-  rb_define_singleton_method(cNfcDevice, "connect", connect, 0);
-  rb_define_method(cNfcDevice, "disconnect", disconnect, 0);
-  rb_define_method(cNfcDevice, "configure", configure, 2);
-  rb_define_method(cNfcDevice, "select", dev_select, 1);
-  rb_define_method(cNfcDevice, "deselect", dev_deselect, 0);
+  cNfcDevice = rb_define_class_under(mNfc, "Device", rb_cObject);
+  rb_define_method(cNfcDevice, "initiator_init", initiator_init, 0);
+  rb_define_method(cNfcDevice, "select_passive_target", select_passive_target, 1);
+  rb_define_method(cNfcDevice, "poll_target", poll_target, 1);
   rb_define_method(cNfcDevice, "name", name, 0);
+  rb_define_method(cNfcDevice, "deselect", dev_deselect, 0);
 
   cNfcModulation = rb_define_class_under(cNfcDevice, "Modulation", rb_cObject);
 

data/ext/nfc/nfc_felica.c

@@ -1,4 +1,4 @@
-#include <nfc_felica.h>
+#include <nfc.h>
 
 VALUE cNfcFelica;
 
@@ -12,47 +12,47 @@ VALUE cNfcFelica;
 
 static VALUE szLen(VALUE self)
 {
-  nfc_felica_info_t * tag;
-  Data_Get_Struct(self, nfc_felica_info_t, tag);
+  nfc_felica_info * tag;
+  Data_Get_Struct(self, nfc_felica_info, tag);
 
   return INT2NUM(tag->szLen);
 }
 
 static VALUE btResCode(VALUE self)
 {
-  nfc_felica_info_t * tag;
-  Data_Get_Struct(self, nfc_felica_info_t, tag);
+  nfc_felica_info * tag;
+  Data_Get_Struct(self, nfc_felica_info, tag);
 
   return INT2NUM(tag->btResCode);
 }
 
 static VALUE abtId(VALUE self)
 {
-  nfc_felica_info_t * tag;
-  Data_Get_Struct(self, nfc_felica_info_t, tag);
+  nfc_felica_info * tag;
+  Data_Get_Struct(self, nfc_felica_info, tag);
 
   return rb_str_new(tag->abtId, 8 );
 }
 
 static VALUE abtPad(VALUE self)
 {
-  nfc_felica_info_t * tag;
-  Data_Get_Struct(self, nfc_felica_info_t, tag);
+  nfc_felica_info * tag;
+  Data_Get_Struct(self, nfc_felica_info, tag);
 
   return rb_str_new(tag->abtPad, 8 );
 }
 
 static VALUE abtSysCode(VALUE self)
 {
-  nfc_felica_info_t * tag;
-  Data_Get_Struct(self, nfc_felica_info_t, tag);
+  nfc_felica_info * tag;
+  Data_Get_Struct(self, nfc_felica_info, tag);
 
   return rb_str_new(tag->abtSysCode, 2 );
 }
 
 void init_felica()
 {
-  cNfcFelica = rb_define_class_under(cNfc, "Felica", rb_cObject);
+  cNfcFelica = rb_define_class_under(mNfc, "Felica", rb_cObject);
 
   rb_define_method(cNfcFelica, "szLen", szLen, 0);
   rb_define_method(cNfcFelica, "btResCode", btResCode, 0);

data/ext/nfc/nfc_iso14443a.c

@@ -1,4 +1,4 @@
-#include <nfc_iso14443a.h>
+#include <nfc.h>
 
 VALUE cNfcISO14443A;
 
@@ -10,10 +10,10 @@ VALUE cNfcISO14443A;
  */
 static VALUE szUidLen(VALUE self)
 {
-  nfc_iso14443a_info_t * tag;
-  Data_Get_Struct(self, nfc_iso14443a_info_t, tag);
+  nfc_target * tag;
+  Data_Get_Struct(self, nfc_target, tag);
 
-  return INT2NUM(tag->szUidLen);
+  return INT2NUM(tag->nti.nai.szUidLen);
 }
 
 /*
@@ -24,10 +24,10 @@ static VALUE szUidLen(VALUE self)
  */
 static VALUE szAtsLen(VALUE self)
 {
-  nfc_iso14443a_info_t * tag;
-  Data_Get_Struct(self, nfc_iso14443a_info_t, tag);
+  nfc_target * tag;
+  Data_Get_Struct(self, nfc_target, tag);
 
-  return INT2NUM(tag->szAtsLen);
+  return INT2NUM(tag->nti.nai.szAtsLen);
 }
 
 /*
@@ -38,10 +38,10 @@ static VALUE szAtsLen(VALUE self)
  */
 static VALUE abtUid(VALUE self)
 {
-  nfc_iso14443a_info_t * tag;
-  Data_Get_Struct(self, nfc_iso14443a_info_t, tag);
+  nfc_target * tag;
+  Data_Get_Struct(self, nfc_target, tag);
 
-  return rb_str_new(tag->abtUid, tag->szUidLen);
+  return rb_str_new((const char *)tag->nti.nai.abtUid, tag->nti.nai.szUidLen);
 }
 
 /*
@@ -52,10 +52,10 @@ static VALUE abtUid(VALUE self)
  */
 static VALUE abtAts(VALUE self)
 {
-  nfc_iso14443a_info_t * tag;
-  Data_Get_Struct(self, nfc_iso14443a_info_t, tag);
+  nfc_target * tag;
+  Data_Get_Struct(self, nfc_target, tag);
 
-  return rb_str_new(tag->abtAts, tag->szAtsLen);
+  return rb_str_new((const char *)tag->nti.nai.abtAts, tag->nti.nai.szAtsLen);
 }
 
 /*
@@ -66,10 +66,10 @@ static VALUE abtAts(VALUE self)
  */
 static VALUE abtAtqa(VALUE self)
 {
-  nfc_iso14443a_info_t * tag;
-  Data_Get_Struct(self, nfc_iso14443a_info_t, tag);
+  nfc_target * tag;
+  Data_Get_Struct(self, nfc_target, tag);
 
-  return rb_str_new(tag->abtAtqa, 2);
+  return rb_str_new((const char *)tag->nti.nai.abtAtqa, 2);
 }
 
 /*
@@ -80,15 +80,15 @@ static VALUE abtAtqa(VALUE self)
  */
 static VALUE btSak(VALUE self)
 {
-  nfc_iso14443a_info_t * tag;
-  Data_Get_Struct(self, nfc_iso14443a_info_t, tag);
+  nfc_target * tag;
+  Data_Get_Struct(self, nfc_target, tag);
 
-  return INT2NUM(tag->btSak);
+  return INT2NUM(tag->nti.nai.btSak);
 }
 
 void init_iso14443a()
 {
-  cNfcISO14443A = rb_define_class_under(cNfc, "ISO14443A", rb_cObject);
+  cNfcISO14443A = rb_define_class_under(mNfc, "ISO14443A", rb_cObject);
 
   rb_define_method(cNfcISO14443A, "szUidLen", szUidLen, 0);
   rb_define_method(cNfcISO14443A, "szAtsLen", szAtsLen, 0);

data/lib/nfc.rb

@@ -1,4 +1,3 @@
-require 'singleton'
 require 'thread'
 require 'nfc/nfc'
 require 'nfc/device'
@@ -7,101 +6,7 @@ require 'nfc/felica'
 
 ###
 # NFC is a class for dealing with Near Field Communication systems.  This
-# library will read RFID tags from an RFID reader.  You should start by reading
-# NFC#find
-class NFC
-  VERSION = '2.1.0'
-
-  include Singleton
-
-  ###
-  # Create a new NFC class.  This is private, do this instead:
-  #   NFC.instance
-  def initialize
-    @device = nil
-    @mutex = Mutex.new
-  end
-
-  ###
-  # Deactivate the detection field
-  def deactivate_field
-    device.configure Device::DCO_ACTIVATE_FIELD, 0
-  end
-
-  ###
-  # Activate the detection field
-  def activate_field
-    device.configure Device::DCO_ACTIVATE_FIELD, 1
-  end
-
-  ###
-  # Do CRC checks
-  def crc= value
-    device.configure Device::DCO_HANDLE_CRC, value ? 1 : 0
-  end
-
-  ###
-  # Parity checks
-  def parity= v
-    device.configure Device::DCO_HANDLE_PARITY, v ? 1 : 0
-  end
-
-  ###
-  # Get the device
-  def device
-    @device ||= NFC::Device.connect
-  end
-
-  ###
-  # Block until a passive tag is detected
-  def infinite_list_passive= v
-    device.configure Device::DCO_INFINITE_LIST_PASSIVE, v ? 1 : 0
-  end
-
-  ###
-  # Select a tag
-  def select
-    device.select Device::IM_ISO14443A_106
-  end
-  alias :detect :select
-
-  ###
-  # Deselect a tag
-  def deselect
-    device.deselect
-  end
-
-  # Read your tag and print the info.
-  #
-  #   p NFC.instance.find
-  #
-  # NFC#find will return immidiately, which means you should have a tag
-  # sitting on the reader when running it.  If you'd like it to block until
-  # it detects a tag, give find a block like so:
-  #
-  #   NFC.instance.find do |tag|
-  #     p tag
-  #   end
-  #
-  # You can even run in an infinite loop if you'd like to continually find
-  # tags:
-  #
-  #   loop do
-  #     NFC.instance.find do |tag|
-  #       p tag
-  #     end
-  #   end
-  def find
-    @mutex.lock
-    deactivate_field
-    self.infinite_list_passive = block_given?
-    self.crc = true
-    self.parity = true
-    activate_field
-    tag = detect
-    deselect
-    @mutex.unlock
-    yield tag if block_given?
-    tag
-  end
+# library will read RFID tags from an RFID reader.
+module NFC
+  VERSION = '3.0.0'
 end

data/lib/nfc/device.rb

@@ -1,4 +1,4 @@
-class NFC
+module NFC
   class Device
     DCO_HANDLE_CRC            = 0x00
     DCO_HANDLE_PARITY         = 0x01
@@ -7,5 +7,10 @@ class NFC
 
     IM_ISO14443A_106 = Modulation.new Modulation::NMT_ISO14443A,
                                       Modulation::NBR_106
+
+    # Find a tag, blocks until there is a tag available
+    def select
+      select_passive_target NFC::Device::IM_ISO14443A_106
+    end
   end
 end

data/lib/nfc/felica.rb

@@ -1,4 +1,4 @@
-class NFC
+module NFC
   class Felica
 
     def uid

data/lib/nfc/iso14443a.rb

@@ -1,4 +1,4 @@
-class NFC
+module NFC
   class ISO14443A
     ###
     # Get the unique ID for this tag

data/test/test_context.rb

@@ -0,0 +1,22 @@
+require "minitest/autorun"
+require "nfc"
+
+module NFC
+  class TestContext < Minitest::Test
+    def test_init
+      assert NFC::Context.new
+    end
+
+    def test_list_devices
+      ctx = NFC::Context.new
+      assert ctx.devices(1)
+    end
+
+    def test_open
+      ctx = NFC::Context.new
+      devs = ctx.devices(1)
+      skip "no devs attached" unless devs.length > 0
+      dev = ctx.open nil
+    end
+  end
+end

data/test/test_device.rb

@@ -0,0 +1,15 @@
+require "minitest/autorun"
+require "nfc"
+
+module NFC
+  class TestDevice < Minitest::Test
+    def test_initiator_init
+      ctx = NFC::Context.new
+      devs = ctx.devices(1)
+      skip "no devs attached" unless devs.length > 0
+      dev = ctx.open nil
+      dev.initiator_init
+      dev.select_passive_target Device::IM_ISO14443A_106
+    end
+  end
+end

metadata

@@ -1,33 +1,61 @@
 --- !ruby/object:Gem::Specification
 name: nfc
 version: !ruby/object:Gem::Version
-  version: 2.1.0
-  prerelease: 
+  version: 3.0.0
 platform: ruby
 authors:
 - Aaron Patterson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-05-28 00:00:00.000000000 Z
+date: 2013-08-19 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &2153398480 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.9.4
+        version: '3.6'
   type: :development
   prerelease: false
-  version_requirements: *2153398480
-description: ! 'NFC is a ruby wrapper for the Near Field Communication library.  The
-  Near
-
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.6'
+description: |-
+  NFC is a ruby wrapper for the Near Field Communication library.  The Near
   Field Communication library works with many USB RFID readers, so this gem
-
-  lets you read RFID tags.'
+  lets you read RFID tags.
 email:
 - aaron@tenderlovemaking.com
 executables:
@@ -35,8 +63,8 @@ executables:
 extensions:
 - ext/nfc/extconf.rb
 extra_rdoc_files:
-- Manifest.txt
 - CHANGELOG.rdoc
+- Manifest.txt
 - README.rdoc
 files:
 - .autotest
@@ -45,23 +73,23 @@ files:
 - README.rdoc
 - Rakefile
 - bin/nfc
+- ext/nfc/context.c
 - ext/nfc/extconf.rb
 - ext/nfc/nfc.c
 - ext/nfc/nfc.h
 - ext/nfc/nfc_device.c
-- ext/nfc/nfc_device.h
 - ext/nfc/nfc_felica.c
-- ext/nfc/nfc_felica.h
 - ext/nfc/nfc_iso14443a.c
-- ext/nfc/nfc_iso14443a.h
 - lib/nfc.rb
 - lib/nfc/device.rb
 - lib/nfc/felica.rb
 - lib/nfc/iso14443a.rb
-- test/test_nfc.rb
+- test/test_context.rb
+- test/test_device.rb
 - .gemtest
 homepage: http://seattlerb.rubyforge.org
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --main
@@ -69,22 +97,21 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: nfc
-rubygems_version: 1.8.2
+rubygems_version: 2.0.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: NFC is a ruby wrapper for the Near Field Communication library
 test_files:
-- test/test_nfc.rb
+- test/test_context.rb
+- test/test_device.rb

data/ext/nfc/nfc_device.h

@@ -1,8 +0,0 @@
-#ifndef NFC_DEVICE_H
-#define NFC_DEVICE_H
-
-#include <nfc.h>
-
-void init_device();
-
-#endif

data/ext/nfc/nfc_felica.h

@@ -1,10 +0,0 @@
-#ifndef NFC_Felica
-#define NFC_Felica
-
-#include <nfc.h>
-
-extern VALUE cNfcFelica;
-
-void init_felica();
-
-#endif

data/ext/nfc/nfc_iso14443a.h

@@ -1,10 +0,0 @@
-#ifndef NFC_ISO14443A
-#define NFC_ISO14443A
-
-#include <nfc.h>
-
-extern VALUE cNfcISO14443A;
-
-void init_iso14443a();
-
-#endif

data/test/test_nfc.rb

@@ -1,35 +0,0 @@
-require "test/unit"
-require "nfc"
-
-class TestNFC < Test::Unit::TestCase
-  def setup
-    @nfc = NFC.instance
-  end
-
-  def test_connect
-    assert_not_nil @nfc.device
-  end
-
-  def test_deactivate_field
-    @nfc.deactivate_field
-  end
-
-  def test_activate_field
-    @nfc.activate_field
-  end
-
-  def test_crc=
-    @nfc.crc = true
-    @nfc.crc = false
-  end
-
-  def test_parity=
-    @nfc.parity = true
-    @nfc.parity = false
-  end
-
-  def test_infinite_list_passive=
-    @nfc.infinite_list_passive = true
-    @nfc.infinite_list_passive = false
-  end
-end