gocardless 0.2.0 → 1.0.0

data/CHANGELOG.md

@@ -1,6 +1,18 @@
+## 1.0.0 - April 24, 2012
+
+- Add plan_id to selected resources
+- Remove deprecated resource attributes
+- Fix sorting issue in Utils.normalize_params
+- Add rake console task
+- Add rake version:bump tasks
+- Fix user agent formatting
+- Relax multi_json dependency
+
+
 ## 0.2.0 - April 3, 2012
 
 - Add `cancel!` method to `Subscription`
+- Depend on multi_json rather than json
 - Include the API version in the user agent header
 
 

data/Rakefile

@@ -7,8 +7,76 @@ YARD::Rake::YardocTask.new do |t|
   t.files = files.reject { |f| f =~ /seed|example/ }
 end
 
+desc "Run an IRB session with gocardless pre-loaded"
+task :console do
+  exec "irb -I lib -r gocardless"
+end
+
 desc "Run the specs"
 RSpec::Core::RakeTask.new(:spec) do |t|
   t.rspec_opts = %w[--color]
 end
 
+
+def generate_changelog(last_version, new_version)
+  commits = `git log v#{last_version}.. --oneline`.split("\n")
+  msgs = commits.map { |commit| commit.sub(/^[a-f0-9]+/, '-') }
+  date = Time.now.strftime("%B %d, %Y")
+  "## #{new_version} - #{date}\n\n#{msgs.join("\n")}\n\n\n"
+end
+
+def update_changelog(last_version, new_version)
+  contents = File.read('CHANGELOG.md')
+  if contents =~ /## #{new_version}/
+    puts "CHANGELOG already contains v#{new_version}, skipping"
+    return false
+  end
+  changelog = generate_changelog(last_version, new_version)
+  File.open('CHANGELOG.md', 'w') { |f| f.write(changelog + contents) }
+end
+
+def update_version_file(new_version)
+  path = "lib/#{Dir.glob('*.gemspec').first.split('.').first}/version.rb"
+  contents = File.read(path)
+  contents.sub!(/VERSION\s+=\s+["'][\d\.]+["']/, "VERSION = '#{new_version}'")
+  File.open(path, 'w') { |f| f.write(contents) }
+end
+
+def bump_version(part)
+  last_version = `git tag -l | tail -1`.strip.sub(/^v/, '')
+  major, minor, patch = last_version.scan(/\d+/).map(&:to_i)
+
+  case part
+  when :major
+    major += 1
+    minor = patch = 0
+  when :minor
+    minor += 1
+    patch = 0
+  when :patch
+    patch += 1
+  end
+  new_version = "#{major}.#{minor}.#{patch}"
+
+  update_changelog(last_version, new_version)
+  puts "Updated CHANGELOG"
+
+  update_version_file(new_version)
+  puts "Updated version.rb"
+end
+
+desc "Update the version, auto-generating the changelog"
+namespace :version do
+  namespace :bump do
+    task :major do
+      bump_version :major
+    end
+    task :minor do
+      bump_version :minor
+    end
+    task :patch do
+      bump_version :patch
+    end
+  end
+end
+

data/gocardless.gemspec

@@ -2,7 +2,7 @@ require File.expand_path('../lib/gocardless/version', __FILE__)
 
 Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'oauth2', '~> 0.5.0.rc1'
-  gem.add_runtime_dependency 'multi_json', '~> 1.2'
+  gem.add_runtime_dependency 'multi_json', '~> 1.0'
 
   gem.add_development_dependency 'rspec', '~> 2.6'
   gem.add_development_dependency 'mocha', '~> 0.9.12'

data/lib/gocardless/bill.rb

@@ -4,13 +4,14 @@ module GoCardless
 
     creatable
 
-    attr_accessor :amount
-    attr_accessor :source_type
-    attr_accessor :description
-    attr_accessor :name
+    attr_accessor :amount,
+                  :source_type,
+                  :description,
+                  :name,
+                  :plan_id
 
     # @attribute source_id
-    # @return [Integer] the ID of the bill's source (eg subscription, pre_authorization)
+    # @return [String] the ID of the bill's source (eg subscription, pre_authorization)
     attr_accessor :source_id
 
     reference_accessor :merchant_id, :user_id, :payment_id

data/lib/gocardless/client.rb

@@ -5,6 +5,7 @@ require 'openssl'
 require 'uri'
 require 'cgi'
 require 'time'
+require 'base64'
 
 module GoCardless
   class Client
@@ -270,7 +271,7 @@ module GoCardless
       opts[:headers] = {} if opts[:headers].nil?
       opts[:headers]['Accept'] = 'application/json'
       opts[:headers]['Content-Type'] = 'application/json' unless method == :get
-      opts[:headers]['User-Agent'] = "gocardless-ruby-v#{GoCardless::VERSION}"
+      opts[:headers]['User-Agent'] = "gocardless-ruby/v#{GoCardless::VERSION}"
       opts[:body] = MultiJson.encode(opts[:data]) if !opts[:data].nil?
 
       # Reset the URL in case the environment / base URL has been changed.

data/lib/gocardless/pre_authorization.rb

@@ -2,8 +2,14 @@ module GoCardless
   class PreAuthorization < Resource
     self.endpoint = '/pre_authorizations/:id'
 
-    attr_accessor :max_amount, :currency, :amount, :interval_length,
-                  :interval_unit, :description
+    attr_accessor :max_amount,
+                  :currency,
+                  :amount,
+                  :interval_length,
+                  :interval_unit,
+                  :name,
+                  :description,
+                  :plan_id
 
     reference_accessor :merchant_id, :user_id
     date_accessor :expires_at, :created_at

data/lib/gocardless/subscription.rb

@@ -3,8 +3,13 @@ module GoCardless
 
     self.endpoint = '/subscriptions/:id'
 
-    attr_accessor  :amount, :currency, :interval_length, :interval_unit,
-                   :description, :setup_fee, :trial_length, :trial_unit
+    attr_accessor  :amount,
+                   :currency,
+                   :interval_length,
+                   :interval_unit,
+                   :name,
+                   :description,
+                   :plan_id
 
     reference_accessor :merchant_id, :user_id
 

data/lib/gocardless/utils.rb

@@ -77,9 +77,9 @@ module GoCardless
     # percent-encoded according to RFC5849 §3.6 and parameters will be
     # normalised according to RFC5849 §3.4.1.3.2.
     def normalize_params(params)
-      flatten_params(params).map do |pair|
+      flatten_params(params).sort.map do |pair|
         pair.map { |item| percent_encode(item) } * '='
-      end.sort * '&'
+      end * '&'
     end
 
     # Given a Hash of parameters, normalize then (flatten and convert to a

data/lib/gocardless/version.rb

@@ -1,3 +1,3 @@
 module GoCardless
-  VERSION = '0.2.0'.freeze
+  VERSION = '1.0.0'.freeze
 end

data/spec/utils_spec.rb

@@ -182,6 +182,10 @@ describe GoCardless::Utils do
       it "joins pairs by '&' signs" do
         subject['a' => 'b', 'c' => 'd'].should == 'a=b&c=d'
       end
+
+      it "sorts pairs by name then value" do
+        subject['a0' => 'b', 'a' => 'c'].should == 'a=c&a0=b'
+      end
     end
 
     describe ".sign_params" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gocardless
 version: !ruby/object:Gem::Version 
-  hash: 2380615109590600174
+  hash: 2387456872237229630
   prerelease: 
   segments: 
+  - 1
   - 0
-  - 2
   - 0
-  version: 0.2.0
+  version: 1.0.0
 platform: ruby
 authors: 
 - Harry Marr
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-03 00:00:00 Z
+date: 2012-04-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: oauth2
@@ -44,11 +44,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3191556116430806706
+        hash: 4428665182548103036
         segments: 
         - 1
-        - 2
-        version: "1.2"
+        - 0
+        version: "1.0"
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency