paid 1.0.1 → 1.0.2

data/test/paid/headers_builder_test.rb

@@ -0,0 +1,39 @@
+require File.expand_path('../../test_helper', __FILE__)
+
+module Paid
+  class HeadersBuilderTest < ::Test::Unit::TestCase
+
+    setup do
+      @headers = {
+        :dog => "dog-value"
+      }
+      @api_key = "test-api-key"
+      @built_headers = HeadersBuilder.build(@headers, @api_key)
+    end
+
+    should 'set the content_type' do
+      assert(@built_headers.has_key?(:content_type))
+      assert_equal('application/x-www-form-urlencoded', @built_headers[:content_type])
+    end
+
+    should 'set the user_agent' do
+      assert(@built_headers.has_key?(:user_agent))
+      assert(@built_headers[:user_agent].include?(Paid::VERSION))
+      assert(@built_headers[:user_agent].include?(Paid.api_version))
+    end
+
+    should 'set the basic auth header' do
+      assert(@built_headers.has_key?("Authorization"))
+      encoded_api_key = Base64.encode64("#{@api_key}:")
+      assert(@built_headers["Authorization"].include?(encoded_api_key))
+    end
+
+    should 'set the custom auth header' do
+      auth_key = "CLIENT-TOKEN"
+      header = HeadersBuilder.build(@headers, @api_key, auth_key)
+      assert(header.has_key?(auth_key))
+      assert_equal(@api_key, header[auth_key])
+    end
+
+  end
+end

data/test/paid/invoice_test.rb

@@ -3,7 +3,7 @@ require File.expand_path('../../test_helper', __FILE__)
 module Paid
   class InvoiceTest < Test::Unit::TestCase
     setup do
-      @invoice_url = "#{Paid.api_base}/v0/invoices"
+      @invoice_url = "#{Paid.api_base}/invoices"
     end
 
     context 'Invoice class' do
@@ -106,8 +106,8 @@ module Paid
     end
 
     should 'be registered' do
-      assert(APIClass.subclasses.include?(Paid::Invoice))
-      assert_equal(Paid::Invoice, APIClass.subclass_fetch("invoice"))
+      assert(APIResource.api_subclasses.include?(Paid::Invoice))
+      assert_equal(Paid::Invoice, APIResource.api_subclass_fetch("invoice"))
     end
 
   end

data/test/paid/params_builder_test.rb

@@ -0,0 +1,57 @@
+require File.expand_path('../../test_helper', __FILE__)
+
+module Paid
+  class ParamsBuilderTest < ::Test::Unit::TestCase
+
+    setup do
+      @params = {
+        :dog => "dog-value",
+        "string" => "str-value"
+      }
+    end
+
+    context '#clean' do
+      setup do
+        @built_params = ParamsBuilder.clean(@params)
+      end
+
+      should 'convert keys to symbols' do
+        assert(@built_params.has_key?(:string))
+        assert_equal(@params["string"], @built_params[:string])
+      end
+
+      should 'not have any string keys' do
+        @built_params.each do |k, v|
+          assert(k.is_a?(Symbol))
+        end
+      end
+    end
+
+    context '#merge' do
+      setup do
+        @to_merge = {
+          :string => "other-str-value",
+          "cat" => "cat-value"
+        }
+        @built_params = ParamsBuilder.merge(@params, @to_merge)
+      end
+
+      should 'convert keys to symbols' do
+        assert(@built_params.has_key?(:cat))
+        assert(@built_params.has_key?(:string))
+        assert(!@built_params.has_key?("string"))
+      end
+
+      should 'merge in all values' do
+        assert_equal(@params[:dog], @built_params[:dog])
+        assert_equal(@to_merge[:string], @built_params[:string])
+        assert_equal(@to_merge["cat"], @built_params[:cat])
+      end
+
+      should 'prioritize values in @to_merge' do
+        assert_equal(@to_merge[:string], @built_params[:string])
+      end
+    end
+
+  end
+end

data/test/paid/path_builder_test.rb

@@ -0,0 +1,67 @@
+require File.expand_path('../../test_helper', __FILE__)
+
+module Paid
+  class PathBuilderTest < ::Test::Unit::TestCase
+    class FakeClass < APIResource
+      attr_reader :id
+      def initialize(id); @id = id; end
+      def abc; return "abc-value"; end
+      def self.xyz; return "xyz-value"; end
+    end
+
+    setup do
+      @params = {
+        :dog => "dog-value"
+      }
+      @obj = FakeClass.new("fake-id")
+    end
+
+    should 'use instance methods' do
+      path = "/a/:abc/123"
+      expected = "/a/abc-value/123"
+
+      actual = PathBuilder.build(path, @obj, nil)
+      assert_equal(expected, actual)
+    end
+
+    should 'use instance attributes' do
+      path = "/a/:id/123"
+      expected = "/a/fake-id/123"
+      actual = PathBuilder.build(path, @obj, nil)
+      assert_equal(expected, actual)
+    end
+
+    should 'use class methods' do
+      path = "/a/:xyz/123"
+      expected = "/a/xyz-value/123"
+
+      actual = PathBuilder.build(path, FakeClass, nil)
+      assert_equal(expected, actual)
+    end
+
+    should 'not use class #id methods (1.8.7)' do
+      path = "/a/:id/123"
+      expected = "/a/param-id/123"
+
+      actual = PathBuilder.build(path, FakeClass, { :id => "param-id" })
+      assert_equal(expected, actual)
+    end
+
+    should 'use param values' do
+      path = "/a/:dog/123"
+      expected = "/a/dog-value/123"
+
+      actual = PathBuilder.build(path, nil, @params)
+      assert_equal(expected, actual)
+    end
+
+    should 'use both methods and params' do
+      path = "/a/:dog/:abc/123"
+      expected = "/a/dog-value/abc-value/123"
+
+      actual = PathBuilder.build(path, @obj, @params)
+      assert_equal(expected, actual)
+    end
+
+  end
+end

data/test/paid/plan_test.rb

@@ -3,7 +3,7 @@ require File.expand_path('../../test_helper', __FILE__)
 module Paid
   class PlanTest < Test::Unit::TestCase
     setup do
-      @plan_url = "#{Paid.api_base}/v0/plans"
+      @plan_url = "#{Paid.api_base}/plans"
     end
 
     context 'Plan class' do
@@ -84,8 +84,8 @@ module Paid
     end
 
     should 'be registered' do
-      assert(APIClass.subclasses.include?(Paid::Plan))
-      assert_equal(Paid::Plan, APIClass.subclass_fetch("plan"))
+      assert(APIResource.api_subclasses.include?(Paid::Plan))
+      assert_equal(Paid::Plan, APIResource.api_subclass_fetch("plan"))
     end
 
 

data/test/paid/requester_test.rb

@@ -0,0 +1,86 @@
+require File.expand_path('../../test_helper', __FILE__)
+
+module Paid
+  class RequesterTest < ::Test::Unit::TestCase
+    setup do
+    end
+
+    context '#prepare_params' do
+      setup do
+        @url = "test_url"
+        @params = { :a => 1, :b => [2, 3] }
+      end
+
+      should 'convert :get params to a query string' do
+        url, params = Requester.prepare_params(@url, @params, :get)
+        assert(url != @url)
+        assert(params.nil?)
+      end
+
+      should 'convert :delete params to a query string' do
+        url, params = Requester.prepare_params(@url, @params, :delete)
+        assert(url != @url)
+        assert(params.nil?)
+      end
+
+      should 'convert :head params to a query string' do
+        url, params = Requester.prepare_params(@url, @params, :head)
+        assert(url != @url)
+        assert(params.nil?)
+      end
+
+      context 'method = :post' do
+        setup do
+          @method = :post
+        end
+
+        should 'not convert params to a query string if a file is in them' do
+          expected = { :file => File.new(__FILE__) }
+          url, params = Requester.prepare_params(@url, expected, @method)
+          assert_equal(expected, params)
+        end
+
+        should 'convert params to a query string if a file is not present' do
+          url, params = Requester.prepare_params(@url, @params, @method)
+          assert(params.is_a?(String))
+        end
+      end
+    end
+
+    context '#query_string' do
+      should 'join #query_array results with an "&"' do
+        start = { :a => 1, :b => [2, 3] }
+        expected = ["a=1", "b[]=2", "b[]=3"]
+
+        actual = Requester.query_string(start).split('&')
+        actual.each do |str|
+          assert(expected.include?(str))
+        end
+      end
+    end
+
+    context '#query_array' do
+      should 'convert { :a => "value" } to []' do
+        start = { :a => "value" }
+        finish = ["a=value"]
+
+        assert_equal(finish, Requester.query_array(start))
+      end
+
+      should 'convert { :a => { :b => { :c => "cvalue" } } } to ["a[b][c]=cvalue"]' do
+        start = { :a => { :b => { :c => "cvalue" } } }
+        finish = ["a[b][c]=cvalue"]
+
+        assert_equal(finish, Requester.query_array(start))
+      end
+
+      should 'convert { :a => [1, 2] } to ["a[]=1", "a[]=2"]' do
+        start = { :a => [1, 2] }
+        finish = ["a[]=1", "a[]=2"]
+
+        assert_equal(finish, Requester.query_array(start))
+      end
+    end
+
+  end
+end

data/test/paid/subscription_test.rb

@@ -3,7 +3,7 @@ require File.expand_path('../../test_helper', __FILE__)
 module Paid
   class SubscriptionTest < Test::Unit::TestCase
     setup do
-      @subscription_url = "#{Paid.api_base}/v0/subscriptions"
+      @subscription_url = "#{Paid.api_base}/subscriptions"
     end
 
     context 'Subscription class' do
@@ -103,8 +103,8 @@ module Paid
     end
 
     should 'be registered' do
-      assert(APIClass.subclasses.include?(Paid::Subscription))
-      assert_equal(Paid::Subscription, APIClass.subclass_fetch("subscription"))
+      assert(APIResource.api_subclasses.include?(Paid::Subscription))
+      assert_equal(Paid::Subscription, APIResource.api_subclass_fetch("subscription"))
     end
 
   end

data/test/paid/transaction_test.rb

@@ -3,7 +3,7 @@ require File.expand_path('../../test_helper', __FILE__)
 module Paid
   class TransactionTest < Test::Unit::TestCase
     setup do
-      @transaction_url = "#{Paid.api_base}/v0/transactions"
+      @transaction_url = "#{Paid.api_base}/transactions"
     end
 
     context 'Transaction class' do
@@ -49,7 +49,7 @@ module Paid
         transaction.description = "new description"
 
         @mock.expects(:put).once.with do |url, headers, params|
-          params == transaction.changed_attributes && url == "#{@transaction_url}/#{transaction.id}"
+          params == transaction.changed_api_attributes && url == "#{@transaction_url}/#{transaction.id}"
         end.returns(test_response(test_transaction))
 
         # This should update this instance with test_transaction since it was returned
@@ -115,8 +115,8 @@ module Paid
     end
 
     should 'be registered' do
-      assert(APIClass.subclasses.include?(Paid::Transaction))
-      assert_equal(Paid::Transaction, APIClass.subclass_fetch("transaction"))
+      assert(APIResource.api_subclasses.include?(Paid::Transaction))
+      assert_equal(Paid::Transaction, APIResource.api_subclass_fetch("transaction"))
     end
 
 

data/test/paid/util_test.rb

@@ -1,50 +1,51 @@
 require File.expand_path('../../test_helper', __FILE__)
 
 module Paid
-  class UtilTest < Test::Unit::TestCase
-    should "symbolize_keys should convert keys to symbols" do
-      start = {
-        'foo' => 'bar',
-        'array' => [{ 'foo' => 'bar' }],
-        'nested' => {
-          1 => 2,
-          :symbol => 9,
-          'string' => nil
+  class UtilTest < ::Test::Unit::TestCase
+    context '#symbolize_keys' do
+      should "convert keys to symbols" do
+        start = {
+          'foo' => 'bar',
+          'array' => [{ 'foo' => 'bar' }],
+          'nested' => {
+            1 => 2,
+            :symbol => 9,
+            'string' => nil
+          }
         }
-      }
-      finish = {
-        :foo => 'bar',
-        :array => [{ :foo => 'bar' }],
-        :nested => {
-          1 => 2,
-          :symbol => 9,
-          :string => nil
+        finish = {
+          :foo => 'bar',
+          :array => [{ :foo => 'bar' }],
+          :nested => {
+            1 => 2,
+            :symbol => 9,
+            :string => nil
+          }
         }
-      }
 
-      symbolized = Paid::Util.symbolize_keys(start)
-      assert_equal(finish, symbolized)
+        symbolized = Util.symbolize_keys(start)
+        assert_equal(finish, symbolized)
+      end
     end
 
-    should 'query_array should convert { :a => "value" } to []' do
-      start = { :a => "value" }
-      finish = ["a=value"]
+    context '#sorta_deep_clone' do
+      # Super hand wavy test.. but it works for now so whatever.
+      should 'clone well enough that we dont accidentally alter json' do
+        start = { :a => "abc", :b => [ { :c => "c-1" }, { :c => "c-2" } ] }
+        cloned = Util.sorta_deep_clone(start)
 
-      assert_equal(finish, Paid::Util.query_array(start))
-    end
-
-    should 'query_array should convert { :a => { :b => { :c => "cvalue" } } } to ["a[b][c]=cvalue"]' do
-      start = { :a => { :b => { :c => "cvalue" } } }
-      finish = ["a[b][c]=cvalue"]
+        cloned[:a] = "123"
+        cloned[:b] << { :c => "c-3" }
+        cloned[:b][0][:c] = "c-one"
 
-      assert_equal(finish, Paid::Util.query_array(start))
+        assert_equal({ :a => "abc", :b => [ { :c => "c-1" }, { :c => "c-2" } ] }, start)
+      end
     end
 
-    should 'query_array should convert { :a => [1, 2] } to ["a[]=1", "a[]=2"]' do
-      start = { :a => [1, 2] }
-      finish = ["a[]=1", "a[]=2"]
-
-      assert_equal(finish, Paid::Util.query_array(start))
+    context '#constantize' do
+      should 'convert :APIResource to the class object' do
+        assert_equal(APIResource, Util.constantize(:APIResource))
+      end
     end
   end
 end

data/test/test_data.rb

@@ -14,7 +14,6 @@ module Paid
 
     def test_mock_resource
       {
-        :id => 'test_mock_resource_id',
         :object => 'mock_resource',
         :name => 'test mr name',
         :nested => {
@@ -22,8 +21,14 @@ module Paid
           :object => 'nested_resource',
           :price => 500
         },
+        :nested_alt_id => 'nested_alt_id',
+        :nested_with => {
+          :id => 'nested_with_id',
+          :price => 500
+        },
         :thash => { :some_key => "some value" },
-        :tarray => ["abc", "xyz"]
+        :tarray => ["abc", "xyz"],
+        :id => 'test_mock_resource_id'
       }
     end
 
@@ -34,6 +39,8 @@ module Paid
       }
     end
 
+    # Resources
+
     def test_account
       {
         :id => 'account_id',