nis-ruby 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: adebde300e51f8f5c6fb4e8ab89b1576f1da53ce
-  data.tar.gz: dba85ef747580684ac4033edd2f7176d60bc4c27
+  metadata.gz: 5b9bc79d0376d239e28cf6c5e8fc77e828e93f19
+  data.tar.gz: 0d0d828ae81680a4835070dbad7fec4dbd07a3e9
 SHA512:
-  metadata.gz: 32f3f47e8e3a7a1469349289bb5c3d4c70380f3c22d4eb91b257affd5a1acb87ad131194c51062cf29082037c24e0d9fd8698adcfaef64052ed20ec16c5a363e
-  data.tar.gz: fad93a592a019513e28d9cca729d481b3bd6c8e0d29fa0873e5647fcf12b93a47012e32304af6dcd5ce03d2f402eef07e4a04ac3f190273a2901565bc7f71774
+  metadata.gz: 45407f6af5215dedc762e96d5fad0b1a8704986a6515cc5d3d4e9f3568dc844b3b8f1ccc29175a617b025ab7f8c0f3907b2e6a37f36eb5761153858333c4c350
+  data.tar.gz: 349d2f09004e8035a438766cb3e48d8aef07dc3a100b9b07e1fdb12900f3fe6da8d23db0d32e986225a4384c80af063d47cb0956fd45c4ebe5d81e5a93699e69

data/README.md

@@ -50,21 +50,46 @@ nis.request(:post, '/account/unlock',
 )
 # => Nothing
 # See http://bob.nem.ninja/docs/#locking-and-unlocking-accounts
-```
-
 
-## Documentation
-
-Available at [rubydoc.info](http://www.rubydoc.info/gems/nis-ruby).
+t = {
+  amount: 10_000_000,
+  fee:     3_000_000,
+  recipient: 'TALICELCD3XPH4FFI5STGGNSNSWPOTG5E4DS2TOS',
+  signer: 'a1aaca6c17a24252e674d155713cdf55996ad00175be4af02a20c67b59f9fe8a',
+  message: {
+    payload: '',
+    type: 1
+  },
+  type: 0x0101, # 257
+  timeStamp: (Time.now.to_i - 1_427_587_585),
+  deadline: (Time.now.to_i - 1_427_587_585) + 43_200,
+  version: -1_744_830_463 # testnet version 1
+}
+puts nis.request! :post, 'transaction/prepare-announce', {
+  transaction: t,
+  privateKey: '68e4f79f886927de698df4f857de2aada41ccca6617e56bb0d61623b35b08cc0'
+}
+# => {innerTransactionHash: {}, code: 1, type: 1, message: "SUCCESS", transactionHash: {data: "9da41fd6c6886740ae6a15c869df0470015d78103e5b216971aa09fdbcce9cde"}}
+# See http://bob.nem.ninja/docs/#initiating-a-transfer-transaction
+```
 
 
 ## Commandline
 
 ```bash
-$ nis status # => {"code":6,"type":4,"message":"status"}
-$ nis heartbeat # => {"code":1,"type":2,"message":"ok"}
+$ nis status
+# => {"code":6,"type":4,"message":"status"}
+
+$ nis heartbeat
+# => {"code":1,"type":2,"message":"ok"}
+
 $ nis request get account/get --params=address:TALICELCD3XPH4FFI5STGGNSNSWPOTG5E4DS2TOS
 # => [AccountMetaDataPair structure]
+
+$ nis request get account/harvests --params=address:TALICELCD3XPH4FFI5STGGNSNSWPOTG5E4DS2TOS hash:81d52a7df4abba8bb1613bcc42b6b93cf3114524939035d88ae8e864cd2c34c8
+# => [Array <HervestInfo structure>]
+
+
 ```
 
 
@@ -93,6 +118,11 @@ Nis.new(url: 'http://bigalice3.nem.ninja:7890')
 - Do more improvements.
 
 
+## Documentation
+
+Available at [rubydoc.info](http://www.rubydoc.info/gems/nis-ruby).
+
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/nis-ruby. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.

data/Rakefile

@@ -1,6 +1,6 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec

data/lib/nis/client.rb

@@ -1,18 +1,19 @@
 require 'faraday'
+require 'faraday_middleware'
 require 'json'
 require 'uri'
 
 # @attr [Hash] options connection options
 class Nis::Client
   DEFAULTS = {
-    url:     -> {ENV['NIS_URL']},
+    url:     -> { ENV['NIS_URL'] },
     scheme:  'http',
     host:    '127.0.0.1',
     port:    7890,
     timeout: 5
-  }
+  }.freeze
 
-  attr :options
+  attr_reader :options
 
   # @param [hash] options HTTP Client connection information
   # @option options [Symbol] :url URL
@@ -28,10 +29,11 @@ class Nis::Client
   # @param [String] path API Path
   # @param [Hash] params API Parameters
   # @return [Hash] Hash converted API Response
-  def request(method, path, params = nil, &block)
-    params.reject! { |_, value| value.nil? } unless params.nil?
-    body = connection.send(method, path, params).body
-    hash = parse_body(body) unless body.size == 0
+  def request(method, path, params = {})
+    params.reject! { |_, value| value.nil? } unless params.empty?
+    res = connection.send(method, path, params)
+    body = res.body
+    hash = parse_body(body) unless body.empty?
     block_given? ? yield(hash) : hash
   end
 
@@ -39,9 +41,10 @@ class Nis::Client
   # @param [String] path API Path
   # @param [Hash] params API Parameters
   # @return [Hash] Hash converted API Response
-  def request!(method, path, params = nil, &block)
+  # @raise [Nis::Error] NIS error
+  def request!(method, path, params = {})
     hash = request(method, path, params)
-    raise Nis::Util.error_handling(hash) if hash.has_key?(:error)
+    raise Nis::Util.error_handling(hash) if hash.key?(:error)
     block_given? ? yield(hash) : hash
   end
 
@@ -50,11 +53,11 @@ class Nis::Client
   def connection
     @connection ||= Faraday.new(url: @options[:url]) do |f|
       f.options[:timeout] = @options[:timeout]
-      f.request :url_encoded
-      f.adapter Faraday.default_adapter
+      f.request :json
       # f.response :logger do | logger |
       #   logger.filter(/(privateKey=)(\w+)/,'\1[FILTERED]')
       # end
+      f.adapter Faraday.default_adapter
     end
   end
 
@@ -69,7 +72,7 @@ class Nis::Client
     defaults[:url] = defaults[:url].call if defaults[:url].respond_to?(:call)
 
     defaults.keys.each do |key|
-      options[key] = options[key.to_s] if options.has_key?(key.to_s)
+      options[key] = options[key.to_s] if options.key?(key.to_s)
     end
 
     url = options[:url] || defaults[:url]

data/lib/nis/error.rb

@@ -1,4 +1,5 @@
 class Nis
   class Error < StandardError; end
-  class BadRequestError < StandardError; end
+  class BadRequestError < Error; end
+  class InternalServerError < Error; end
 end

data/lib/nis/struct/nem_request_result.rb

@@ -1,12 +1,14 @@
 class Nis::Struct
+  # @attr [Integer] type
+  # @attr [String] code
+  # @attr [String] message
   # @see http://bob.nem.ninja/docs/#nemRequestResult
   class NemRequestResult
     include Nis::Util::Assignable
-
     attr_accessor :type, :code, :message
 
-    def self.build(json)
-      new(json)
+    def self.build(attrs)
+      new(attrs)
     end
 
     # @return [Boolean]
@@ -24,6 +26,7 @@ class Nis::Struct
       @type == 4
     end
 
+    # @return [String]
     def to_s
       @message
     end

data/lib/nis/unit/address.rb

@@ -1,8 +1,7 @@
 module Nis::Unit
   # @attr [String] value
-  # @attr [String] first_char
   class Address
-    attr_accessor :value, :first_char
+    attr_accessor :value
 
     def initialize(value)
       @value = value
@@ -24,10 +23,12 @@ module Nis::Unit
       @first_char == 'T'
     end
 
+    # @return [String]
     def to_s
       @value
     end
 
+    # @return [Boolean]
     def ==(other)
       @value == other.value
     end

data/lib/nis/unit/balance.rb

@@ -1,6 +1,8 @@
 module Nis::Unit
   # @attr [String] value
   class Balance
+    include Comparable
+
     attr_accessor :value
 
     def initialize(value)
@@ -9,7 +11,7 @@ module Nis::Unit
 
     # @return [Float]
     def in_nem
-      @value_in_nem ||= @value.to_f / 1_000_000
+      @value.to_f / 1_000_000
     end
 
     # @return [String]
@@ -23,8 +25,16 @@ module Nis::Unit
     end
 
     # @return [Boolean]
-    def ==(other)
-      @value == other.value
+    def <=>(other)
+      @value <=> other.to_i
+    end
+
+    %w(+ -).each do |op|
+      define_method op do |other|
+        a = instance_variable_get('@value')
+        b = other.to_i
+        self.class.new(a.send(op, b))
+      end
     end
   end
 end

data/lib/nis/unit/type.rb

@@ -8,8 +8,6 @@ module Nis::Unit
       @value = value
     end
 
-    attr_reader :message
-
     # @return [String]
     def to_s
       @message

data/lib/nis/util.rb

@@ -1,9 +1,10 @@
 module Nis::Util
   def self.error_handling(hash)
     error_klass = case hash[:error]
-      when 'Bad Request' then Nis::BadRequestError
-      else Nis::Error
-    end
+                  when 'Bad Request' then Nis::BadRequestError
+                  when 'Internal Server Error' then Nis::InternalServerError
+                  else Nis::Error
+                  end
     error_klass.new(hash[:message])
   end
 end

data/lib/nis/util/assignable.rb

@@ -16,7 +16,7 @@ module Nis::Util
     # @return [Hash] Attribute and value pairs
     def to_hash
       instance_variables.each_with_object({}) do |var, hash|
-        hash[var.to_s.delete("@").to_sym] = instance_variable_get(var)
+        hash[var.to_s.delete('@').to_sym] = instance_variable_get(var)
       end
     end
 

data/lib/nis/version.rb

@@ -1,3 +1,3 @@
 class Nis
-  VERSION = '0.0.4'.freeze
+  VERSION = '0.0.5'.freeze
 end

data/nis.gemspec

@@ -1,4 +1,5 @@
 # coding: utf-8
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'nis/version'
@@ -9,15 +10,15 @@ Gem::Specification.new do |spec|
   spec.authors     = ['Yoshiyuki Ieyama']
   spec.email       = ['yukku0423@gmail.com']
 
-  spec.summary     = %q{Ruby client library for the NEM Infrastructure Server API}
-  spec.description = %q{Ruby client library for the NEM Infrastructure Server API}
+  spec.summary     = 'Ruby client library for the NEM Infrastructure Server API'
+  spec.description = 'Ruby client library for the NEM Infrastructure Server API'
   spec.homepage    = 'https://github.com/44uk/nis-ruby'
   spec.license     = 'MIT'
 
   spec.required_ruby_version = '>= 2.2'
   spec.metadata['yard.run'] = 'yri'
 
-  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
+  spec.files = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
   spec.bindir        = 'bin'
@@ -33,5 +34,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'pry', '~> 0.10'
 
   spec.add_dependency 'faraday', '~> 0.11'
+  spec.add_dependency 'faraday_middleware', '~> 0.11'
   spec.add_dependency 'thor', '~> 0.19'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nis-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Yoshiyuki Ieyama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-04 00:00:00.000000000 Z
+date: 2017-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -122,6 +122,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.11'
+- !ruby/object:Gem::Dependency
+  name: faraday_middleware
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.11'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.11'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement