ppp 0.1.5.alpha → 0.1.6.alpha

data/lib/ppp/card/base.rb

@@ -7,10 +7,11 @@ module Ppp
 
       @@CHARS_PER_LINE = 34
       @@FIRST_COLUMN = ?A
-      @@ROW_COL_PATTERN = /[[:digit:]][[:alpha:]]/
+      @@ROW_COL_PATTERN = /([[:digit:]]+)([[:alpha:]])/
 
-      @@ERROR_BAD_ROW_COL = %[Expected a string with exactly one digit and one letter, got "%s".]
-      @@ERROR_LONG_CODES  = %[Passcodes longer than 16 characters are too long for printing]
+      @@ERROR_BAD_ROW_COL    = %[Expected a string with exactly one integer followed by one letter, got "%s"]
+      @@ERROR_LONG_CODES     = %[Passcodes longer than 16 characters are too long for printing]
+      @@ERROR_WRONG_NUM_ARGS = %[Wrong number of arguments. Expected %s, got %d]
 
       def initialize generator, opts={}
         @generator = generator
@@ -44,28 +45,51 @@ module Ppp
 
       def codes
         (1..row_count).collect do |row|
-          card_offset = (card_number-1) * passcodes_per_card
           offset = card_offset + ((row-1) * passcodes_per_line)
-          puts "offset: #{offset}"
-          @generator.passcodes( offset, passcodes_per_line )
+
+          @generator.passcodes offset, passcodes_per_line
         end
       end
 
-      def passcode row_col
-        raise ArgumentError.new( @@ERROR_BAD_ROW_COL % row_col ) unless row_col.size == 2 && @@ROW_COL_PATTERN.match( row_col.split('').sort.join )
-        passcode *row_col.split('')
-      end
+      def passcode *args
+        case args.size
+        when 1
+          match = @@ROW_COL_PATTERN.match( args.first )
+          raise ArgumentError.new( @@ERROR_BAD_ROW_COL % args.first ) unless match
+          row = match[1]
+          col = match[2]
+        when 2
+          (row, col) = args
+        else
+          raise ArgumentError.new( @@ERROR_WRONG_NUM_ARGS % ['1 or 2', args.size] )
+        end
 
-      def passcode row, col
         col_offset = col.ord - @@FIRST_COLUMN.ord
-        row_offset = row - 1
+        row_offset = row.to_i - 1
+
+        offset = row_offset * passcodes_per_line + col_offset
+        offset = card_offset + offset
+        @generator.passcode offset
+      end
+
+      def verify *args
+        given_code = args.pop
+        given_code == passcode( *args )
+      end
 
-        @generator.passcode row_offset * passcodes_per_line + col_offset
+      def row_label row_number
+        "#{row_number + 1}:"
       end
 
       def column_label column_number
         (@@FIRST_COLUMN.ord + (column_number - 1)).chr
       end
+  
+      protected
+  
+      def card_offset
+        (card_number-1) * passcodes_per_card
+      end
     end
   end
 end

data/lib/ppp/card/plain.rb

@@ -71,7 +71,7 @@ class Ppp::Card::Plain < Ppp::Card::Base
   end
 
   def first_column row_index
-    label = "#{row_index}:"
+    label = row_label row_index
     padding = ' ' * (first_column_width - label.size)
     padding + label
   end

data/lib/ppp/version.rb

@@ -1,3 +1,3 @@
 module Ppp
-  VERSION = '0.1.5.alpha'
+  VERSION = '0.1.6.alpha'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ppp
 version: !ruby/object:Gem::Version
-  version: 0.1.5.alpha
+  version: 0.1.6.alpha
   prerelease: 6
 platform: ruby
 authors: