ruby-nfc 1.2 → 1.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MGMwZTM5MGEwYWFiODNjNWQ0YTBiMDBhMWNhZjQwOWE2NDdiYTE2ZQ==
+    ZDg5NmM4MjM1Zjg5NGQxMzI4OGZjYTUwYjVhNGYzMDQ4NzQ0NjU0Nw==
   data.tar.gz: !binary |-
-    Yzc1MGE4MjZhMGE4OGM1YjdiODNhYzEyY2Q3YWQ0ZjcyNTYzOTRmNw==
+    MGNkNTBkMmE5YThiY2M0YWI3NDZiODRkOTQ5YjU2Y2MxYjcxZjA3NQ==
 SHA512:
   metadata.gz: !binary |-
-    NzIwODVjMTFmYjBkZDY3M2Q4ODE5YjJhYzY3NTU1ODZmNmEzMzBmNzEyMDE5
-    MGYxY2Q1ZDRiNTJkNjlmMTZkMjUyMzUyMjc4YTk5YmZmY2M2Mzg3YjZjMGZm
-    ZDJhYzQzZWY4MTQ3MzFmMTIwYWU0ZDc1YzNmNmQxYmI5MTdiZDg=
+    OGQwOGQzYmJjOTAxYmVkYjcwYzk4NTBhNzZkMWZjYzE0YTUyMjAxYmM0MzBk
+    NjZmMDkwYzkyZWQ2NzUzNjQyZTQyM2M0ZWJlYmIxODUxYjM0Y2ZiNjMwZWYw
+    MWQwMmI0NzAyM2FiMDdhODVlMzk4YjE0ZTYzM2M3ZTczMTRjOTI=
   data.tar.gz: !binary |-
-    MjNmZmZiNDdjMTFkMGFkMWY0YjM0ZjVkN2MwNTkyZGExZTUwZTQ4YTcyN2Yx
-    YTI5ZmJhMWVmMjdmOWE0ODIzNzE3YzY4M2ZlYjU2ZTg2MzMyMjMwZGZmNTJm
-    MDk3NTY2NDUwOGU4NWExNDVjMzcyNWE0YzVhODYyZTJmM2I3NmY=
+    MThlODVkNjcyYjAxYzg2YTU1MGYwYTdlOTMyZmY3ZWEzYzhhODJlODM0NzQy
+    YjRlZTc0Mjg2ZmYyY2RlZWNkMzk5NWUyNWEyYzE4OTc4YjUxZDFkYjBhOGMz
+    ZDQ2MDc2MTA2YjBmZjdiODdlOWFmYmUxMTc1YzZlN2M2NWRiZjc=

data/lib/ruby-nfc/reader.rb

@@ -7,58 +7,66 @@ module NFC
       @ptr = nil
     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?
+      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
+
       self
     end
 
     # Returns list of tags applied to reader
-    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)
+    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
       end
     end
 
-    def poll(*card_types, &block)
+    def poll(*tag_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 and iterate
+				# iterate over all applied targets
 				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
-					card_types.each do |card_type|
-						if card_type.match?(target)
-							tag = card_type.new(target, self)
+					tag_types.each do |tag_type|
+						if tag_type.match?(target)
+							tag = tag_type.new(target, self)
 							tag.connect(&block)
-							# if this tag was marked as processed - continue with next tag
+
+							# if this tag was marked as processed within the bloc - 
+							# continue with the next tag
 							break if target.processed?
 						end
 					end
@@ -81,5 +89,9 @@ 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,16 +65,6 @@ 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/tag.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-nfc
 version: !ruby/object:Gem::Version
-  version: '1.2'
+  version: '1.3'
 platform: ruby
 authors:
 - Maxim Chechel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-23 00:00:00.000000000 Z
+date: 2015-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi