dropzone_ruby 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c19a6591e576becbce95eee6a238525d940238fc
-  data.tar.gz: 54b5e677b28bdd5825e19400f7c86c0f5b68f9fc
+  metadata.gz: 002a3c52fb4d1c4a622a1912b359adeffb2b4d9b
+  data.tar.gz: 0d6e7f4f848e95e507eac992dd75596b1e0a9841
 SHA512:
-  metadata.gz: 48fe31ddabbd0ccb13dd7af857ad566d7da0c8c1ac54c1c7af6c6aca785018310cc6209918e1f9c1111698e890731b965e4cdcce2da87efb620056f5aa4e7869
-  data.tar.gz: 0e164617b26aa065bee6a266e45fec20c7e2e7490cbf781fb237fccc4348dc885205c935ae77ffd260292c01de07d46054fb1bbfc593adf18dd8233d6bfae189
+  metadata.gz: 730eeb352aa24143eb363539eddc34849b6c7e81479d10275e5744461ce8985770bea4364f051bd498652bfae089f9a64dfef15f6d0cd586213daf203222a6e0
+  data.tar.gz: bb721453be95e7e21992a5ce6e8dabf468a83f86ed05695fd0d13e83de9e8ad8d50b1e55e979b46b3b0f70c9b21029ce8a65e841b7ce8c0d118afa9fa1685ef0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dropzone_ruby (0.1.1)
+    dropzone_ruby (0.1.2)
       commander (~> 4.3)
       counterparty_ruby (~> 1.2)
       sequel (~> 4.21)
@@ -49,7 +49,7 @@ GEM
       rspec-support (~> 3.2.0)
     rspec-support (3.2.2)
     ruby-rc4 (0.1.5)
-    sequel (4.25.0)
+    sequel (4.26.0)
     sham (1.1.0)
     socksify (1.7.0)
     sqlite3 (1.3.10)

data/README.md

@@ -5,7 +5,7 @@ messaging between buyers and sellers, using nothing but the Bitcoin network.
 Testnet is used for communications. Mainnet is used for the storage of listings,
 buyer profiles, and reputational events.
 
-[White Paper](http://www.metzdowd.com/pipermail/cryptography/2015-March/025212.html)
+[White Paper](Drop Zone - Whitepaper.pdf)
 
 [Rubygems](https://rubygems.org/gems/dropzone_ruby)
 
@@ -86,5 +86,6 @@ __quia omnis qui se exaltat humiliabitur et qui se humiliat exaltabitur__
   * The white paper expressed transaction ids as being encoded ints. These are instead encoded as variable length strings.
 
 ## Changelog
+  * v0.1.2 - Cleaned up the chat listing interface (renamed communication to chat). Fixed issue with new session create
   * v0.1.1 - Addressed bugs in Listing find and buyer profiles
   * v0.1 - First Release

data/bin/dropzone

@@ -400,11 +400,11 @@ command 'review create' do |c|
     "The seller's communications skill. Between 0 (worst) to 8 (best)"
 end
 
-command 'communication list' do |c|
-  c.when_called DropZoneCommand, :communication_list
+command 'chat list' do |c|
+  c.when_called DropZoneCommand, :chat_list
 
   c.syntax, c.summary, c.description = 
-    'dropzone communication list <private_key>',
+    'dropzone chat list <private_key>',
     'Show all the available communication channels for the given testnet address',
     multi(<<-eos)
       This command lists all the conversations that have been initiated and/or
@@ -414,16 +414,16 @@ command 'communication list' do |c|
 
   c.example 'List all communication sessions for a testnet address:', 
     multi(<<-eos)
-    dropzone communication list
+    dropzone chat list
       92UvdTpmxA6cvD6YeJZSiHW8ff8DsZXL2PHZu9Mg7JY3zbaETJw
     eos
 end
 
-command 'communication show' do |c|
-  c.when_called DropZoneCommand, :communication_show
+command 'chat show' do |c|
+  c.when_called DropZoneCommand, :chat_show
 
   c.syntax, c.summary, c.description = 
-    'dropzone communication show <private_key> <tx_id>',
+    'dropzone chat show <private_key> <tx_id>',
     'Show all the available communication channels for the given testnet address',
     multi(<<-eos)
       Output a full conversation, start to finish, between the testnet 
@@ -432,17 +432,17 @@ command 'communication show' do |c|
 
   c.example 'Show the conversation:', 
     multi(<<-eos) % RANDOM_TXID
-    dropzone communication show
+    dropzone chat show
       92UvdTpmxA6cvD6YeJZSiHW8ff8DsZXL2PHZu9Mg7JY3zbaETJw
       %s
     eos
 end
 
-command 'communication say' do |c|
-  c.when_called DropZoneCommand, :communication_say
+command 'chat say' do |c|
+  c.when_called DropZoneCommand, :chat_say
 
   c.syntax, c.summary, c.description = 
-    'dropzone communication say <private_key> <tx_id> <message>',
+    'dropzone chat say <private_key> <tx_id> <message>',
     '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
@@ -451,24 +451,24 @@ command 'communication say' do |c|
 
   c.example 'Converse with another user over testnet:', 
     multi(<<-eos) % RANDOM_TXID
-    dropzone communication say
+    dropzone chat say
       92UvdTpmxA6cvD6YeJZSiHW8ff8DsZXL2PHZu9Mg7JY3zbaETJw
       %s
       "Thank you for your Inquiry"
     eos
 end
 
-command 'communication new' do |c|
-  c.when_called DropZoneCommand, :communication_new
+command 'chat new' do |c|
+  c.when_called DropZoneCommand, :chat_new
 
   c.syntax, c.summary, c.description = 
-    'dropzone communication new <private_key> <addr>',
+    'dropzone chat new <private_key> <addr>',
     'Start a new conversation with the person at a given testnet address',
     multi(<<-eos)
       Start a conversation between your tesnet <private_key> and the user at
       the specified testnet address <addr>. An initiation request needs only 
       to be issued by one user, a recipient must reply to that request using
-      the "communication say" command, in order to authenticate the initiator's
+      the "chat say" command, in order to authenticate the initiator's
       request and perform key exchange. Thereafter, a channel between the two
       addresses is established, and communications will remain open. 
 
@@ -480,7 +480,7 @@ command 'communication new' do |c|
 
   c.example 'Start a conversation:', 
     multi(<<-eos)
-    dropzone communication new
+    dropzone chat new
       92UvdTpmxA6cvD6YeJZSiHW8ff8DsZXL2PHZu9Mg7JY3zbaETJw
       mqVRfjepJTxxoDgDt892tCybhmjfKCFNyp
     eos

data/lib/dropzone/command.rb

@@ -64,6 +64,40 @@ class DropZoneCommand
   MAX_TABLE_WIDTH = 80
 
   class << self
+    def local_persistence=(store)
+      @local_persistence = store
+    end
+
+    def local_persistence
+      unless @local_persistence
+        config_dir = File.join(Dir.home, ".dropzone")
+        Dir.mkdir config_dir, 0700 unless Dir.exists? config_dir
+
+        @local_persistence = Sequel.connect('sqlite://%s/dropzone.db' % config_dir )
+      end
+
+      @local_persistence.create_table :communication_keys do
+        primary_key :id
+        String :sender_addr
+        String :receiver_addr
+        String :secret
+      end unless @local_persistence.table_exists? :communication_keys
+
+      @local_persistence.create_table :chats do
+        primary_key :id
+        String :session_txid
+        Integer :last_read_message_count
+      end unless @local_persistence.table_exists? :chats
+
+      @local_persistence.create_table :addresses do
+        primary_key :id
+        String :addr
+        String :label
+      end unless @local_persistence.table_exists? :addresses
+
+      @local_persistence
+    end
+
     def create_command(action, klass, label, *attributes, &block)
       define_method(action) do |args, options|
         privkey = privkey_from args
@@ -187,7 +221,7 @@ class DropZoneCommand
     end
   end
 
-  def communication_new(args, options)
+  def chat_new(args, options)
     network! :testnet3
 
     privkey = privkey_from args, :testnet3
@@ -207,19 +241,28 @@ class DropZoneCommand
       [:sender_addr, privkey.addr], [:receiver_addr, receiver_addr] ]
   end
 
-  def communication_list(args, options)
+  def chat_list(args, options)
     network! :testnet3
 
     privkey = privkey_from args, :testnet3
 
-    Dropzone::Session.all(privkey.addr).each do |session|
-      puts_table '%s: %s' % ['Session', session.txid], nil, [ 
-        [:sender_addr, session.sender_addr], 
-        [:receiver_addr, session.receiver_addr] ]
+    Dropzone::Session.all(privkey.addr).each do |init|
+      session = session_for privkey, init
+
+      chat_with = [init.sender_addr, init.receiver_addr].find{|a| a != privkey.addr}
+
+      chats_cache = local_persistence[:chats].first(session_txid: init.txid)
+      read_messages = (chats_cache) ? chats_cache[:last_read_message_count] : 0
+      total_messages = session.communications.length
+      unread_messages = (total_messages-read_messages)
+
+      puts_table '%s: %s' % ['Session', init.txid], nil, [ 
+        ['Address', chat_with], 
+        ['Messages', '%d Unread / %d Total' % [unread_messages, total_messages ] ] ]
     end
   end
 
-  def communication_say(args, options)
+  def chat_say(args, options)
     network! :testnet3
 
     privkey = privkey_from args, :testnet3
@@ -258,13 +301,13 @@ class DropZoneCommand
 
     comm_txid = session << message
 
-    puts_table '%s: %s' % ['Communication', comm_txid], nil, [ 
+    puts_table '%s: %s' % ['Chat', comm_txid], nil, [ 
       ['Session', txid], 
       [:sender_addr, privkey.addr], 
       [:message, message] ]
   end
 
-  def communication_show(args, options)
+  def chat_show(args, options)
     network! :testnet3
 
     privkey = privkey_from args, :testnet3
@@ -279,9 +322,18 @@ class DropZoneCommand
 
     session = session_for privkey, comm_init
 
-    puts_table '%s: %s' % ['Communication', txid], nil,
-     session.communications.collect{|comm|
+    update_attrs = {last_read_message_count: session.communications.length}
+
+    cache = local_persistence[:chats]
+    unless 1 == cache.where(session_txid: txid).update(update_attrs)
+      cache.insert update_attrs.merge(session_txid: txid)
+    end
+
+    puts_table '%s: %s' % ['Chat', txid], nil,
+     session.communications.reverse.collect{|comm|
       [comm.sender_addr, comm.contents_plain] }
+
+    # TODO: Determine how many messages to show here, instead of 'all'
   end
 
   def listing_find(args, options)
@@ -361,6 +413,10 @@ class DropZoneCommand
 
   private
 
+  def local_persistence
+    self.class.local_persistence
+  end
+
   def secret_for(sender_addr, receiver_addr)
     record = local_persistence[:communication_keys].where( 
       Sequel.expr(receiver_addr: receiver_addr) & 
@@ -378,24 +434,6 @@ class DropZoneCommand
     end
   end
 
-  def local_persistence
-    unless @local_persistence
-      config_dir = File.join(Dir.home, ".dropzone")
-      Dir.mkdir config_dir, 0700 unless Dir.exists? config_dir
-
-      @local_persistence = Sequel.connect 'sqlite://%s/dropzone.db' % config_dir
-      
-      @local_persistence.create_table :communication_keys do
-        primary_key :id
-        String :sender_addr
-        String :receiver_addr
-        String :secret
-      end unless @local_persistence.table_exists? :communication_keys
-    end
-
-    @local_persistence
-  end
-
   def session_for(privkey, comm_init)
     receiver_addr = (comm_init.receiver_addr == privkey.addr) ?
       comm_init.sender_addr : comm_init.receiver_addr

data/lib/dropzone/session.rb

@@ -62,12 +62,11 @@ module Dropzone
       # If we're already authenticated, we'll try to re-initialize. Presumably
       # one would want to do this if they lost a secret key, or that key were
       # somehow compromised
-      if is_init
-        dh = OpenSSL::PKey::DH.new(der || 1024)
-     else
-        raise DerAlreadyExists unless der.nil?
-        dh = OpenSSL::PKey::DH.new with.der
-      end
+      raise DerAlreadyExists unless der.nil? if !is_init
+
+      der ||= (with) ? with.der : 1024
+
+      dh = OpenSSL::PKey::DH.new der
 
       dh.priv_key = session_key
       dh.generate_key! 

data/lib/dropzone/version.rb

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

data/spec/command_spec.rb

@@ -16,6 +16,8 @@ describe DropZoneCommand do
     # ran before us.
     db = FakeBitcoinConnection::DB.execute(
       "UPDATE SQLITE_SEQUENCE SET SEQ=0 WHERE NAME='transactions';" )
+
+   DropZoneCommand.local_persistence = Sequel.sqlite
   end
 
   def to_out(string)
@@ -214,7 +216,7 @@ describe DropZoneCommand do
   end
 
   it "converses" do
-    expect{ DropZoneCommand.new(true).communication_new(
+    expect{ DropZoneCommand.new(true).chat_new(
       [test_privkey, TESTER2_PUBLIC_KEY], {}
     )}.to output(to_out(<<-eos)).to_stdout
     +---------------------------------------------------+
@@ -225,33 +227,33 @@ describe DropZoneCommand do
     +---------------------------------------------------+
     eos
 
-    expect{ DropZoneCommand.new(true).communication_list(
+    expect{ DropZoneCommand.new(true).chat_list(
       [test_privkey], {}
     )}.to output(to_out(<<-eos)).to_stdout
-    +---------------------------------------------------+
-    | Session: 7                                        |
-    +---------------------------------------------------+
-    | sender_addr  : mi37WkBomHJpUghCn7Vgh3ah33h6L9Nkqw |
-    | receiver_addr: mqVRfjepJTxxoDgDt892tCybhmjfKCFNyp |
-    +---------------------------------------------------+
+    +----------------------------------------------+
+    | Session: 7                                   |
+    +----------------------------------------------+
+    | Address : mqVRfjepJTxxoDgDt892tCybhmjfKCFNyp |
+    | Messages: 0 Unread / 0 Total                 |
+    +----------------------------------------------+
     eos
 
-    expect{ DropZoneCommand.new(true).communication_list(
+    expect{ DropZoneCommand.new(true).chat_list(
       [TESTER2_PRIVATE_KEY], {}
     )}.to output(to_out(<<-eos)).to_stdout
-    +---------------------------------------------------+
-    | Session: 7                                        |
-    +---------------------------------------------------+
-    | sender_addr  : mi37WkBomHJpUghCn7Vgh3ah33h6L9Nkqw |
-    | receiver_addr: mqVRfjepJTxxoDgDt892tCybhmjfKCFNyp |
-    +---------------------------------------------------+
+    +----------------------------------------------+
+    | Session: 7                                   |
+    +----------------------------------------------+
+    | Address : mi37WkBomHJpUghCn7Vgh3ah33h6L9Nkqw |
+    | Messages: 0 Unread / 0 Total                 |
+    +----------------------------------------------+
     eos
 
-    expect{ DropZoneCommand.new(true).communication_say(
+    expect{ DropZoneCommand.new(true).chat_say(
       [TESTER2_PRIVATE_KEY, '7', 'Greetings Initiator'], {}
     )}.to output(to_out(<<-eos)).to_stdout
     +-------------------------------------------------+
-    | Communication: 9                                |
+    | Chat: 9                                         |
     +-------------------------------------------------+
     | Session    : 7                                  |
     | sender_addr: mqVRfjepJTxxoDgDt892tCybhmjfKCFNyp |
@@ -259,11 +261,11 @@ describe DropZoneCommand do
     +-------------------------------------------------+
     eos
 
-    expect{ DropZoneCommand.new(true).communication_say(
+    expect{ DropZoneCommand.new(true).chat_say(
       [test_privkey, '7', 'Conversation Initiated'], {}
     )}.to output(to_out(<<-eos)).to_stdout
     +-------------------------------------------------+
-    | Communication: 10                               |
+    | Chat: 10                                        |
     +-------------------------------------------------+
     | Session    : 7                                  |
     | sender_addr: mi37WkBomHJpUghCn7Vgh3ah33h6L9Nkqw |
@@ -271,25 +273,25 @@ describe DropZoneCommand do
     +-------------------------------------------------+
     eos
 
-    expect{ DropZoneCommand.new(true).communication_show(
+    expect{ DropZoneCommand.new(true).chat_show(
       [test_privkey, '7'], {}
     )}.to output(to_out(<<-eos)).to_stdout
     +------------------------------------------------------------+
-    | Communication: 7                                           |
+    | Chat: 7                                                    |
     +------------------------------------------------------------+
-    | mi37WkBomHJpUghCn7Vgh3ah33h6L9Nkqw: Conversation Initiated |
     | mqVRfjepJTxxoDgDt892tCybhmjfKCFNyp: Greetings Initiator    |
+    | mi37WkBomHJpUghCn7Vgh3ah33h6L9Nkqw: Conversation Initiated |
     +------------------------------------------------------------+
     eos
 
-    expect{ DropZoneCommand.new(true).communication_show(
+    expect{ DropZoneCommand.new(true).chat_show(
       [TESTER2_PRIVATE_KEY, '7'], {}
     )}.to output(to_out(<<-eos)).to_stdout
     +------------------------------------------------------------+
-    | Communication: 7                                           |
+    | Chat: 7                                                    |
     +------------------------------------------------------------+
-    | mi37WkBomHJpUghCn7Vgh3ah33h6L9Nkqw: Conversation Initiated |
     | mqVRfjepJTxxoDgDt892tCybhmjfKCFNyp: Greetings Initiator    |
+    | mi37WkBomHJpUghCn7Vgh3ah33h6L9Nkqw: Conversation Initiated |
     +------------------------------------------------------------+
     eos
   end
@@ -315,11 +317,11 @@ is akin to that of Craigslist.org or Uber, but is distributed and as such provid
 risk-free terms to contraband sellers, and drastically reduced risk to contraband buyers.
     eos
 
-    expect{ DropZoneCommand.new(true).communication_say(
+    expect{ DropZoneCommand.new(true).chat_say(
       [test_privkey, '7', abstract], {}
     )}.to output(to_out(<<-eos)).to_stdout
     +----------------------------------------------------------------------------------+
-    | Communication: 11                                                                |
+    | Chat: 11                                                                         |
     +----------------------------------------------------------------------------------+
     | Session    : 7                                                                   |
     | sender_addr: mi37WkBomHJpUghCn7Vgh3ah33h6L9Nkqw                                  |

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dropzone_ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Miracle Max
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-31 00:00:00.000000000 Z
+date: 2015-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: counterparty_ruby
@@ -177,7 +177,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- Drop Zone - An Anonymous Peer-To-Peer Local Contraband Marketplace.pdf
+- Drop Zone - Whitepaper.pdf
 - Gemfile
 - Gemfile.lock
 - README.md
@@ -241,7 +241,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: An Anonymous Peer-To-Peer Local Contraband Marketplace