resource_kit 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5b4f9ef92b9859bec0fff18766087660f650fe1
-  data.tar.gz: 365c6e38731eae50c87eb11f7d225daa364e29de
+  metadata.gz: 158cb8dee1f383a0ab067cfdf45c5a829b9dbf6a
+  data.tar.gz: 14ac8a0b08632bc316542b33207c403a6bc6ea89
 SHA512:
-  metadata.gz: fc1e6f8e169f2bf93da9e32019a525ac8374bda740266a482d95164456315a4495160ca5715761a0d978ea2f1ab5577b93a7f3ce7037c1c9442540afab59299d
-  data.tar.gz: f06860e9f4bf4789bfd7865c61e2977239f73d9a69f1cd7f2933381f0a8d9ce80c36957ddcb7e8d40ac335dd3438d18a50dc60a28e6d3604f3c28461eaaea69e
+  metadata.gz: 1b8c836667ccd5eae36974b6baa51cebc6e2b492bf026d097cc588828a63e56375abec5ffed8c5f65cba622ec1e25883090cd91a421aa2ccb9d04021ed53c697
+  data.tar.gz: 5a4c3abd0ba46c9c8c877751dfae0aed1f2e021b6b5cbca22e0b35bc248274a56b0f8635eed23b870a28f8eb32127d2cd56376969afc23820d7933ef2608c741

data/lib/resource_kit.rb

@@ -1,5 +1,4 @@
 require 'resource_kit/version'
-require 'faraday'
 
 module ResourceKit
   ALLOWED_VERBS = [:get, :post, :put, :delete, :head, :patch, :options]

data/lib/resource_kit/endpoint_resolver.rb

@@ -10,8 +10,9 @@ module ResourceKit
     end
 
     def resolve(values = {})
-      uri = Addressable::URI.new
-      new_path = generated_path(values)
+      uri = Addressable::URI.parse(path)
+      new_path = generated_path(uri.path, values)
+
       uri.path = normalized_path_components(new_path)
       uri.query = append_query_values(uri, values) unless query_param_keys.empty?
 
@@ -20,8 +21,8 @@ module ResourceKit
 
     private
 
-    def generated_path(values)
-      values.inject(path) do |np, (key, value)|
+    def generated_path(supplied_path, values)
+      values.inject(supplied_path) do |np, (key, value)|
         np.gsub(":#{key}", value.to_s)
       end
     end
@@ -34,7 +35,8 @@ module ResourceKit
     end
 
     def append_query_values(uri, values)
-      params = query_param_keys.each_with_object({}) do |key, query_values|
+      pre_vals = uri.query_values || {}
+      params = query_param_keys.each_with_object(pre_vals) do |key, query_values|
         query_values[key] = values[key] if values.has_key?(key)
       end
 

data/lib/resource_kit/version.rb

@@ -1,3 +1,3 @@
 module ResourceKit
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/resource_kit.gemspec

@@ -19,11 +19,11 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'faraday'
   spec.add_dependency 'addressable', '~> 2.3.6'
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency 'faraday'
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "webmock", "~> 1.18.0"
   spec.add_development_dependency "kartograph", "~> 0.0.8"

data/spec/lib/resource_kit/endpoint_resolver_spec.rb

@@ -12,7 +12,10 @@ RSpec.describe ResourceKit::EndpointResolver do
   end
 
   describe '#resolve' do
-    let(:options) { { path: '/users' } }
+    let(:path) { '/users' }
+    let(:query_param_keys) { [] }
+    let(:options) { { path: path, query_param_keys: query_param_keys } }
+
     subject(:resolver) { ResourceKit::EndpointResolver.new(options) }
 
     context 'simple resolve' do
@@ -23,7 +26,7 @@ RSpec.describe ResourceKit::EndpointResolver do
     end
 
     context 'substituted paths' do
-      let(:options) { super().merge(path: '/users/:id') }
+      let(:path) { '/users/:id' }
 
       it 'creates a populated URL from passed values' do
         endpoint = resolver.resolve(id: 1066)
@@ -32,7 +35,7 @@ RSpec.describe ResourceKit::EndpointResolver do
     end
 
     context 'with query parameters' do
-      let(:options) { super().merge(path: '/users', query_param_keys: [:per_page, :page]) }
+      let(:query_param_keys) { [:per_page, :page] }
 
       it 'generates a URL with query parameters set correctly' do
         endpoint = resolver.resolve(per_page: 2, page: 3)
@@ -41,5 +44,17 @@ RSpec.describe ResourceKit::EndpointResolver do
         expect(uri.query_values).to eq("per_page" => '2', "page" => '3')
       end
     end
+
+    context 'with query parameters already appended' do
+      let(:path) { '/:something/users?foo=bar' }
+      let(:query_param_keys) { [:per_page, :page] }
+
+      it 'appends the query params to the url that already has some' do
+        endpoint = resolver.resolve(something: 'testing', per_page: 2, page: 3)
+
+        uri = Addressable::URI.parse(endpoint)
+        expect(uri.query_values).to eq("foo" => 'bar', "per_page" => '2', "page" => '3')
+      end
+    end
   end
 end

data/spec/spec_helper.rb

@@ -1,6 +1,7 @@
 require 'resource_kit'
 require 'resource_kit/testing'
 require 'pry'
+require 'faraday'
 
 RSpec.configure do |config|
   config.order = :random

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resource_kit
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Robert Ross
@@ -9,22 +9,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-01 00:00:00.000000000 Z
+date: 2015-01-07 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: faraday
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
@@ -67,6 +53,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: faraday
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement