ruby-nfc 1.3 → 1.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDg5NmM4MjM1Zjg5NGQxMzI4OGZjYTUwYjVhNGYzMDQ4NzQ0NjU0Nw==
+    MGMyYWNlNjRjNWRlOTQ4YzQxMzg3MjUxZTMyNjljNjdiZWQxMDMxNQ==
   data.tar.gz: !binary |-
-    MGNkNTBkMmE5YThiY2M0YWI3NDZiODRkOTQ5YjU2Y2MxYjcxZjA3NQ==
+    NmFlNmYxNzNhNDQyZmY3NmI2N2NjMjRlZjA4NGViMjdhYmQ3ODA2OQ==
 SHA512:
   metadata.gz: !binary |-
-    OGQwOGQzYmJjOTAxYmVkYjcwYzk4NTBhNzZkMWZjYzE0YTUyMjAxYmM0MzBk
-    NjZmMDkwYzkyZWQ2NzUzNjQyZTQyM2M0ZWJlYmIxODUxYjM0Y2ZiNjMwZWYw
-    MWQwMmI0NzAyM2FiMDdhODVlMzk4YjE0ZTYzM2M3ZTczMTRjOTI=
+    ODRiMTJmZmEyYjQ1ZDg0NmMzNmI0YmQ0ZGZlMDMwOTM1NGI2ZDg3OWRmMDZm
+    OWUzYjYwZmFiNzk4ZTRiMmIwNTUyMzcwNWRiZWQyM2IzMTNmMzZhYjdkMTc5
+    ZjI0NDhiZTdkMmNjMWIwNjFkYzFiYjNjZDA5MjQ5MTU2ZjYzMTc=
   data.tar.gz: !binary |-
-    MThlODVkNjcyYjAxYzg2YTU1MGYwYTdlOTMyZmY3ZWEzYzhhODJlODM0NzQy
-    YjRlZTc0Mjg2ZmYyY2RlZWNkMzk5NWUyNWEyYzE4OTc4YjUxZDFkYjBhOGMz
-    ZDQ2MDc2MTA2YjBmZjdiODdlOWFmYmUxMTc1YzZlN2M2NWRiZjc=
+    ZGQxZDYxMTBiY2I1MGQxMjlkYmIzYmZiZGVlMDQ4YjJkMGQ3NzM4MzE4ZDlh
+    ZjdkMGM2MDgyMGMwY2VhODM5ZDU3NjIyYTExMTM1ZTRiZmYxZDFlNWY2YjBm
+    NTkwZGEzZjhkMTViN2VmYjM3NDJiN2M4NDM3YjY5MDI0NzJhODI=

data/lib/ruby-nfc/nfc.rb

@@ -19,6 +19,7 @@ module NFC
       LibNFC.nfc_init(ptr)
       @@context = ptr.read_pointer
     end
+    @@context
   end
 
   def self.logger

data/lib/ruby-nfc/reader.rb

@@ -7,66 +7,58 @@ module NFC
       @ptr = nil
     end
 
-    def connect
-      unless @ptr
-        @ptr = LibNFC.nfc_open(NFC.context, @name)
-        raise NFC::Error.new("Cant connect to #{@name}") if @ptr.null?
-
-        LibNFC.nfc_initiator_init(@ptr)
-
-        set_flag(:NP_ACTIVATE_FIELD, false)
-        set_flag(:NP_HANDLE_CRC, true)
-        set_flag(:NP_HANDLE_PARITY, true)
-        set_flag(:NP_AUTO_ISO14443_4, true)
-        set_flag(:NP_ACTIVATE_FIELD, true)
-
-        @modulation = LibNFC::Modulation.new
-			  @modulation[:nmt] = :NMT_ISO14443A 
-			  @modulation[:nbr] = :NBR_106
-      end
+    def set_flag(name, value)
+			LibNFC.nfc_device_set_property_bool(@ptr, name, value)
+    end
 
+    def connect
+      @ptr ||= LibNFC.nfc_open(NFC.context, @name)
+      raise NFC::Error.new('Cant connect to ' << @name) if @ptr.null?
       self
     end
 
     # Returns list of tags applied to reader
-    def discover(*tag_types)
-      connect
-
-      targets = FFI::MemoryPointer.new(:uchar, LibNFC::Target.size * 10)
-      res = LibNFC.nfc_initiator_list_passive_targets(@ptr, @modulation, 
-                                                      targets, 10)
-      0.upto(res - 1).inject([]) do |tags, i|
-				target = LibNFC::Target.new(targets + i * LibNFC::Target.size)
-
-        tag_types.select{|type| type.match?(target)}.inject(tags) do |r, type|
-          r << type.new(target, self)
-        end
+    def discover(*card_types)
+      # TODO: по правильному здесь надо делать низкоуровневый
+      card_types.inject([]) do |tags, card_type|
+        raise NFC::Error.new('Wrong card type') unless card_type.respond_to? :discover
+        tags += card_type.discover(connect)
       end
     end
 
-    def poll(*tag_types, &block)
+    def poll(*card_types, &block)
     	connect
 
+			LibNFC.nfc_initiator_init(@ptr) # we'll be initiator not a target
+
+      set_flag(:NP_ACTIVATE_FIELD, false)
+ 			set_flag(:NP_HANDLE_CRC, true)
+ 			set_flag(:NP_HANDLE_PARITY, true)
+     	set_flag(:NP_AUTO_ISO14443_4, true)
+ 			set_flag(:NP_ACTIVATE_FIELD, true)
+
+      modulation = LibNFC::Modulation.new
+			modulation[:nmt] = :NMT_ISO14443A 
+			modulation[:nbr] = :NBR_106
+
       targets = FFI::MemoryPointer.new(:uchar, LibNFC::Target.size * 10)
 
 			loop do
-   			res = LibNFC.nfc_initiator_list_passive_targets(@ptr, @modulation, 
+   			res = LibNFC.nfc_initiator_list_passive_targets(@ptr, modulation, 
    																											targets, 10)
 			
-				# iterate over all applied targets
+				# iterate over all applied targets and iterate
 				0.upto(res - 1) do |i|
 					target = LibNFC::Target.new(targets + i * LibNFC::Target.size)
 					# iterate over requested card types for each target
 					# notice that some targets can match several types i.e.
 					# contactless credit cards (PayPass/payWave) with mifare chip
 					# on board
-					tag_types.each do |tag_type|
-						if tag_type.match?(target)
-							tag = tag_type.new(target, self)
+					card_types.each do |card_type|
+						if card_type.match?(target)
+							tag = card_type.new(target, self)
 							tag.connect(&block)
-
-							# if this tag was marked as processed within the bloc - 
-							# continue with the next tag
+							# if this tag was marked as processed - continue with next tag
 							break if target.processed?
 						end
 					end
@@ -89,9 +81,5 @@ module NFC
         names.map {|name| Reader.new(name)}
       end 
     end
-
-    def set_flag(name, value)
-			LibNFC.nfc_device_set_property_bool(@ptr, name, value)
-    end
 	end
 end

data/lib/ruby-nfc/tags/isodep.rb

@@ -65,6 +65,16 @@ module IsoDep
     	select(aid).raise_errno!
     end
 
+		# Public: Select application with given AID (Application Identifier)
+		# 
+		# aid	-	Application Identifier of an applet located on a card
+		#
+		# Returns nothing.
+		# Raises APDU::Errno if application with such AID doesn't exists on a card
+    def select(aid)
+			send_apdu!("\x00\xA4\x04\x00#{aid.size.chr}#{aid}")
+    end
+
 		# Public: Send APDU command to tag
 		#
 		# apdu	-	APDU command to send. see ISO/IEC 7816-4 or wiki for details.

data/lib/ruby-nfc/tags/mifare/tag.rb

@@ -21,7 +21,7 @@ module Mifare
 	}
 
   # common freefare functions prototypes
-	attach_function :freefare_tag_new, [:pointer, LibNFC::ISO14443a.by_value], :pointer
+	attach_function :freefare_tag_new, [:pointer, LibNFC::Target.by_value], :pointer
 	attach_function :freefare_free_tag, [:pointer], :void
 
   # tag
@@ -37,7 +37,7 @@ module Mifare
 		def initialize(target, reader)
 			super(target, reader)
 
-			@pointer = Mifare.freefare_tag_new(reader.ptr, target[:nti][:nai])
+			@pointer = Mifare.freefare_tag_new(reader.ptr, target)
 
 			raise Mifare::Error, "Unknown mifare tag" if @pointer.null?
 		end

data/lib/ruby-nfc/tags/tag.rb

@@ -6,10 +6,10 @@ module NFC
 			@processed = false
 		end
 
-		def connect
+		def connect(&block)
 			if block_given?
 				begin
-					yield self
+					self.instance_eval(&block)
 				ensure
 					disconnect
 				end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: ruby-nfc
 version: !ruby/object:Gem::Version
-  version: '1.3'
+  version: '1.4'
 platform: ruby
 authors:
 - Maxim Chechel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-25 00:00:00.000000000 Z
+date: 2015-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   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'
 description: ! "  \tThis gem is built on top of libnfc and libfreefare using ffi and