oja 0.1.2 → 0.2.0

data/lib/oja.rb

@@ -3,13 +3,42 @@ require 'oja/request'
 require 'oja/response'
 
 module Oja
-  def self.verify(data)
-    receipt = Oja::Receipt.new(:data => data)
+  # Verify a receipt data with the App Store. You can either pass the receipt
+  # and password as two arguments or as a option hash.
+  #
+  # Receipt data should be raw, not Base64 encoded. It usually begins with
+  # ‘{ "signature" = ’.
+  #
+  # Example:
+  #   Oja.verify(receipt_data, password)
+  #   Oja.verify(:data => receipt_data, :password => password)
+  def self.verify(*args)
+    receipt = Oja::Receipt.new(argument_hash(*args, [:data, :password]))
     receipt.verify
   end
 
-  def self.verify_filename(receipt_filename)
-    receipt = Oja::Receipt.new(:filename => receipt_filename)
+  # Verify a receipt file with the App Store. You can either pass the filename
+  # and password as two arguments or as a option hash.
+  #
+  # Example:
+  #   Oja.verify_filename(filename, password)
+  #   Oja.verify(:filename => filename, :password => password)
+  def self.verify_filename(*args)
+    receipt = Oja::Receipt.new(argument_hash(*args, [:filename, :password]))
     receipt.verify
   end
+
+  private
+
+  def self.argument_hash(*args)
+    args  = args.dup
+    parts = args.pop
+    if args[0].kind_of?(Hash)
+      args[0]
+    else
+      h = {}; parts.each_with_index do |part, index|
+        h[part] = args[index]
+      end; h
+    end
+  end
 end

data/lib/oja/cli.rb

@@ -8,13 +8,20 @@ module Oja
     end
 
     def usage
-      puts "Usage: #{File.basename($0)} <receipt-file>"
+      puts "Usage: #{File.basename($0)} <receipt-file> [options]"
+      puts ""
+      puts "Options"
+      puts "  -p, --password <password>"
     end
 
     def receipt_filename
       @argv[0]
     end
 
+    def password
+      @options['p'] || @options['password']
+    end
+
     def print_receipt_details(receipt_data)
       receipt_data.each do |key, value|
         puts "#{key}: #{value}"
@@ -22,7 +29,7 @@ module Oja
     end
 
     def check_receipt
-      if response = Oja.verify_filename(receipt_filename)
+      if response = Oja.verify_filename(:filename => receipt_filename, :password => password)
         if response.active?
           puts "[!] Receipt appears to be valid and active"
           puts

data/lib/oja/receipt.rb

@@ -2,7 +2,7 @@ require 'base64'
 
 module Oja
   class Receipt
-    attr_accessor :filename
+    attr_accessor :filename, :password
     attr_writer :data
 
     def initialize(attributes)
@@ -31,10 +31,14 @@ module Oja
       Base64.encode64(data)
     end
 
+    def attributes
+      attributes = { 'receipt-data' => receipt_data }
+      attributes['password'] = password if password
+      attributes
+    end
+
     def to_json
-      JSON.dump(
-        'receipt-data' => receipt_data
-      )
+      JSON.dump(attributes)
     end
 
     def verify

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oja
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-25 00:00:00.000000000 Z
+date: 2012-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nap