justgiving 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 330ff0c02a601ad892f6f09d5bc2c210d3fff526
-  data.tar.gz: 90d0cfee0ffba46683b449c4585afa1d86d38f96
+  metadata.gz: 149cdad0d3a7e2f98ffdafeaed8e285a1ad3599a
+  data.tar.gz: b6a7a81216152023c21816fab925f1868e252353
 SHA512:
-  metadata.gz: f641934cea354d787e5803bb3d78b3dec139e03b736d2691ee4114c361943f2fedde24d7e10e2fa0cce9b8b4f8d4f0335fdd7fd1a474011d544ca719b67a094b
-  data.tar.gz: c63d6a4032ec7885b6de07689556f2b1e529294fb45a56f49ccca7741fcb2b7b6344dc41e66458c3db5e3b4e7f966de3b315ddb3a1213c888bf17f88b9d0933e
+  metadata.gz: d2b08eefee9d32e7e897ea28e1656d5f61e36d965cdbee60353aafb1d9d4cb9b4fcee88ce7afbda0e6ce5aa5636618e5783088bc573de1ccfba01948d693c8a5
+  data.tar.gz: 2d386fcea88cd7e8cfce3eb1c432aacd5be9417e6d7d7421108ee43b71a43bd1a41525a107d563a9d654a55309c69a1bae845a0f83fd61287dc2fe15b53da96c

data/justgiving.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "curb"
-  spec.add_development_dependency "json"
+  spec.add_development_dependency "faraday"
+  spec.add_development_dependency "faraday_middleware"
   spec.add_development_dependency "addressable"
 end

data/lib/justgiving/client.rb

@@ -1,5 +1,5 @@
-require 'json'
-require 'curb'
+require "faraday"
+require "faraday_middleware"
 require "addressable/uri"
 
 module JustGiving
@@ -7,19 +7,30 @@ module JustGiving
 
     def initialize(token)
       @token = token
-      @base_url = "https://api.justgiving.com/#{@token}/v1"
+      @base_url = "https://api.justgiving.com/#{@token}/v1/"
     end
 
     protected
 
       def get(path, query_hash=nil)
-        url = "#{@base_url}/#{path}"
-        url += '?' + query_string_from_hash(query_hash) if query_hash
-        request = Curl.get(url) do |curl| 
-          curl.headers["User-Agent"] = "Ruby REST client"
-          curl.headers["Content-Type"] = "application/json"
+        if not @conn
+          defaults = {
+            url: @base_url,
+            headers: {
+              'User-Agent' => 'Ruby REST client',
+              'Content-Type' => 'application/json'
+            }
+          }
+          connection = Faraday.new(defaults) do |connection|
+            connection.response :json, :content_type => /\bjson$/
+            connection.response :logger
+            connection.adapter  Faraday.default_adapter
+          end
         end
-        JSON.parse request.body_str
+
+        path += '?' + query_string_from_hash(query_hash) if query_hash
+        response = connection.get path
+        response.body
       end
 
       def query_string_from_hash(query_hash)

data/lib/justgiving/version.rb

@@ -1,3 +1,3 @@
 module JustGiving
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: justgiving
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Jack Dent
@@ -14,70 +14,70 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   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: curb
+  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: json
+  name: faraday_middleware
   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: addressable
   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'
 description: 
@@ -87,7 +87,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -111,17 +111,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A Ruby REST client for the JustGiving API