nanook 0.6.3 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38e4a248c6ea62d44a35964f3f06287cfead6987
-  data.tar.gz: 02eadb7cf364bcadddceec3983af2fce00ff669b
+  metadata.gz: 6e6170431fd02cf9172ba555460af6fdecfefe79
+  data.tar.gz: 93049e6146081de1a0019bff1ef9a2c7796114fe
 SHA512:
-  metadata.gz: 89a7f7be437584c723f121440d4c771805466a1d1447e1368d83a79e39d9048317dbf0f3d83b75121ec664a995ba19f8f331135322564bd146804b408a88d13b
-  data.tar.gz: 41d112321008ed82fb4c4be00cb1fe343c7bc385b25b240d1eb2ca7103fa1fc9496aa4a28548fde665dd239a4df4746e85410b31e609c83ea0379378529501a7
+  metadata.gz: ce1761786956bf8111289d74cd042d72fdbc23d0e623dbaee4e85a80f704b5fb22b1db6dc5666ddb9057166f5713d6194438fbd915c5b9e5c3bac6cbbce29f3e
+  data.tar.gz: 0ebe5795c0a2af3a71483b7b43fe41d091b41f726bfa2fa16959f326656af77b9a3b52c367115a33e91f784699f10777fa12f52a20d8027aae4f145d60eb9dcb

data/Gemfile.lock

@@ -1,24 +1,31 @@
 PATH
   remote: .
   specs:
-    nanook (0.6.3)
-      symbolized
+    nanook (0.7.0)
+      symbolized (~> 0.0.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
+    coderay (1.1.2)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     diff-lcs (1.3)
     hashdiff (0.3.7)
+    method_source (0.9.0)
+    pry (0.11.3)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
     public_suffix (3.0.2)
     rake (10.5.0)
     rspec (3.7.0)
       rspec-core (~> 3.7.0)
       rspec-expectations (~> 3.7.0)
       rspec-mocks (~> 3.7.0)
+    rspec-collection_matchers (1.1.3)
+      rspec-expectations (>= 2.99.0.beta1)
     rspec-core (3.7.1)
       rspec-support (~> 3.7.0)
     rspec-expectations (3.7.0)
@@ -43,9 +50,11 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.16)
   nanook!
+  pry
   rake (~> 10.0)
   rspec (~> 3.2)
-  rspec_junit_formatter
+  rspec-collection_matchers (~> 1.1)
+  rspec_junit_formatter (~> 0.3)
   webmock (~> 3.3)
 
 BUNDLED WITH

data/lib/nanook/account.rb

@@ -8,7 +8,7 @@ class Nanook
 
     def delegators
       account_required!
-      rpc(:delegators)
+      rpc(:delegators)[:delegators]
     end
 
     def exists?
@@ -19,17 +19,17 @@ class Nanook
 
     def history(limit: 1000)
       account_required!
-      rpc(:account_history, count: limit)
+      rpc(:account_history, count: limit)[:history]
     end
 
     def public_key
       account_required!
-      rpc(:account_key)
+      rpc(:account_key)[:key]
     end
 
     def representative
       account_required!
-      rpc(:account_representative)
+      rpc(:account_representative)[:representative]
     end
 
     def balance
@@ -44,17 +44,24 @@ class Nanook
 
     def ledger(limit: 1)
       account_required!
-      rpc(:ledger, count: limit)
+      rpc(:ledger, count: limit)[:accounts]
     end
 
-    def pending(limit: 1000)
+    # Returns Array of block hashes
+    # Or, with detailed: true, returns Hashes
+    def pending(limit: 1000, detailed: false)
       account_required!
-      rpc(:pending, count: limit)
+
+      args = { count: limit }
+      args[:source] = true if detailed
+
+      response = rpc(:pending, args)[:blocks]
+      Nanook::Util.coerce_empty_string_to_type(response, (detailed ? Hash : Array))
     end
 
     def weight
       account_required!
-      rpc(:account_weight)
+      rpc(:account_weight)[:weight]
     end
 
     private

data/lib/nanook/block.rb

@@ -8,23 +8,24 @@ class Nanook
     end
 
     def account
-      rpc(:block_account, :hash)
+      rpc(:block_account, :hash)[:account]
     end
 
     def cancel_work
-      rpc(:work_cancel, :hash)
+      rpc(:work_cancel, :hash).empty?
     end
 
     def chain(limit: 1000)
-      rpc(:chain, :block, count: limit)
+      response = rpc(:chain, :block, count: limit)[:blocks]
+      Nanook::Util.coerce_empty_string_to_type(response, Array)
     end
 
     def generate_work
-      rpc(:work_generate, :hash)
+      rpc(:work_generate, :hash)[:work]
     end
 
     def history(limit: 1000)
-      rpc(:history, :hash, count: limit)
+      rpc(:history, :hash, count: limit)[:history]
     end
 
     def info(allow_unchecked: false)
@@ -57,7 +58,7 @@ class Nanook
       params[:sources] = sources unless sources.nil?
       params[:count] = 1 unless params.empty?
 
-      rpc(:republish, :hash, params)
+      rpc(:republish, :hash, params)[:blocks]
     end
 
     def pending?
@@ -66,11 +67,12 @@ class Nanook
     end
 
     def process
-      rpc(:process, :block)
+      rpc(:process, :block)[:hash]
     end
 
     def successors(limit: 1000)
-      rpc(:successors, :block, count: limit)
+      response = rpc(:successors, :block, count: limit)[:blocks]
+      Nanook::Util.coerce_empty_string_to_type(response, Array)
     end
 
     private
@@ -92,8 +94,9 @@ class Nanook
     def _parse_info_response(response)
       # The contents is a stringified JSON
       if response[:contents]
-        response[:contents] = JSON.parse(response[:contents])
+        return JSON.parse(response[:contents]).to_symbolized_hash
       end
+
       response
     end
 

data/lib/nanook/node.rb

@@ -14,27 +14,27 @@ class Nanook
     end
 
     def bootstrap(address:, port:)
-      rpc(:bootstrap, address: address, port: port)
+      rpc(:bootstrap, address: address, port: port).has_key?(:success)
     end
 
     def bootstrap_any
-      rpc(:bootstrap_any)
+      rpc(:bootstrap_any).has_key?(:success)
     end
 
     def frontier_count
-      rpc(:frontier_count)
+      rpc(:frontier_count)[:count]
     end
 
     def peers
-      rpc(:peers)
+      rpc(:peers)[:peers]
     end
 
     def representatives
-      rpc(:representatives)
+      rpc(:representatives)[:representatives]
     end
 
     def stop
-      rpc(:stop)
+      rpc(:stop).has_key?(:success)
     end
 
     def sync_progress

data/lib/nanook/util.rb

@@ -5,5 +5,13 @@ class Nanook
       nano * (10**30)
     end
 
+    def self.coerce_empty_string_to_type(response, type)
+      if response == ""
+        return type.new
+      end
+
+      response
+    end
+
   end
 end

data/lib/nanook/version.rb

@@ -1,3 +1,3 @@
 class Nanook
-  VERSION = "0.6.3"
+  VERSION = "0.7.0"
 end

data/lib/nanook/wallet.rb

@@ -12,30 +12,32 @@ class Nanook
 
     def accounts
       wallet_required!
-      rpc(:account_list)
+      response = rpc(:account_list)[:accounts]
+      Nanook::Util.coerce_empty_string_to_type(response, Array)
     end
 
     def balance(account_break_down: false)
       wallet_required!
       if account_break_down
-        rpc(:wallet_balances)
+        rpc(:wallet_balances)[:balances]
       else
         rpc(:wallet_balance_total)
       end
     end
 
     def create
-      rpc(:wallet_create)
+      rpc(:wallet_create)[:wallet]
     end
 
     def destroy
       wallet_required!
       rpc(:wallet_destroy)
+      true
     end
 
     def export
       wallet_required!
-      rpc(:wallet_export)
+      rpc(:wallet_export)[:json]
     end
 
     def contains?(account)
@@ -62,17 +64,17 @@ class Nanook
 
     def unlock(password)
       wallet_required!
-      rpc(:password_enter, password: password)
+      rpc(:password_enter, password: password)[:valid] == 1
     end
 
     def change_password(password)
       wallet_required!
-      rpc(:password_change, password: password)
+      rpc(:password_change, password: password)[:changed] == 1
     end
 
     def all
       wallet_required!
-      rpc(:account_list)
+      rpc(:account_list)[:accounts]
     end
 
     private

data/lib/nanook/wallet_account.rb

@@ -14,13 +14,13 @@ class Nanook
 
     def create
       wallet_required!
-      rpc(:account_create)
+      rpc(:account_create)[:account]
     end
 
     def destroy
       wallet_required!
       account_required!
-      rpc(:account_remove)
+      rpc(:account_remove)[:removed] == 1
     end
 
     def pay(to:, amount:, id:)
@@ -38,9 +38,10 @@ class Nanook
         id: id
       }
 
-      @rpc.call(:send, p)
+      @rpc.call(:send, p)[:block]
     end
 
+    # Returns false if no block to receive
     def receive(block=nil)
       wallet_required!
       account_required!
@@ -76,8 +77,10 @@ class Nanook
       _receive_with_block(block)
     end
 
+    # Returns block if successful, otherwise false
     def _receive_with_block(block)
-      rpc(:receive, block: block)
+      response = rpc(:receive, block: block)[:block]
+      response.nil? ? false : response
     end
 
     def rpc(action, params={})

data/lib/nanook/work_peer.rb

@@ -6,15 +6,15 @@ class Nanook
     end
 
     def add(address:, port:)
-      rpc(:work_peer_add, address: address, port: port)
+      rpc(:work_peer_add, address: address, port: port).has_key?(:success)
     end
 
     def clear
-      rpc(:work_peers_clear)
+      rpc(:work_peers_clear).has_key?(:success)
     end
 
     def list
-      rpc(:work_peers)
+      rpc(:work_peers)[:work_peers]
     end
 
     private

data/nanook.gemspec

@@ -22,10 +22,12 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.16"
+  spec.add_development_dependency "pry"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.2"
-  spec.add_development_dependency "rspec_junit_formatter"
+  spec.add_development_dependency "rspec-collection_matchers", "~> 1.1"
+  spec.add_development_dependency "rspec_junit_formatter", "~> 0.3"
   spec.add_development_dependency "webmock", "~> 3.3"
 
-  spec.add_dependency "symbolized"
+  spec.add_dependency "symbolized", "~> 0.0.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nanook
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.7.0
 platform: ruby
 authors:
 - Luke Duncalfe
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.16'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -52,20 +66,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: rspec-collection_matchers
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rspec_junit_formatter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -84,16 +112,16 @@ dependencies:
   name: symbolized
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.1
 description: Ruby library for managing a nano currency node, including making and
   receiving payments, using the nano RPC protocol
 email: