dropzone_ruby 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 002a3c52fb4d1c4a622a1912b359adeffb2b4d9b
-  data.tar.gz: 0d6e7f4f848e95e507eac992dd75596b1e0a9841
+  metadata.gz: e1b7b2c5315e091f51cac362b232d3c3512fc746
+  data.tar.gz: 5030f97c3474a1a7646ccf478d651cd053594fcd
 SHA512:
-  metadata.gz: 730eeb352aa24143eb363539eddc34849b6c7e81479d10275e5744461ce8985770bea4364f051bd498652bfae089f9a64dfef15f6d0cd586213daf203222a6e0
-  data.tar.gz: bb721453be95e7e21992a5ce6e8dabf468a83f86ed05695fd0d13e83de9e8ad8d50b1e55e979b46b3b0f70c9b21029ce8a65e841b7ce8c0d118afa9fa1685ef0
+  metadata.gz: 4475a7296863b5ba323521176845709eb98edabcb2df7a33c1e37dd76e31e23a8ae64c93e1216022e57649733c8743ad2ae083dfa3d0e84662a07903c7d8eedf
+  data.tar.gz: 36bbddc69a5f483be6c7b5d42956bb01cf73deca38346bdf669cac09a2fdde229418f3729c99cd577db082d47fe0996c61eb156e369a0c90b7872e11f3cbef68

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dropzone_ruby (0.1.2)
+    dropzone_ruby (0.1.3)
       commander (~> 4.3)
       counterparty_ruby (~> 1.2)
       sequel (~> 4.21)

data/README.md

@@ -19,6 +19,10 @@ Find a list of commands with:
 
     $ dropzone help
 
+Online help for individual commands can be obtained like so (example for `chat list`):
+
+    $ dropzone help chat list
+
 Fund a testnet key with tBTC or a mainnet key with BTC
 
 Create a seller or buyer profile

data/bin/dropzone

@@ -133,16 +133,16 @@ command 'listing find' do |c|
   c.example 'Find listings in block 371812', 
     'dropzone listing find 0 --start_at 371812'
 
-  c.option '--latitude LAT ', Float, 
+  c.option '--latitude LAT', Float, 
     'The approximate latitude of your location.'
-  c.option '--longitude LON ', Float, 
+  c.option '--longitude LON', Float, 
     'The approximate longitude of your location.'
-  c.option '--radius METERS ', Integer, multi(<<-eos)
+  c.option '--radius METERS', Integer, multi(<<-eos)
     The approximate diameter you wish to search around the provided 
     latitude and longitude. The expected unit of distance is in meters.
     eos
 
-  c.option '--start_at BLOCKHEIGHT ', Integer, multi(<<-eos)
+  c.option '--start_at BLOCKHEIGHT', Integer, multi(<<-eos)
     Start searching from the specified block height until <block_depth> 
     'blocks down'. The default behavior is to start at the current blockchain 
     height.
@@ -164,9 +164,9 @@ def listing_create_update_options(cmd)
     A three or four digit currency identifier. Common values would include 
     'BTC' or 'USD', though any identifier can be specified
     eos
-  cmd.option '--price_in_units PRICE ', Integer, 
+  cmd.option '--price_in_units PRICE', Integer, 
     'The price of the specified item denominated in cents, or satoshis, etc.'
-  cmd.option '--expiration_in NBLOCKS ', Integer, multi(<<-eos)
+  cmd.option '--expiration_in NBLOCKS', Integer, multi(<<-eos)
     The expiration time of the item. "Times" are to be indicated in the number 
     of blocks that this listing is available for. Omitting this field indicates 
     no expiration. Note that clients will likely override the seller's 
@@ -349,7 +349,7 @@ command 'invoice create' do |c|
 
   c.option '--amount_due BTC', String, 
     'Amount due, denominated in Bitcoin (ie "0.5")'
-  c.option '--expiration_in NBLOCKS ', Integer, multi(<<-eos)
+  c.option '--expiration_in NBLOCKS', Integer, multi(<<-eos)
     The expiration time of the invoice. "Times" are to be indicated in the number 
     of blocks that this listing is available for. Omitting this field indicates 
     no expiration. Specifying an expiration is useful for locking in an exchange
@@ -380,7 +380,7 @@ command 'review create' do |c|
 
   c.example 'Review a purchase:', multi(<<-eos) % [RANDOM_TXID]
     dropzone review create 
-      --description: 'Fair exchange"
+      --description: "Fair exchange"
       --delivery_quality 8, 
       --product_quality 8
       --communications_quality 4
@@ -394,7 +394,7 @@ command 'review create' do |c|
     'The quality of the delivery itself. Between 0 (worst) to 8 (best)'
 
   c.option '--product_quality N', Integer, 
-    'The quality of the product.  Between 0 (worst) to 8 (best)'
+    'The quality of the product. Between 0 (worst) to 8 (best)'
 
   c.option '--communications_quality N', Integer, 
     "The seller's communications skill. Between 0 (worst) to 8 (best)"
@@ -443,7 +443,7 @@ command 'chat say' do |c|
 
   c.syntax, c.summary, c.description = 
     'dropzone chat say <private_key> <tx_id> <message>',
-    'Communicate to another party in a private/encrypted conversation over testnet.',
+    'Communicate to another party in a private/encrypted conversation over testnet',
     multi(<<-eos)
       Append to the conversation <tx_id> at your testnet address <private> key
       say the provided <message> to a receiving party.

data/lib/dropzone/command.rb

@@ -108,10 +108,17 @@ class DropZoneCommand
 
         message = klass.new params
 
-        txid = message.save! privkey.to_base58
+        if (message.valid?)
+          txid = message.save! privkey.to_base58
 
-        puts_object '%s: %s' % [label, message.receiver_addr], 'Tx: %s' % txid, attributes, 
-          message
+          puts_object '%s: %s' % [label, message.receiver_addr], 
+            'Tx: %s' % txid, attributes, message
+        else
+          puts "Errors Found in %s:" % label
+          message.errors.each_pair do |attr, reasons|
+            puts ' * "%s": %s' % [attr, reasons.join(', ')]
+          end
+        end
       end
     end
 

data/lib/dropzone/item.rb

@@ -115,7 +115,7 @@ module Dropzone
 
     def address_parts(addr, part)
       parts = HASH_160_PARTS.match(addr)
-      (parts.length > 0) ? parts[part+1].tr('X','0').to_i : nil
+      (parts && parts.length > 0) ? parts[part+1].tr('X','0').to_i : nil
     end
 
     def latlon_to_integer(lat_or_lon, unsigned_offset = 90)

data/lib/dropzone/version.rb

@@ -1,4 +1,4 @@
 module Dropzone
   # The library version string
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/spec/bitcoin_spec.rb

@@ -9,8 +9,8 @@ describe Dropzone do
 
     before(:all) do
       Bitcoin.network = :testnet3
-      TCPSocket::socks_server = "127.0.0.1"
-      TCPSocket::socks_port = 9050
+      #TCPSocket::socks_server = "127.0.0.1"
+      #TCPSocket::socks_port = 9050
       # Socksify::debug = true
       #RestClient.log = Logger.new STDOUT
 

data/spec/item_spec.rb

@@ -290,5 +290,45 @@ describe Dropzone::Item do
     end
   end
 
+  describe "problematic decodes" do
+    # @Junseth Issue #18:
+    # txid: 73cfb35e1e6bb31b3ddffb41322c46f155970bfae3c40385b171ba02f88985a0
+    it "Fails to decode invalid radius transaction" do
+      tx_id = '73cfb35e1e6bb31b3ddffb41322c46f155970bfae3c40385b171ba02f88985a0'
+      tx_hex = '01000000017ecf3bcdd734881a466b2fcb8ff9c602ff96190ecbda86fadd2'+
+        'f907bfeb7f22a020000006b4830450221008b343292dbc140379bdcdad613fd8bd2b'+
+        'e739147a10f57b5dd3f6c23afe818e402201edbe946b27a0183a3d98ce61f0f88872'+
+        '1330c8694f8b700448d8c902317db4c0121031bf0b235cb0cefcf8c9c299f3009257'+
+        '04d6da7e6b448bd185c80d28f1216ef44ffffffff0536150000000000001976a9141'+
+        'f319c85b0cb2667e09fc4388dc209b0c4a240d388ac3615000000000000695121039'+
+        'fb679314a062d887537ad75b6e056bd4020807e56d742cd0aa77bf890aea5e121027'+
+        'fdb01ce03a72c67551b80e18a612a4789a6b3d168e4ca883dd7236d2c19b60f21031'+
+        'bf0b235cb0cefcf8c9c299f300925704d6da7e6b448bd185c80d28f1216ef4453ae3'+
+        '615000000000000695121039fb679166a6b5f8f5951a77ef1a258a50368c22f5dd15'+
+        '9dc07a824a29dacaa0a21026bdb01e004a62f2f7b1cceecde622814d2fdb4d63ca5c'+
+        '8d1668e2d78263defb421031bf0b235cb0cefcf8c9c299f300925704d6da7e6b448b'+
+        'd185c80d28f1216ef4453ae361500000000000069512103aeb679311f267c896372c'+
+        '86b8b823adc234ba05d34b631a868c61794bdcdc48221030ffb228a71c85c4a0f74e'+
+        'e84aa16582efdd2d6bf488ba4a849bf464d4a6bd93021031bf0b235cb0cefcf8c9c2'+
+        '99f300925704d6da7e6b448bd185c80d28f1216ef4453ae2cf41100000000001976a'+
+        '9142bb8d14d65d316483e24da5512bfd2a977da85ea88ac00000000'
+
+      tx = Bitcoin::P::Tx.new [tx_hex].pack('H*')
+
+      record = Counterparty::TxDecode.new tx,
+        prefix: Dropzone::BitcoinConnection::PREFIX
+
+      item = Dropzone::Item.new(data: record.data, 
+        receiver_addr: record.receiver_addr, 
+        txid: tx_id, sender_addr: record.sender_addr)
 
+      expect(item.valid?).to eq(false)
+      expect(item.errors.count).to eq(3)
+      expect(item.errors.on(:latitude)).to eq(['is not a number'])
+      expect(item.errors.on(:longitude)).to eq(['is not a number'])
+      expect(item.errors.on(:radius)).to eq(['is not a number'])
+
+    end
+
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dropzone_ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Miracle Max
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-27 00:00:00.000000000 Z
+date: 2015-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: counterparty_ruby