recurly 0.2.6 → 0.2.7

data/lib/recurly.rb

@@ -1,5 +1,6 @@
 require 'active_resource'
 require 'active_support/deprecation'
+require 'active_support/json'
 require 'cgi'
 
 require 'recurly/version'
@@ -53,6 +54,8 @@ module Recurly
       true
     end
 
+    # allows configuration from a yml file that contains the fields:
+    # username,password,site
     def configure_from_yaml(path = nil)
       configure do |c|
         # parse configuration from yml
@@ -65,5 +68,16 @@ module Recurly
         end
       end
     end
+
+    # allows configuration from a json string that contains the fields:
+    # username,password,site
+    def configure_from_json(json_string)
+      config_data = ActiveSupport::JSON.decode(json_string)
+      configure do |c|
+        c.username = config_data['username']
+        c.password = config_data['password']
+        c.site = config_data['site']
+      end
+    end
   end
 end

data/lib/recurly/rails3/railtie.rb

@@ -5,8 +5,14 @@ module Recurly
     end
 
     config.after_initialize do
-      # setup recurly authentication details for testing
-      ::Recurly.configure_from_yaml unless Recurly.configured?
+      unless Recurly.configured?
+        if ENV["RECURLY_CONFIG"]
+          ::Recurly.configure_from_json(ENV["RECURLY_CONFIG"])
+        else
+          # setup recurly authentication details for testing
+          ::Recurly.configure_from_yaml
+        end
+      end
     end
 
   end

data/lib/recurly/version.rb

@@ -1,3 +1,3 @@
 module Recurly #:nodoc
-  VERSION = "0.2.6"
+  VERSION = "0.2.7"
 end

data/spec/config/test.yml

@@ -0,0 +1,4 @@
+---
+username: username1@recurly.com
+site: https://site1.recurly.com
+password: asdf4jk31

data/spec/spec_helper.rb

@@ -6,11 +6,23 @@ Bundler.setup
 $LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../lib"
 require 'recurly'
 
-Recurly.settings_path = "#{File.dirname(__FILE__)}/config/recurly.yml"
-
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
-# setup recurly authentication details for testing
-Recurly.configure_from_yaml
+module SpecHelper
+  # add helper methods here
+end
+
+RSpec.configure do |config|
+  config.include SpecHelper
+
+  config.mock_with :rspec
+
+  config.before(:each) do
+    Recurly.settings_path = "#{File.dirname(__FILE__)}/config/recurly.yml"
+    Recurly.configure_from_yaml
+  end
+
+end
+

data/spec/unit/config_spec.rb

@@ -0,0 +1,38 @@
+require 'spec_helper'
+
+describe "RecurlyConfig" do
+
+  context "loading from YML" do
+    it "should load configuration from a YML file" do
+      Recurly.configure_from_yaml("#{File.dirname(__FILE__)}/../config/test.yml")
+      Recurly.username.should == "username1@recurly.com"
+      Recurly.password.should == "asdf4jk31"
+      Recurly.site.should == "https://site1.recurly.com"
+    end
+  end
+
+  context "loading from json" do
+    it "should load configuration from a json config string" do
+      Recurly.configure_from_json({
+        :username => "someuser@heroku.com",
+        :password => "somepass",
+        :site => "https://recurlytest3-test.recurly.com"
+      }.to_json)
+      Recurly.username.should == "someuser@heroku.com"
+      Recurly.password.should == "somepass"
+      Recurly.site.should == "https://recurlytest3-test.recurly.com"
+
+      # test with some crazy chars in the password
+      Recurly.configure_from_json({
+        :username => "api-someuser@heroku.com",
+        :password => "*$&!!::@&!)*)*_",
+        :site => "https://recurlytest3-test.recurly.com"
+      }.to_json)
+
+      Recurly.username.should == "api-someuser@heroku.com"
+      Recurly.password.should == "*$&!!::@&!)*)*_"
+      Recurly.site.should == "https://recurlytest3-test.recurly.com"
+    end
+
+  end
+end

data/spec/vcr/account/close/1288381765.yml

@@ -0,0 +1,159 @@
+--- 
+- !ruby/struct:VCR::HTTPInteraction 
+  request: !ruby/struct:VCR::Request 
+    method: :post
+    uri: https://railsjedi%40sogetthis.com:7PCB2mZC@recurlytest3-test.recurly.com:443/accounts.xml
+    body: |
+      <?xml version="1.0" encoding="UTF-8"?>
+      <account>
+        <company-name>Recurly Ruby Gem</company-name>
+        <account-code>account-close-1288381765</account-code>
+        <last-name>Test</last-name>
+        <email>verena@test.com</email>
+        <first-name>Verena</first-name>
+      </account>
+
+    headers: 
+      accept: 
+      - "*/*"
+      connection: 
+      - close
+      content-type: 
+      - application/xml
+      authorization: 
+      - Basic cmFpbHNqZWRpQHNvZ2V0dGhpcy5jb206N1BDQjJtWkM=
+  response: !ruby/struct:VCR::Response 
+    status: !ruby/struct:VCR::ResponseStatus 
+      code: 201
+      message: Created
+    headers: 
+      location: 
+      - https://recurlytest3-test.recurly.com/accounts/account-close-1288381765
+      connection: 
+      - close
+      content-type: 
+      - application/xml; charset=utf-8
+      x-runtime: 
+      - "946"
+      date: 
+      - Thu, 04 Nov 2010 23:28:30 GMT
+      server: 
+      - nginx/0.7.65
+      content-length: 
+      - "581"
+      set-cookie: 
+      - account_credentials=a476384e263aeb19f519938bdeeadf93776dd15256d87acd8242ae19e3903967093a832aae26280d980bf4ab501ec9e72ef275793de0fd7b7c2f55965f637e86%3A%3A; domain=.recurly.com; path=/; secure; HttpOnly
+      - ""
+      - _recurly_session=ce022bfb19e67e52f921d472015fee74; domain=.recurly.com; path=/; Secure; HttpOnly
+      cache-control: 
+      - no-cache
+    body: |
+      <?xml version="1.0" encoding="UTF-8"?>
+      <account>
+        <id>account-close-1288381765</id>
+        <account_code>account-close-1288381765</account_code>
+        <username></username>
+        <email>verena@test.com</email>
+        <first_name>Verena</first_name>
+        <last_name>Test</last_name>
+        <company_name>Recurly Ruby Gem</company_name>
+        <balance_in_cents type="integer">0</balance_in_cents>
+        <closed type="boolean">false</closed>
+        <hosted_login_token>7278e28f910e44eb9cdff3f470d78d92</hosted_login_token>
+        <created_at type="datetime">2010-11-04T23:28:30Z</created_at>
+        <state>active</state>
+      </account>
+
+    http_version: "1.1"
+- !ruby/struct:VCR::HTTPInteraction 
+  request: !ruby/struct:VCR::Request 
+    method: :delete
+    uri: https://railsjedi%40sogetthis.com:7PCB2mZC@recurlytest3-test.recurly.com:443/accounts/account-close-1288381765.xml
+    body: 
+    headers: 
+      accept: 
+      - application/xml
+      connection: 
+      - close
+      authorization: 
+      - Basic cmFpbHNqZWRpQHNvZ2V0dGhpcy5jb206N1BDQjJtWkM=
+  response: !ruby/struct:VCR::Response 
+    status: !ruby/struct:VCR::ResponseStatus 
+      code: 200
+      message: OK
+    headers: 
+      x-ua-compatible: 
+      - IE=Edge
+      connection: 
+      - close
+      content-type: 
+      - application/xml; charset=utf-8
+      x-runtime: 
+      - "41"
+      date: 
+      - Thu, 04 Nov 2010 23:28:30 GMT
+      server: 
+      - nginx/0.7.65
+      content-length: 
+      - "1"
+      set-cookie: 
+      - _recurly_session=7d783a8d7cde5200af2d020b05a91a81; domain=.recurly.com; path=/; Secure; HttpOnly
+      cache-control: 
+      - no-cache
+    body: " "
+    http_version: "1.1"
+- !ruby/struct:VCR::HTTPInteraction 
+  request: !ruby/struct:VCR::Request 
+    method: :get
+    uri: https://railsjedi%40sogetthis.com:7PCB2mZC@recurlytest3-test.recurly.com:443/accounts/account-close-1288381765.xml
+    body: 
+    headers: 
+      accept: 
+      - application/xml
+      connection: 
+      - close
+      authorization: 
+      - Basic cmFpbHNqZWRpQHNvZ2V0dGhpcy5jb206N1BDQjJtWkM=
+  response: !ruby/struct:VCR::Response 
+    status: !ruby/struct:VCR::ResponseStatus 
+      code: 200
+      message: OK
+    headers: 
+      x-ua-compatible: 
+      - IE=Edge
+      etag: 
+      - "\"dd45c48eab60e4d9a5477ce39c221a67\""
+      connection: 
+      - close
+      content-type: 
+      - application/xml; charset=utf-8
+      x-runtime: 
+      - "65"
+      date: 
+      - Thu, 04 Nov 2010 23:28:30 GMT
+      server: 
+      - nginx/0.7.65
+      content-length: 
+      - "580"
+      set-cookie: 
+      - _recurly_session=74d09c3b165af34a8d66576a10648f1d; domain=.recurly.com; path=/; Secure; HttpOnly
+      cache-control: 
+      - private, max-age=0, must-revalidate
+    body: |
+      <?xml version="1.0" encoding="UTF-8"?>
+      <account>
+        <id>account-close-1288381765</id>
+        <account_code>account-close-1288381765</account_code>
+        <username></username>
+        <email>verena@test.com</email>
+        <first_name>Verena</first_name>
+        <last_name>Test</last_name>
+        <company_name>Recurly Ruby Gem</company_name>
+        <balance_in_cents type="integer">0</balance_in_cents>
+        <closed type="boolean">true</closed>
+        <hosted_login_token>7278e28f910e44eb9cdff3f470d78d92</hosted_login_token>
+        <created_at type="datetime">2010-11-04T23:28:30Z</created_at>
+        <state>closed</state>
+      </account>
+
+    http_version: "1.1"

data/spec/vcr/account/create-blank/1288381765.yml

@@ -0,0 +1,49 @@
+--- 
+- !ruby/struct:VCR::HTTPInteraction 
+  request: !ruby/struct:VCR::Request 
+    method: :post
+    uri: https://railsjedi%40sogetthis.com:7PCB2mZC@recurlytest3-test.recurly.com:443/accounts.xml
+    body: |
+      <?xml version="1.0" encoding="UTF-8"?>
+      <account>
+        <account-code></account-code>
+      </account>
+
+    headers: 
+      accept: 
+      - "*/*"
+      connection: 
+      - close
+      content-type: 
+      - application/xml
+      authorization: 
+      - Basic cmFpbHNqZWRpQHNvZ2V0dGhpcy5jb206N1BDQjJtWkM=
+  response: !ruby/struct:VCR::Response 
+    status: !ruby/struct:VCR::ResponseStatus 
+      code: 422
+      message: ""
+    headers: 
+      connection: 
+      - close
+      content-type: 
+      - application/xml; charset=utf-8
+      x-runtime: 
+      - "18"
+      date: 
+      - Thu, 04 Nov 2010 23:28:31 GMT
+      server: 
+      - nginx/0.7.65
+      content-length: 
+      - "186"
+      set-cookie: 
+      - _recurly_session=256704ef48861f2093da586621cf2def; domain=.recurly.com; path=/; Secure; HttpOnly
+      cache-control: 
+      - no-cache
+    body: |
+      <?xml version="1.0" encoding="UTF-8"?>
+      <errors>
+        <error field="account_code">Account code can't be blank</error>
+        <error field="account_code">Account code is invalid</error>
+      </errors>
+
+    http_version: "1.1"

data/spec/vcr/account/create-duplicate/1288381765.yml

@@ -0,0 +1,95 @@
+--- 
+- !ruby/struct:VCR::HTTPInteraction 
+  request: !ruby/struct:VCR::Request 
+    method: :post
+    uri: https://railsjedi%40sogetthis.com:7PCB2mZC@recurlytest3-test.recurly.com:443/accounts.xml
+    body: |
+      <?xml version="1.0" encoding="UTF-8"?>
+      <account>
+        <account-code>account-exists</account-code>
+      </account>
+
+    headers: 
+      accept: 
+      - "*/*"
+      connection: 
+      - close
+      content-type: 
+      - application/xml
+      authorization: 
+      - Basic cmFpbHNqZWRpQHNvZ2V0dGhpcy5jb206N1BDQjJtWkM=
+  response: !ruby/struct:VCR::Response 
+    status: !ruby/struct:VCR::ResponseStatus 
+      code: 422
+      message: ""
+    headers: 
+      connection: 
+      - close
+      content-type: 
+      - application/xml; charset=utf-8
+      x-runtime: 
+      - "18"
+      date: 
+      - Thu, 04 Nov 2010 23:28:32 GMT
+      server: 
+      - nginx/0.7.65
+      content-length: 
+      - "132"
+      set-cookie: 
+      - _recurly_session=262a0b6ce0bef317c6cd308e5c567b83; domain=.recurly.com; path=/; Secure; HttpOnly
+      cache-control: 
+      - no-cache
+    body: |
+      <?xml version="1.0" encoding="UTF-8"?>
+      <errors>
+        <error field="account_code">Account code has already been taken</error>
+      </errors>
+
+    http_version: "1.1"
+- !ruby/struct:VCR::HTTPInteraction 
+  request: !ruby/struct:VCR::Request 
+    method: :post
+    uri: https://railsjedi%40sogetthis.com:7PCB2mZC@recurlytest3-test.recurly.com:443/accounts.xml
+    body: |
+      <?xml version="1.0" encoding="UTF-8"?>
+      <account>
+        <account-code>account-exists</account-code>
+      </account>
+
+    headers: 
+      accept: 
+      - "*/*"
+      connection: 
+      - close
+      content-type: 
+      - application/xml
+      authorization: 
+      - Basic cmFpbHNqZWRpQHNvZ2V0dGhpcy5jb206N1BDQjJtWkM=
+  response: !ruby/struct:VCR::Response 
+    status: !ruby/struct:VCR::ResponseStatus 
+      code: 422
+      message: ""
+    headers: 
+      connection: 
+      - close
+      content-type: 
+      - application/xml; charset=utf-8
+      x-runtime: 
+      - "33"
+      date: 
+      - Thu, 04 Nov 2010 23:28:32 GMT
+      server: 
+      - nginx/0.7.65
+      content-length: 
+      - "132"
+      set-cookie: 
+      - _recurly_session=02f72a71d5bea4806c902d3e8991324b; domain=.recurly.com; path=/; Secure; HttpOnly
+      cache-control: 
+      - no-cache
+    body: |
+      <?xml version="1.0" encoding="UTF-8"?>
+      <errors>
+        <error field="account_code">Account code has already been taken</error>
+      </errors>
+
+    http_version: "1.1"

data/spec/vcr/account/create-min/1288381765.yml

@@ -0,0 +1,63 @@
+--- 
+- !ruby/struct:VCR::HTTPInteraction 
+  request: !ruby/struct:VCR::Request 
+    method: :post
+    uri: https://railsjedi%40sogetthis.com:7PCB2mZC@recurlytest3-test.recurly.com:443/accounts.xml
+    body: |
+      <?xml version="1.0" encoding="UTF-8"?>
+      <account>
+        <account-code>d00d-1288381765</account-code>
+      </account>
+
+    headers: 
+      accept: 
+      - "*/*"
+      connection: 
+      - close
+      content-type: 
+      - application/xml
+      authorization: 
+      - Basic cmFpbHNqZWRpQHNvZ2V0dGhpcy5jb206N1BDQjJtWkM=
+  response: !ruby/struct:VCR::Response 
+    status: !ruby/struct:VCR::ResponseStatus 
+      code: 201
+      message: Created
+    headers: 
+      location: 
+      - https://recurlytest3-test.recurly.com/accounts/d00d-1288381765
+      connection: 
+      - close
+      content-type: 
+      - application/xml; charset=utf-8
+      x-runtime: 
+      - "696"
+      date: 
+      - Thu, 04 Nov 2010 23:28:01 GMT
+      server: 
+      - nginx/0.7.65
+      content-length: 
+      - "522"
+      set-cookie: 
+      - account_credentials=02decb7a373b176644e10195b3b28e05cc93ed199e524ab4a89bea8701dc277d7768e16ece52ffc314a600852ccd75386dacf8130365a5ebf2a5a9ee8a259553%3A%3A; domain=.recurly.com; path=/; secure; HttpOnly
+      - ""
+      - _recurly_session=7694025c0172b2f8376a356003464977; domain=.recurly.com; path=/; Secure; HttpOnly
+      cache-control: 
+      - no-cache
+    body: |
+      <?xml version="1.0" encoding="UTF-8"?>
+      <account>
+        <id>d00d-1288381765</id>
+        <account_code>d00d-1288381765</account_code>
+        <username></username>
+        <email></email>
+        <first_name></first_name>
+        <last_name></last_name>
+        <company_name></company_name>
+        <balance_in_cents type="integer">0</balance_in_cents>
+        <closed type="boolean">false</closed>
+        <hosted_login_token>ae169b31c14e4ecdaeca26cd42eb4819</hosted_login_token>
+        <created_at type="datetime">2010-11-04T23:28:01Z</created_at>
+        <state>active</state>
+      </account>
+
+    http_version: "1.1"