chargify2 0.2.1 → 0.2.2

data/Gemfile

@@ -15,4 +15,5 @@ group :development do
   gem "webmock"
   gem "vcr"
   gem "capybara"
+  gem "ruby-debug19", :platforms => [:ruby_19]
 end

data/Gemfile.lock

@@ -2,6 +2,7 @@ GEM
   remote: http://rubygems.org/
   specs:
     addressable (2.2.5)
+    archive-tar-minitar (0.5.2)
     capybara (0.4.1.2)
       celerity (>= 0.7.9)
       culerity (>= 0.2.4)
@@ -14,6 +15,7 @@ GEM
     celerity (0.8.9)
     childprocess (0.1.8)
       ffi (~> 1.0.6)
+    columnize (0.3.4)
     crack (0.1.8)
     culerity (0.2.15)
     diff-lcs (1.1.2)
@@ -29,6 +31,8 @@ GEM
       git (>= 1.2.5)
       rake
     json_pure (1.5.1)
+    linecache19 (0.5.12)
+      ruby_core_source (>= 0.1.4)
     mime-types (1.16)
     nokogiri (1.4.4)
     rack (1.2.2)
@@ -44,6 +48,16 @@ GEM
     rspec-expectations (2.3.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.3.0)
+    ruby-debug-base19 (0.11.25)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby_core_source (>= 0.1.4)
+    ruby-debug19 (0.11.6)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby-debug-base19 (>= 0.11.19)
+    ruby_core_source (0.1.5)
+      archive-tar-minitar (>= 0.5.2)
     rubyzip (0.9.4)
     selenium-webdriver (0.1.4)
       childprocess (>= 0.1.7)
@@ -71,6 +85,7 @@ DEPENDENCIES
   jeweler (~> 1.5.2)
   rcov
   rspec (~> 2.3.0)
+  ruby-debug19
   vcr
   webmock
   yard (~> 0.6.0)

data/chargify2.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{chargify2}
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Michael Klett"]
-  s.date = %q{2011-10-19}
+  s.authors = ["Michael Klett", "Shay Frendt"]
+  s.date = %q{2011-10-28}
   s.description = %q{}
   s.email = %q{michael@webadvocate.com}
   s.extra_rdoc_files = [

data/lib/chargify2/direct.rb

@@ -1,12 +1,12 @@
 module Chargify2
   class Direct
     attr_reader :client
-    
+
     def initialize(client)
       @client = client
       validate_client
     end
-    
+
     def secure_parameters(params = {})
       SecureParameters.new(params, client)
     end
@@ -18,9 +18,9 @@ module Chargify2
     def self.signature(message, secret)
       OpenSSL::HMAC.hexdigest(OpenSSL::Digest::Digest.new('sha1'), secret, message)
     end
-    
+
     private
-    
+
     def validate_client
       unless client.is_a?(Client)
         raise ArgumentError.new("Direct.new requires a Client as an argument")
@@ -35,20 +35,20 @@ module Chargify2
       attr_reader :nonce
       attr_reader :data
       attr_reader :secret
-      
+
       def initialize(hash, client)
         args = hash.symbolize_keys
-        
+
         @api_id     = client.api_id
         @secret     = client.api_secret
 
         @timestamp  = args[:timestamp]
         @nonce      = args[:nonce]
         @data       = args[:data]
-        
+
         validate_args
       end
-      
+
       def to_form_inputs
         output = []
         output << %{<input type="hidden" name="secure[api_id]" value="#{h(api_id)}"/>}
@@ -59,42 +59,42 @@ module Chargify2
         output.join("\n")
       end
 
-      %w(timestamp nonce data).each do |method|
+      %w(timestamp nonce data api_id secret).each do |method|
         define_method("#{method}?") do
           value = self.send(method)
-          value && value.to_s.strip.length > 0
+          value && !(value.is_a?(Hash) ? value : value.to_s.strip).empty?
         end
       end
-      
+
       def encoded_data
         hash = data? ? data : {}
         uri = Addressable::URI.new
         uri.query_values = hash
         uri.query
       end
-      
+
       def signature
         message = "#{api_id}#{timestamp}#{nonce}#{encoded_data}"
         Direct.signature(message, secret)
       end
-      
+
       private
-      
+
       def h(s)
         ERB::Util.html_escape(s)
       end
-      
+
       def validate_args
         if data && !data.is_a?(Hash)
           raise ArgumentError.new("The 'data' must be provided as a Hash (you passed a #{data.class})")
         end
-        
-        unless api_id && secret && api_id.to_s.length > 0 && secret.to_s.length > 0
+
+        unless api_id? && secret?
           raise ArgumentError.new("SecureParameters require connection to a Client - was one given?")
         end
       end
     end
-    
+
     # There is no need to instantiate a ResponseParameters instance directly.  Use Direct#response_parameters instead.
     class ResponseParameters
       attr_reader :api_id
@@ -105,10 +105,10 @@ module Chargify2
       attr_reader :call_id
       attr_reader :secret
       attr_reader :signature
-      
+
       def initialize(params, client)
         args = params.symbolize_keys
-        
+
         @api_id       = client.api_id
         @secret       = client.api_secret
 
@@ -118,21 +118,21 @@ module Chargify2
         @result_code  = args[:result_code]
         @call_id      = args[:call_id]
         @signature    = args[:signature]
-        
+
         validate_args
       end
-      
+
       def verified?
         message = "#{api_id}#{timestamp}#{nonce}#{status_code}#{result_code}#{call_id}"
         Direct.signature(message, secret) == signature
       end
-      
+
       def success?
         status_code.to_s == '200'
       end
-      
+
       private
-      
+
       def validate_args
         unless api_id && secret && api_id.to_s.length > 0 && secret.to_s.length > 0
           raise ArgumentError.new("ResponseParameters require connection to a Client - was one given?")
@@ -140,4 +140,4 @@ module Chargify2
       end
     end
   end
-end
+end

data/spec/direct_response_parameters_spec.rb

@@ -3,13 +3,13 @@ require 'spec_helper'
 module Chargify2
   describe Direct::ResponseParameters do
     let(:client) { Client.new(valid_client_credentials) }
-    
+
     it "raises an argument error if it could not get an api_id and secret from the passed client" do
       lambda {
         Direct::SecureParameters.new({}, OpenCascade.new)
       }.should raise_error(ArgumentError)
     end
-    
+
     describe "#verified?" do
       before(:each) do
         @api_id = valid_client_credentials[:api_id]
@@ -18,7 +18,7 @@ module Chargify2
         @status_code = '200'
         @result_code = '2000'
         @call_id = 'blah'
-        
+
         # Used the generator here: http://hash.online-convert.com/sha1-generator
         # ... with message: "1c016050-498a-012e-91b1-005056a216ab13032453261c016050-498a-012e-91b1-005056a216ab2002000blah"
         # ... and secret: "p5lxQ804MYtwZecFWNOT"
@@ -36,10 +36,10 @@ module Chargify2
           'call_id' => @call_id,
           'signature' => @signature
         }, client)
-        
+
         rp.verified?.should be_true
       end
-      
+
       it "returns false when the calculated signature of the result params is different from the received signature" do
         rp = Direct::ResponseParameters.new({
           'api_id' => @api_id,
@@ -50,10 +50,10 @@ module Chargify2
           'call_id' => @call_id,
           'signature' => 'foo'
         }, client)
-        
+
         rp.verified?.should be_false
       end
-      
+
       it "returns false when the calculated signature is correct but the api_id does not match the client's" do
         other_client_credentials = valid_client_credentials.merge(:api_id => '1')
         other_client = Client.new(other_client_credentials)
@@ -67,9 +67,9 @@ module Chargify2
           'call_id' => @call_id,
           'signature' => @signature
         }, other_client)
-        
+
         rp.verified?.should be_false
       end
     end
   end
-end
+end

data/spec/direct_secure_parameters_spec.rb

@@ -3,30 +3,30 @@ require 'spec_helper'
 module Chargify2
   describe Direct::SecureParameters do
     let(:client) { Client.new(valid_client_credentials) }
-    
+
     it "raises an argument error if data is provided but it is not in hash format" do
       lambda {
         Direct::SecureParameters.new({'data' => 'string'}, client)
       }.should raise_error(ArgumentError)
     end
-    
+
     it "raises an argument error if it could not get an api_id and secret from the passed client" do
       lambda {
         Direct::SecureParameters.new({}, OpenCascade.new)
       }.should raise_error(ArgumentError)
     end
-    
+
     describe "#timestamp?" do
       it "returns true when a timestamp is provided via a string hash key" do
         sp = Direct::SecureParameters.new({'timestamp' => '1234'}, client)
         sp.timestamp?.should be_true
       end
-      
+
       it "returns true when a timestamp is provided via a symbol hash key" do
         sp = Direct::SecureParameters.new({:timestamp => '1234'}, client)
         sp.timestamp?.should be_true
       end
-      
+
       it "returns false when a timestamp key/value is not provided" do
         sp = Direct::SecureParameters.new({}, client)
         sp.timestamp?.should be_false
@@ -48,12 +48,12 @@ module Chargify2
         sp = Direct::SecureParameters.new({'nonce' => '1234'}, client)
         sp.nonce?.should be_true
       end
-      
+
       it "returns true when a nonce is provided via a symbol hash key" do
         sp = Direct::SecureParameters.new({:nonce => '1234'}, client)
         sp.nonce?.should be_true
       end
-      
+
       it "returns false when a nonce key/value is not provided" do
         sp = Direct::SecureParameters.new({}, client)
         sp.nonce?.should be_false
@@ -75,12 +75,12 @@ module Chargify2
         sp = Direct::SecureParameters.new({'data' => {'foo' => 'bar'}}, client)
         sp.data?.should be_true
       end
-      
+
       it "returns true when data is provided via a symbol hash key" do
         sp = Direct::SecureParameters.new({:data => {'foo' => 'bar'}}, client)
         sp.data?.should be_true
       end
-      
+
       it "returns false when a data key/value is not provided" do
         sp = Direct::SecureParameters.new({}, client)
         sp.data?.should be_false
@@ -96,24 +96,24 @@ module Chargify2
         sp.data?.should be_false
       end
     end
-    
+
     describe "#encoded_data" do
       it "turns the data hash in to query string format" do
         sp = Direct::SecureParameters.new({'data' => {'one' => 'two', 'three' => 'four'}}, client)
         sp.encoded_data.should == "one=two&three=four"
       end
-      
+
       it "turns a nested data hash in to nested query string format" do
         sp = Direct::SecureParameters.new({'data' => {'one' => {'two' => {'three' => 'four'}}, 'foo' => 'bar'}}, client)
         sp.encoded_data.should == "foo=bar&one[two][three]=four"
       end
-      
+
       it "performs percent encoding on unsafe characters" do
         sp = Direct::SecureParameters.new({'data' => {'redirect_uri' => 'http://www.example.com', 'sentence' => 'Michael was here!'}}, client)
         sp.encoded_data.should == "redirect_uri=http%3A%2F%2Fwww.example.com&sentence=Michael%20was%20here%21"
       end
     end
-    
+
     describe "#to_form_inputs" do
       context "with no timestamp, nonce, nor data" do
         it "outputs 2 hidden form inputs - one for the api_id and one for the signature" do
@@ -125,7 +125,7 @@ module Chargify2
           form.should have_selector("input[type='hidden'][name='secure[signature]'][value='#{sp.signature}']", :count => 1)
         end
       end
-      
+
       context "with a timestamp" do
         it "outputs 3 hidden form inputs - one each for the api_id, timestamp, and signature" do
           sp = Direct::SecureParameters.new({'timestamp' => '1234'}, client)
@@ -183,7 +183,7 @@ module Chargify2
         nonce = '5678'
         data = {'one' => 'two', 'three' => {'four' => "http://www.example.com"}}
         sp = Direct::SecureParameters.new({'timestamp' => timestamp, 'nonce' => nonce, 'data' => data}, client)
-        
+
         # Used the generator here: http://hash.online-convert.com/sha1-generator
         # ... with message: "1c016050-498a-012e-91b1-005056a216ab12345678one=two&three[four]=http%3A%2F%2Fwww.example.com"
         # ... and secret: "p5lxQ804MYtwZecFWNOT"

data/spec/spec_helper.rb

@@ -13,6 +13,11 @@ Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 RSpec.configure do |config|
   config.include SpecHelperMethods
   config.extend VCR::RSpec::Macros
+  config.filter_run :focused => true
+  config.run_all_when_everything_filtered = true
+  config.alias_example_to :fit, :focused => true
+  config.alias_example_to :xit, :disabled => true
+  config.color_enabled = true
 end
 
 VCR.config do |c|

metadata

@@ -1,20 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: chargify2
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
 - Michael Klett
+- Shay Frendt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-19 00:00:00.000000000 -04:00
+date: 2011-10-28 00:00:00.000000000 -04:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &2153775320 !ruby/object:Gem::Requirement
+  requirement: &2153786560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +23,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153775320
+  version_requirements: *2153786560
 - !ruby/object:Gem::Dependency
   name: addressable
-  requirement: &2153774820 !ruby/object:Gem::Requirement
+  requirement: &2153786080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +34,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153774820
+  version_requirements: *2153786080
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &2153774320 !ruby/object:Gem::Requirement
+  requirement: &2153785600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +45,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153774320
+  version_requirements: *2153785600
 - !ruby/object:Gem::Dependency
   name: hashery
-  requirement: &2153773820 !ruby/object:Gem::Requirement
+  requirement: &2153785120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +56,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153773820
+  version_requirements: *2153785120
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153773320 !ruby/object:Gem::Requirement
+  requirement: &2153784640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +67,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *2153773320
+  version_requirements: *2153784640
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2153772780 !ruby/object:Gem::Requirement
+  requirement: &2153784160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +78,10 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *2153772780
+  version_requirements: *2153784160
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2153772240 !ruby/object:Gem::Requirement
+  requirement: &2153783680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +89,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2153772240
+  version_requirements: *2153783680
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2153771720 !ruby/object:Gem::Requirement
+  requirement: &2153799580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -99,10 +100,10 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *2153771720
+  version_requirements: *2153799580
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2153771200 !ruby/object:Gem::Requirement
+  requirement: &2153799100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +111,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153771200
+  version_requirements: *2153799100
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &2153770660 !ruby/object:Gem::Requirement
+  requirement: &2153798620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +122,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153770660
+  version_requirements: *2153798620
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: &2153770140 !ruby/object:Gem::Requirement
+  requirement: &2153798140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +133,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153770140
+  version_requirements: *2153798140
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &2153769600 !ruby/object:Gem::Requirement
+  requirement: &2153797660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,7 +144,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153769600
+  version_requirements: *2153797660
 description: ''
 email: michael@webadvocate.com
 executables: []
@@ -190,9 +191,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1643346488157857297
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: