recurly 0.3.1 → 0.3.2

data/lib/recurly.rb

@@ -86,5 +86,13 @@ module Recurly
         c.site = config_data['site']
       end
     end
+
+    def current_accept_language
+      Thread.current[:recurly_accept_language]
+    end
+
+    def current_accept_language=(accept_language)
+      Thread.current[:recurly_accept_language] = accept_language
+    end
   end
 end

data/lib/recurly/account.rb

@@ -13,6 +13,11 @@ module Recurly
       account_code_was || account_code
     end
 
+    def encode(options={})
+      attributes[:accept_language] ||= Recurly.current_accept_language
+      super
+    end
+
     # Maps the
     SHOW_PARAMS = {
       :active => "active_subscribers",

data/lib/recurly/rails3/railtie.rb

@@ -8,5 +8,14 @@ module Recurly
       Recurly.configure unless Recurly.configured?
     end
 
+    initializer :recurly_set_accept_language do
+      ActionController::Base.class_eval do
+        prepend_before_filter do
+          # used to default the current accept language to the latest request
+          Recurly.current_accept_language = request.env["HTTP_ACCEPT_LANGUAGE"]
+        end
+      end
+    end
+
   end
 end

data/lib/recurly/version.rb

@@ -1,3 +1,3 @@
 module Recurly #:nodoc
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/spec/integration/account_spec.rb

@@ -131,7 +131,7 @@ module Recurly
 
       it "should return a list of accounts with matching criteria" do
         Account.list(:all).total_entries.should >= 8
-        Account.list(:paid).total_entries.should >= 4
+        Account.list(:active).total_entries.should >= 4
         Account.list(:free).total_entries.should >= 4
       end
 
@@ -242,5 +242,33 @@ module Recurly
       end
     end
 
+    describe "defaulting account's accept_language to Recurly.current_accept_language" do
+
+      context "user is from france" do
+        # wrap these example runs, setting current_accept_language properly
+        around(:each) do |example|
+          old_setting = Recurly.current_accept_language
+          Recurly.current_accept_language = "fr"
+          example.run
+          Recurly.current_accept_language = old_setting
+        end
+
+        context "user creates an account" do
+          use_vcr_cassette "account/accept-language-account/#{timestamp}"
+          let(:attributes) { Factory.account_attributes("account1-french-#{timestamp}") }
+
+          before(:each) do
+            @account = Account.create(attributes)
+          end
+
+          it "should automaticaly set the accounts accept_language" do
+            @account.attributes[:accept_language].should == "fr"
+          end
+        end
+
+      end
+
+    end
+
   end
 end

data/spec/integration/add_on_spec.rb

@@ -0,0 +1,84 @@
+require 'spec_helper'
+
+module Recurly
+  describe "Subscription Addons" do
+    # version accounts based on this current files modification dates
+    timestamp = File.mtime(__FILE__).to_i
+
+    describe "create a subscription with addons" do
+      use_vcr_cassette "subscription/addons/create/#{timestamp}"
+
+      let(:account){ Factory.create_account("subscription-addons-create-#{timestamp}") }
+
+      before(:each) do
+        Factory.create_subscription(account, :paid, :add_ons => [
+          {
+            :add_on_code => "special",
+            :quantity => 1,
+            :unit_amount => 10,
+          }
+        ])
+      end
+
+      it "should return the subscription addons" do
+        subscription = Subscription.find(account.account_code)
+        subscription.add_ons.count == 1
+      end
+    end
+
+    describe "add an addon to a subscription" do
+      use_vcr_cassette "subscription/addons/add/#{timestamp}"
+
+      let(:account){ Factory.create_account("subscription-addons-add-#{timestamp}") }
+
+      before(:each) do
+        Factory.create_subscription(account, :paid, :add_ons => [
+          {
+            :add_on_code => "special",
+            :quantity => 1,
+            :unit_amount => 10,
+          }
+        ])
+      end
+
+      it "should allow adding a new addon" do
+        subscription = Subscription.find(account.account_code)
+        subscription.add_ons << {
+          :add_on_code => "special2",
+          :quantity => 2,
+          :unit_amount => 500
+        }
+        subscription.change('now', :add_ons => subscription.add_ons)
+
+        subscription = Subscription.find(account.account_code)
+        subscription.add_ons.count == 2
+      end
+    end
+
+    describe "remove an addon from a subscription" do
+      use_vcr_cassette "subscription/addons/remove/#{timestamp}"
+
+      let(:account){ Factory.create_account("subscription-addons-remove-#{timestamp}") }
+
+      before(:each) do
+        Factory.create_subscription(account, :paid, :add_ons => [
+          {
+            :add_on_code => "special",
+            :quantity => 1,
+            :unit_amount => 1000,
+          }
+        ])
+      end
+
+      it "should allow removing an addon" do
+        subscription = Subscription.find(account.account_code)
+        subscription.change('now', :add_ons => [])
+
+        subscription = Subscription.find(account.account_code)
+        subscription.add_ons.count == 0
+      end
+
+    end
+
+  end
+end

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

@@ -0,0 +1,68 @@
+--- 
+- !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>account1-french-1294473653</account-code>
+        <last-name>Test</last-name>
+        <accept-language>fr</accept-language>
+        <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/account1-french-1294473653
+      connection: 
+      - close
+      content-type: 
+      - application/xml; charset=utf-8
+      x-runtime: 
+      - "358"
+      date: 
+      - Sat, 08 Jan 2011 08:01:01 GMT
+      server: 
+      - nginx/0.8.53
+      content-length: 
+      - "585"
+      set-cookie: 
+      - account_credentials=5efb585021cad50f5041bf437711e958e99e6854065d72cc582483bd506398b356b79593ccb3742f7b88c0d283d71c9d4577d5e1a3ebf419d125a668471d8933%3A%3A; domain=.recurly.com; path=/
+      - ""
+      - _recurly_session=f3db85de64b4022a045ffb442afc32ea; domain=.recurly.com; path=/; secure; HttpOnly
+      cache-control: 
+      - no-cache
+    body: |
+      <?xml version="1.0" encoding="UTF-8"?>
+      <account>
+        <id>account1-french-1294473653</id>
+        <account_code>account1-french-1294473653</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>eeae5cb20fcd4b059f4e33d0dfe94cab</hosted_login_token>
+        <created_at type="datetime">2011-01-08T08:01:01Z</created_at>
+        <state>active</state>
+      </account>
+
+    http_version: "1.1"

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

@@ -0,0 +1,68 @@
+--- 
+- !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>account1-french-1294473761</account-code>
+        <last-name>Test</last-name>
+        <accept-language>fr</accept-language>
+        <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/account1-french-1294473761
+      connection: 
+      - close
+      content-type: 
+      - application/xml; charset=utf-8
+      x-runtime: 
+      - "346"
+      date: 
+      - Sat, 08 Jan 2011 08:03:28 GMT
+      server: 
+      - nginx/0.8.53
+      content-length: 
+      - "585"
+      set-cookie: 
+      - account_credentials=0698802063b183bb20df9484ab1c0d5be4fb7f1fbd4c3d74f281dc7a4875b6f3fb10363f5d05b61feda85060f09d1802a327fd6ea8a5d378326cca9ebd4dbc7e%3A%3A; domain=.recurly.com; path=/
+      - ""
+      - _recurly_session=80bb998351fb4c4751d41318f92d7f3d; domain=.recurly.com; path=/; secure; HttpOnly
+      cache-control: 
+      - no-cache
+    body: |
+      <?xml version="1.0" encoding="UTF-8"?>
+      <account>
+        <id>account1-french-1294473761</id>
+        <account_code>account1-french-1294473761</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>72cf579d8ef84a78a54117d97e1a5c11</hosted_login_token>
+        <created_at type="datetime">2011-01-08T08:03:28Z</created_at>
+        <state>active</state>
+      </account>
+
+    http_version: "1.1"

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

@@ -0,0 +1,167 @@
+--- 
+- !ruby/struct:VCR::HTTPInteraction 
+  request: !ruby/struct:VCR::Request 
+    method: :get
+    uri: https://railsjedi%40sogetthis.com:7PCB2mZC@recurlytest3-test.recurly.com:443/company/plans/paid.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: 
+      - "\"47a9e8e85691ef0600a2dd39f113a21e\""
+      connection: 
+      - close
+      content-type: 
+      - application/xml; charset=utf-8
+      x-runtime: 
+      - "27"
+      date: 
+      - Sat, 08 Jan 2011 07:58:06 GMT
+      server: 
+      - nginx/0.8.53
+      content-length: 
+      - "1564"
+      set-cookie: 
+      - _recurly_session=db99a487d1f0e1eabe733c2987356ddc; domain=.recurly.com; path=/; secure; HttpOnly
+      cache-control: 
+      - private, max-age=0, must-revalidate
+    body: |
+      <?xml version="1.0" encoding="UTF-8"?>
+      <plan>
+        <plan_code>paid</plan_code>
+        <name>Paid</name>
+        <description></description>
+        <success_url></success_url>
+        <cancel_url></cancel_url>
+        <created_at type="datetime">2010-09-19T00:56:05Z</created_at>
+        <unit_amount_in_cents type="integer">1000</unit_amount_in_cents>
+        <setup_fee_in_cents type="integer">0</setup_fee_in_cents>
+        <plan_interval_length type="integer">1</plan_interval_length>
+        <plan_interval_unit>months</plan_interval_unit>
+        <trial_interval_length type="integer">0</trial_interval_length>
+        <trial_interval_unit>months</trial_interval_unit>
+        <latest_version depreciated="true">
+          <version type="integer">1</version>
+          <unit_amount_in_cents type="integer">1000</unit_amount_in_cents>
+          <setup_fee_in_cents type="integer">0</setup_fee_in_cents>
+          <plan_interval_length type="integer">1</plan_interval_length>
+          <plan_interval_unit>months</plan_interval_unit>
+          <trial_interval_length type="integer">0</trial_interval_length>
+          <trial_interval_unit>months</trial_interval_unit>
+          <created_at type="datetime">2010-12-10T19:19:03Z</created_at>
+        </latest_version>
+        <add_ons type="collection">
+          <add_on>
+            <add_on_code>special</add_on_code>
+            <default_unit_amount_in_cents>1000</default_unit_amount_in_cents>
+            <default_quantity>1</default_quantity>
+          </add_on>
+          <add_on>
+            <add_on_code>special2</add_on_code>
+            <default_unit_amount_in_cents>1500</default_unit_amount_in_cents>
+            <default_quantity>1</default_quantity>
+          </add_on>
+        </add_ons>
+      </plan>
+
+    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/account-french-1294473117/subscription.xml
+    body: |
+      <?xml version="1.0" encoding="UTF-8"?>
+      <subscription>
+        <quantity type="integer">1</quantity>
+        <plan-code>paid</plan-code>
+        <account>
+          <company-name>Recurly Ruby Gem</company-name>
+          <account-code>account-french-1294473117</account-code>
+          <last-name>Test</last-name>
+          <billing-info>
+            <city>San Francisco</city>
+            <address1>123 Test St</address1>
+            <zip>94115</zip>
+            <country>US</country>
+            <credit-card>
+              <number>1</number>
+              <month type="integer">1</month>
+              <year type="integer">2012</year>
+              <verification-value>123</verification-value>
+            </credit-card>
+            <last-name>Test</last-name>
+            <first-name>Verena</first-name>
+            <state>CA</state>
+          </billing-info>
+          <email>verena@test.com</email>
+          <first-name>Verena</first-name>
+        </account>
+      </subscription>
+
+    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: 
+      connection: 
+      - close
+      content-type: 
+      - application/xml; charset=utf-8
+      x-runtime: 
+      - "10955"
+      date: 
+      - Sat, 08 Jan 2011 07:58:17 GMT
+      server: 
+      - nginx/0.8.53
+      content-length: 
+      - "898"
+      set-cookie: 
+      - account_credentials=6cba421d09e204c2bfd53ed49c5f577d3c448e8f5c1cecb1c5e6749a01a19aa16bfebd18747805c433a01b10d05302472320eaac8b5804de67160e98bc62c35b%3A%3A; domain=.recurly.com; path=/
+      - ""
+      - _recurly_session=058b42e7f16161577a325998a32ce06b; domain=.recurly.com; path=/; secure; HttpOnly
+      cache-control: 
+      - no-cache
+    body: |
+      <?xml version="1.0" encoding="UTF-8"?>
+      <subscription>
+        <id>account-french-1294473117</id>
+        <account_code>account-french-1294473117</account_code>
+        <plan>
+          <plan_code>paid</plan_code>
+          <name>Paid</name>
+        </plan>
+        <state>active</state>
+        <quantity type="integer">1</quantity>
+        <total_amount_in_cents type="integer">1000</total_amount_in_cents>
+        <activated_at type="datetime">2011-01-08T07:58:07Z</activated_at>
+        <canceled_at nil="true" type="datetime"></canceled_at>
+        <expires_at nil="true" type="datetime"></expires_at>
+        <current_period_started_at type="datetime">2011-01-08T07:58:07Z</current_period_started_at>
+        <current_period_ends_at type="datetime">2011-02-08T07:58:07Z</current_period_ends_at>
+        <trial_started_at nil="true" type="datetime"></trial_started_at>
+        <trial_ends_at nil="true" type="datetime"></trial_ends_at>
+        <add_ons type="array">
+        </add_ons>
+      </subscription>
+
+    http_version: "1.1"