fake_braintree 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e1f728169a3ebbadce2b17ce18b02573c62bebb
-  data.tar.gz: ae270d791ae918780fc6d73876d1262b767b2d9c
+  metadata.gz: 0385e84347d1d92ab4951d21df8af132e73c6540
+  data.tar.gz: 847bcc0ae451a40e220e89a2cb22a410486a3daf
 SHA512:
-  metadata.gz: 8760ad110627da619df7e9d01886f106d43c0e79b820185dce901aabf38c1ca563fc81f9449af1dee11bad69fcc125c3f6cc262314aefd0a24140eab68b1876d
-  data.tar.gz: e436d08996cb0b17ef1ab0cd8668dbeb3cd44ef60717b4f69b68fe2f46dddb3d470722b7698b73f6fd7ed25bddef9c17a00312417195272fdcf8edfdba12f87f
+  metadata.gz: 1b4aa0f157daad2ce7d6dd98a1156a7383ccb559289d532069724374448ecf125959eb24218d2b6dfb3135f7789708a0ecd678c3577b13e653af0f0a4530348f
+  data.tar.gz: 985280d3c27fd84ce9719721ebe53c3a3133dfc96f213a49fffe2cb9dd9393094913bd9b032fe58dd02cb76fa3443ece70c4639ecb2846822fa15c2686541f12

data/.travis.yml

@@ -1,12 +1,11 @@
 rvm:
-  - 1.9.2
   - 1.9.3
   - 2.0.0
-  - 2.1.0
-  - 2.1.1
-  - 2.1.2
+  - 2.1.4
 before_install:
   - gem update --system
 branches:
   only:
     - master
+notifications:
+  email: false

data/Gemfile

@@ -1,21 +1,3 @@
 source 'http://rubygems.org'
 
-# Web servers for different platforms
-platform :jruby do
-  gem 'puma'
-end
-
-platform :mri do
-  gem 'thin'
-end
-
 gemspec
-
-# Capybara 2.1.0 requires 1.9.3+ so we install a version that works with every
-# Ruby version we test against. This can be removed if we stop testing against
-# 1.9.2.
-gem 'capybara', '~> 2.0.3'
-
-if RUBY_VERSION == '1.9.2'
-  gem 'activesupport', '< 4.0'
-end

data/NEWS.md

@@ -1,4 +1,21 @@
-# HEAD
+# 0.6.0
+
+* Remove support for 1.9.2, which is EOL'd. `fake_braintree` now requires
+  Ruby 1.9.3+.
+* Use WEBrick as the Capybara server handler in all cases. Previously we used
+  Thin and fell back to Puma, which caused problems like issue #54.
+* Customers and Subscriptions that were stored with a custom (non-integer) ID
+  can be retrieved (#67)
+* Braintree::Subscription has associated dates thanks to @1st8 (#66):
+  - `next_billing_date` is 1 month from billing period start date
+  - `billing_day_of_month` is the next billing date's mday, but is true to
+    Braintree's [exceptional handling of the 31st day of the
+    month](https://www.braintreepayments.com/docs/ruby/subscriptions/details#attributes_that_need_a_bit_more_explaining)
+  - `billing_period_start_date` is either the provided start date or today
+  - `billing_period_end_date` is the day before the next billing date
+* Save discounts amount when adding them to a Subscription (#72)
+
+# 0.5.0
 
 * Remove unused `i18n` gem dependency (#56).
 * Set `credit_card.card_type`, `credit_card.last_4`, and

data/README.md

@@ -155,6 +155,31 @@ Full example:
     #   "subscription_id" => "foobar"
     # }
 
+Note that the generated transaction is not saved in `fake_braintree` - the
+method just gives you a hash.
+
+## Adding your own transactions
+
+If you want `fake_braintree` to be aware of a transaction, you can add it to the
+`FakeBraintree.registry.transactions` hash like this:
+
+
+```ruby
+transaction_id = "something"
+example_response = { "id" => transaction_id, "amount" => "10.0", "type" => "credit", "status" => "authorized" }
+FakeBraintree.registry.transactions[transaction_id] = example_response
+```
+
+Now you can do `Braintree::Transaction.find("something")` and it will find that
+transaction.
+
+Not all of the keys in `example_response` are necessary, but you'll probably
+want at least `id` and `amount`, depending on the type of response.
+
+`FakeBraintree.registry.transactions` will be cleared when you call
+`FakeBraintree.clear!`.
+
+
 ## Running the tests
 
 During tests, debug-level logs will be sent to `tmp/braintree_log`. This is

data/fake_braintree.gemspec

@@ -15,11 +15,11 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ['lib']
-  s.required_ruby_version = Gem::Requirement.new(">= 1.9.2")
+  s.required_ruby_version = Gem::Requirement.new(">= 1.9.3")
 
   s.add_dependency 'activesupport'
   s.add_dependency 'braintree', '~> 2.32'
-  s.add_dependency 'capybara'
+  s.add_dependency 'capybara', '>= 2.0.3'
   s.add_dependency 'sinatra'
 
   s.add_development_dependency 'rake'

data/lib/fake_braintree.rb

@@ -1,6 +1,9 @@
-require 'fileutils'
 require 'braintree'
-require 'active_support/core_ext/module/attribute_accessors'
+require 'capybara'
+require 'digest/md5'
+require 'fileutils'
+require 'active_support/core_ext'
+require 'sinatra/base'
 
 require 'fake_braintree/helpers'
 require 'fake_braintree/customer'

data/lib/fake_braintree/customer.rb

@@ -50,7 +50,7 @@ module FakeBraintree
     end
 
     def create_customer_with(hash)
-      FakeBraintree.registry.customers[hash['id']] = hash
+      FakeBraintree.registry.customers[hash['id'].to_s] = hash
     end
 
     def add_credit_card_to_registry(new_credit_card_hash)

data/lib/fake_braintree/helpers.rb

@@ -1,7 +1,3 @@
-require 'digest/md5'
-require 'active_support'
-require 'active_support/core_ext'
-
 module FakeBraintree
   module Helpers
     def gzip(content)

data/lib/fake_braintree/server.rb

@@ -1,37 +1,7 @@
-require 'capybara'
-require 'capybara/server'
-
 class FakeBraintree::Server
-
   def boot
-    with_runner do
-      server = Capybara::Server.new(FakeBraintree::SinatraApp)
-      server.boot
-      ENV['GATEWAY_PORT'] = server.port.to_s
-    end
-  end
-
-  private
-
-  def with_runner
-    default_server_process = Capybara.server
-    Capybara.server do |app, port|
-      handler.run(app, Port: port)
-    end
-    yield
-  ensure
-    Capybara.server(&default_server_process)
-  end
-
-  def handler
-    if defined?(Thin)
-      require 'rack/handler/thin'
-      Rack::Handler::Thin
-    elsif defined?(Puma)
-      require 'rack/handler/puma'
-      Rack::Handler::Puma
-    else
-      raise 'No Rack handler was defined! Please include `gem "thin"` or `gem "puma"` in your Gemfile."'
-    end
+    server = Capybara::Server.new(FakeBraintree::SinatraApp)
+    server.boot
+    ENV['GATEWAY_PORT'] = server.port.to_s
   end
 end

data/lib/fake_braintree/sinatra_app.rb

@@ -1,5 +1,3 @@
-require 'sinatra/base'
-
 module FakeBraintree
   class SinatraApp < Sinatra::Base
     set :show_exceptions, false

data/lib/fake_braintree/subscription.rb

@@ -33,7 +33,10 @@ module FakeBraintree
         'transactions' => [],
         'add_ons' => added_add_ons,
         'discounts' => added_discounts,
-        'next_billing_date' => braintree_formatted_date(1.month.from_now)
+        'next_billing_date' => braintree_formatted_date(next_billing_date),
+        'billing_day_of_month' => billing_day_of_month,
+        'billing_period_start_date' => braintree_formatted_date(billing_period_start_date),
+        'billing_period_end_date' => braintree_formatted_date(billing_period_end_date)
       )
     end
 
@@ -43,7 +46,7 @@ module FakeBraintree
     end
 
     def create_subscription_with(new_subscription_hash)
-      FakeBraintree.registry.subscriptions[new_subscription_hash['id']] = new_subscription_hash
+      FakeBraintree.registry.subscriptions[new_subscription_hash['id'].to_s] = new_subscription_hash
     end
 
     def subscription_from_registry
@@ -68,12 +71,28 @@ module FakeBraintree
 
     def added_discounts
       if @subscription_hash['discounts'].is_a?(Hash) && @subscription_hash['discounts']['add']
-        @subscription_hash['discounts']['add'].map { |discount| { 'id' => discount['inherited_from_id'] } }
+        @subscription_hash['discounts']['add'].map { |discount| { 'id' => discount['inherited_from_id'], 'amount' => discount['amount'] } }
       else
         []
       end
     end
 
+    def next_billing_date
+      billing_period_start_date + 1.month
+    end
+
+    def billing_day_of_month
+      next_billing_date.mday > 28 ? 31 : next_billing_date.mday
+    end
+
+    def billing_period_start_date
+      @billing_period_start_date ||= Date.today
+    end
+
+    def billing_period_end_date
+      next_billing_date - 1.day
+    end
+
     def set_subscription_id
       @subscription_hash['id'] ||= generate_new_subscription_id
     end

data/lib/fake_braintree/version.rb

@@ -1,3 +1,3 @@
 module FakeBraintree
-  VERSION = '0.5.0'
+  VERSION = '0.6.0'
 end

data/spec/fake_braintree/customer_spec.rb

@@ -125,6 +125,26 @@ describe 'Braintree::Customer.find' do
   it 'raises an error for a nonexistent customer' do
     expect(lambda { Braintree::Customer.find('foo') }).to raise_error(Braintree::NotFoundError)
   end
+
+  it 'finds customer created with custom id' do
+    Braintree::Customer.create(
+        id: 'bob-smith',
+        first_name: 'Bob',
+        last_name: 'Smith'
+    )
+
+    expect(Braintree::Customer.find('bob-smith').first_name).to eq 'Bob'
+  end
+
+  it 'finds customer created with custom integer id' do
+    Braintree::Customer.create(
+        id: 1,
+        first_name: 'Bob',
+        last_name: 'Smith'
+    )
+
+    expect(Braintree::Customer.find(1).first_name).to eq 'Bob'
+  end
 end
 
 describe 'Braintree::Customer.update' do

data/spec/fake_braintree/subscription_spec.rb

@@ -45,6 +45,34 @@ describe 'Braintree::Subscription.create' do
       expect(create_subscription.subscription.next_billing_date).to eq 1.month.from_now.strftime('%Y-%m-%d')
     end
   end
+
+  # according to https://developers.braintreepayments.com/javascript+ruby/reference/objects/subscription#subscription.billing-day-of-month
+  it 'sets billing_day_of_month, keeping values in 1..28' do
+    Timecop.freeze(Date.new(2014, 8, 28)) do
+      expect(create_subscription.subscription.billing_day_of_month).to eq 28
+    end
+  end
+  it 'sets billing_day_of_month, forcing value to 31 if outside of 1..28' do
+    Timecop.freeze(Date.new(2014, 8, 29)) do
+      expect(create_subscription.subscription.billing_day_of_month).to eq 31
+    end
+  end
+
+  context 'without custom start date' do
+    around do |example|
+      Timecop.freeze(Date.new(2014, 8, 25), &example)
+    end
+    it 'sets billing_period_start_date to today' do
+      expect(create_subscription.subscription.billing_period_start_date).to eq "2014-08-25"
+    end
+    it 'sets next_billing_date to one month from now' do
+      expect(create_subscription.subscription.next_billing_date).to eq "2014-09-25"
+    end
+    it 'sets billing_period_end_date to one day before next_billing_date' do
+      expect(create_subscription.subscription.billing_period_end_date).to eq "2014-09-24"
+    end
+  end
+
 end
 
 describe 'Braintree::Subscription.find' do
@@ -77,11 +105,23 @@ describe 'Braintree::Subscription.find' do
 
   it 'returns discounts added with the subscription' do
     discount_id = 'def456'
-    subscription_id = create_subscription(discounts: { add: [{ inherited_from_id: discount_id, amount: BigDecimal.new('15.00') }]}).subscription.id
+    amount = BigDecimal.new('15.00')
+    subscription_id = create_subscription(discounts: { add: [{ inherited_from_id: discount_id, amount: amount }]}).subscription.id
     subscription = Braintree::Subscription.find(subscription_id)
     discounts = subscription.discounts
     expect(discounts.size).to eq 1
     expect(discounts.first.id).to eq discount_id
+    expect(discounts.first.amount).to eq amount
+  end
+
+  it 'finds subscriptions created with custom id' do
+    create_subscription(id: 'bob-smiths-subscription')
+    expect(Braintree::Subscription.find('bob-smiths-subscription')).to be_a Braintree::Subscription
+  end
+
+  it 'finds subscriptions created with custom integer id' do
+    create_subscription(id: 1)
+    expect(Braintree::Subscription.find(1)).to be_a Braintree::Subscription
   end
 end
 

data/spec/spec_helper.rb

@@ -1,7 +1,6 @@
 require 'bundler'
 Bundler.require
 
-require 'rspec'
 require 'fake_braintree'
 require 'timecop'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fake_braintree
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - thoughtbot, inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-08 00:00:00.000000000 Z
+date: 2014-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.3
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -164,7 +164,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -172,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A fake Braintree that you can run integration tests against