waffle_api 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2b30166123afd1f59e7585120211af5da274c6e
-  data.tar.gz: 7a3acecf444ba8910aba86c014e9b77cd7fe618f
+  metadata.gz: b37de94f955112e583f831d8a16ef579c1afc5ec
+  data.tar.gz: e1ae1d9128a4835d55610e2b475c4b64a79911b8
 SHA512:
-  metadata.gz: 536e904fbdd7d7d3b53cfd9be00dbcc6dfd525441774711874f9c9d82a07dd6936332cd66fb4ec077ce9880a1e7b37b48e469948c4d0b6e57ca230439a01d018
-  data.tar.gz: b9cf8fd05960c7b087870c8602f5259e31586419159c4505207765dbd7f714dc40a312e3f0e53739fcfe83cdf8cf891741bbd52102bc1fecb71ab74c75cffafa
+  metadata.gz: 15f87d7fe974b901553c758274cdf48dcd5affd67c4214349f3b74d374624a520bed35c09e6d67e4459eb440f2e206215d7d91941bed4c90764ce3fa78cd9559
+  data.tar.gz: f15a48e4b2a09c51841cf1099b4c3152e5579cef02de7b8cd50e7bf4d77dfce7de27f70d73f73097fda07c3fff91269f9e52b08e2576ee4154a73b324cc0991d

data/.travis.yml

@@ -2,5 +2,4 @@ language: ruby
 cache: bundler
 rvm:
   - 2.0.0
-  - 2.1.0
   - 2.1.1

data/README.md

@@ -111,7 +111,7 @@ Released under the MIT License. See the [LICENSE](https://github.com/Calyhre/waf
 
 [travis_img]: https://travis-ci.org/Calyhre/waffle_api.svg?branch=master
 [travis_url]: https://travis-ci.org/Calyhre/waffle_api
-[fury_img]: https://badge.fury.io/rb/waffle_api.png
+[fury_img]: https://badge.fury.io/rb/waffle_api.svg
 [fury_url]: http://badge.fury.io/rb/waffle_api
 [code_climate_img]: https://codeclimate.com/github/Calyhre/waffle_api.png
 [code_climate_url]: https://codeclimate.com/github/Calyhre/waffle_api

data/lib/waffle_api/address_validator.rb

@@ -6,41 +6,37 @@ module WaffleAPI
   module AddressValidator
     private
 
-    B58_CHARS = '123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz'
-    B58_BASE = B58_CHARS.length
-
     def valid_address?
       (@address =~ /^[a-zA-Z1-9]{33,35}$/) && DigestUtilities.version(@address)
     end
 
     # Utilities are in a class to make them private
     class DigestUtilities
-      def self.version(address)
-        decoded = b58_decode(address, 25)
+      B58_CHARS = '123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz'
+      B58_BASE = B58_CHARS.length
 
-        version = decoded[0, 1]
+      def self.version(address)
+        decoded  = b58_decode(address, 25)
+        version  = decoded[0, 1]
         checksum = decoded[-4, decoded.length]
-        vh160 = decoded[0, decoded.length - 4]
-
-        hashed = (Digest::SHA2.new << (Digest::SHA2.new << vh160).digest).digest
+        vh160    = decoded[0, decoded.length - 4]
+        vh160_digest = (Digest::SHA2.new << vh160).digest
+        hashed   = (Digest::SHA2.new << vh160_digest).digest
 
         hashed[0, 4] == checksum ? version[0] : nil
       end
 
       def self.b58_decode(value, length)
         long_value = 0
-        index = 0
-        result = ""
+        result = ''
 
-        value.reverse.each_char do |c|
-          long_value += B58_CHARS.index(c) * (B58_BASE ** index)
-          index += 1
+        value.reverse.each_char.with_index do |c, index|
+          long_value += B58_CHARS.index(c) * (B58_BASE**index)
         end
 
-        while long_value >= 256 do
-          div, mod = long_value.divmod 256
+        while long_value >= 256
+          long_value, mod = long_value.divmod 256
           result = mod.chr + result
-          long_value = div
         end
 
         result = long_value.chr + result

data/lib/waffle_api/client.rb

@@ -9,7 +9,6 @@ module WaffleAPI
   #
   #   require 'waffle_api'
   #   stats = WaffleAPI::Client.new address: '<BTC_ADDRESS_HERE>'
-  #   stats.create()
   #
   class Client
     include WaffleAPI::Helpers
@@ -17,7 +16,7 @@ module WaffleAPI
 
     attr_accessor :address, :https_only
 
-    def initialize(address: nil, https_only: false, ignore_bad_address: false)
+    def initialize(address: nil, ignore_bad_address: false)
       @address   = address || ENV['BTC_ADDRESS']
       @https_only = https_only
 

data/lib/waffle_api/errors.rb

@@ -31,15 +31,6 @@ module WaffleAPI
       end
     end
 
-    # Error raised when https call Waffle returned a bad call
-    # It meens Waffle isn't supporting https right now.
-    class HttpsNotSupportedYet < Standard
-      def message
-        "Waffle pool isn\'t supporting https yet. Please use WaffleAPI " \
-        "without https_only argument."
-      end
-    end
-
     # Error raised when Waffle change his API endpoint. Nothing to do but
     # report an issue on this gem repo
     class EndPointMoved < Standard

data/lib/waffle_api/helpers.rb

@@ -7,15 +7,11 @@ require 'uri'
 module WaffleAPI
   # List of helpers used in WaffleAPI
   module Helpers
-    WAFFLE_POOL_HOST = 'wafflepool.com'
     NOT_FOUND_ERROR = 'Invalid BTC Address!'
     INVALIDATION_TIME = 30 # Seconds
 
     def call_uri
-      URI(
-        "#{@https_only ? 'https' : 'http'}://#{WAFFLE_POOL_HOST}" \
-        "/tmp_api?address=#{@address}"
-      )
+      URI "#{WAFFLEPOOL_URL}#{WAFFLEPOOL_API_PATH}?address=#{@address}"
     end
 
     def request_json
@@ -26,10 +22,7 @@ module WaffleAPI
       fail Error::AddressNotFound, @address if json['error'] == NOT_FOUND_ERROR
       fail Error::UnknownError, json['error'] unless json['error'].empty?
       json.delete 'error'
-
-      return json
-    rescue OpenSSL::SSL::SSLError
-      raise Error::HttpsNotSupportedYet
+      json
     end
 
     def data_recent?

data/lib/waffle_api/version.rb

@@ -1,3 +1,4 @@
+# WaffleAPI Version
 module WaffleAPI
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/lib/waffle_api.rb

@@ -1,5 +1,7 @@
 # Waffle pool API gem
 module WaffleAPI
+  WAFFLEPOOL_URL = 'http://wafflepool.com'
+  WAFFLEPOOL_API_PATH = '/tmp_api'
 end
 
 require 'waffle_api/client'

data/spec/lib/waffle_api/client_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe WaffleAPI::Client do
   describe 'without address' do
-    it 'raises an WaffleAPI::Error::EmptyAddress' do
+    it 'raises WaffleAPI::Error::EmptyAddress' do
       expect do
         WaffleAPI::Client.new
       end.to raise_error(WaffleAPI::Error::EmptyAddress)
@@ -10,7 +10,7 @@ describe WaffleAPI::Client do
   end
 
   describe 'with a bad address' do
-    it 'raises an WaffleAPI::Error::BadAddress' do
+    it 'raises WaffleAPI::Error::BadAddress' do
       expect do
         WaffleAPI::Client.new address: 'some_bad_address'
       end.to raise_error(WaffleAPI::Error::BadAddress)
@@ -19,24 +19,46 @@ describe WaffleAPI::Client do
 
   describe 'with a valid address' do
     subject do
-      WaffleAPI::Client.new address: '1Ju8U9Ukfc5kiMqzQrRgQBP1JvRkeSv94V'
+      WaffleAPI::Client.new address: BTC_ADDRESS
     end
 
-    describe 'asking for a non existing key' do
-      it 'raises an NoMethodError' do
-        stub_waffle Wafflepool::Success
+    describe 'which not exist on waffle' do
+      it 'raises WaffleAPI::Error::AddressNotFound' do
+        stub_waffle_with Wafflepool::AddressNotFound
 
         expect do
-          subject.i_hope_this_key_will_never_exist
-        end.to raise_error(NoMethodError)
+          subject.hashrate
+        end.to raise_error(WaffleAPI::Error::AddressNotFound)
       end
     end
 
-    describe 'asking for an existing key' do
-      it 'just return it' do
-        stub_waffle Wafflepool::Success
+    describe 'which exist on waffle' do
+      describe 'with a not yet supported error' do
+        it 'raises WaffleAPI::Error::UnknownError' do
+          stub_waffle_with Wafflepool::UnknownError
 
-        expect(subject.hashrate).to eq 4_303_407
+          expect do
+            subject.i_hope_this_key_will_never_exist
+          end.to raise_error(WaffleAPI::Error::UnknownError)
+        end
+      end
+
+      describe 'asking for a non existing key' do
+        it 'raises NoMethodError' do
+          stub_waffle_with Wafflepool::Success
+
+          expect do
+            subject.i_hope_this_key_will_never_exist
+          end.to raise_error(NoMethodError)
+        end
+      end
+
+      describe 'asking for an existing key' do
+        it 'just return it' do
+          stub_waffle_with Wafflepool::Success
+
+          expect(subject.hashrate).to eq 4_303_407
+        end
       end
     end
   end

data/spec/spec_helper.rb

@@ -1,5 +1,7 @@
-require 'coveralls'
-Coveralls.wear!
+if ENV['TRAVIS']
+  require 'coveralls'
+  Coveralls.wear!
+end
 
 require 'webmock/rspec'
 require 'waffle_api'
@@ -8,8 +10,9 @@ Dir[File.dirname(__FILE__) + '/support/**/*.rb'].each { |f| require f }
 
 WebMock.disable_net_connect! allow_localhost: true
 
-URL = 'http://wafflepool.com/tmp_api?address=1Ju8U9Ukfc5kiMqzQrRgQBP1JvRkeSv94V'
+BTC_ADDRESS = '1Ju8U9Ukfc5kiMqzQrRgQBP1JvRkeSv94V'
+URL = "http://wafflepool.com/tmp_api?address=#{BTC_ADDRESS}"
 
-def stub_waffle(response_class)
+def stub_waffle_with(response_class)
   stub_request(:any, URL).to_rack(response_class)
 end

data/waffle_api.gemspec

@@ -4,7 +4,7 @@ Gem::Specification.new do |s|
   s.name         = 'waffle_api'
   s.version      = WaffleAPI::VERSION
   s.summary      = 'Waffle pool API gem'
-  s.description  = s.summary
+  s.description  = 'Simple gem to make fast and cached calls to Wafflepool API'
   s.authors      = ['Calyhre']
   s.email        = ['contact@calyh.re']
   s.require_path = 'lib'
@@ -16,9 +16,9 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 2.0.0'
 
-  s.add_development_dependency 'rake'
-  s.add_development_dependency 'rspec'
-  s.add_development_dependency 'sinatra'
-  s.add_development_dependency 'webmock'
-  s.add_development_dependency 'coveralls'
+  s.add_development_dependency 'rake', '~> 10.3'
+  s.add_development_dependency 'rspec', '~> 2.14'
+  s.add_development_dependency 'sinatra', '~> 1.4'
+  s.add_development_dependency 'webmock', '~> 1.17'
+  s.add_development_dependency 'coveralls', '~> 0.7'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: waffle_api
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Calyhre
@@ -14,73 +14,73 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.14'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.17'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.17'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-description: Waffle pool API gem
+        version: '0.7'
+description: Simple gem to make fast and cached calls to Wafflepool API
 email:
 - contact@calyh.re
 executables: []