silkroad 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12295a48d43500089e274ee57200ae3b69ee25a2
-  data.tar.gz: 7ccc5dd46d366fffe5b902568b265fcb3686408b
+  metadata.gz: 418db557c865c75cb14484e2abf1774a352d9adb
+  data.tar.gz: 94db88ee449808a5298e04422f0ca3c4bede9250
 SHA512:
-  metadata.gz: d2ebedd62b7a978d9e7b285c9278c66b8d26a62fb90c78fc0ec2cd66271a27dd4a7351c3de92cef8ee3b8f34f1c5e80a4a348f98ef0ebc064e380c731607e12e
-  data.tar.gz: 122479eae9b1b55f1e2a9d75d34ce24f23695d6f6ed30cb698c53e7cc3c672bed0a975f5d93ba230e430a39256c9e4e2bd7e30135e778e040dff3c084d2ae631
+  metadata.gz: 4f3155bc47b4dfaf5cf0629ec36b6ed61226c3886a6d271335d77f12b2125da708c589ebb46481f17c1638a6a59e4c31b2e3cace29617ca9e39871e099d2afee
+  data.tar.gz: 2c96cf231a68dd4d17e10a46b0eabe55d59a68c4273d885726a15775cd0fc667e18b487e39a84161668ee88c89db1e218a9eebf35ace04c127c38fee9c2291a0

data/lib/silkroad/client.rb

@@ -1,18 +1,17 @@
 module Silkroad
   class Client
     class Error < StandardError; end
+    attr_reader :uri
 
     DEFAULT_RPC_PORT = 8332
     TESTNET_RPC_PORT = 18332
     JSONRPC_VERSION  = '2.0'
 
-    def initialize(user, pass, opts={})
-      @user        = user
-      @opts        = opts
-      @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
+    def initialize(uri, opts={})
+      @opts = opts
+      @uri = URI uri
+      raise Error, 'user and password required' unless @uri.user && @uri.password
+      @uri.port = DEFAULT_RPC_PORT if @uri.port.nil? || (@uri.port == 80 && !uri.match(/:80/))
     end
 
     def batch(requests=nil, &block)
@@ -39,7 +38,7 @@ module Silkroad
     def send(formdata)
       resp = Net::HTTP.start(@uri.host, @uri.port) do |http|
         req = Net::HTTP::Post.new '/'
-        req.basic_auth @user, @pass
+        req.basic_auth @uri.user, @uri.password
         req.add_field 'Content-Type', 'application/json'
         req.use_ssl = true if @uri.scheme == 'https'
         req.body = formdata.to_json
@@ -56,4 +55,4 @@ module Silkroad
       "#<#{self.class} user=\"#{@user}\" @uri=\"#{@uri.to_s}\">"
     end
   end
-end
+end

data/lib/silkroad/version.rb

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

data/test/client_test.rb

@@ -17,10 +17,21 @@ end
 
 describe Silkroad::Client do
   before do
-    @silkroad = Silkroad::Client.new('user', 'pass')
+    @silkroad = Silkroad::Client.new 'http://user:pass@localhost'
     WebMock.reset!
   end
 
+  it 'sets url defaults correctly' do
+    Proc.new { Silkroad::Client.new 'http://localhost' }.must_raise Silkroad::Client::Error
+    
+    
+    silkroad = Silkroad::Client.new 'http://user:pass@localhost'
+    silkroad.uri.to_s.must_equal 'http://user:pass@localhost:8332'
+
+    silkroad = Silkroad::Client.new 'https://user:pass@example.org:1234'
+    silkroad.uri.to_s.must_equal 'https://user:pass@example.org:1234'
+  end
+
   it 'makes a call' do
     stub_with_body(
       {jsonrpc: "2.0", method: "getbalance", params: ["tyler@example.com"]},

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: silkroad
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Kyle Drake