radiator 0.4.1 → 0.4.2pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f9903d1a4e0c654af377fcc0a353e0079e631d5
-  data.tar.gz: b92e18fe56c4a13d0af9d0bae369e9e9a7dbb075
+  metadata.gz: 9205ff2b00976d4717752ad47112efd596b15ccc
+  data.tar.gz: cfce2cbd7f2cc5140d5c03fd7d01df79ffee29aa
 SHA512:
-  metadata.gz: acfad80288e67f8662e6fdadcbf92be26963dd588c77a16419a40a38b940ef21258d4536d5aac2ef014af8fb3eb5851430d7e56f4d858c4b60489aeca7a628bb
-  data.tar.gz: efe041ba627bf96aa77c0ea32c13603e07b4183cabd81e1b3808dfad4bf84776bfe2fd5fb94b99d43790d6eb80aa22b72805e6b5d649cc893d0053dd3ca795ff
+  metadata.gz: f3965f9a9479b748ba9bbf74e88e4318503709b88426f11c95d24175bc1948f592e95a413f6f694245628e8d89902b748e3544d09bccd71bf18b16221289d764
+  data.tar.gz: d94606774f9783caad74c04307f7a1428b05fd6e3b1e8ce9c632da2fd231efcd468651b28a8339c32847c5b34e1e6ccfc517a2fcd13bcdef22f1a2fe78a73e29

data/.travis.yml

@@ -18,6 +18,6 @@ before_script:
 script:
   - TESTOPTS="--verbose" bundle exec rake test
 after_script:
-  - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT
+  - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT --coverage-input-type simplecov
 notifications:
   slack: galacticaactual:rhAXgZ68aoikbxBBA05xIUVC

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    radiator (0.4.1)
+    radiator (0.4.2pre1)
       awesome_print (~> 1.7, >= 1.7.0)
       bitcoin-ruby (~> 0.0, >= 0.0.11)
       ffi (~> 1.9, >= 1.9.18)

data/README.md

@@ -541,13 +541,14 @@ https://github.com/inertia186/radiator/issues/12
   * `HELL_ENABLED=true rake`
 * To run a stream test on the live STEEM blockchain with debug logging enabled:
   * `LOG=DEBUG rake test_live_stream`
+
 ---
 
 <center>
   <img src="http://www.steemimg.com/images/2016/08/19/RadiatorCoolingFan-54in-Webfdcb1.png" />
 </center>
 
-See my previous Ruby How To posts in: [/f/ruby](https://chainbb.com/f/ruby)
+See my previous Ruby How To posts in: [#radiator](https://steemit.com/created/radiator) [#ruby](https://steemit.com/created/ruby)
 
 ## Get in touch!
 

data/lib/radiator/api.rb

@@ -9,7 +9,7 @@ require 'net/http/persistent'
 module Radiator
   # Radiator::Api allows you to call remote methods to interact with the STEEM
   # blockchain.  The `Api` class is a shortened name for
-  # `Radiator::DatabaseApi`.
+  # `Radiator::CondenserApi`.
   #
   # Examples:
   #
@@ -248,6 +248,12 @@ module Radiator
         true
       end
       
+      @use_condenser_namespace = if options.keys.include? :use_condenser_namespace
+        options[:use_condenser_namespace]
+      else
+        true
+      end
+      
       if defined? Net::HTTP::Persistent::DEFAULT_POOL_SIZE
         @pool_size = options[:pool_size] || Net::HTTP::Persistent::DEFAULT_POOL_SIZE
       end
@@ -288,11 +294,19 @@ module Radiator
       
       if !!block
         block_number.each do |i|
-          yield block_api.get_block(block_num: i).result, i
+          if use_condenser_namespace?
+            yield api.get_block(i)
+          else
+            yield block_api.get_block(block_num: i).result, i
+          end
         end
       else
         block_number.map do |i|
-          block_api.get_block(block_num: i).result
+          if use_condenser_namespace?
+            api.get_block(i)
+          else
+            block_api.get_block(block_num: i).result
+          end
         end
       end
     end
@@ -519,6 +533,7 @@ module Radiator
       properties = %w(
         chain url backoff_at max_requests ssl_verify_mode ssl_version persist
         recover_transactions_on_error reuse_ssl_sessions pool_size
+        use_condenser_namespace
       ).map do |prop|
         if !!(v = instance_variable_get("@#{prop}"))
           "@#{prop}=#{v}" 
@@ -543,6 +558,10 @@ module Radiator
       
       @uri.nil? && @http_id.nil? && !http_active && @api.nil? && @block_api.nil?
     end
+    
+    def use_condenser_namespace?
+      @use_condenser_namespace
+    end
   private
     def self.methods_json_path
       @methods_json_path ||= "#{File.dirname(__FILE__)}/methods.json"

data/lib/radiator/chain.rb

@@ -3,17 +3,17 @@ module Radiator
   # 
   # To vote on a post/comment:
   # 
-  #     steem = Steem.new(account_name: 'your account name', wif: 'your wif')
+  #     steem = Radiator::Chain.new(chain: :steem, account_name: 'your account name', wif: 'your wif')
   #     steem.vote!(10000, 'author', 'post-or-comment-permlink')
   # 
   # To post and vote in the same transaction:
   # 
-  #     steem = Steem.new(account_name: 'your account name', wif: 'your wif')
+  #     steem = Radiator::Chain.new(chain: :steem, account_name: 'your account name', wif: 'your wif')
   #     steem.post!(title: 'title of my post', body: 'body of my post', tags: ['tag'], self_upvote: 10000)
   #
   # To post and vote with declined payout:
   #
-  #     steem = Steem.new(account_name: 'your account name', wif: 'your wif')
+  #     steem = Radiator::Chain.new(chain: :steem, account_name: 'your account name', wif: 'your wif')
   #     
   #     options = {
   #       title: 'title of my post',
@@ -68,7 +68,7 @@ module Radiator
     #
     # Example:
     #
-    #     steem = Steem.new
+    #     steem = Radiator::Chain.new(chain: :steem)
     #     block = steem.find_block(12345678)
     #     transactions = block.transactions
     #
@@ -82,7 +82,7 @@ module Radiator
     #
     # Example:
     #
-    #     steem = Steem.new
+    #     steem = Radiator::Chain.new(chain: :steem)
     #     ned = steem.find_account('ned')
     #     vesting_shares = ned.vesting_shares
     #
@@ -100,7 +100,7 @@ module Radiator
     #
     # Example:
     #
-    #     steem = Steem.new
+    #     steem = Radiator::Chain.new(chain: :steem)
     #     comment = steem.find_comment('inertia', 'kinda-spooky') # by account, permlink
     #     active_votes = comment.active_votes
     #

data/lib/radiator/mixins/acts_as_poster.rb

@@ -3,7 +3,7 @@ module Radiator
     module ActsAsPoster
       # Creates a post operation.
       #
-      #     steem = Steem.new(account_name: 'your account name', wif: 'your wif')
+      #     steem = Radiator::Chain.new(chain: :steem, account_name: 'your account name', wif: 'your wif')
       #     options = {
       #       title: 'This is my fancy post title.',
       #       body: 'This is my fancy post body.',
@@ -80,7 +80,7 @@ module Radiator
       
       # Create a vote operation and broadcasts it right away.
       #
-      #     steem = Steem.new(account_name: 'your account name', wif: 'your wif')
+      #     steem = Radiator::Chain.new(chain: :steem, account_name: 'your account name', wif: 'your wif')
       #     options = {
       #       title: 'This is my fancy post title.',
       #       body: 'This is my fancy post body.',
@@ -95,7 +95,7 @@ module Radiator
       #
       # Examples:
       #
-      #     steem = Steem.new(account_name: 'your account name', wif: 'your wif')
+      #     steem = Radiator::Chain.new(chain: :steem, account_name: 'your account name', wif: 'your wif')
       #     steem.delete_comment('permlink')
       #     steem.broadcast!
       #
@@ -114,7 +114,7 @@ module Radiator
       #
       # Examples:
       #
-      #     steem = Steem.new(account_name: 'your account name', wif: 'your wif')
+      #     steem = Radiator::Chain.new(chain: :steem, account_name: 'your account name', wif: 'your wif')
       #     steem.delete_comment!('permlink')
       #
       # @see delete_comment

data/lib/radiator/mixins/acts_as_voter.rb

@@ -5,13 +5,13 @@ module Radiator
       #
       # Examples:
       #
-      #     steem = Steem.new(account_name: 'your account name', wif: 'your wif')
+      #     steem = Radiator::Chain.new(chain: :steem, account_name: 'your account name', wif: 'your wif')
       #     steem.vote(10000, 'author', 'permlink')
       #     steem.broadcast!
       #
       # ... or ...
       #
-      #     steem = Steem.new(account_name: 'your account name', wif: 'your wif')
+      #     steem = Radiator::Chain.new(chain: :steem, account_name: 'your account name', wif: 'your wif')
       #     steem.vote(10000, '@author/permlink')
       #     steem.broadcast!
       #
@@ -35,12 +35,12 @@ module Radiator
       #
       # Examples:
       #
-      #     steem = Steem.new(account_name: 'your account name', wif: 'your wif')
+      #     steem = Radiator::Chain.new(chain: :steem, account_name: 'your account name', wif: 'your wif')
       #     steem.vote!(10000, 'author', 'permlink')
       #
       # ... or ...
       #
-      #     steem = Steem.new(account_name: 'your account name', wif: 'your wif')
+      #     steem = Radiator::Chain.new(chain: :steem, account_name: 'your account name', wif: 'your wif')
       #     steem.vote!(10000, '@author/permlink')
       #
       # @see vote

data/lib/radiator/mixins/acts_as_wallet.rb

@@ -5,7 +5,7 @@ module Radiator
       #
       # Examples:
       #
-      #     steem = Steem.new(account_name: 'your account name', wif: 'your wif')
+      #     steem = Radiator::Chain.new(chain: :steem, account_name: 'your account name', wif: 'your wif')
       #     steem.claim_reward_balance(reward_sbd: '100.000 SBD')
       #     steem.broadcast!
       #
@@ -33,7 +33,7 @@ module Radiator
       #
       # Examples:
       #
-      #     steem = Steem.new(account_name: 'your account name', wif: 'your wif')
+      #     steem = Radiator::Chain.new(chain: :steem, account_name: 'your account name', wif: 'your wif')
       #     steem.claim_reward_balance!(reward_sbd: '100.000 SBD')
       #
       # @see claim_reward_balance
@@ -41,7 +41,7 @@ module Radiator
       
       # Create a transfer operation.
       #
-      #     steem = Steem.new(account_name: 'your account name', wif: 'your active wif')
+      #     steem = Radiator::Chain.new(chain: :steem, account_name: 'your account name', wif: 'your active wif')
       #     steem.transfer(amount: '1.000 SBD', to: 'account name', memo: 'this is a memo')
       #     steem.broadcast!
       #
@@ -57,7 +57,7 @@ module Radiator
       
       # Create a transfer operation and broadcasts it right away.
       #
-      #     steem = Steem.new(account_name: 'your account name', wif: 'your wif')
+      #     steem = Radiator::Chain.new(chain: :steem, account_name: 'your account name', wif: 'your wif')
       #     steem.transfer!(amount: '1.000 SBD', to: 'account name', memo: 'this is a memo')
       #
       # @see transfer

data/lib/radiator/operation.rb

@@ -12,6 +12,12 @@ module Radiator
         instance_variable_set("@#{k}", type(@type, k, v))
       end
       
+      @use_condenser_namespace = if options.keys.include? :use_condenser_namespace
+        options.delete(:use_condenser_namespace)
+      else
+        true
+      end
+      
       unless Operation::known_operation_names.include? @type
         raise OperationError, "Unsupported operation type: #{@type}"
       end
@@ -55,7 +61,12 @@ module Radiator
         
         params[p] = case v
         when Radiator::Type::Beneficiaries then [[0, v.to_h]]
-        when Radiator::Type::Amount then v.to_a
+        when Radiator::Type::Amount
+          if use_condenser_namespace?
+            v.to_s
+          else
+            v.to_a
+          end
         else; v
         end
       end
@@ -82,5 +93,9 @@ module Radiator
         end
       end
     end
+    
+    def use_condenser_namespace?
+      @use_condenser_namespace
+    end    
   end
 end

data/lib/radiator/stream.rb

@@ -326,7 +326,13 @@ module Radiator
               end
             end
             
-            block_api.get_block(block_num: n) do |current_block, error|
+            scoped_api, block_options = if use_condenser_namespace?
+              [api, n]
+            else
+              [block_api, {block_num: n}]
+            end
+              
+            scoped_api.get_block(n) do |current_block, error|
               if !!error
                 if error.message == 'Unable to acquire database lock'
                   start = n

data/lib/radiator/transaction.rb

@@ -11,7 +11,7 @@ module Radiator
 
     VALID_OPTIONS = %w(
       wif private_key ref_block_num ref_block_prefix expiration
-      chain
+      chain use_condenser_namespace
     ).map(&:to_sym)
     VALID_OPTIONS.each { |option| attr_accessor option }
 
@@ -66,7 +66,13 @@ module Radiator
 
       @api = Api.new(options)
       @network_broadcast_api = NetworkBroadcastApi.new(options)
-
+      
+      @use_condenser_namespace = if options.keys.include? :use_condenser_namespace
+        options[:use_condenser_namespace]
+      else
+        true
+      end
+      
       ObjectSpace.define_finalizer(self, self.class.finalize(@api, @network_broadcast_api, @self_logger, @logger))
     end
 
@@ -91,7 +97,7 @@ module Radiator
 
       if broadcast
         loop do
-          response = @network_broadcast_api.broadcast_transaction_synchronous(trx: payload)
+          response = broadcast_payload(payload)
 
           if !!response.error
             parser = ErrorParser.new(response)
@@ -137,7 +143,19 @@ module Radiator
         end
       end
     end
+    
+    def use_condenser_namespace?
+      !!@use_condenser_namespace
+    end
   private
+    def broadcast_payload(payload)
+      if use_condenser_namespace?
+        @api.broadcast_transaction_synchronous(payload)
+      else
+        @network_broadcast_api.broadcast_transaction_synchronous(trx: payload)
+      end
+    end
+    
     def payload
       @payload ||= {
         expiration: @expiration.strftime('%Y-%m-%dT%H:%M:%S'),

data/lib/radiator/version.rb

@@ -1,4 +1,4 @@
 module Radiator
-  VERSION = '0.4.1'
+  VERSION = '0.4.2pre1'
   AGENT_ID = "radiator/#{VERSION}"
 end

data/lib/steem.rb

@@ -1,8 +1,14 @@
 # Steem chain client for broadcasting common operations.
 # 
 # @see Radiator::Chain
+# @deprecated Using Steem class provided by Radiator is deprecated.  Please use: Radiator::Chain.new(chain: :steem)
 class Steem < Radiator::Chain
   def initialize(options = {})
+    unless defined? @@deprecated_warning_shown
+      warn "[DEPRECATED] Using Steem class provided by Radiator is deprecated.  Please use: Radiator::Chain.new(chain: :steem)"
+      @@deprecated_warning_shown = true
+    end
+    
     super(options.merge(chain: :steem))
   end
   

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: radiator
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2pre1
 platform: ruby
 authors:
 - Anthony Martin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-06 00:00:00.000000000 Z
+date: 2018-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -401,9 +401,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.14