openname 0.3 → 0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0ff21c569840d76a58bb158b88643067ecde030
-  data.tar.gz: ba50050face0f3f78cc4a31984ea51344aa3061c
+  metadata.gz: 12fa57d0eddaa6b5e7024a8020060c07c85207ee
+  data.tar.gz: 8ecea83221d00a389cd5285e82438c4ad140dcb0
 SHA512:
-  metadata.gz: 04ad91168836900329aa8ee19b1860379c18d1ead0028d3595efce128e800c44dbf6577bc0ef9f518733942da96cf2593386ba2745281991217c397ca00d1eda
-  data.tar.gz: ad57b925778d880051987f39cc041563a28b475bb3e22bbfadc52d05198b63cd992826819a90deb52db0895587e4c1db1359e6f906860dfe8880585c31dcaf23
+  metadata.gz: 209ba518efcf73b42c5eae62256518d63f2a365d638f268ed59dd05b7a49235e356f57ed4198fdcc4e4a50848e7798c1c3c5af8aa4954bb4b04368aa7e786485
+  data.tar.gz: 050dacec96225c9016d045ce8d87e3b939b4b3f366015d2c197402f83f035357305c62ff0750a213a69502dfa01d1601644d4de5857f6334b9720c64cd79748f

data/Gemfile

@@ -2,3 +2,5 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in openname.gemspec
 gemspec
+gem 'bitcoin-ruby', git: 'https://github.com/lian/bitcoin-ruby', branch: 'master', require: 'bitcoin'
+

data/lib/openname.rb

@@ -1,6 +1,7 @@
 require "openname/version"
 require 'net/http'
 require 'json'
+require 'bitcoin'
 
 
 ##
@@ -36,7 +37,7 @@ module Openname
   # Check if the given +openname+ is in proper format
   # Does not downcase input
   def self.valid?(openname)
-    Openname::ONENAME_REGEX.match(openname).nil? ? false : true
+    Openname::OPENNAME_REGEX.match(openname).nil? ? false : true
   end
 
   ##
@@ -48,13 +49,13 @@ module Openname
     http.use_ssl = uri.scheme == "https" ? true : false
     req = Net::HTTP::Get.new(uri.path, {'User-Agent' => USERAGENT})
     res = http.request(req)
-    case res.code
-      when 404 then raise NameError.new("User with Openname \"#{openname}\" does not exist")
-      when res.code != 200 then
+    case res.code.to_s
+      when "404" then raise NameError.new("User with Openname \"#{openname}\" does not exist")
+      when "200" then return JSON.parse(res.body)
+	  else
         error = JSON.parse(res.body)
         raise RuntimeError.new("Openname endpoint returned error: #{error["error"]}")
     end  
-    json = JSON.parse(res.body)
     
   end
   
@@ -64,6 +65,16 @@ module Openname
     User.from_json(self.get_json(openname),openname)
   end
   
+  ##
+  # Takes either a bitcoin address or a openname
+  # Returns the bitcoin address associated with the openname or passes through address provided
+  def self.get_bitcoin_address(openname_or_address)
+	 return openname_or_address if Bitcoin.valid_address?(openname_or_address)
+	 raise ArgumentError.new("#{openname_or_address} is not a valid Openname or Bitcoin address") if !self.valid?(openname_or_address)
+	 user = get(openname_or_address)
+	 raise NameError.new("Openname user #{openname_or_address} does not have a Bitcoin address") if !Bitcoin.valid_address?(user.bitcoin_address)
+	 return user.bitcoin_address  
+  end
   
   class User
     def self.from_json(json,openname)

data/lib/openname/version.rb

@@ -1,3 +1,3 @@
 module Openname
-  VERSION = "0.3"
+  VERSION = "0.4"
 end

data/openname.gemspec

@@ -23,4 +23,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "webmock"
   spec.add_development_dependency "vcr"
+  
+  spec.add_runtime_dependency 'bitcoin-ruby'
 end

data/spec/fixtures/cassettes/openname.yml

@@ -47,4 +47,76 @@ http_interactions:
         \ \"name\": {\n    \"formatted\": \"Larry Salibra\"\n  }\n}"
     http_version: 
   recorded_at: Sun, 06 Apr 2014 14:00:02 GMT
+- request:
+    method: get
+    uri: https://www.onename.io/bitcoinhater.json
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - onename-ruby 0.1
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - '*/*'
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Content-Type:
+      - application/json
+      Date:
+      - Sun, 06 Apr 2014 14:00:02 GMT
+      Server:
+      - gunicorn/18.0
+      Strict-Transport-Security:
+      - max-age=31536000
+      Content-Length:
+      - '909'
+      Connection:
+      - keep-alive
+    body:
+      encoding: UTF-8
+      string: "{\n \n  \"avatar\": {\n    \"url\": \"http://www.example.com/pic.png\"\n
+        \ }, \n
+        \ \"name\": {\n    \"formatted\": \"Bitcoin Hater\"\n  }\n}"
+    http_version: 
+  recorded_at: Sun, 06 Apr 2014 14:00:02 GMT
+- request:
+    method: get
+    uri: https://www.onename.io/nothere.json
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - onename-ruby 0.1
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - '*/*'
+  response:
+    status:
+      code: 404
+      message: NOT FOUND
+    headers:
+      Content-Type:
+      - application/json
+      Date:
+      - Sun, 06 Apr 2014 14:00:02 GMT
+      Server:
+      - gunicorn/18.0
+      Strict-Transport-Security:
+      - max-age=31536000
+      Content-Length:
+      - '909'
+      Connection:
+      - keep-alive
+    body:
+      encoding: UTF-8
+      string: ""
+    http_version: 
+  recorded_at: Sun, 06 Apr 2014 14:00:02 GMT
 recorded_with: VCR 2.9.0

data/spec/lib/onename_spec.rb

@@ -1,23 +1,30 @@
 require 'spec_helper'
+require 'bitcoin'
 
 describe Openname, :vcr => { :cassette_name => "openname" }  do
  
   
-  it "should have a default endpoint" do
-    Openname.endpoint.should == "https://www.onename.io"
-  end
-  
-  it "should allow setting a different endpoint and returning to default" do
-    Openname.endpoint = "https://www.example.com"
-    Openname.endpoint.should == "https://www.example.com"
-    Openname.endpoint = nil
-    Openname.endpoint.should == "https://www.onename.io"
-  end
-  
-  it "should retrieve openname user" do 
-    user = Openname.get("larry")
-    user.is_a?(Openname::User).should == true
-  end
+	it "should have a default endpoint" do
+	    Openname.endpoint.should == "https://www.onename.io"
+	end
+	  
+	it "should allow setting a different endpoint and returning to default" do
+		Openname.endpoint = "https://www.example.com"
+		Openname.endpoint.should == "https://www.example.com"
+	    Openname.endpoint = nil
+	    Openname.endpoint.should == "https://www.onename.io"
+	  end
+	  
+	it "should retrieve openname user" do 
+	    user = Openname.get("larry")
+	    user.is_a?(Openname::User).should == true
+	end
+	
+	it "should give error if openname user does not exist" do 
+	    expect {
+		    user = Openname.get("nothere")
+		}.to raise_error(NameError)
+	end
     
     context "we've retrieved an openname user" do 
       before :each do 
@@ -28,5 +35,34 @@ describe Openname, :vcr => { :cassette_name => "openname" }  do
         @user.openname.should == "larry"
       end
       
+      it "should have a bitcoin address" do
+	    address = @user.bitcoin_address
+	    Bitcoin.valid_address?(address).should == true
+	  end
+      
     end
+    
+    context "retrieving Bitcoin addreses" do 
+	    it "should retrieve a Bitcoin address" do 
+		    address = Openname.get_bitcoin_address("larry")
+		    Bitcoin.valid_address?(address).should == true
+		    
+		    address = Openname.get_bitcoin_address("143xFrxppUD9oQE7mGvQFe23h814YorMBs")
+		    Bitcoin.valid_address?(address).should == true
+		end
+		
+		it "should raise an error when retrieving poorly formed Bitcoin address" do
+			expect {
+				address = Openname.get_bitcoin_address("143xFrxpp")
+			}.to raise_error(ArgumentError)
+
+		end
+		
+		it "should raise an error when user has no Bitcoin address" do
+			expect {
+				address = Openname.get_bitcoin_address("bitcoinhater")
+			}.to raise_error(NameError)
+
+		end
+	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openname
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: '0.4'
 platform: ruby
 authors:
 - Larry Salibra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-20 00:00:00.000000000 Z
+date: 2014-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: bitcoin-ruby
+  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'
 description: Ruby library for the Openname distributed identity & naming system
 email:
 - larry@pay4bugs.com