fastspring-saasy 0.5.5 → 0.6.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 6ec611dbeb819d848bd29442ef1547625a07df04
+  data.tar.gz: 822563c9505e32c16f4247b47dc9db5771378f34
+SHA512:
+  metadata.gz: b94e7269c9c5ffe2391b9ee21096d9e7e8ac8b1579a4d166095c7759f8101ee580a5b19d80e102ed8a81055c97284609693582e23ba4e0b9fa57566e2d1c4577
+  data.tar.gz: 6c411738518eedc937ec7fa56c69e237f49116710b0e5f4e0c8f28d58ca4adab5b7b8987094f79f10a5bd41f6c8d54e63b331439a0c66f43efb0321b61fb4f79

data/.gitignore

@@ -0,0 +1,51 @@
+# rcov generated
+coverage
+
+# rdoc generated
+rdoc
+
+# yard generated
+doc
+.yardoc
+
+# bundler
+.bundle
+
+# jeweler generated
+pkg
+
+.rvmrc
+.rbenv-version
+
+# Have editor/IDE/OS specific files you need to ignore? Consider using a global gitignore: 
+#
+# * Create a file at ~/.gitignore
+# * Include files you want ignored
+# * Run: git config --global core.excludesfile ~/.gitignore
+#
+# After doing this, these files will be ignored in all your git projects,
+# saving you from having to 'pollute' every project you touch with them
+#
+# Not sure what to needs to be ignored for particular editors/OSes? Here's some ideas to get you started. (Remember, remove the leading # of the line)
+#
+# For MacOS:
+#
+.DS_Store
+
+# For TextMate
+#*.tmproj
+#tmtags
+
+# For emacs:
+#*~
+#\#*
+#.\#*
+
+# For vim:
+#*.swp
+
+# For redcar:
+#.redcar
+
+# For rubinius:
+#*.rbc

data/Gemfile

@@ -1,16 +1,14 @@
-source :rubygems
+source "http://rubygems.org"
 
 gem 'httparty'
+gem 'gyoku'
 
 group :development do
   gem 'rake'
   gem 'bundler'
-  gem 'jeweler'
-  gem 'ruby-debug19', :require => 'ruby-debug'
 end
 
 group :test do
   gem 'rspec'
   gem 'webmock'
-  gem 'ruby-debug19', :require => 'ruby-debug'
 end

data/Gemfile.lock

@@ -2,27 +2,17 @@ GEM
   remote: http://rubygems.org/
   specs:
     addressable (2.3.2)
-    archive-tar-minitar (0.5.2)
-    columnize (0.3.6)
+    builder (3.2.2)
     crack (0.3.2)
     diff-lcs (1.1.3)
-    git (1.2.5)
+    gyoku (1.0.0)
+      builder (>= 2.1.2)
     httparty (0.10.0)
       multi_json (~> 1.0)
       multi_xml
-    jeweler (1.8.4)
-      bundler (~> 1.0)
-      git (>= 1.2.5)
-      rake
-      rdoc
-    json (1.7.6)
-    linecache19 (0.5.12)
-      ruby_core_source (>= 0.1.4)
     multi_json (1.5.0)
     multi_xml (0.5.2)
     rake (10.0.3)
-    rdoc (3.12)
-      json (~> 1.4)
     rspec (2.12.0)
       rspec-core (~> 2.12.0)
       rspec-expectations (~> 2.12.0)
@@ -31,16 +21,6 @@ GEM
     rspec-expectations (2.12.1)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.12.1)
-    ruby-debug-base19 (0.11.25)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby_core_source (>= 0.1.4)
-    ruby-debug19 (0.11.6)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby-debug-base19 (>= 0.11.19)
-    ruby_core_source (0.1.5)
-      archive-tar-minitar (>= 0.5.2)
     webmock (1.9.0)
       addressable (>= 2.2.7)
       crack (>= 0.1.7)
@@ -50,9 +30,8 @@ PLATFORMS
 
 DEPENDENCIES
   bundler
+  gyoku
   httparty
-  jeweler
   rake
   rspec
-  ruby-debug19
   webmock

data/README.rdoc

@@ -22,6 +22,21 @@ Get subscription
 Renew subscription
   sub.renew
 
+Update subscription
+  attributes = {
+    first_name: 'John',
+    last_name: 'Doe',
+    company: 'Doe Inc.',
+    email: 'john.doe@example.com',
+    phone_number: '+1 123 456 789',
+    product_path: '/product',
+    quantity: 1,
+    tags: 'tag1, tag2, tag3',
+    coupon: 'code',
+    proration: true
+  }
+  sub.update!(attributes)
+
 Cancel subscription
   sub.cancel!
 
@@ -29,7 +44,13 @@ Create subscriptions url
   FastSpring::Subscription.create_subscription_url('test_product', 'new_co')
   => http://sites.fastspring.com/acme/product/test_product?referrer=new_co
 
-Orders
+Search Orders
+  orders = FastSpring::Order.search('search-string')
+  orders.each do |order|
+    # order.inspect
+  end
+
+Find Order
   order = FastSpring::Order.find('reference')
   order.items.each do |item|
     # item.inspect
@@ -53,4 +74,4 @@ FastSpring have their own gem at https://github.com/fastspring/fastspring-ruby
 
 == Copyright
 
-Copyright (c) 2012 Richard Patching. See LICENSE.txt for further details.
+Copyright (c) 2014 Richard Patching. See LICENSE.txt for further details.

data/Rakefile

@@ -11,20 +11,8 @@ rescue Bundler::BundlerError => e
 end
 require 'rake'
 
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  gem.name = "fastspring-saasy"
-  gem.homepage = "http://github.com/patchfx/fastspring"
-  gem.license = "MIT"
-  gem.summary = %Q{Ruby lib for using the FastSpring (Saasy) API}
-  gem.description = %Q{Ruby lib for using the FastSpring (Saas) subscription management API}
-  gem.email = "richard@justaddpixels.com"
-  gem.authors = ["Richard Patching"]
-  gem.add_development_dependency 'httparty', '~> 0.8.1'
-end
-Jeweler::RubygemsDotOrgTasks.new
-
 require 'rdoc/task'
+
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 

data/fastspring-saasy.gemspec

@@ -1,87 +1,27 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
+#coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |s|
   s.name = "fastspring-saasy"
-  s.version = "0.5.5"
+  s.version = "0.6.0"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Richard Patching"]
-  s.date = "2013-02-18"
-  s.description = "Ruby lib for using the FastSpring (Saas) subscription management API"
   s.email = "richard@justaddpixels.com"
-  s.extra_rdoc_files = [
-    "LICENSE.txt",
-    "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-    ".rspec",
-    "Gemfile",
-    "Gemfile.lock",
-    "LICENSE.txt",
-    "README.rdoc",
-    "Rakefile",
-    "VERSION",
-    "fastspring-saasy.gemspec",
-    "lib/fastspring-saasy.rb",
-    "lib/fastspring-saasy/account.rb",
-    "lib/fastspring-saasy/address.rb",
-    "lib/fastspring-saasy/customer.rb",
-    "lib/fastspring-saasy/error.rb",
-    "lib/fastspring-saasy/fastspring.crt",
-    "lib/fastspring-saasy/item.rb",
-    "lib/fastspring-saasy/localized_store_pricing.rb",
-    "lib/fastspring-saasy/order.rb",
-    "lib/fastspring-saasy/payment.rb",
-    "lib/fastspring-saasy/private_api_base.rb",
-    "lib/fastspring-saasy/public_api_base.rb",
-    "lib/fastspring-saasy/subscription.rb",
-    "lib/httparty/txt_parser.rb",
-    "spec/account_spec.rb",
-    "spec/customer_spec.rb",
-    "spec/fixtures/basic_localized_store_pricing.txt",
-    "spec/fixtures/basic_localized_store_pricing_with_3_products.txt",
-    "spec/fixtures/basic_order.xml",
-    "spec/fixtures/basic_subscription.xml",
-    "spec/localized_store_pricing_spec.rb",
-    "spec/order_spec.rb",
-    "spec/spec_helper.rb",
-    "spec/subscription_spec.rb"
-  ]
+  s.description = "Ruby lib for using the FastSpring (SaaSy) subscription management API"
+  s.summary = "Ruby lib for using the FastSpring (Saasy) API"
   s.homepage = "http://github.com/patchfx/fastspring"
+
+  s.files = `git ls-files`.split($/)
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.23"
-  s.summary = "Ruby lib for using the FastSpring (Saasy) API"
+  s.test_files    = s.files.grep(%r{^(test|spec|features)/})
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
+  s.add_dependency "httparty"
+  s.add_dependency "gyoku"
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<httparty>, [">= 0"])
-      s.add_development_dependency(%q<rake>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_development_dependency(%q<ruby-debug19>, [">= 0"])
-      s.add_development_dependency(%q<httparty>, ["~> 0.8.1"])
-    else
-      s.add_dependency(%q<httparty>, [">= 0"])
-      s.add_dependency(%q<rake>, [">= 0"])
-      s.add_dependency(%q<bundler>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<ruby-debug19>, [">= 0"])
-      s.add_dependency(%q<httparty>, ["~> 0.8.1"])
-    end
-  else
-    s.add_dependency(%q<httparty>, [">= 0"])
-    s.add_dependency(%q<rake>, [">= 0"])
-    s.add_dependency(%q<bundler>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<ruby-debug19>, [">= 0"])
-    s.add_dependency(%q<httparty>, ["~> 0.8.1"])
-  end
+  s.add_development_dependency "rake"
+  s.add_development_dependency "rspec"
+  s.add_development_dependency "webmock"
 end
 

data/lib/fastspring-saasy.rb

@@ -19,4 +19,5 @@ require_relative 'fastspring-saasy/error'
 module FastSpring
   SITE_URL = 'http://sites.fastspring.com'
   API_URL = 'https://api.fastspring.com'
+  VERSION = "0.6"
 end

data/lib/fastspring-saasy/order.rb

@@ -6,6 +6,10 @@ module FastSpring
       self
     end
 
+    def build_from(response)
+      @response = response
+    end
+
     def base_order_path
       "/company/#{@company}/order/#{@reference}"
     end

data/lib/fastspring-saasy/private_api_base.rb

@@ -19,6 +19,20 @@ module FastSpring
       self.new(reference).find
     end
 
+    def self.search(query="")
+      self.new("").search(query)
+    end
+
+    def search(query)
+      response = self.class.get("/company/#{@company}/orders/search?query=#{CGI::escape(query)}", :basic_auth => @auth, :ssl_ca_file => @ssl_ca_file)
+      order_response = response.parsed_response['orders']['order']
+      return [] if order_response.nil?
+
+      order_response.map do |order|
+        Order.new("").build_from(order)
+      end
+    end
+
     def reference
       @reference
     end

data/lib/fastspring-saasy/subscription.rb

@@ -1,16 +1,24 @@
 require 'date'
+require 'gyoku'
 
 module FastSpring
   class Subscription < PrivateApiBase
     def self.create_subscription_url(reference, referrer)
       "#{SITE_URL}/#{FastSpring::Account.fetch(:company)}/product/#{reference}?referrer=#{referrer}"
     end
+
     # Get the subscription from Saasy
     def find
       @response = self.class.get(base_subscription_path, :basic_auth => @auth, :ssl_ca_file => @ssl_ca_file)
       self
     end
 
+    # Update the subscription from Saasy
+    def update!(options={})
+      @response = self.class.put(base_subscription_path, :body => Gyoku.xml(subscription: options), :headers => {'Content-Type' => 'application/xml'},:basic_auth => @auth)
+      self
+    end
+
     # Returns the base path for a subscription
     def base_subscription_path
       "/company/#{@company}/subscription/#{@reference}"
@@ -53,12 +61,12 @@ module FastSpring
       begin
         fs_tags = value_for('tags')
         result = {}
-        fs_tags.split(",").each do |t| 
+        fs_tags.split(",").each do |t|
            k,v = t.strip.split('=')
            result[k.to_sym] = v
         end
         result
-      rescue 
+      rescue
         nil
       end
     end
@@ -87,7 +95,6 @@ module FastSpring
     def parsed_response
       @response.parsed_response['subscription']
     end
-
   end
 end
 

data/spec/fixtures/basic_order_search.xml

@@ -0,0 +1,30 @@
+<orders>
+  <order>
+    <reference/>
+    <status>open</status>
+    <statusChanged>2010-08-15T00:00:00.000Z</statusChanged>
+    <test>true</test>
+    <returnStatus>none</returnStatus>
+    <customer>
+      <firstName/>
+      <lastName/>
+      <company/>
+      <email/>
+      <phoneNumber/>
+    </customer>
+  </order>
+  <order>
+    <reference/>
+    <status>closed</status>
+    <statusChanged>2010-08-15T00:00:00.000Z</statusChanged>
+    <test>true</test>
+    <returnStatus>none</returnStatus>
+    <customer>
+      <firstName/>
+      <lastName/>
+      <company/>
+      <email/>
+      <phoneNumber/>
+    </customer>
+  </order>
+</orders>

data/spec/fixtures/basic_updated_subscription.xml

@@ -0,0 +1,25 @@
+<subscription>
+  <status>active</status>
+  <statusChanged>2010-08-15T00:00:00.000Z</statusChanged>
+  <statusReason>completed</statusReason>
+  <cancelable>true</cancelable>
+  <reference/>
+  <test>true</test>
+  <referrer>acme_app</referrer>
+  <sourceName>acme_source</sourceName>
+  <sourceKey>acme_source_key</sourceKey>
+  <sourceCampaign>acme_source_campaign</sourceCampaign>
+  <customer>
+    <firstName>John</firstName>
+    <lastName>Doe</lastName>
+    <company>Doe Inc</company>
+    <email>johndoe@example.com</email>
+    <phoneNumber>0123456789</phoneNumber>
+  </customer>
+  <customerUrl/>
+  <productName>Acme Inc Web</productName>
+  <tags>number1=1, number2=2</tags>
+  <quantity>12</quantity>
+  <nextPeriodDate>2010-08-15Z</nextPeriodDate>
+  <end>2010-08-15Z</end>
+</subscription>

data/spec/order_spec.rb

@@ -10,6 +10,16 @@ describe FastSpring::Order do
     end
   end
 
+  context 'search' do
+    it 'searches for orders from a given query' do
+      stub_request(:get, "https://admin:test@api.fastspring.com/company/acme/orders/search?query=doe").
+        to_return(stub_http_response_with('basic_order_search.xml'))
+
+      orders = FastSpring::Order.search('doe')
+      orders.size.should be(2)
+    end
+  end
+
   context 'url for orders' do
     subject { FastSpring::Order.find('test_ref') }
     before do

data/spec/spec_helper.rb

@@ -7,21 +7,24 @@ def file_fixture(filename)
   open(File.join(File.dirname(__FILE__), 'fixtures', "#{filename.to_s}")).read
 end
 
-def stub_http_response_with(filename)
+def stub_http_response_with(filename, type=:get)
   format = filename.split('.').last.intern
   data = file_fixture(filename)
 
   response = Net::HTTPOK.new("1.1", 200, "Content for you")
   response.stub!(:body).and_return(data)
 
+  request_type = Net::HTTP::Get if type == :get
+  request_type = Net::HTTP::Put if type == :put
+
   if format == :txt
-    http_request = HTTParty::Request.new(Net::HTTP::Get, 'http://localhost', :format => format, :parser => HTTParty::Parser::Txt)
+    http_request = HTTParty::Request.new(request_type, 'http://localhost', :format => format, :parser => HTTParty::Parser::Txt)
   else
-    http_request = HTTParty::Request.new(Net::HTTP::Get, 'http://localhost', :format => format)
+    http_request = HTTParty::Request.new(request_type, 'http://localhost', :format => format)
   end
   http_request.stub_chain(:http, :request).and_return(response)
 
-  HTTParty::Request.should_receive(:new).and_return(http_request)
+  HTTParty::Request.should_receive(:new).at_most(2).times.and_return(http_request)
 end
 
 def stub_response(body, code = 200)

data/spec/subscription_spec.rb

@@ -109,4 +109,20 @@ describe FastSpring::Subscription do
       subject.renew_path.should == "/company/acme/subscription/test_ref/renew"
     end
   end
+
+  context 'update' do
+    subject { FastSpring::Subscription.find('test_ref') }
+
+    before do
+      stub_request(:get, "https://admin:test@api.fastspring.com/company/acme/subscription/test_ref").
+        to_return(stub_http_response_with('basic_subscription.xml'))
+      stub_request(:put, "https://admin:test@api.fastspring.com/company/acme/subscription/test_ref").
+        to_return(stub_http_response_with('basic_updated_subscription.xml', :put))
+    end
+
+    it "updates the subscription from given attributes" do
+      subject.update!(quantity: 12)
+      subject.quantity.should be(12)
+    end
+  end
 end

metadata

@@ -1,121 +1,93 @@
 --- !ruby/object:Gem::Specification
 name: fastspring-saasy
 version: !ruby/object:Gem::Version
-  version: 0.5.5
-  prerelease: 
+  version: 0.6.0
 platform: ruby
 authors:
 - Richard Patching
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-18 00:00:00.000000000 Z
+date: 2014-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: gyoku
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: jeweler
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ruby-debug19
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: httparty
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.8.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.8.1
-description: Ruby lib for using the FastSpring (Saas) subscription management API
+description: Ruby lib for using the FastSpring (SaaSy) subscription management API
 email: richard@justaddpixels.com
 executables: []
 extensions: []
-extra_rdoc_files:
-- LICENSE.txt
-- README.rdoc
+extra_rdoc_files: []
 files:
 - .document
+- .gitignore
 - .rspec
 - Gemfile
 - Gemfile.lock
@@ -123,6 +95,7 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- fastspring-saasy-0.5.5.gem
 - fastspring-saasy.gemspec
 - lib/fastspring-saasy.rb
 - lib/fastspring-saasy/account.rb
@@ -143,7 +116,9 @@ files:
 - spec/fixtures/basic_localized_store_pricing.txt
 - spec/fixtures/basic_localized_store_pricing_with_3_products.txt
 - spec/fixtures/basic_order.xml
+- spec/fixtures/basic_order_search.xml
 - spec/fixtures/basic_subscription.xml
+- spec/fixtures/basic_updated_subscription.xml
 - spec/localized_store_pricing_spec.rb
 - spec/order_spec.rb
 - spec/spec_helper.rb
@@ -151,29 +126,38 @@ files:
 homepage: http://github.com/patchfx/fastspring
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -313030860356725140
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby lib for using the FastSpring (Saasy) API
-test_files: []
+test_files:
+- spec/account_spec.rb
+- spec/customer_spec.rb
+- spec/fixtures/basic_localized_store_pricing.txt
+- spec/fixtures/basic_localized_store_pricing_with_3_products.txt
+- spec/fixtures/basic_order.xml
+- spec/fixtures/basic_order_search.xml
+- spec/fixtures/basic_subscription.xml
+- spec/fixtures/basic_updated_subscription.xml
+- spec/localized_store_pricing_spec.rb
+- spec/order_spec.rb
+- spec/spec_helper.rb
+- spec/subscription_spec.rb
+has_rdoc: