ppp 0.1.3.alpha → 0.1.4.alpha

data/ext/ppp/cppp.c

@@ -12,7 +12,6 @@ void Init_Cppp()
 {
     cPpp = rb_define_class( "Cppp", rb_cObject );
     rb_define_module_function( cPpp, "random_key", t_random_key, 0 );
-    rb_define_module_function( cPpp, "key_from_string", t_key_from_string, 1 );
     rb_define_module_function( cPpp, "passcodes", t_get_passcodes, 5 );
 }
 
@@ -38,14 +37,6 @@ static VALUE t_random_key( VALUE self )
     return key_to_string( &key );
 }
 
-static VALUE t_key_from_string( VALUE self, VALUE str )
-{
-    SequenceKey key;
-
-    GenerateSequenceKeyFromString( StringValueCStr( str ), &key );
-    return key_to_string( &key );
-}
-
 static VALUE t_get_passcodes( VALUE self, VALUE v_key, VALUE v_offset, VALUE v_count, VALUE v_length, VALUE v_alphabet )
 {
     SequenceKey key;

data/lib/ppp.rb

@@ -4,6 +4,7 @@ require "ppp/generator"
 require 'ppp/Cppp'
 require 'ppp/card/base'
 require 'ppp/card/html'
+require 'ppp/card/xml'
 require 'ppp/card/plain'
 
 module Ppp
@@ -29,6 +30,7 @@ module Ppp
     def printer style, *args
       case style
       when :html  then return Card::Html.new  *args
+      when :xml   then return Card::Xml.new   *args
       when :plain then return Card::Plain.new *args
       end
       raise ArgumentError.new( "%s is not a valid printer style." % style )

data/lib/ppp/card/base.rb

@@ -3,6 +3,8 @@ require 'ppp/generator'
 module Ppp
   module Card
     class Base
+      attr_reader :card_number, :row_count, :title
+
       @@CHARS_PER_LINE = 34
       @@FIRST_COLUMN = ?A
       @@ROW_COL_PATTERN = /[[:digit:]][[:alpha:]]/
@@ -14,24 +16,39 @@ module Ppp
         @generator = generator
         raise ArgumentError.new( @@ERROR_LONG_CODES ) if code_length > 16
 
-        options = { :card_title => 'PPP Passcard', :first_card_index => 1 }.merge opts
-        @title      = options[ :card_title       ]
-        @card_index = options[ :first_card_index ]
-        @offset     = 0
+        options = { :row_count         => 10,
+                    :card_title        => 'PPP Passcard',
+                    :first_card_number => 1 }
+        options.merge! opts
+        @title       = options[ :card_title        ]
+        @row_count   = options[ :row_count         ]
+        @card_number = options[ :first_card_number ]
       end
 
       def code_length
         @generator.length
       end
 
+      def card_number= number
+        raise ArgumentError.new( "card number must be a positive integer" ) if number < 1
+        @card_number = number
+      end
+
       def passcodes_per_line
         @passcodes_per_line ||= ( (@@CHARS_PER_LINE+1) / (code_length + 1) ).to_i
       end
 
-      def next_code
-        code = @generator.passcode( @offset )
-        @offset += 1
-        code
+      def passcodes_per_card
+        passcodes_per_line * row_count
+      end
+
+      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 )
+        end
       end
 
       def passcode row_col
@@ -45,6 +62,10 @@ module Ppp
 
         @generator.passcode row_offset * passcodes_per_line + col_offset
       end
+
+      def column_label column_number
+        (@@FIRST_COLUMN.ord + (column_number - 1)).chr
+      end
     end
   end
 end

data/lib/ppp/card/html.rb

@@ -15,7 +15,7 @@ class Ppp::Card::Html < Ppp::Card::Base
   def css
     %[
       <style>
-        .card, .card .title, .card .card_index, .card .codes, .card .codes td {
+        .card, .card .title, .card .card_number, .card .codes, .card .codes td {
           font-family: monospace;
           font-size: 3.5mm;
         }
@@ -39,12 +39,12 @@ class Ppp::Card::Html < Ppp::Card::Base
         .title td:first-child {
           width: 2.5em;
         }
-        .card_index {
+        .card_number {
           float: right;
           margin-right: 1ex;
         }
-        .card_index:before { content: '['; }
-        .card_index:after  { content: ']'; }
+        .card_number:before { content: '['; }
+        .card_number:after  { content: ']'; }
 
         .codes_heading th {
           text-align: center;
@@ -79,20 +79,25 @@ class Ppp::Card::Html < Ppp::Card::Base
   end
 
   def html
+    rows = codes.each_with_index.collect do |row, i|
+      cols = row.collect { |code| "  <td>#{code}</td>" }.join(?\n)
+      "<tr>\n  <td>#{i+1}:</td>\n#{cols}</tr>"
+    end.join(?\n)
+
     %[
       <table class="card">
         <caption class="title">
           #{@title}
-          <span class="card_index">#{@card_index}</span>
+          <span class="card_number">#{card_number}</span>
         </caption>
         <colgroup span="1">
         <colgroup span="#{passcodes_per_line}">
         <thead class="codes_heading">
           <th>&nbsp;</th>
-          #{ (0..passcodes_per_line-1).collect { |i| %[<th>#{(@@FIRST_COLUMN.ord + i).chr}</th>] }.join ?\n }
+          #{ passcodes_per_line.times.collect { |i| %[<th>#{column_label(i+1)}</th>] }.join ?\n }
         </thead>
         <tbody class="codes">
-          #{ (1..9).collect { |i| "<tr><td>#{i}</td>#{(1..passcodes_per_line).collect {%[<td>#{next_code}</td>]}.join(?\n) }</tr>" }.join(?\n) }
+          #{rows}
         </tbody>
       </table>
     ]

data/lib/ppp/card/plain.rb

@@ -4,9 +4,6 @@ class Ppp::Card::Plain < Ppp::Card::Base
 
   def initialize generator, opts={}
     super
-
-    options    = { :row_count => 10 }.merge opts
-    @row_count = options[ :row_count ]
   end
 
   def to_s
@@ -18,59 +15,53 @@ class Ppp::Card::Plain < Ppp::Card::Base
     line( split_bar )
   end
 
+  def card_number= number
+    super
+  end
+
   private
 
   def bar
-    @bar ||= '-' * (width + 2)
+    '-' * (width + 2)
   end
 
   def width
-    @width ||= begin
-      return rows.first.join( ' ' ).size if rows.size >= 1
-      header.size
-    end
+    return rows.first.join( ' ' ).size if rows.size >= 1
+    header.size
   end
 
   def rows
-    @rows ||= begin
-    (1..@row_count).collect do |i|
-        [ first_column( i ) ] + (1..passcodes_per_line).collect {next_code}
-      end
-    end
+    codes.each_with_index.collect { |row, i| [ first_column( i ) ] + row }
   end
 
   def header
-    @header ||= header_cells.join ' '
+    header_cells.join ' '
   end
 
   def header_cells
-    [' ' * first_column_width ] + (1..passcodes_per_line).collect do |i|
-    (@@FIRST_COLUMN.ord + i-1).chr.center code_length
-    end
+    cells = passcodes_per_line.times.collect { |i| column_label(i+1).center code_length }
+
+    [' ' * first_column_width ] + cells
   end
 
   def title_str
-    @title_str ||= begin
-      title = @title[0, width - card_label.size] # trim title if it's too long to fit
+    title = @title[0, width - card_label.size] # trim title if it's too long to fit
 
-      blank_space = width - (title.size + card_label.size)
-      title = title + (' ' * blank_space) + card_label
-    end
+    blank_space = width - (title.size + card_label.size)
+    title = title + (' ' * blank_space) + card_label
   end
 
   def card_label
-    @card_label ||= "[#{@card_index}]"
+    "[#{card_number}]"
   end
 
   def split_bar
-    @split_bar ||= begin
-      parts = ['-' * first_column_width] + (1..passcodes_per_line).collect { '-' * code_length }
-      "-#{parts.join '+'}-"
-    end
+    parts = ['-' * first_column_width] + (1..passcodes_per_line).collect { '-' * code_length }
+    "-#{parts.join '+'}-"
   end
 
   def row_lines
-    @row_lines ||= rows.collect{ |r| line :pad, r.join( ' ' ) }
+    rows.collect{ |r| line :pad, r.join( ' ' ) }
   end
 
   def line pad=:nopad, str
@@ -86,6 +77,6 @@ class Ppp::Card::Plain < Ppp::Card::Base
   end
 
   def first_column_width
-    @first_column_width ||= @row_count.to_s.size + 1
+    @row_count.to_s.size + 1
   end
 end

data/lib/ppp/card/xml.rb

@@ -0,0 +1,20 @@
+require 'ppp/generator'
+require 'ppp/card/base'
+
+class Ppp::Card::Xml < Ppp::Card::Base
+  def initialize generator, opts={}
+    super
+  end
+  
+  def to_s
+    rows = codes.each_with_index.collect do |row, i|
+      cols = row.each_with_index.collect { |code, j| "    <column label=\"#{column_label(j+1)}\">#{code}</column>" }.join(?\n)
+      "  <row number=\"#{i+1}\">\n#{cols}\n  </row>\n"
+    end.join(?\n)
+
+    %[<?xml version="1.0" encoding="UTF-8" ?>\n] +
+    %[<card title="#{@title}" number="#{card_number}">\n] +
+    rows + 
+    %[</card>\n]
+  end
+end

data/lib/ppp/version.rb

@@ -1,3 +1,3 @@
 module Ppp
-  VERSION = '0.1.3.alpha'
+  VERSION = '0.1.4.alpha'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ppp
 version: !ruby/object:Gem::Version
-  version: 0.1.3.alpha
+  version: 0.1.4.alpha
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-20 00:00:00.000000000 Z
+date: 2012-02-21 00:00:00.000000000 Z
 dependencies: []
 description: Ruby-PPP is a Ruby language binding of PPP (Perfect Paper Passwords).
   PPP is a library designed to create one-time passwords, described at http://grc.com/ppp.htm
@@ -26,6 +26,7 @@ files:
 - lib/ppp/version.rb
 - lib/ppp/card/base.rb
 - lib/ppp/card/plain.rb
+- lib/ppp/card/xml.rb
 - lib/ppp/card/html.rb
 - ext/ppp/ppp.c
 - ext/ppp/cppp.c