recurly 0.2.0 → 0.2.1

data/README.md

@@ -16,22 +16,26 @@ Installation
 
 This library can be installed as a gem or a plugin. Your choice.
 
-**Rails3 Bundle Integration:**
+**Rails3 Stable Version:**
 
-    gem "recurly", :git => "http://github.com/railsjedi/recurly-client-ruby.git"
+    gem 'recurly'
 
+**Bleeding Edge Version:**
+    gem 'recurly', :git => "http://github.com/recurly/recurly-client-ruby.git"
 
-**Plugin Installation (not recommended):**
 
-    script/plugin install http://github.com/railsjedi/recurly-client-ruby.git
-
-
-Authentication
+Setup (Rails 3)
 --------------
 
 The Recurly Ruby Client requires a username and password to connect.  We recommend creating a user just for your API.  Please see the [Authentication](http://support.recurly.com/faqs/api/authentication) documentation for more information.
 
-Create a file in your Rails app at __/config/initializers/recurly_config.rb__ with contents like:
+If using Rails 3, the easiest way to get Recurly set up is to run `rake recurly:setup`. This will create a config/recurly.yml that has your recurly account authentication, and the Recurly rails initializer will pick it up on restart of your web app.
+
+
+Setup (Rails 2 and other frameworks)
+--------------
+
+Alternatively, if not using Rails 3, just make sure to call a Recurly configure block somewhere in your applications initialization.
 
     Recurly.configure do |c|
       c.username = 'api@yourcompany.com'
@@ -39,8 +43,35 @@ Create a file in your Rails app at __/config/initializers/recurly_config.rb__ wi
       c.site = 'https://my-recurly-site.recurly.com'
     end
 
+In Rails 2.x, this code should be in config/initializers/recurly.rb
+
+In Sinatra, it should be within a `configure` block.
+
+
+Manual Setup via YAML
+--------------
+
+You can also configure Recurly via a YAML file by using:
+
+    Recurly.configure_via_yaml("./config/recurly.yml")
+
 
-Demo Application
+The Recurly Configuration YAML is in the format of:
+
+    username: myrecurlyuser@domain.com
+    password: myrecurlypassword
+    site: https://myrecurlysite.recurly.com
+
+
+Clearing test data (Rails3)
+----------------
+
+   The Recurly Railtie (for rails3) includes a rake task that allows you to easily clear out the test data on your Account. This is useful when automating the testing of the api interation within your own app.
+
+   rake recurly:clear_test_data
+
+
+Rails Demo Application
 ----------------
 
 [Recurly Ruby Demo App](http://github.com/recurly/recurly-client-ruby-demo)
@@ -67,7 +98,7 @@ The next thing is to setup all the spec dependencies
 
     bundle
 
-When first running the specs, you'll need to setup a recurly test account. Use the provided rake task to walk you through creating spec/spec_settings.yml with all the authentication info.
+When first running the specs, you'll need to setup a recurly test account. Use the provided rake task to walk you through creating spec/config/recurly.yml with all the authentication info.
 
     rake recurly:setup
 
@@ -80,20 +111,14 @@ Something go Wrong?
 You can view the full http interactions with Recurly at spec/vcr. Please attached these to any bug reports so we can replicate.
 
 
-Clearing Test Data
-------------------
-
-You can delete the spec/vcr folder at any time, and it will regenerate the requests to recurly's apis. However if you do this, you'll also need to clear the test data on your recurly account. Here's how (manually):
-
-* Login to Recurly
-* Click "Configuration"" on the top right menu
-* Select "Clear Test Data"
+Clearing Test Data in Specs
+----------------------------
 
-This is also automated via a rake task. It will delete the spec/vcr files, and clear the data for you on the server (using your spec_settings.yml authentication info).
+You can delete the spec/vcr folder at any time, and it will regenerate the requests to recurly's apis. However if you do this, you'll also need to clear the test data on your recurly account. To do this run:
 
     rake recurly:clear
 
-
+This will run `recurly:clear_test_data` (using your spec/config/recurly.yml authentication info) to clear out the test data on the server and then delete the associated spec/vcr files so you can start from scratch.
 
 API Documentation
 -----------------

data/lib/recurly.rb

@@ -1,16 +1,42 @@
-require 'rubygems'
-require "active_resource"
-
+require 'active_resource'
 require 'cgi'
 
 require 'recurly/version'
 require 'recurly/formats/xml_with_pagination'
+require 'recurly/config_parser'
+require 'recurly/rails/railtie' if defined?(::Rails::Railtie)
 
 # configuration
 module Recurly
+
+  autoload :RecurlyBase,    'recurly/base'
+  autoload :Account,        'recurly/account'
+  autoload :BillingInfo,    'recurly/billing_info'
+  autoload :Charge,         'recurly/charge'
+  autoload :Credit,         'recurly/credit'
+  autoload :Invoice,        'recurly/invoice'
+  autoload :Plan,           'recurly/plan'
+  autoload :Subscription,   'recurly/subscription'
+  autoload :Transaction,    'recurly/transaction'
+
   class << self
     attr_accessor :username, :password, :site
 
+    # default Recurly.settings_path to config/recurly.yml
+    unless respond_to?(:settings_path)
+      def settings_path
+        @settings_path || "config/recurly.yml"
+      end
+
+      def settings_path=(new_settings_path)
+        @settings_path = new_settings_path
+      end
+    end
+
+    def configured?
+      RecurlyBase.user && RecurlyBase.password && RecurlyBase.site
+    end
+
     def configure
       yield self
 
@@ -20,15 +46,18 @@ module Recurly
 
       true
     end
+
+    def configure_from_yaml(path = nil)
+      configure do |c|
+        # parse configuration from yml
+        recurly_config = ConfigParser.parse(path)
+
+        if recurly_config.present?
+          c.username = recurly_config["username"]
+          c.password = recurly_config["password"]
+          c.site = recurly_config["site"]
+        end
+      end
+    end
   end
-end
-
-require 'recurly/base'
-require 'recurly/account'
-require 'recurly/billing_info'
-require 'recurly/charge'
-require 'recurly/credit'
-require 'recurly/invoice'
-require 'recurly/plan'
-require 'recurly/subscription'
-require 'recurly/transaction'
+end

data/lib/recurly/account.rb

@@ -3,6 +3,16 @@ module Recurly
     self.element_name = "account"
     self.primary_key = :account_code
 
+    attr_accessor :account_code_was
+    def account_code=(new_account_code)
+      self.account_code_was = self.account_code
+      super
+    end
+
+    def to_param
+      account_code_was || account_code
+    end
+
     # Maps the
     SHOW_PARAMS = {
       :active => "active_subscribers",
@@ -30,8 +40,8 @@ module Recurly
       destroy
     end
 
-    def charges
-      Charge.list(account_code)
+    def charges(status = :all)
+      Charge.list(account_code, status)
     end
     memoize :charges
 
@@ -49,7 +59,7 @@ module Recurly
     end
 
     def transactions(status)
-      Transaction.list(account_code, status)
+      Transaction.list_for_account(account_code, status)
     end
     memoize :transactions
 

data/lib/recurly/base.rb

@@ -17,6 +17,10 @@ module Recurly
       false
     end
 
+    def valid?
+      self.errors.blank?
+    end
+
     # See http://github.com/rails/rails/commit/1488c6cc9e6237ce794e3c4a6201627b9fd4ca09
     # Errors in Rails 2.3.4 are not parsed correctly.
     def save

data/lib/recurly/charge.rb

@@ -3,8 +3,14 @@ module Recurly
     self.element_name = "charge"
     self.prefix = "/accounts/:account_code/"
 
-    def self.list(account_code)
-      find(:all, :params => { :account_code => account_code })
+    def self.list(account_code, status = :all)
+      params = {:account_code => account_code}
+
+      if status != :all
+        params[:show] = status.to_s
+      end
+
+      find(:all, :params => params)
     end
 
     def self.lookup(account_code, id)

data/lib/recurly/config_parser.rb

@@ -0,0 +1,28 @@
+require 'fileutils'
+module Recurly
+  module ConfigParser
+    class << self
+
+      def parse(path = nil)
+        path ||= Recurly.settings_path
+        settings = {}
+        if File.exists?(path)
+          settings = YAML.load_file(path) || {}
+        else
+          puts "\n#{path} file not found. Run rake recurly:setup to create one\n\n"
+        end
+
+        settings
+      end
+
+      def save(settings = {}, path = nil)
+        path ||= Recurly.settings_path
+        FileUtils.mkdir_p(File.dirname(path))
+        File.open(path, 'w' ) do |out|
+          YAML.dump(settings, out)
+        end
+      end
+    end
+  end
+
+end

data/lib/recurly/formats/xml_with_pagination.rb

@@ -15,20 +15,21 @@ module Recurly
 
       # convert the data into a paginated resultset (array with singleton methods)
       def paginate_data(data)
+
         # find the first array and use that as the resultset (lame workaround)
-        results = data.values.select{|v| v.is_a?(Array)}.first
+        results = data.values.select{|v| v.is_a?(Array)}.first || []
 
-        # use a singleton methods for now (maybe wrap in WillPaginate later?)
+        # define total_entries accessor on result object
         total_entries = data["total_entries"] || 0
-        def results.total_entries; total_entries; end
+        results.instance_eval "def total_entries; #{total_entries.to_i}; end"
 
-        current_page = data["current_page"] || 1
-        def results.current_page; current_page; end
+        # define current_page accessor on result object
+        current_page = data["current_page"] || 0
+        results.instance_eval "def current_page; #{current_page.to_i}; end"
 
-        per_page = data["per_page"]
-        if per_page
-          def results.per_page; per_page; end
-        end
+        # define per_page accessor on result object
+        per_page = data["per_page"] || 0
+        results.instance_eval "def per_page; #{per_page.to_i}; end"
 
         results
       end

data/lib/recurly/rails/railtie.rb

@@ -0,0 +1,13 @@
+module Recurly
+  class Railtie < ::Rails::Railtie
+    rake_tasks do
+      load 'recurly/rails/recurly.rake'
+    end
+
+    config.after_initialize do
+      # setup recurly authentication details for testing
+      ::Recurly.configure_from_yaml unless Recurly.configured?
+    end
+
+  end
+end

data/lib/recurly/rails/recurly.rake

@@ -0,0 +1,77 @@
+namespace :recurly do
+
+  # loads settings
+  task :load_settings => :environment do
+    # load the recurly.yml file
+    @recurly_config = Recurly::ConfigParser.parse
+  end
+
+  desc "Clears out the Test data from your configured Recurly site (does not touch your production site)"
+  task :clear_test_data => :load_settings do
+    puts "\n"
+
+    begin
+      require 'restclient'
+    rescue LoadError
+      puts "Install the 'rest-client' gem in order to automatically clear your recurly test data via a rake task. If using Bundler, add it to your project's Gemfile (in :development group) and run again."
+      exit
+    end
+
+    username = @recurly_config["username"]
+    password = @recurly_config["password"]
+
+    # lets try logging into site
+    login_response = nil
+    begin
+      RestClient.post "https://app.recurly.com/login",
+        :user_session => {
+          :email => username,
+          :password => password
+        }
+
+      # yes, RestClient api is weird
+      raise "Login Failed for #{username} (we should have gotten a redirect)"
+    rescue RestClient::Found => e
+      # we got a redirect. horray!
+      login_response = e.response
+    end
+
+    # now lets clear site data
+    begin
+      RestClient.post( @recurly_config["site"]+"/site/test_data",
+                       {"_method"=>"delete"},
+                       :cookies => login_response.cookies)
+      raise "Clearing Didn't work for some reason. Is your site setting correct?"
+    rescue RestClient::Found => e
+      puts "Test Data Cleared from: #{@recurly_config["site"]}"
+    end
+  end
+
+  desc "Creates a recurly.yml config file"
+  task :setup => :environment do
+
+    # load the recurly.yml file
+    Rake::Task["recurly:load_settings"].invoke
+
+    puts "Creating a recurly.yml config file for your project\n"
+
+    begin
+      require 'highline/import'
+    rescue LoadError
+      puts "Install the 'highline' gem for a more interactive experience. If using Bundler, add it to your project's Gemfile (in :development group) and run again."
+      exit
+    end
+
+    # ask for the username
+    say "\nStep 1) Go to recurly.com and set up a test account...\n"
+    @recurly_config["username"] = ask("\nStep 2) Enter your recurly username (email):", String)
+
+    @recurly_config["password"] = ask("\nStep 3) Enter your recurly password:", String){ |q| q.echo = "*" }
+
+    @recurly_config["site"] = ask("\nStep 4) Enter your recurly base site url (e.g. https://testrecurly2-test.recurly.com):", String)
+
+    # saves the yml file
+    Recurly::ConfigParser.save(@recurly_config)
+    puts "\nYour settings were saved in:\n#{Recurly.settings_path}\n"
+  end
+end

data/lib/recurly/transaction.rb

@@ -2,7 +2,18 @@ module Recurly
   class Transaction < RecurlyBase
     self.element_name = "transaction"
 
-    def self.list(account_code, status = :all)
+
+    def self.list(status = :all)
+
+      options = {}
+      if status != :all
+        options[:params] = {:show => status.to_s}
+      end
+
+      find(:all, options)
+    end
+
+    def self.list_for_account(account_code, status = :all)
       results = find(:all, :from => "/accounts/#{CGI::escape(account_code || '')}/transactions")
 
       # filter by status
@@ -17,5 +28,13 @@ module Recurly
       find(id, :params => { :account_code => account_code })
     end
 
+    def void
+      connection.delete(element_path(:action => "void"), self.class.headers)
+    end
+
+    def refund(amount_in_cents)
+      connection.delete(element_path(:action => "refund", :amount => amount_in_cents), self.class.headers)
+    end
+
   end
 end

data/lib/recurly/version.rb

@@ -1,3 +1,3 @@
 module Recurly #:nodoc
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/spec/config/recurly.yml

@@ -0,0 +1,4 @@
+--- 
+username: railsjedi@sogetthis.com
+site: https://recurlytest3-test.recurly.com
+password: 7PCB2mZC

data/spec/integration/account_spec.rb

@@ -4,15 +4,69 @@ module Recurly
   describe Account do
     timestamp = File.mtime(__FILE__).to_i
 
+    describe "#new" do
+      let(:attributes) { Factory.account_attributes("account-new-#{timestamp}") }
+      before(:each) do
+        @account = Account.new(attributes)
+      end
+
+      it "should be valid" do
+        @account.should be_valid
+      end
+
+      it "should set the attributes correctly" do
+        attributes.each do |key, val|
+          @account.attributes[key].should == val
+        end
+      end
+    end
+
     describe "#create" do
-      use_vcr_cassette "account/create/#{timestamp}"
+      context "with full data" do
+        use_vcr_cassette "account/create/#{timestamp}"
 
-      before(:each) do
-        @account = Factory.create_account("account-create-#{timestamp}")
+        let(:attributes) { Factory.account_attributes("account-create-#{timestamp}") }
+        before(:each) do
+          @account = Account.create(attributes)
+        end
+
+        it "should be valid" do
+          @account.should be_valid
+        end
+
+        it "should set a created_at date from the server" do
+          @account.created_at.should_not be_nil
+        end
+
+        it "should set a hosted_login_token from the server" do
+          @account.hosted_login_token.should_not be_nil
+        end
+
+        it "should set the balance to 0" do
+          @account.balance_in_cents.should == 0
+        end
+
+        it "should set the account status to active" do
+          @account.state.should == "active"
+          @account.closed?.should be_false
+        end
       end
 
-      it "should have a created_at date" do
-        @account.created_at.should_not be_nil
+      context "with just account-code" do
+        use_vcr_cassette "account/create-min/#{timestamp}"
+
+        before(:each) do
+          @account = Account.create(:account_code => "d00d-#{timestamp}")
+        end
+
+        it "should be valid" do
+          @account.should be_valid
+        end
+
+        it "should set a created_at date from the server" do
+          @account.created_at.should_not be_nil
+        end
+
       end
     end
 
@@ -45,10 +99,49 @@ module Recurly
           @account.first_name.should == orig.first_name
         end
       end
+
+      context "looking for a non-existant account" do
+        it "should raise an ActiveResource::ResourceNotFound exception" do
+          pending "This isn't supposed to throw 500 errors..."
+
+          expect {
+            Account.find('account-that-doesnt-exist')
+          }.to raise_error ActiveResource::ResourceNotFound
+        end
+      end
     end
 
+
+    # spec list queries for finding acocunts
+    describe "#list" do
+      use_vcr_cassette "account/list/#{timestamp}"
+
+      before(:each) do
+
+        # create new ones
+        @accounts = []
+        8.times do |i|
+          @accounts << Factory.create_account("account-list-num-#{i}-#{timestamp}")
+        end
+
+        # mark the 4 of them as paid
+        @subscriptions = []
+        @accounts[0, 4].each do |account|
+          @subscriptions << Factory.create_subscription(account, :paid)
+        end
+      end
+
+      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(:free).total_entries.should >= 4
+      end
+
+    end
+
+
     describe "#update" do
-      around(:each){ |e| VCR.use_cassette("account/update/#{timestamp}", &e) }
+      use_vcr_cassette "account/update/#{timestamp}"
 
       let(:orig){ Factory.create_account("account-update-#{timestamp}") }
 
@@ -76,17 +169,80 @@ module Recurly
       end
     end
 
+    # EDITING ACCOUNT_CODE NOT YET SUPPORTED ON RECURLY API
+    # describe "#update with account_code" do
+    #   use_vcr_cassette "account/update2/#{timestamp}"
+    #
+    #   let(:orig){ Factory.create_account("account-update2-#{timestamp}") }
+    #
+    #   let(:new_account_code){ "#{orig.account_code}-edited" }
+    #
+    #   before(:each) do
+    #     # update account data
+    #     @account = Account.find(orig.account_code)
+    #     @account.account_code = new_account_code
+    #     @account.save!
+    #
+    #     @account = Account.find(new_account_code)
+    #   end
+    #
+    #   it "should update the account code" do
+    #     @account.account_code.should == new_account_code
+    #   end
+    # end
+
     describe "#close_account" do
       use_vcr_cassette "account/close/#{timestamp}"
       let(:account){ Factory.create_account("account-close-#{timestamp}") }
 
       before(:each) do
         account.close_account
+
+        # load a fresh account
+        @account = Account.find(account.account_code)
       end
 
       it "should mark the account as closed" do
-        Account.find(account.account_code).state.should == "closed"
+        @account.state.should == "closed"
+        @account.closed?.should be_true
+      end
+    end
+
+    describe "validations" do
+      context "with blank data" do
+        use_vcr_cassette "account/create-blank/#{timestamp}"
+
+        before(:each) do
+          @account = Account.create({:account_code => ""})
+        end
+
+        it "should not be valid" do
+          @account.should_not be_valid
+        end
+
+        it "should require setting an account code" do
+          @account.errors[:account_code].should include("can't be blank")
+          @account.errors[:account_code].should include("is invalid")
+        end
+      end
+
+      context "with duplicate data" do
+        use_vcr_cassette "account/create-duplicate/#{timestamp}"
+
+        before(:each) do
+          Account.create({:account_code => "account-exists"})
+          @account = Account.create({:account_code => "account-exists"})
+        end
+
+        it "should not be valid" do
+          @account.should_not be_valid
+        end
+
+        it "should require setting an account code" do
+          @account.errors[:account_code].should include("has already been taken")
+        end
       end
     end
+
   end
 end

data/spec/integration/billing_info_spec.rb

@@ -18,7 +18,7 @@ module Recurly
       billing_info.credit_card.last_four.should == billing_attributes[:credit_card][:number]
     end
 
-    describe "#create" do
+    describe "create an account's billing information" do
       use_vcr_cassette "billing/create/#{timestamp}"
       let(:account){ Factory.create_account("billing-create-#{timestamp}") }
 
@@ -42,7 +42,28 @@ module Recurly
       end
     end
 
-    describe "#find" do
+    describe "update an account's billing information" do
+      use_vcr_cassette "billing/update/#{timestamp}"
+      let(:account){ Factory.create_account_with_billing_info("billing-update-#{timestamp}") }
+
+      before(:each) do
+        @new_billing_attributes = Factory.billing_attributes({
+          :account_code => account.account_code,
+          :first_name => account.first_name,
+          :last_name => account.last_name,
+          :address1 => "1st Ave South, Apt 5001"
+        })
+
+        @billing_info = BillingInfo.create(@new_billing_attributes)
+      end
+
+      it "should set the correct billing_info on the server " do
+        billing_info = BillingInfo.find(account.account_code)
+        verify_billing_info(billing_info, @new_billing_attributes)
+      end
+    end
+
+    describe "get account's billing information" do
       use_vcr_cassette "billing/find/#{timestamp}"
       let(:account){ Factory.create_account_with_billing_info("billing-find-#{timestamp}") }
 
@@ -62,5 +83,37 @@ module Recurly
       end
     end
 
+    describe "clearing an account's billing information" do
+      use_vcr_cassette "billing/destroy/#{timestamp}"
+      let(:account){ Factory.create_account("billing-destroy-#{timestamp}") }
+
+      before(:each) do
+        @billing_attributes = Factory.billing_attributes({
+          :account_code => account.account_code,
+          :first_name => account.first_name,
+          :last_name => account.last_name,
+          :address1 => "500 South Central Blvd",
+          :city => "Los Angeles",
+          :state => "CA",
+          :zip => "90001"
+        })
+
+        BillingInfo.create(@billing_attributes)
+
+        @billing_info = BillingInfo.find(account.account_code)
+      end
+
+      it "should allow destroying the billing info for an account" do
+        @billing_info.destroy
+
+        fresh = BillingInfo.find(account.account_code)
+        fresh.first_name.should be_nil
+        fresh.last_name.should be_nil
+        fresh.address1.should be_nil
+        fresh.city.should be_nil
+        fresh.state.should be_nil
+        fresh.zip.should be_nil
+      end
+    end
   end
 end

data/spec/integration/charge_spec.rb

@@ -5,7 +5,78 @@ module Recurly
     # version accounts based on this current files modification dates
     timestamp = File.mtime(__FILE__).to_i
 
-    describe "create a charge" do
+    describe "list an account's charges" do
+
+      context "all charges" do
+        use_vcr_cassette "charge/list-all/#{timestamp}"
+
+        let(:account) { Factory.create_account("charge-list-all-#{timestamp}") }
+        before(:each) do
+          Factory.create_charge(account.account_code)
+          Factory.create_charge(account.account_code)
+          Factory.create_charge(account.account_code)
+
+          @charges = Charge.list(account.account_code)
+        end
+
+        it "should return all the charges" do
+          @charges.length.should == 3
+        end
+
+        it "should also be available via Account#charges" do
+          account.charges.should == @charges
+        end
+      end
+
+      context "pending charges" do
+        use_vcr_cassette "charge/list-pending/#{timestamp}"
+
+        let(:account) { Factory.create_account("charge-list-pending-#{timestamp}") }
+        before(:each) do
+          Factory.create_charge(account.account_code)
+          Factory.create_charge(account.account_code)
+          Factory.create_charge(account.account_code)
+
+          @charges = Charge.list(account.account_code, :pending)
+        end
+
+        it "should return all the charges" do
+          @charges.length.should == 3
+        end
+
+        it "should also be available via Account#charges" do
+          account.charges(:pending).should == @charges
+        end
+      end
+
+      context "invoiced charges" do
+        use_vcr_cassette "charge/list-invoiced/#{timestamp}"
+
+        let(:account) { Factory.create_account("charge-list-invoiced-#{timestamp}") }
+        before(:each) do
+          Factory.create_charge(account.account_code)
+          Factory.create_charge(account.account_code)
+          Factory.create_charge(account.account_code)
+
+          Invoice.create(:account_code => account.account_code)
+
+          Factory.create_charge(account.account_code)
+
+          @charges = Charge.list(account.account_code, :invoiced)
+        end
+
+        it "should return all the charges that were invoiced" do
+          @charges.length.should == 3
+        end
+
+        it "should also be available via Account#charges" do
+          account.charges(:invoiced).should == @charges
+        end
+      end
+
+    end
+
+    describe "charge an account" do
       use_vcr_cassette "charge/create/#{timestamp}"
 
       let(:account) { Factory.create_account_with_billing_info("charge-create-#{timestamp}") }
@@ -31,28 +102,6 @@ module Recurly
       end
     end
 
-    describe "list charges for an account" do
-      use_vcr_cassette "charge/list/#{timestamp}"
-
-      let(:account) { Factory.create_account("charge-list-#{timestamp}") }
-      before(:each) do
-        Factory.create_charge(account.account_code)
-        Factory.create_charge(account.account_code)
-        Factory.create_charge(account.account_code)
-
-        @charges = Charge.list(account.account_code)
-      end
-
-      it "should return all the transactions" do
-        @charges.length.should == 3
-      end
-
-      it "should also be available via Account#charges" do
-        account.charges.should == @charges
-      end
-
-    end
-
     describe "lookup a charge" do
       use_vcr_cassette "charge/lookup/#{timestamp}"
 

data/spec/integration/credit_spec.rb

@@ -5,7 +5,7 @@ module Recurly
     # version accounts based on this current files modification dates
     timestamp = File.mtime(__FILE__).to_i
 
-    describe "create a credit" do
+    describe "credit an account" do
       use_vcr_cassette "credit/create/#{timestamp}"
 
       let(:account){ Factory.create_account("credit-create-#{timestamp}") }
@@ -31,7 +31,7 @@ module Recurly
       end
     end
 
-    describe "list credits for an account" do
+    describe "list an account's credits" do
       use_vcr_cassette "credit/list/#{timestamp}"
       let(:account){ Factory.create_account("credit-list-#{timestamp}") }
 

data/spec/integration/invoice_spec.rb

@@ -25,6 +25,18 @@ module Recurly
           @invoice.line_items.length.should == 2
         end
       end
+
+      context "without charges" do
+        use_vcr_cassette "invoice/create-no-charges/#{timestamp}"
+
+        let(:account) { Factory.create_account_with_billing_info("invoice-create-no-charges-#{timestamp}") }
+
+        it "should not be created since no charges were posted" do
+          pending "Server should not throw a 500 error here"
+          @invoice = Invoice.create(:account_code => account.account_code)
+          @invoice.should_not be_valid
+        end
+      end
     end
 
     describe "listing invoices" do

data/spec/integration/plan_spec.rb

@@ -2,6 +2,9 @@ require 'spec_helper'
 
 module Recurly
   describe Plan do
+    # version accounts based on this current files modification dates
+    timestamp = File.mtime(__FILE__).to_i
+
     describe "list all plans" do
       use_vcr_cassette "plan/all"
 
@@ -53,8 +56,8 @@ module Recurly
         Plan.find("test")
       end
 
+      # setup test plan
       before(:each) do
-
         begin
           @test_plan = test_plan
         rescue ActiveResource::ResourceNotFound => e
@@ -69,17 +72,44 @@ module Recurly
           }).save!
           @test_plan = test_plan
         end
+      end
 
-        # double the price
+      it "should update the plan" do
         @test_plan.unit_amount_in_cents = 200
         @test_plan.save!
-      end
 
-      it "should update the plan" do
         @test_plan = test_plan
         @test_plan.unit_amount_in_cents.should == 200
       end
     end
 
+    describe "delete a plan" do
+      use_vcr_cassette "plan/delete/#{timestamp}"
+
+      let(:plan) do
+        plan = Plan.new({
+          :plan_code => "test_#{timestamp}",
+          :name => "Test Plan #{timestamp}",
+          :unit_amount_in_cents => 100,
+          :plan_interval_length => 1,
+          :plan_interval_unit => "months",
+          :trial_interval_length => 0,
+          :trial_interval_unit => "months"
+        })
+        plan.save!
+        plan
+      end
+
+      it "should delete the plan" do
+        @plan = Plan.find(plan.plan_code)
+        @plan.destroy
+
+        expect {
+          Plan.find(@plan.plan_code)
+        }.to raise_error(ActiveResource::ResourceNotFound)
+      end
+
+    end
+
   end
 end

data/spec/integration/subscription_spec.rb

@@ -5,7 +5,23 @@ module Recurly
     # version accounts based on this current files modification dates
     timestamp = File.mtime(__FILE__).to_i
 
-    describe "#create" do
+    describe "look up a subscription" do
+      use_vcr_cassette "subscription/find/#{timestamp}"
+
+      let(:account){ Factory.create_account("subscription-find-#{timestamp}") }
+
+      before(:each) do
+        Factory.create_subscription(account, :paid)
+      end
+
+      it "should return the subscription" do
+        subscription = Subscription.find(account.account_code)
+        subscription.state.should == "active"
+        subscription.plan.plan_code.should == "paid"
+      end
+    end
+
+    describe "create a new subscription" do
       use_vcr_cassette "subscription/create/#{timestamp}"
 
       let(:account){ Factory.create_account("subscription-create-#{timestamp}") }
@@ -29,9 +45,10 @@ module Recurly
       it "should be started" do
         @subscription.current_period_started_at.should_not be_nil
       end
+
     end
 
-    describe "#update" do
+    describe "updates and downgrades" do
       use_vcr_cassette "subscription/update/#{timestamp}"
 
       let(:account){ Factory.create_account("subscription-update-#{timestamp}") }
@@ -48,7 +65,7 @@ module Recurly
       end
     end
 
-    describe "#cancel" do
+    describe "cancel a subscription" do
       use_vcr_cassette "subscription/cancel/#{timestamp}"
 
       let(:account){ Factory.create_account("subscription-cancel-#{timestamp}") }
@@ -69,7 +86,7 @@ module Recurly
       end
     end
 
-    describe "#refund" do
+    describe "refund a subscription" do
       use_vcr_cassette "subscription/refund/#{timestamp}"
 
       let(:account){ Factory.create_account("subscription-refund-#{timestamp}") }

data/spec/integration/transaction_spec.rb

@@ -57,7 +57,7 @@ module Recurly
         let(:account) { Factory.create_account_with_billing_info("transaction-list-empty-#{timestamp}") }
 
         before(:each) do
-          @transactions = Transaction.list(account.account_code)
+          @transactions = Transaction.list_for_account(account.account_code)
         end
 
         it "should return an empty array of transactions" do
@@ -74,7 +74,7 @@ module Recurly
           Factory.create_transaction account.account_code, :amount_in_cents => 200, :description => "two"
           Factory.create_transaction account.account_code, :amount_in_cents => 300, :description => "three"
 
-          @successful_transactions = Transaction.list(account.account_code, :success)
+          @successful_transactions = Transaction.list_for_account(account.account_code, :success)
         end
 
         it "should return a list of transactions made on the account" do
@@ -109,8 +109,37 @@ module Recurly
       it "should also be available via Account#lookup_transaction" do
         account.lookup_transaction(@transaction3.id).should == @transaction3
       end
+    end
+
+    describe "void a transaction" do
+      use_vcr_cassette "transaction/void/#{timestamp}"
+      let(:account) { Factory.create_account_with_billing_info("transaction-void-#{timestamp}") }
+
+      before(:each) do
+        @transaction = Factory.create_transaction account.account_code, :amount_in_cents => 100, :description => "one"
+      end
+
+      it "should void a transaction" do
+        @transaction.void
+        Transaction.list(:voided).should include(@transaction)
+      end
+    end
+
+    describe "refund a transaction" do
+      use_vcr_cassette "transaction/refund/#{timestamp}"
+      let(:account) { Factory.create_account_with_billing_info("transaction-refund-#{timestamp}") }
 
+      before(:each) do
+        @transaction = Factory.create_transaction account.account_code, :amount_in_cents => 1000, :description => "one"
+      end
+
+      it "should refund the transaction" do
+        pending "Server should refund the transaction"
+        @transaction.refund(1000)
+        Transaction.list(:refunds).should include(@transaction)
+      end
     end
 
+
   end
 end

data/spec/spec_helper.rb

@@ -3,18 +3,14 @@ require 'rubygems'
 require "bundler"
 Bundler.setup
 
-require File.dirname(__FILE__) + '/../lib/recurly'
+$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}
 
-# loads the settings from yml
-Recurly::SpecSettings.reload!
-
 # setup recurly authentication details for testing
-Recurly.configure do |c|
-  c.username = Recurly::SpecSettings["username"]
-  c.password = Recurly::SpecSettings["password"]
-  c.site = Recurly::SpecSettings["site"]
-end
+Recurly.configure_from_yaml

data/spec/support/factory.rb

@@ -1,8 +1,15 @@
 module Recurly
   module Factory
 
+
     # creates an account
     def self.create_account(account_code, overrides = {})
+      account = Account.new(account_attributes(account_code, overrides))
+      account.save!
+      account
+    end
+
+    def self.account_attributes(account_code, overrides = {})
       attributes = {
         # version is used to avoid duplicate account errors on recurly's api, pass in a different one every time
         :account_code => account_code,
@@ -17,9 +24,7 @@ module Recurly
         attributes[key] = val
       end
 
-      account = Account.new(attributes)
-      account.save!
-      account
+      attributes
     end
 
     # creates an account with associated billing information

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: recurly
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Isaac Hall
@@ -16,13 +16,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-08 00:00:00 -07:00
+date: 2010-10-12 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: activeresource
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -32,17 +30,17 @@ dependencies:
         - 2
         - 3
         version: "2.3"
+  requirement: *id001
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
+  name: activeresource
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 2632228393
+        hash: 62196431
         segments: 
         - 2
         - 0
@@ -50,12 +48,12 @@ dependencies:
         - beta
         - 22
         version: 2.0.0.beta.22
+  requirement: *id002
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: webmock
+  name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -64,12 +62,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id003
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: vcr
+  name: webmock
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -78,8 +76,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id004
   type: :development
-  version_requirements: *id004
+  name: vcr
+  prerelease: false
 description: A Ruby API wrapper for Recurly. Super Simple Subscription billing.
 email: 
 - support@recurly.com
@@ -94,10 +94,13 @@ files:
 - lib/recurly/base.rb
 - lib/recurly/billing_info.rb
 - lib/recurly/charge.rb
+- lib/recurly/config_parser.rb
 - lib/recurly/credit.rb
 - lib/recurly/formats/xml_with_pagination.rb
 - lib/recurly/invoice.rb
 - lib/recurly/plan.rb
+- lib/recurly/rails/railtie.rb
+- lib/recurly/rails/recurly.rake
 - lib/recurly/subscription.rb
 - lib/recurly/transaction.rb
 - lib/recurly/version.rb
@@ -105,6 +108,7 @@ files:
 - init.rb
 - LICENSE
 - README.md
+- spec/config/recurly.yml
 - spec/integration/account_spec.rb
 - spec/integration/billing_info_spec.rb
 - spec/integration/charge_spec.rb
@@ -114,9 +118,7 @@ files:
 - spec/integration/subscription_spec.rb
 - spec/integration/transaction_spec.rb
 - spec/spec_helper.rb
-- spec/spec_settings.yml.example
 - spec/support/factory.rb
-- spec/support/spec_settings.rb
 - spec/support/vcr.rb
 has_rdoc: true
 homepage: http://github.com/recurly/recurly-client-ruby
@@ -153,6 +155,7 @@ signing_key:
 specification_version: 3
 summary: Ruby API wrapper for Recurly
 test_files: 
+- spec/config/recurly.yml
 - spec/integration/account_spec.rb
 - spec/integration/billing_info_spec.rb
 - spec/integration/charge_spec.rb
@@ -162,7 +165,5 @@ test_files:
 - spec/integration/subscription_spec.rb
 - spec/integration/transaction_spec.rb
 - spec/spec_helper.rb
-- spec/spec_settings.yml.example
 - spec/support/factory.rb
-- spec/support/spec_settings.rb
 - spec/support/vcr.rb

data/spec/spec_settings.yml.example

@@ -1,3 +0,0 @@
-username: ''
-password: ''
-site: 'https://yoursitename-test.recurly.com'

data/spec/support/spec_settings.rb

@@ -1,36 +0,0 @@
-require 'fileutils'
-require 'yaml'
-
-module Recurly
-  module SpecSettings
-    SETTINGS_PATH = File.dirname(__FILE__) + '/../spec_settings.yml'
-
-    class << self
-      # keep all the settings global for now
-      attr_accessor :settings
-
-      def [](val)
-        self.settings[val]
-      end
-
-      def []=(key,val)
-        self.settings[key] = val
-      end
-
-      def reload!
-        if File.exists?(SETTINGS_PATH)
-          self.settings = YAML.load_file(SETTINGS_PATH)
-        else
-          raise "spec/spec_settings.yml file not found. Run rake recurly:setup to create one"
-        end
-      end
-
-      def save!
-        File.open(SETTINGS_PATH, 'w' ) do |out|
-          YAML.dump(self.settings, out)
-        end
-      end
-    end
-  end
-end
-