localbitcoins 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e26538ea5d0e612baff16fa2f93a3a5a7230e46
-  data.tar.gz: c1f6c5e4f42c2d26c9ad5b100f7bfa2ad5ca5432
+  metadata.gz: f32b2111b3e627e2cdadc083e665f9d9af54d4c8
+  data.tar.gz: aaa3523f0a7c6cbb944d6047f361df38261bbbb0
 SHA512:
-  metadata.gz: c125d972fab3ba0702599ddf27d25abee1deafc2b22dbc7206f935ae6528efb92cc75e1628ba93ab5afaf2f0ae241e9595a3029f7d423697d091dd9c6554a3fd
-  data.tar.gz: db8add4569e1b29a65d2010c59eb7f02041c10ecba0d846eeba33d73624e5254771a6c00176243f77e151134e6fcc73811507554eb6fb03ac9854d16e58aa0e6
+  metadata.gz: f1b20d3836f2eb810bbccf0eca763dd88ee929bd456bbd25e95386b76c00fac5cdb4bb94a8149a4916f31ae47cea52de87623bf8b46f88433cabc4879d1bdc6d
+  data.tar.gz: d4e2c991028a547274adeb72c636fd1f764fcfc312f28f57a82a21e0fc07722bcf53ace2750f50a29ac5257b0f4f01323b21c482a5ce72f62eb885ad586cb656

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    localbitcoins (0.0.2)
+    localbitcoins (0.0.4)
       activesupport (~> 3)
       hashie (~> 2.0.2)
       json (~> 1.8.0)
-      oauth (~> 0.4)
+      oauth2 (~> 0.9.2)
       rest-client (~> 1.6)
 
 GEM
@@ -18,12 +18,26 @@ GEM
     crack (0.4.0)
       safe_yaml (~> 0.9.0)
     diff-lcs (1.2.4)
+    faraday (0.8.7)
+      multipart-post (~> 1.1)
     hashie (2.0.5)
+    httpauth (0.2.0)
     i18n (0.6.1)
     json (1.8.0)
+    jwt (0.1.8)
+      multi_json (>= 1.5)
     mime-types (1.23)
     multi_json (1.7.7)
-    oauth (0.4.7)
+    multi_xml (0.5.4)
+    multipart-post (1.2.0)
+    oauth2 (0.9.2)
+      faraday (~> 0.8)
+      httpauth (~> 0.2)
+      jwt (~> 0.1.4)
+      multi_json (~> 1.0)
+      multi_xml (~> 0.5)
+      rack (~> 1.2)
+    rack (1.5.2)
     rest-client (1.6.7)
       mime-types (>= 1.16)
     rspec (2.14.1)

data/README.md

@@ -1,9 +1,7 @@
-# LocalBitcoins API Gem 0.0.2
+# LocalBitcoins API Gem 0.0.3
 
 This gem provides a simple, extensible Ruby wrapper to access the [LocalBitcoins API](https://localbitcoins.com/api-docs/).
 
-THIS IS A WORK IN PROGRESS AND DOES NOT YET HAVE A TEST SUITE. DO NOT USE THIS IN PRODUCTION APPLICATIONS UNTIL THE TEST SUITE HAS BEEN WRITTEN. THANKS!
-
 ## Installation
 
 Install the gem:
@@ -64,7 +62,7 @@ You can get a list of the token owner's releaseable escrows through the OAuth cl
 ``` ruby
 escrows = client.escrows
 
-escrows.each do |e|
+escrows.escrow_list.each do |e|
   e.data.created_at     # => UTC datetime escrow was created at
   e.data.buyer_username # => username of the buyer
   e.data.reference_code # => reference code for the escrow
@@ -89,7 +87,7 @@ You can get a list of the token owner's ads with the following method:
 ``` ruby
 ads = client.ads
 
-ads.each do |a|
+ads.ad_list.each do |a|
   a.data.visible    # => boolean value of the ad's visibility
   a.data.email      # => valid e-mail string or null
   a.data.location_string # => human-readable location

data/lib/localbitcoins/client/escrows.rb

@@ -4,7 +4,7 @@ module LocalBitcoins
     #
     def escrows()
       data = oauth_request(:get, '/api/escrows')
-      Hashie::Mash.new(data['escrow_list'])
+      Hashie::Mash.new(data)
     end
 
     # Release an escrow

data/lib/localbitcoins/client.rb

@@ -8,13 +8,12 @@ module LocalBitcoins
     include LocalBitcoins::Escrows
     include LocalBitcoins::Ads
 
-    attr_reader :oauth_token
+    attr_reader :oauth_client, :access_token
 
     # Initialize a LocalBitcoins::Client instance
     #
-    # All API calls to LocalBitcoins require an OAuth token, so you 
-    # need to include one when you initialize the client.
-    #
+    # options[:client_id]
+    # options[:client_secret]
     # options[:oauth_token]
     #
     def initialize(options={})
@@ -22,7 +21,18 @@ module LocalBitcoins
         raise ArgumentError, "Options hash required."
       end
 
-      @oauth_token = options[:oauth_token]
+      @oauth_client = OAuth2::Client.new(
+        options[:client_id],
+        options[:client_secret],
+        authorize_url: "/oauth2/authorize",
+        token_url: "/oauth2/access_token",
+        site: "https://www.localbitcoins.com"
+      )
+
+      @access_token = OAuth2::AccessToken.new(
+        oauth_client,
+        options[:oauth_token]
+      ) 
     end
   end
 end

data/lib/localbitcoins/request.rb

@@ -2,9 +2,11 @@ require 'rest-client'
 require 'active_support/core_ext'
 require 'json'
 require 'hashie'
+require 'oauth2'
 
 module LocalBitcoins
   module Request
+    API_URL = "https://www.localbitcoins.com"
 
     protected
 
@@ -16,9 +18,9 @@ module LocalBitcoins
     # params - Parameters hash
     #
     def oauth_request(http_method, path, params={})
-      raise 'OAuth access token required!' unless @oauth_token
+      raise 'OAuth access token required!' unless @access_token
       params.merge!('Accept'=>'application/json')
-      resp = @oauth_token.request(http_method, path, params)
+      resp = @access_token.request(http_method, path, params)
 
       case resp
         when Net::HTTPUnauthorized

data/lib/localbitcoins/version.rb

@@ -1,5 +1,5 @@
 module LocalBitcoins
   unless defined?(LocalBitcoins::VERSION)
-    VERSION = '0.0.3'
+    VERSION = '0.0.4'
   end
 end

data/localbitcoins.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'rest-client',   '~> 1.6'
   s.add_runtime_dependency 'hashie',        '~> 2.0.2'
   s.add_runtime_dependency 'activesupport', '~> 3'
-  s.add_runtime_dependency 'oauth',         '~> 0.4'
+  s.add_runtime_dependency 'oauth2',        '~> 0.9.2'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/spec/client_spec.rb

@@ -1,22 +1,27 @@
 require 'spec_helper'
-require 'oauth'
+require 'oauth2'
 
 describe 'Client' do
-  describe '#escrows' do
-    let(:consumer) { OAuth::Consumer.new('CLIENT_ID', 'CLIENT_SECRET', site: 'https://www.localbitcoins.com') }
-    let(:token)    { OAuth::AccessToken.new(consumer, 'ACCESS_TOKEN', 'ACCESS_SECRET') }
+  let(:client) { LocalBitcoins::Client.new(
+    client_id: 'CLIENT_ID',
+    client_secret: 'CLIENT_SECRET',
+    oauth_token: 'ACCESS_TOKEN'
+  )}
 
+  describe "#escrows" do
     before do
-      stub_request(:get, "https://www.localbitcoins.com/oauth2/access_token").
-        to_return(status: 200, body: fixture('oauth_response.json'), headers: {})
+      stub_get('/api/escrows/', 'escrows.json')
     end
 
     it 'returns escrows owner of the access token can release' do
-      client = LocalBitcoins::Client.new(oauth_token: token)
-      
-      escrows = client.escrows
+      expect { client.escrows }.not_to raise_error
 
+      escrows = client.escrows
       escrows.should be_a Hashie::Mash
+      escrows.escrow_list[0].data.buyer_username.should eq "alice"
+      escrows.escrow_list[0].data.reference_code.should eq "123"
+      escrows.escrow_list[1].data.reference_code.should eq "456"
+      escrows.escrow_list[1].actions.release_url.should eq "/api/escrow_release/2/"
     end
   end
 end

data/spec/fixtures/escrows.json

@@ -1,10 +1,10 @@
-{
-  "escrow_list": [
+{ "escrow_list": 
+  [
     {
       "data": {
         "created_at": "2013-06-20T15:23:01.61",
         "buyer_username": "alice",
-        "reference_code": "123",
+        "reference_code": "123"
       },
       "actions": {
         "release_url": "/api/escrow_release/1/"
@@ -14,7 +14,7 @@
       "data": {
         "created_at": "2013-06-21T16:20:13.04",
         "buyer_username": "bob",
-        "reference_code": "456",
+        "reference_code": "456"
       },
       "actions": {
         "release_url": "/api/escrow_release/2/"

data/spec/spec_helper.rb

@@ -10,15 +10,21 @@ RSpec.configure do |config|
 end
 
 def stub_get(path, fixture_name)
-  stub_request(:get, api_url(path)).
-    with(headers: {
-      'Accept'=>'application/json'
-    }).
-    to_return(
-      status:  200, 
-      body:    fixture(fixture_name), 
-      headers: {}
-    )
+  stub_request(:get, "https://www.localbitcoins.com/api/escrows").
+         with(:headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization'=>'Bearer ACCESS_TOKEN', 'User-Agent'=>'Faraday v0.8.7'}).
+         to_return(:status => 200, :body => fixture(fixture_name), :headers => {})
+#  stub_request(:get, api_url(path)).
+#    with(
+#      headers: {
+#        'Accept'        => 'application/json',
+#        'Authorization' => 'Bearer ACCESS_TOKEN',
+#        'User-Agent'    => 'Faraday v0.8.7'
+#      }).
+#    to_return(
+#      status:  200, 
+#      body:    fixture(fixture_name), 
+#      headers: {}
+#    )
 end
 
 def stub_post(path, fixture_name)
@@ -46,5 +52,5 @@ def fixture(file)
 end
 
 def api_url(path)
-  "https://www.localbitcoins.com#{path}"
+  "#{LocalBitcoins::Request::API_URL}#{path}"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: localbitcoins
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - John Shutt
@@ -95,19 +95,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
-  name: oauth
+  name: oauth2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: 0.9.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: 0.9.2
 description: Ruby wrapper for the LocalBitcoins API
 email:
 - john.d.shutt@gmail.com