xrbp 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 92361edaa1feff8405d57bd715093cd1211d0adb2b0175f5d3f6493542526c3c
-  data.tar.gz: a9a9d1e8a6d1c2682f8e4c685ca0c7f73da74b37bee211af2afc39ac53600cd9
+  metadata.gz: 30fb389dec1e019a299501a035cb5131332fec5b3cc192f24be9ad280aaf60e4
+  data.tar.gz: 8bec54f51b34ebbee7a2f433191d6dbe72e07fb3d2c60c1d3caa0b818c4da1f8
 SHA512:
-  metadata.gz: 7e327415d681a20d7e9d5abdbaf5d0e052a7562124f83a8171645fda5321b2a692be042d8230881c4a3cd13c032c661aa2c6566b87574aabf16482a0d436fc8c
-  data.tar.gz: b26cfa8b7a106f15385d4210e1b8972771c3400e57721f72095f1a2f84504cd6e91d0a22fb2f2a958c17e37e22652cf6041c10196f732a58788aab72eab1497f
+  metadata.gz: f62bb3b3c347d42c29f227afd7398257078b6a30996a82f06d0952a337dcea495b33707a8430432c9945214d0609efde2c73a37472a23dfdeba9ab4ee13aebe3
+  data.tar.gz: d156f474e8d54a4583f3b41516caa9fb6e55d1c1d7edc6d04838f7066e93a560b48485880bdd2b1cf15b7aeb05c93087542dbf1ad80e5f8620a24dee16592e5f

data/.yardopts

@@ -0,0 +1 @@
+--no-private

data/examples/accounts.rb

@@ -10,4 +10,5 @@ Signal.trap("INT") {
   connection.force_quit!
 }
 
-XRBP::Model::Account.all(:connection => connection)
+XRBP::Model::Account.all(:connection => connection,
+                         :replay     => true)

data/lib/xrbp.rb

@@ -1,5 +1,6 @@
 require 'event_emitter'
 
+require 'xrbp/json'
 require 'xrbp/common'
 require 'xrbp/terminatable'
 require 'xrbp/plugins'

data/lib/xrbp/json.rb

@@ -0,0 +1,7 @@
+# Attempt to use yajl bindings,
+# else fallback to stock json
+begin
+  require 'yajl/json_gem'
+rescue LoadError
+  require 'json'
+end

data/lib/xrbp/model/account.rb

@@ -1,3 +1,4 @@
+require 'date'
 require 'fileutils'
 require_relative './parsers/account'
 
@@ -6,7 +7,7 @@ module XRBP
     class Account < Base
       extend Base::ClassMethods
 
-     DATE_FORMAT = "%Y-%m-%dT%H:%M:%SZ"
+      DATE_FORMAT = "%Y-%m-%dT%H:%M:%SZ"
 
       attr_accessor :id
 
@@ -17,11 +18,15 @@ module XRBP
 
       # All cached accounts
       def self.cached
-        Dir.glob("#{cache}/*").collect { |f|
+        Dir.glob("#{cache}/*").sort.collect { |f|
           next nil if f == "#{cache}marker" ||
                       f == "#{cache}start"
           begin
             JSON.parse(File.read(f))
+                .collect { |acct|
+                  # convert string keys to symbols
+                  Hash[acct.map { |k,v| [k.intern, v] }]
+                }
           rescue
             nil
           end
@@ -51,14 +56,20 @@ module XRBP
         set_opts(opts)
         FileUtils.mkdir_p(cache) unless File.exist?(cache)
 
+        cached.each { |acct|
+          break if connection.force_quit?
+          connection.emit :account, acct
+        } if opts[:replay]
+
         # start at last marker
         marker = File.exist?("#{cache}/marker") ?
                    File.read("#{cache}/marker") : nil
+        marker = nil if marker.strip.empty?
 
         # load start time, if set
         start = File.exist?("#{cache}/start") ?
-                  File.read("#{cache}/start") :
-           GENESIS_TIME.strftime(DATE_FORMAT)
+          DateTime.parse(File.read("#{cache}/start")) :
+           GENESIS_TIME
 
         # Parse results
         connection.add_plugin :result_parser       unless connection.plugin?(:result_parser)
@@ -70,11 +81,14 @@ module XRBP
         until finished || connection.force_quit?
           # HTTP request
           connection.url = "https://data.ripple.com/v2/accounts/?"\
-                             "start=#{start}&limit=1000&marker=#{marker}"
+                             "start=#{start.strftime(DATE_FORMAT)}&"\
+                             "limit=1000&marker=#{marker}"
           res = connection.perform
+          break if connection.force_quit?
+          break unless res[:accounts] && !res[:accounts].empty?
 
           # Cache data
-          cache_file = "#{cache}/#{marker || "genesis"}"
+          cache_file = "#{cache}/#{marker || start.strftime("%Y%m%d%H%M%S")}"
           File.write(cache_file, res[:accounts].to_json)
 
           # Emit signal
@@ -94,8 +108,13 @@ module XRBP
         end
 
         # Store state for next run
+        # FIXME: results in an overlap, accounts created
+        #        at this inception will also be retrieved
+        #        during next run
         File.write("#{cache}/start",
-                   accounts.last[:inception]) unless marker
+                   accounts.last[:inception]) unless connection.force_quit? ||
+                                                            accounts.empty? ||
+                                                                    marker
 
         accounts
       end

data/lib/xrbp/plugins/has_plugin.rb

@@ -32,7 +32,7 @@ module XRBP
        cls = plugin_namespace.plugins[plg]
        plugins.find { |_plg|
          (plg.is_a?(Class) && _plg.kind_of?(plg)) ||
-         (cls.is_a?(Class) && _plg.class.kind_of?(cls))
+         (cls.is_a?(Class) && _plg.kind_of?(cls))
        }
     end
 

data/lib/xrbp/version.rb

@@ -1,3 +1,3 @@
 module XRBP
-  VERSION = '0.1.1'
+  VERSION = '0.1.3'
 end # module XRBP

data/lib/xrbp/websocket/client.rb

@@ -109,7 +109,7 @@ module XRBP
       def handshake!
         socket.write handshake.to_s
 
-        until handshaked?
+        until handshaked? || closed? #|| connection.force_quit?
           socket.read_next handshake
           @handshaked = handshake.finished?
         end

data/lib/xrbp/websocket/command.rb

@@ -1,5 +1,3 @@
-require 'json'
-
 module XRBP
   module WebSocket
     class Command < Message

data/lib/xrbp/websocket/plugins/message_dispatcher.rb

@@ -119,6 +119,13 @@ module XRBP
           true
         end
 
+        # FIXME: I *believe* there is issue causing deadlock at process
+        #        termination where subsequent pages in paginated cmds
+        #        are timing out. Since when retrieving messages
+        #        synchronously, the first message block will be used
+        #        to wait for the results and on timeout cancel_message
+        #        will be called with the _latest_ message, the wait
+        #        block never gets unlocked.
         def cancel_message(msg)
           connection.state_mutex.synchronize {
             messages.delete(msg)

data/spec/xrbp/websocket/command_spec.rb

@@ -1,13 +1,11 @@
 describe XRBP::WebSocket::Command do
-  context "command specified" do
-    subject { described_class.new(command: 'test') } 
+  subject { described_class.new(command: 'test') }
 
-    it 'returns command' do
-      expect(subject.requesting).to eq 'test'
-    end
+  it 'returns command being requested' do
+    expect(subject.requesting).to eq 'test'
+  end
 
-    it 'is requesting' do
-      expect(subject).to be_requesting('test')
-    end
+  it 'returns bool indicating if we are request command' do
+    expect(subject).to be_requesting('test')
   end
 end

data/spec/xrbp/websocket/message_spec.rb

@@ -4,21 +4,34 @@ describe XRBP::WebSocket::Message do
   subject { described_class.new 'Test message' }
   let(:connection) { XRBP::WebSocket::Connection.new "*" }
 
+  before(:each) do
+    subject.connection = connection
+  end
+
   it 'returns message text' do
     expect(subject.to_s).to eq 'Test message'
   end
 
   it 'waits for signal' do
-    expect(subject.signal).to be(subject)
+    Thread.new {
+      sleep(0.1)
+      subject.signal
+    }
+    subject.wait
   end
 
   it 'waits for connection close' do
     expect(connection).to receive(:closed?).and_return true
-    subject.connection = connection
     expect(subject.wait).to be_nil
   end
 
-  it 'returns proc which waites for signal' do
-    expect(subject.bl.call).to be(subject)
+  describe "#bl" do
+    it 'defaults to callback which signals wait condition' do
+      Thread.new {
+        sleep(0.1)
+        subject.bl.call
+      }
+      subject.wait
+    end
   end
 end

data/spec/xrbp/websocket/plugins/cmd_dispatcher_spec.rb

@@ -11,7 +11,8 @@
 #    Camcorder.intercept_constructor XRBP::WebSocket::Socket
 #
 #    # XXX fix random 
-#    allow(SecureRandom).to receive(:random_bytes).with(4).and_return('1234')
+#    allow(handshake.instance_variable_get(:@handler)).to receive(:rand).with(255).and_return(100)
+#    #allow(SecureRandom).to receive(:random_bytes).with(4).and_return('1234')
 #  end
 #
 #  after(:each) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xrbp
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Dev Null Productions
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-27 00:00:00.000000000 Z
+date: 2019-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -115,6 +115,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".yardopts"
 - LICENSE.txt
 - README.md
 - examples/accounts.rb
@@ -148,6 +149,7 @@ files:
 - lib/xrbp/dsl/validators.rb
 - lib/xrbp/dsl/webclient.rb
 - lib/xrbp/dsl/websocket.rb
+- lib/xrbp/json.rb
 - lib/xrbp/model.rb
 - lib/xrbp/model/account.rb
 - lib/xrbp/model/base.rb