silkroad 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5050de75e2288298be54325a2ff9428d98c9cde
-  data.tar.gz: cf687338313a99fa297a2a5d532f67e66280bb00
+  metadata.gz: 12295a48d43500089e274ee57200ae3b69ee25a2
+  data.tar.gz: 7ccc5dd46d366fffe5b902568b265fcb3686408b
 SHA512:
-  metadata.gz: aa2924a294708adde8b1e45fb25011d318d0af511b3633a61ab74d1750c30f80b067a7482233c620000a5ebf80244270933aaaa43adb40266b1fd6e8348ffffc
-  data.tar.gz: aac2a971cfd4e06d27fe4b0b6cd821053ba8230921c6bc1254a6c9ed038c36a96a080c803b72a80b44266c1e8a7ba2712d7b1b61de84dad13b9ff3a14dddf300
+  metadata.gz: d2ebedd62b7a978d9e7b285c9278c66b8d26a62fb90c78fc0ec2cd66271a27dd4a7351c3de92cef8ee3b8f34f1c5e80a4a348f98ef0ebc064e380c731607e12e
+  data.tar.gz: 122479eae9b1b55f1e2a9d75d34ce24f23695d6f6ed30cb698c53e7cc3c672bed0a975f5d93ba230e430a39256c9e4e2bd7e30135e778e040dff3c084d2ae631

data/Gemfile

@@ -2,3 +2,4 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in silkroad.gemspec
 gemspec
+gem 'pry'

data/README.md

@@ -29,7 +29,7 @@ You can set a custom url:
 silkroad = Silkroad::Client.new 'rpcuser', 'rpcpass', url: 'https://yourbitcoinddaemon.com:31337'
 ```
 
-Now you can make RPC API calls (see the [API calls list](https://en.bitcoin.it/wiki/Original_Bitcoin_client/API_calls_list)). Pass params as per the spec, and the result will be returned as an array or hash (depending on the call):
+Now you can make RPC API calls (see the [API calls list](https://en.bitcoin.it/wiki/Original_Bitcoin_client/API_calls_list)). Pass params as per the spec, and the result will be returned as a primitive type (string, number, boolean, and nil) or structured type (hash, array), depending on the call:
 
 ```ruby
 silkroad.rpc 'getbalance', 'derp@example.com' # => 31337

data/lib/silkroad/client.rb

@@ -1,17 +1,18 @@
 module Silkroad
   class Client
     class Error < StandardError; end
-    DEFAULT_PORT    = 8332
-    JSONRPC_VERSION = '2.0'
+
+    DEFAULT_RPC_PORT = 8332
+    TESTNET_RPC_PORT = 18332
+    JSONRPC_VERSION  = '2.0'
 
     def initialize(user, pass, opts={})
       @user        = user
       @opts        = opts
-      @url         = Addressable::URI.parse @opts[:url] || "http://localhost:#{DEFAULT_PORT}"
-      @url.port    = DEFAULT_PORT if @url.port.nil?
-
-      @http_client = HTTPClient.new
-      @http_client.set_auth @url.to_s, user, pass
+      @uri         = URI.parse @opts[:url] || "http://localhost:#{DEFAULT_RPC_PORT}"
+      @uri.port    = DEFAULT_RPC_PORT if @opts[:url].nil? || !@opts[:url].match(/:80/)
+      @user        = user
+      @pass        = pass
     end
 
     def batch(requests=nil, &block)
@@ -23,7 +24,7 @@ module Silkroad
     def rpc(meth, *params)
       response = send jsonrpc: JSONRPC_VERSION, method: meth, params: params
 
-      if response.status != 200
+      if response.code != '200'
         if response.body.nil?
           raise Error.new "bitcoind returned HTTP status #{response.status} with no body: #{response.http_header.reason_phrase}"
         else
@@ -35,12 +36,24 @@ module Silkroad
       end
     end
 
-    def send(request)
-      @http_client.post @url, request.to_json, {'Content-Type' => 'application/json'}
+    def send(formdata)
+      resp = Net::HTTP.start(@uri.host, @uri.port) do |http|
+        req = Net::HTTP::Post.new '/'
+        req.basic_auth @user, @pass
+        req.add_field 'Content-Type', 'application/json'
+        req.use_ssl = true if @uri.scheme == 'https'
+        req.body = formdata.to_json
+        http.request req
+      end
+
+      if resp.code == '403' && resp.body.empty?
+        raise Error, '403 Forbidden - check your user/pass and/or uri, and ensure IP is whitelisted for remote connections'
+      end
+      resp
     end
 
     def inspect
-      "#<#{self.class} user=\"#{@user}\" @url=\"#{@url.to_s}\">"
+      "#<#{self.class} user=\"#{@user}\" @uri=\"#{@uri.to_s}\">"
     end
   end
 end

data/lib/silkroad/version.rb

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

data/lib/silkroad.rb

@@ -1,5 +1,5 @@
-require "httpclient"
-require "addressable/uri"
+require "uri"
+require "net/http"
 require "json"
 require "silkroad/batch"
 require "silkroad/client"

data/silkroad.gemspec

@@ -18,9 +18,6 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "addressable"
-  spec.add_dependency "httpclient"
-
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "minitest"

data/test/client_test.rb

@@ -11,14 +11,14 @@ end
 
 def stub_with_body(body, response)
   stub_request(:post, url).
-    with(body: body,
-         headers: {'Authorization'=>'Basic dXNlcjpwYXNz'}).
-    to_return(response)
+  with(body: body, headers: {'Content-Type'=>'application/json'}).
+  to_return(response)
 end
 
 describe Silkroad::Client do
   before do
     @silkroad = Silkroad::Client.new('user', 'pass')
+    WebMock.reset!
   end
 
   it 'makes a call' do
@@ -44,7 +44,7 @@ describe Silkroad::Client do
           {method: 'getbalance', params: ['tyler@example.com'], jsonrpc: '2.0'},
           {method: 'notworking', params: ['derp'], jsonrpc: '2.0'}
         ].to_json,
-        headers: {'Authorization'=>'Basic dXNlcjpwYXNz', 'Content-Type'=>'application/json'}).
+        headers: {'Content-Type'=>'application/json'}).
       to_return(
         :body => [
           {result: 31337, error: nil, id: nil},

metadata

@@ -1,43 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: silkroad
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Kyle Drake
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-15 00:00:00.000000000 Z
+date: 2013-06-13 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: addressable
-  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: httpclient
-  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: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -147,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: A fast, thread-safe, simple, lightweight, batchable, sober interface to the