rippler 0.0.10 → 0.0.11

data/README.md

@@ -32,9 +32,13 @@ Ripple server replies are returned as JSON and printed to stdout. If you want to
 
 ## Usage: additional commands
 
-Rippler also provides additional commands that print out human-readable output:
+Rippler also provides additional commands that print out human-readable output. You can use option -t for text (rather than structural) output.
 
-    $ rippler history account:molecular
+    $ rippler -t order_book buy:BTC/bitstamp sell:XRP
+
+This one prints current order book for any currency pair.
+
+    $ rippler -t history account:molecular
 
 This one prints any account history in a human-readable format.
 
@@ -46,6 +50,10 @@ This one prints out all outstanding balances (debit/credit IOUs and XRP) for a s
 
 This one monitors Ripple transactions in real-time similar to #ripple-watch, but more interesting since it shows known account names instead of opaque addresses. Ctrl-C to stop it.
 
+	$ rippler path_find source_account:RippleUnion destination_account:singpolyma 'destination_amount:{currency:CAD, value:1}'
+
+This one finds possible paths for amounts of money between two addresses, and prints out what the source would have to send to get that amount to the destination.
+
 ## Contacts database
 
 Contacts database is in lib/rippler/contacts.rb, mostly auto-scraped from Bitcointalk. It may be a bit inaccurate, you can modify/extend it as you see fit.

data/bin/rippler

@@ -6,4 +6,16 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'rippler'
 require "pp"
 
-pp Rippler.process ARGV
+if ARGV[0] == '-t'
+	ARGV.shift
+
+	Rippler.process(ARGV).each do |v|
+		if v.is_a?(String)
+			puts v
+		else
+			pp v
+		end
+	end
+else
+	pp Rippler.process ARGV
+end

data/lib/rippler.rb

@@ -11,6 +11,7 @@ require 'rippler/account'
 require 'rippler/ledger'
 require 'rippler/transaction'
 require 'rippler/line'
+require 'rippler/offer'
 
 module Rippler
   extend Rippler::Utils
@@ -18,16 +19,23 @@ module Rippler
   RIPPLE_URI = 'wss://s1.ripple.com:51233'
   DEFAULT_ACCT = Rippler::Contacts["molecular"]
 
+  def self.parse_params command_line
+    params = command_line.map {|p| p.split(':',2)}.flatten.        # get json pairs
+      map {|p| p =~ /\[.*\]/ ? p.gsub(/\[|\]/,'').split(',') : p}. # get arrays
+      map {|p| p =~ /\{(.*)\}/ ? self.parse_params($1.split(/\s*,\s*/)) : p} # get objects
+    Hash[*params]
+  end
+
   # Turn command line arguments into command json
   def self.process args
     command_line = args.empty? ? ['account_info'] : args.dup
 
     command = command_line.shift
-    params = command_line.map {|p| p.split(':')}.flatten. #         get json pairs
-      map {|p| p =~ /\[.*\]/ ? p.gsub(/\[|\]/,'').split(',') : p} # get arrays
-    params = Hash[*params]
+    params = self.parse_params command_line
 
     params['account'] = Account(params['account']).address if params['account']
+    params['destination_account'] = Account(params['destination_account']).address if params['destination_account']
+    params['source_account'] = Account(params['source_account']).address if params['source_account']
 
     # p command, params
 
@@ -86,17 +94,12 @@ module Rippler
 
   ### These API commands need some pre/post-process wrappers
 
-  # book_offers needs to convert "taker_gets" & "taker_pays" params
-  # from  "CUR/issuer" to { "currency": currency, "issuer" : address },
+  # book_offers should accept "taker_gets" & "taker_pays" params
+  # in both "CUR/issuer" and {"currency":currency, "issuer":address} formats
   def self.book_offers params
-    taker_gets = Money("0/#{params['taker_gets']}")
-    taker_pays = Money("0/#{params['taker_pays']}")
-
-    reply = request( params.merge('command' => "book_offers",
-                                  'taker_gets' => taker_gets.to_hash,
-                                  'taker_pays' => taker_pays.to_hash))
-
-    # lines = reply["result"]["lines"]
+    request( params.merge('command' => "book_offers",
+                          'taker_gets' => Money(params['taker_gets']).to_hash,
+                          'taker_pays' => Money(params['taker_pays']).to_hash))
   end
 
 
@@ -108,6 +111,22 @@ module Rippler
 
   ### These are user-defined methods that post-process Ripple replies
 
+  # Subscibe to event streams, print events out nicely formatted
+  def self.order_book params
+
+    buy = params['buy']
+    sell = params['sell']
+    reply = book_offers('taker_gets' => buy,'taker_pays' => sell)
+
+    asks = reply['result']['offers'].map {|o| Offer.new(o)}
+
+    reply = book_offers('taker_gets' => sell,'taker_pays' => buy)
+
+    bids  = reply['result']['offers'].map {|o| Offer.new(o)}
+
+    (asks.reverse + bids.unshift("-"*40) ).map(&:to_s)
+  end
+
   # Subscibe to event streams, print events out nicely formatted
   def self.monitor params
     subscribe(params) do |message|
@@ -155,8 +174,27 @@ module Rippler
                       'sort_asc' => 1
                       }.merge(params) ) #(optional)
     txs = reply["result"]["transactions"]
-    txs.map {|t| Transaction.new(t)}.map(&:to_s)
+    txs.map {|t| Transaction.new(t)}.map(&:to_s).reverse
     .push("Total transactions: #{txs.size}")
+  end
 
+  def self.path_find params
+    params.merge!('command' => 'ripple_path_find')
+    if params['destination_amount'] && ! params['destination_amount']['issuer']
+      params['destination_amount']['issuer'] = params['destination_account']
+    end
+    reply = request(params)
+    reply['result']['alternatives'].map {|alt|
+      if alt['source_amount'].is_a?(String)
+        # XRP as per https://ripple.com/wiki/JSON_API#XRP
+        if alt['source_amount'] =~ /\./
+          alt['source_amount'].to_f
+        else
+          alt['source_amount'].to_i.to_f / 1000000
+        end
+      else
+        "#{alt['source_amount']['value']}/#{alt['source_amount']['currency']}/#{alt['source_amount']['issuer']}"
+      end
+    }
   end
 end

data/lib/rippler/contacts.rb

@@ -13,7 +13,6 @@ module Rippler
     X.FortKnox.9        rp7gaQch2fiNQHDPrnPk9pG65e9cnv7g6X
     X.FortKnox.a        rstKSeB2Qx7zrwSkyc7X9Xm5nYTJqtL3iM
     X.FortKnox.b        rJYMACXJd1eejwzZA53VncYmiK2kZSBxyD
-    X.FortKnox.c        r9ycgvDgXjeiaYmoz4F8sKBNXgHHx1wVFM
     X.Distributor.1     r8TR1AeB1RDQFabM6i8UoFsRF5basqoHJ
     X.Veirou            rhq5LEZSWHWY6H3raiC2KGe8TVeirou4BS
     X.Wow               rHD7Bs8Zk1oQeUhLjPrsFStFcRE2NWoWpe
@@ -43,7 +42,6 @@ module Rippler
     X.16                rUGNvasUuxLiPL5RXvfZXW8HjBtSHZgqgz
     X.17                rPyuHFYDwYMGJ5xhMbzfYeikx7ARV3ExvF
     X.18                r4MZrGMPEHfxGNQHR92BJo5hU9BiqMsTej
-    X.19                r3ADD8kXSUKHd6zTCKfnKT3zV9EZHjzp1S
     X.20                rnW7DHtmZGJk4uhGTSU2BW3iPCPWb2xegg
     X.21                rUrdFHbrEKWNQQ444zcTLrThjcnHCw2FPu
     X.22                r49nVgaYSDuU7GEQh4mF1nyjsXSVRcUHsr
@@ -82,7 +80,6 @@ module Rippler
     X.56                rDZ8QghKF4C11pmbVAkqumPTehiF8mfHt3
     X.57                rDGd76GCnZYGhjiAngV3xrPV4Qkfx79qqp
     X.58                r9Y4Mdhs339CxpCFxgdBVRcuM5i4rMRbu
-    X.59                rPcu8U9dSsK6nHtqgpeSvjuFTmNGq3arPh
 
     ADDRESS_ONE         rrrrrrrrrrrrrrrrrrrrBZbvji
     OpenCoin            rJR7gjNe3DpJ7kpB4CHBxjDKfwVMpTKPpj
@@ -95,6 +92,8 @@ module Rippler
     bitstamp            rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B
     bitstamp.hotwallet  rrpNnNLKrartuEqfJGpqyDwPj1AFPg9vn1
     bitstamp.NejcKodric rphasxS8Q5p5TLTpScQCBhh5HfJfPbM2M8
+    bitstamp.wholesale  r9ycgvDgXjeiaYmoz4F8sKBNXgHHx1wVFM
+    RippleUnion         r3ADD8kXSUKHd6zTCKfnKT3zV9EZHjzp1S
 
     TTBit               rGwUWgN5BEg3QGNY3RX2HfYowjUTZdid3E
     BankOfZed           ra88Lr8fyo9cUTuyjVFMTrvTSBU93erjyh
@@ -507,6 +506,7 @@ module Rippler
     DrG.1               rJEZjBv27ZHCPAoDtTBJb9r82VnUdkRd77
     DrG.2               rQNFxWVBxnjeF5gaFKwoj5nr3WansCtR19
     UnitClick           rLKojeESeKi9mdBuPLkiQhCxs4wh8iKy2W
+    UnitClick.1         rJrJuCmNuZ9shGgZvAhM6Xsv8PdghQTokc
     saddambitcoin       rMSEYpzcRtkiA5kkxYEWZtvLr8u3jnn385
     helloworld111       rwGAnUvzT5yrDz6dXxm6MWVhpV9abm39W3
     dykast              rQfwn3GVHVEfTpjqU2Y3BoMGAGHrw43XnT
@@ -577,10 +577,25 @@ module Rippler
     v7znay              rGNNQZo3KXaeC8i33FmbddUk43iRELPkKk
     wannabitcoin        rLubad3VQxaeT6qk43jEGPJX7ADkMBkwTM
     webr3               rnW7DHtmZGJk4uhGTSU2BW3iPCPWb2xegg
+    webr3.1             rPcu8U9dSsK6nHtqgpeSvjuFTmNGq3arPh
     WikileaksDude       rE7QqUJQWFGu7JZU6E9byysF6Qu5UQjQkP
+    WikileaksDude.1     r9nzyxxnnmf2Qg8HjKYdwWSN6YJXJtMpQ
     LoweryCBS           rBiYVjzHRQxMDMdC5ynKsejqoy1qJMQ8zR
     ScratAcorns         rEwNm7FWSy4whunsNRCebPbDktjeoGhdbS
     Dreamweaver         rnt5BahXixR8PeBwsYXynN6Ew8MCn87GUn
+    nomis               rUr7cFcUasrhZ234RZKfKHmQNzM5FPQEHi
+    alberthrocks        rUaEuoMVzmZNxx3etp8DhEWGD6UeJaoiq4
+    Xenius              rfaLKpYas7BLsjnbm2dpPDQRKaNbBLGTgs
+    liamwli             rEvjdo5evfU65J9evHZyHFsEVs4t4Mbfqr
+    fghj                rHpaEMuN84JR6VT2umSbtSrHJ8JGWyza8f
+    MasonIII            rsieHiunKBtHr1JXZZvU98erDkG8MD7R2r
+    macbook-air         rp3dmTa3i1aFY1JwsMKc1WVKJtdj3s6cHc
+    Dabs                rsAbwKtKaePtmVZhS5H2eT5K4u9UWR7mX5
+    Liquid              rsuvuGXuWdoRUJXiLQ7z9kyM4tjuXgrZJs
+    Projects            rsjPEDMnjdcKRJhCDm61YbXPNgJN6tjoPc
+    Snowpea             rsCmWSczxBpRri57jcMw8duYJETaspFRd9
+    stick               rQy7ajMPs2WMmMgLTtZtadLxTEvsXDhRF
+    darkmule            r4VfSDJZNX53TRd6nExAmzsPdX7jbRSHf1
   ]]
 
   Addresses = Contacts.invert

data/lib/rippler/money.rb

@@ -18,13 +18,18 @@ module Rippler
         @issuer = data['issuer']
       when String
         @value, @currency, @issuer = *data.split('/')
-        if @currency
-          @value = @value.to_f
+
+        if @value.to_f == 0 # No value, must be generic currency: XRP or USD/bitstamp
+          @currency, @issuer = @value, @currency
         else
-          @value = @value.to_i/1000000.0
-          @currency = "XRP"
+          if @currency
+            @value = @value.to_f
+          else
+            @value = @value.to_i/1000000.0
+            @currency = "XRP"
+          end
         end
-      when Int
+      when Integer
         @value = data.to_i/1000000.0
         @currency = "XRP"
       end
@@ -44,8 +49,8 @@ module Rippler
         [self, cross]
       end
       r = first.value.to_f/second.value.to_f
-      r = r.to_i == r ? r.to_i : r
-      "#{r}#{first.currency}/#{second.currency}"
+      r = r.to_i == r ? r.to_i : r.round(2)
+      "#{r} #{first.currency}/#{second.currency}"
     end
 
     # Allows methods such as xrp? usd? or btc?

data/lib/rippler/offer.rb

@@ -0,0 +1,63 @@
+module Rippler
+  class Offer
+    include Rippler::Utils
+
+    # attr_accessor :address, :balance, :flags
+
+    # Hash:
+    # {"Account"=>"rngJ9Co6MPZxJcyepRv2hMPV1HqaeGCdVU",
+    #   "BookDirectory"=> "4627DFFCFF8B5A265EDBD8AE8C14A52325DBFEDAF4F5C32E5E03DACD3F94D000",
+    #   "BookNode"=>"0000000000000000",
+    #   "Flags"=>0,
+    #   "LedgerEntryType"=>"Offer",
+    #   "OwnerNode"=>"0000000000000000",
+    #   "PreviousTxnID"=> "704A6FCC2DD0AEE9B5F420C3641FB86FFE73F4D233E4B9F6A10E5DE79F7DAACF",
+    #   "PreviousTxnLgrSeq"=>432517,
+    #   "Sequence"=>191,
+    # "TakerGets"=>
+    #   {"currency"=>"USD", "issuer"=>"rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B", "value"=>"150"},
+    #  "TakerPays"=>"449850000000",
+    #  "index"=> "D34C841609A12DAF9DF1B59CA7CB930091A1A16C4A400D8AFDF73311CBB2A2C5",
+    #  "taker_gets_funded"=>
+    #   {"currency"=>"USD", "issuer"=>"rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B", "value"=>"51.73532238374231"},
+    #  "taker_pays_funded"=>"155154231828"},
+    def initialize data
+      @data = data
+      @take
+      case data
+      when String
+        @address = Rippler::Contacts[data] || data
+        @name = Rippler::Addresses[@address]
+      when Hash
+        @address = data["Account"]
+        @name = Rippler::Addresses[@address]
+        @balance = Money(data["Balance"])
+        @flags = data["Flags"]
+      end
+    end
+
+    def gets
+      @get ||= Money(@data['TakerGets'])
+    end
+
+    def pays
+      @pay = Money(@data['TakerPays'])
+    end
+
+    def account
+      @account ||= Account(@data['Account'])
+    end
+
+    def funded
+      if @data['taker_gets_funded'] || @data['taker_pays_funded']
+        funds = Money(@data['taker_gets_funded'])
+        " (#{(funds.value/gets.value*100).round(2)}% funded)"
+      end
+    end
+
+    def to_s
+      "OFR at #{gets.rate(pays)}, #{gets} for #{pays}" +
+      "#{funded} by #{account} ##{@data['Sequence']}"
+    end
+  end
+end

data/lib/rippler/transaction.rb

@@ -28,10 +28,7 @@ module Rippler
         when "OfferCancel"
           "CAN #{Account(tx['Account'])} ##{tx['Sequence']}"
         when "OfferCreate"
-          get = Money(tx['TakerGets'])
-          pay = Money(tx['TakerPays'])
-          "OFR #{Account(tx['Account'])} ##{tx['Sequence']} offers " +
-            "#{get} for #{pay} (#{get.rate(pay)})"
+          Offer(tx).to_s
         when "TrustSet"
           "TRS #{Money(tx['LimitAmount'])} #{Account(tx['Account'])}"
         else

data/lib/rippler/utils.rb

@@ -15,5 +15,9 @@ module Rippler
     def Account(data)
       Rippler::Account.new(data)
     end
+
+    def Offer(data)
+      Rippler::Offer.new(data)
+    end
   end
 end

data/lib/rippler/version.rb

@@ -1,3 +1,3 @@
 module Rippler
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rippler
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-26 00:00:00.000000000 Z
+date: 2013-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faye-websocket
@@ -48,6 +48,7 @@ files:
 - lib/rippler/ledger.rb
 - lib/rippler/line.rb
 - lib/rippler/money.rb
+- lib/rippler/offer.rb
 - lib/rippler/transaction.rb
 - lib/rippler/utils.rb
 - lib/rippler/version.rb