recurly 0.4.0 → 0.4.1

data/lib/patches/rails2/active_resource/connection.rb

@@ -0,0 +1,10 @@
+module ActiveResource
+  class Connection
+
+    # Get the results without decoding
+    def get_raw(path, headers = {})
+      request(:get, path, build_request_headers(headers, :get))
+    end
+
+  end
+end

data/lib/recurly.rb

@@ -4,7 +4,12 @@ require 'cgi'
 require 'openssl'
 require 'addressable/uri'
 
-require 'patches/active_resource/connection'
+# load ActiveResource patches
+if defined?(::Rails::VERSION::MAJOR) and ::Rails::VERSION::MAJOR == 3
+  require 'patches/rails3/active_resource/connection'
+elsif defined?(::Rails::VERSION::MAJOR) and ::Rails::VERSION::MAJOR == 2
+  require 'patches/rails2/active_resource/connection'
+end
 
 require 'recurly/version'
 require 'recurly/exceptions'
@@ -128,4 +133,4 @@ module Recurly
       Thread.current[:recurly_accept_language] = accept_language
     end
   end
-end
+end

data/lib/recurly/transparent.rb

@@ -129,6 +129,8 @@ module Recurly
       data.each do |key, val|
         if val.is_a?(Hash)
           data[key] = process_data(val)
+        elsif val.is_a?(String)
+          data[key] = val.to_s
         elsif val.is_a?(Enumerable)
           data[key] = val.map{|i| i.to_s}
         else
@@ -137,4 +139,5 @@ module Recurly
       end
     end
   end
-end
+end
+

data/lib/recurly/version.rb

@@ -1,3 +1,3 @@
 module Recurly #:nodoc
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/spec/integration/transaction_spec.rb

@@ -65,7 +65,8 @@ module Recurly
         end
 
         it "should be in void state" do
-          @transactions.first.amount_in_cents.should == 0
+          @transactions.first.amount_in_cents.should == 100
+          @transactions.first.status.should == 'void'
         end
       end
 
@@ -79,10 +80,12 @@ module Recurly
           Factory.create_transaction account.account_code, :amount_in_cents => 300, :description => "three"
 
           @successful_transactions = Transaction.list_for_account(account.account_code, :success)
+          @total_transactions = Transaction.list_for_account(account.account_code)
         end
 
         it "should return a list of transactions made on the account" do
-          @successful_transactions.length.should == 4
+          @successful_transactions.length.should == 3
+          @total_transactions.length.should == 4
         end
 
         it "should also be available via Account#transactions" do

data/spec/unit/transparent_spec.rb

@@ -16,14 +16,37 @@ module Recurly
         Transparent.url(Action::UpdateBilling).should == "#{Recurly::Base.site}/transparent/#{Recurly.subdomain}/billing_info"
         Transparent.url(Action::CreateTransaction).should == "#{Recurly::Base.site}/transparent/#{Recurly.subdomain}/transaction"
       end
+
+      it "should equal api-sandbox for sandbox" do
+        Recurly.configure do |config|
+          config.environment = :sandbox
+          config.subdomain = 'testtest'
+        end
+        Transparent.url(Action::CreateSubscription).should == "https://api-sandbox.recurly.com/transparent/testtest/subscription"
+        Transparent.url(Action::UpdateBilling).should == "https://api-sandbox.recurly.com/transparent/testtest/billing_info"
+        Transparent.url(Action::CreateTransaction).should == "https://api-sandbox.recurly.com/transparent/testtest/transaction"
+      end
+
+      it "should equal api-production for sandbox" do
+        Recurly.configure do |config|
+          config.environment = :production
+          config.subdomain = 'testtest'
+        end
+        Transparent.url(Action::CreateSubscription).should == "https://api-production.recurly.com/transparent/testtest/subscription"
+        Transparent.url(Action::UpdateBilling).should == "https://api-production.recurly.com/transparent/testtest/billing_info"
+        Transparent.url(Action::CreateTransaction).should == "https://api-production.recurly.com/transparent/testtest/transaction"
+      end
     end
 
     describe ".encrypt_string" do
       it "should encrypt the data using the configured private key" do
+        Recurly.configure do |config|
+          config.private_key = '986bfa2bec61479ca560dbaaec345820'
+        end
         result = Transparent.encrypt_string("d00d")
 
         # hashed manually
-        result.should == "938f381f79192f536cbe29a79db5c595b7a09379"
+        result.should == "790a4038fb9047889a767baadf8edc3e07b6e66b"
 
         result2 = Transparent.encrypt_string("d00d2")
         result2.should_not eq(result)
@@ -110,5 +133,40 @@ module Recurly
       end
     end
 
+    describe "#hidden_field" do
+      it "should return a string of a HTML hidden input element" do
+
+        transparent = Transparent.new({
+          :redirect_url => "http://example.com/",
+          :account => { :account_code => 'howdy' },
+          :value => "hello"
+        })
+
+        transparent.hidden_field.class.should eq(String)
+      end
+
+      it "should return a string of a HTML hidden input element" do
+        transparent = Transparent.new({
+          :redirect_url => "http://example.com/",
+          :account => { :account_code => '123' },
+          :amount => 10
+        })
+
+        transparent.hidden_field.class.should eq(String)
+      end
+
+      it "should return a string of a HTML hidden input element" do
+        transparent = Transparent.new({
+          :redirect_url => "http://example.com/",
+          :account => { :account_code => '123' },
+          :transaction => {
+            :amount => 10
+          }
+        })
+
+        transparent.hidden_field.class.should eq(String)
+      end
+    end
+
   end
 end

data/spec/vcr/account/accept-language-account/1297746103.yml

@@ -32,27 +32,24 @@
   response: !ruby/struct:VCR::Response 
     status: !ruby/struct:VCR::ResponseStatus 
       code: 201
-      message: "Created "
+      message: Created
     headers: 
       cache-control: 
       - no-cache
       location: 
       - http://app.recurly.local:3000/accounts/account1-french-1297746103
       x-runtime: 
-      - "515"
+      - "433"
       content-type: 
       - application/xml; charset=utf-8
       content-length: 
       - "585"
-      server: 
-      - WEBrick/1.3.1 (Ruby/1.9.2/2010-08-18)
-      date: 
-      - Fri, 11 Mar 2011 18:47:28 GMT
+      set-cookie: 
+      - _recurly_session=2646fb7dc231fbc50507e35872ded86d; domain=.recurly.local; path=/; HttpOnly
       connection: 
       - close
-      set-cookie: 
-      - account_credentials=d4fc51be51177aace2e3f530412ea425f760549c2083c14bbe9af0b5080cd66188dbb71bf7ffc1ca96d400c693d152db3f53a3deef4848f44afd42fe45dd4733%3A%3A; domain=.recurly.local; path=/
-      - _recurly_session=b8385e736e2e0c446b6b99f1e68c415d; domain=.recurly.local; path=/; HttpOnly
+      server: 
+      - thin 1.2.7 codename No Hup
     body: |
       <?xml version="1.0" encoding="UTF-8"?>
       <account>
@@ -65,8 +62,8 @@
         <company_name>Recurly Ruby Gem</company_name>
         <balance_in_cents type="integer">0</balance_in_cents>
         <closed type="boolean">false</closed>
-        <hosted_login_token>d7d5841da4264edaa467e01335407311</hosted_login_token>
-        <created_at type="datetime">2011-03-11T18:47:28Z</created_at>
+        <hosted_login_token>e38a18fa5fd94ef4a2df36503bc62111</hosted_login_token>
+        <created_at type="datetime">2011-03-18T18:47:35Z</created_at>
         <state>active</state>
       </account>
 

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

@@ -32,27 +32,24 @@
   response: !ruby/struct:VCR::Response 
     status: !ruby/struct:VCR::ResponseStatus 
       code: 201
-      message: "Created "
+      message: Created
     headers: 
       cache-control: 
       - no-cache
       location: 
       - http://app.recurly.local:3000/accounts/account-close-1297746103
       x-runtime: 
-      - "378"
+      - "347"
       content-type: 
       - application/xml; charset=utf-8
       content-length: 
       - "581"
-      server: 
-      - WEBrick/1.3.1 (Ruby/1.9.2/2010-08-18)
-      date: 
-      - Fri, 11 Mar 2011 18:47:16 GMT
+      set-cookie: 
+      - _recurly_session=feaecccc5b88d662541ee1e1c65c0b66; domain=.recurly.local; path=/; HttpOnly
       connection: 
       - close
-      set-cookie: 
-      - account_credentials=132e508bc3ed7d75b50b4d5d55a1ecb0f335784f2dd4e74c0532be92c81f3173bd66e27469e417dcf1b4b609844532ca32711edeca80ba96acebfc9a63c39b66%3A%3A; domain=.recurly.local; path=/
-      - _recurly_session=017dc9de9ee713b550c96ec1e1d36355; domain=.recurly.local; path=/; HttpOnly
+      server: 
+      - thin 1.2.7 codename No Hup
     body: |
       <?xml version="1.0" encoding="UTF-8"?>
       <account>
@@ -65,8 +62,8 @@
         <company_name>Recurly Ruby Gem</company_name>
         <balance_in_cents type="integer">0</balance_in_cents>
         <closed type="boolean">false</closed>
-        <hosted_login_token>45503dd9dca646499d29fc6522c3caf9</hosted_login_token>
-        <created_at type="datetime">2011-03-11T18:47:16Z</created_at>
+        <hosted_login_token>1c795d69f9e5437883fd99cc5a915d19</hosted_login_token>
+        <created_at type="datetime">2011-03-18T18:47:23Z</created_at>
         <state>active</state>
       </account>
 
@@ -88,24 +85,22 @@
   response: !ruby/struct:VCR::Response 
     status: !ruby/struct:VCR::ResponseStatus 
       code: 200
-      message: "OK "
+      message: OK
     headers: 
       cache-control: 
       - no-cache
       x-runtime: 
-      - "321"
+      - "481"
       content-type: 
       - application/xml; charset=utf-8
       content-length: 
       - "1"
-      server: 
-      - WEBrick/1.3.1 (Ruby/1.9.2/2010-08-18)
-      date: 
-      - Fri, 11 Mar 2011 18:47:18 GMT
+      set-cookie: 
+      - _recurly_session=217d1e05f1a8ea27ddfd1f6dc856d77b; domain=.recurly.local; path=/; HttpOnly
       connection: 
       - close
-      set-cookie: 
-      - _recurly_session=0993d29250a0117917de948d56b4ec48; domain=.recurly.local; path=/; HttpOnly
+      server: 
+      - thin 1.2.7 codename No Hup
     body: " "
     http_version: "1.1"
 - !ruby/struct:VCR::HTTPInteraction 
@@ -127,26 +122,24 @@
   response: !ruby/struct:VCR::Response 
     status: !ruby/struct:VCR::ResponseStatus 
       code: 200
-      message: "OK "
+      message: OK
     headers: 
       x-runtime: 
-      - "247"
+      - "293"
       content-type: 
       - application/xml; charset=utf-8
       etag: 
-      - "\"5a863b1aea60da430de63a76ffdb8aff\""
+      - "\"2a99494260c548f181eba47d258df6c2\""
       cache-control: 
       - private, max-age=0, must-revalidate
       content-length: 
       - "580"
-      server: 
-      - WEBrick/1.3.1 (Ruby/1.9.2/2010-08-18)
-      date: 
-      - Fri, 11 Mar 2011 18:47:20 GMT
+      set-cookie: 
+      - _recurly_session=d093e4e66b3ca4d1dde043580ada11c2; domain=.recurly.local; path=/; HttpOnly
       connection: 
       - close
-      set-cookie: 
-      - _recurly_session=c373ff7975bc328866ef41150b11a1e1; domain=.recurly.local; path=/; HttpOnly
+      server: 
+      - thin 1.2.7 codename No Hup
     body: |
       <?xml version="1.0" encoding="UTF-8"?>
       <account>
@@ -159,8 +152,8 @@
         <company_name>Recurly Ruby Gem</company_name>
         <balance_in_cents type="integer">0</balance_in_cents>
         <closed type="boolean">true</closed>
-        <hosted_login_token>45503dd9dca646499d29fc6522c3caf9</hosted_login_token>
-        <created_at type="datetime">2011-03-11T18:47:16Z</created_at>
+        <hosted_login_token>1c795d69f9e5437883fd99cc5a915d19</hosted_login_token>
+        <created_at type="datetime">2011-03-18T18:47:23Z</created_at>
         <state>closed</state>
       </account>
 

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

@@ -33,19 +33,17 @@
       cache-control: 
       - no-cache
       x-runtime: 
-      - "364"
+      - "371"
       content-type: 
       - application/xml; charset=utf-8
       content-length: 
       - "186"
-      server: 
-      - WEBrick/1.3.1 (Ruby/1.9.2/2010-08-18)
-      date: 
-      - Fri, 11 Mar 2011 18:47:22 GMT
+      set-cookie: 
+      - _recurly_session=bd077a070421d681c7485e8eef00715d; domain=.recurly.local; path=/; HttpOnly
       connection: 
       - close
-      set-cookie: 
-      - _recurly_session=b91cf21d0aa96326375445710ef2f8af; domain=.recurly.local; path=/; HttpOnly
+      server: 
+      - thin 1.2.7 codename No Hup
     body: |
       <?xml version="1.0" encoding="UTF-8"?>
       <errors>

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

@@ -28,27 +28,24 @@
   response: !ruby/struct:VCR::Response 
     status: !ruby/struct:VCR::ResponseStatus 
       code: 201
-      message: "Created "
+      message: Created
     headers: 
       cache-control: 
       - no-cache
       location: 
       - http://app.recurly.local:3000/accounts/account-exists
       x-runtime: 
-      - "387"
+      - "384"
       content-type: 
       - application/xml; charset=utf-8
       content-length: 
       - "520"
-      server: 
-      - WEBrick/1.3.1 (Ruby/1.9.2/2010-08-18)
-      date: 
-      - Fri, 11 Mar 2011 18:47:24 GMT
+      set-cookie: 
+      - _recurly_session=23879cef56d0b271a81ec227a113a1a0; domain=.recurly.local; path=/; HttpOnly
       connection: 
       - close
-      set-cookie: 
-      - account_credentials=b664123bc55a78c30adefd77ead47380b5dfd751b045c31a71bef135c1e89ee2e50ba23d729343265442c5700855b890a61e92cb7e1d34fc2d4b56f738a09bc6%3A%3A; domain=.recurly.local; path=/
-      - _recurly_session=4bfcbd106c4f8f9a8722123aaeee014d; domain=.recurly.local; path=/; HttpOnly
+      server: 
+      - thin 1.2.7 codename No Hup
     body: |
       <?xml version="1.0" encoding="UTF-8"?>
       <account>
@@ -61,8 +58,8 @@
         <company_name></company_name>
         <balance_in_cents type="integer">0</balance_in_cents>
         <closed type="boolean">false</closed>
-        <hosted_login_token>ee9df1b236504ebfa4b3efb716b13cb0</hosted_login_token>
-        <created_at type="datetime">2011-03-11T18:47:23Z</created_at>
+        <hosted_login_token>23bcf23b07e24395a3555ce974c14dda</hosted_login_token>
+        <created_at type="datetime">2011-03-18T18:47:31Z</created_at>
         <state>active</state>
       </account>
 
@@ -101,19 +98,17 @@
       cache-control: 
       - no-cache
       x-runtime: 
-      - "349"
+      - "316"
       content-type: 
       - application/xml; charset=utf-8
       content-length: 
       - "132"
-      server: 
-      - WEBrick/1.3.1 (Ruby/1.9.2/2010-08-18)
-      date: 
-      - Fri, 11 Mar 2011 18:47:26 GMT
+      set-cookie: 
+      - _recurly_session=9c5a5f7417e1b30d65a610ec081797ff; domain=.recurly.local; path=/; HttpOnly
       connection: 
       - close
-      set-cookie: 
-      - _recurly_session=fbf14194474f77a451b5c5b85dfec93e; domain=.recurly.local; path=/; HttpOnly
+      server: 
+      - thin 1.2.7 codename No Hup
     body: |
       <?xml version="1.0" encoding="UTF-8"?>
       <errors>

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

@@ -28,27 +28,24 @@
   response: !ruby/struct:VCR::Response 
     status: !ruby/struct:VCR::ResponseStatus 
       code: 201
-      message: "Created "
+      message: Created
     headers: 
       cache-control: 
       - no-cache
       location: 
       - http://app.recurly.local:3000/accounts/d00d-1297746103
       x-runtime: 
-      - "341"
+      - "347"
       content-type: 
       - application/xml; charset=utf-8
       content-length: 
       - "522"
-      server: 
-      - WEBrick/1.3.1 (Ruby/1.9.2/2010-08-18)
-      date: 
-      - Fri, 11 Mar 2011 18:45:46 GMT
+      set-cookie: 
+      - _recurly_session=2050d2c84f769b6781b8c218e3a393d4; domain=.recurly.local; path=/; HttpOnly
       connection: 
       - close
-      set-cookie: 
-      - account_credentials=e2fd86ca4d01f1dade5f277215c391bf5abecb34e117c47d4a6d0d92073c30627c628b94b12d5f8d3893deddfd0128dd053792ba6e565a986886b233cbd11cc4%3A%3A; domain=.recurly.local; path=/
-      - _recurly_session=50b68c0d6209378a114e224a005ecf38; domain=.recurly.local; path=/; HttpOnly
+      server: 
+      - thin 1.2.7 codename No Hup
     body: |
       <?xml version="1.0" encoding="UTF-8"?>
       <account>
@@ -61,8 +58,8 @@
         <company_name></company_name>
         <balance_in_cents type="integer">0</balance_in_cents>
         <closed type="boolean">false</closed>
-        <hosted_login_token>65fd765641144b338700054678727154</hosted_login_token>
-        <created_at type="datetime">2011-03-11T18:45:46Z</created_at>
+        <hosted_login_token>df2b753ecc344ddda3d8006e5dc36d4e</hosted_login_token>
+        <created_at type="datetime">2011-03-18T18:45:59Z</created_at>
         <state>active</state>
       </account>