vines 0.4.6 → 0.4.7

data/README.md

@@ -10,10 +10,11 @@ custom storage implementation that you provide. LDAP authentication can be used
 so user names and passwords aren't stored in the chat database. SSL encryption
 is mandatory on all client and server connections.
 
-The Vines XMPP server includes a web chat client. The web application is available
-after starting the chat server at http://localhost:5280/chat/.
+The server includes support for web chat clients, using BOSH (XMPP over HTTP). A
+sample web application is available in the
+[vines-web](https://github.com/negativecode/vines-web) gem.
 
-Additional documentation can be found at www.getvines.org.
+Additional documentation can be found at [getvines.org](http://www.getvines.org/).
 
 ## Usage
 
@@ -21,7 +22,6 @@ Additional documentation can be found at www.getvines.org.
 $ gem install vines
 $ vines init wonderland.lit
 $ cd wonderland.lit && vines start
-$ open http://localhost:5280/chat/
 ```
 
 Login with your favorite chat program (iChat, Adium, Pidgin, etc.) to start chatting!

data/Rakefile

@@ -4,15 +4,12 @@ require 'rake'
 require 'rake/clean'
 require 'rake/testtask'
 
-ignore = File.read('web/lib/javascripts/.gitignore')
-  .split("\n").map {|f| "web/lib/javascripts/#{f}" }
-
-CLOBBER.include('pkg', 'web/chat/javascripts', *ignore)
+CLOBBER.include('pkg')
 
 directory 'pkg'
 
 desc 'Build distributable packages'
-task :build => [:assets, :pkg] do
+task :build => [:pkg] do
   system 'gem build vines.gemspec && mv vines-*.gem pkg/'
 end
 
@@ -23,35 +20,4 @@ Rake::TestTask.new(:test) do |test|
   test.warning = false
 end
 
-desc 'Compile and minimize web assets'
-task :assets do
-  require 'coffee-script'
-  require 'uglifier'
-
-  # combine and compile library coffeescripts
-  File.open('web/lib/javascripts/base.js', 'w') do |basejs|
-    assets = %w[layout button contact filter session transfer router navbar notification login logout]
-    coffee = assets.inject('') do |sum, name|
-      sum + File.read("web/lib/coffeescripts/#{name}.coffee")
-    end
-    js = %w[jquery jquery.cookie raphael icons strophe].inject('') do |sum, name|
-      sum + File.read("web/lib/javascripts/#{name}.js")
-    end
-    compiled = js + CoffeeScript.compile(coffee)
-    compressed = Uglifier.compile(compiled)
-    basejs.write(compressed)
-  end
-
-  # combine and compile chat application's coffeescripts
-  Dir.mkdir('web/chat/javascripts') unless File.exists?('web/chat/javascripts')
-  File.open('web/chat/javascripts/app.js', 'w') do |appjs|
-    coffee = %w[chat init].inject('') do |sum, name|
-      sum + File.read("web/chat/coffeescripts/#{name}.coffee")
-    end
-    compiled = CoffeeScript.compile(coffee)
-    compressed = Uglifier.compile(compiled)
-    appjs.write(compressed)
-  end
-end
-
 task :default => [:clobber, :test, :build]

data/lib/vines/version.rb

@@ -1,5 +1,5 @@
 # encoding: UTF-8
 
 module Vines
-  VERSION = '0.4.6'
+  VERSION = '0.4.7'
 end

data/vines.gemspec

@@ -24,9 +24,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'nokogiri', '~> 1.5.10'
 
   s.add_development_dependency 'minitest', '~> 5.0.5'
-  s.add_development_dependency 'coffee-script', '~> 2.2.0'
-  s.add_development_dependency 'coffee-script-source', '~> 1.6.2'
-  s.add_development_dependency 'uglifier', '~> 1.3.0'
   s.add_development_dependency 'rake', '~> 10.1.0'
 
   s.required_ruby_version = '>= 1.9.3'

data/web/404.html

@@ -5,47 +5,24 @@
   <meta name="apple-mobile-web-app-capable" content="yes"/>
   <title>Vines</title>
   <link rel="shortcut icon" type="image/png" href="/favicon.png"/>
-  <link rel="stylesheet" href="/lib/stylesheets/base.css"/>
   <style type="text/css">
     body {
-      background: -moz-radial-gradient(rgba(26, 55, 98, 0.8), rgba(12, 26, 45, 0.8)), url(/lib/images/dark-gray.png);
-      background: -ms-radial-gradient(center, 500px 500px, rgba(26, 55, 98, 0.8), rgba(12, 26, 45, 0.8)), url(/lib/images/dark-gray.png);
-      background: -o-radial-gradient(rgba(26, 55, 98, 0.8), rgba(12, 26, 45, 0.8)), url(/lib/images/dark-gray.png);
-      background: -webkit-radial-gradient(center, 500px 500px, rgba(26, 55, 98, 0.8), rgba(12, 26, 45, 0.8)), url(/lib/images/dark-gray.png);
-      display: table;
-      text-align: center;
-      width: 100%;
-    }
-    header {
-      display: table-cell;
-      vertical-align: middle;
-      width: 100%;
-    }
-    h1 {
-      background: url(/lib/images/logo-large.png) no-repeat center;
-      color: transparent;
-      height: 82px;
-      text-shadow: none;
-      width: 100%;
+      background: rgb(253, 253, 253);
+      font-family: "Helvetica Neue", sans-serif;
+      font-weight: 200;
+      font-size: 13px;
+      text-shadow: 0 1px 1px #fff;
     }
     p {
-      color: rgba(255, 255, 255, 0.8);
-      font-size: 11pt;
-      margin: 20px auto;
-      width: 400px;
-    }
-    a {
-      color: inherit;
+      position: absolute;
+      top: 50%;
+      margin-top: -10px;
+      width: 100%;
+      text-align: center;
     }
   </style>
 </head>
 <body>
-  <header>
-    <h1>Page not found</h1>
-    <p>
-      This is not the page you're looking for. You probably wanted the
-      <a href="/chat/">chat</a> application.
-    </p>
-  </header>
+  <p>This is not the page you're looking for.</p>
 </body>
 </html>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vines
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-21 00:00:00.000000000 Z
+date: 2013-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby
@@ -123,54 +123,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 5.0.5
-- !ruby/object:Gem::Dependency
-  name: coffee-script
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.2.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.2.0
-- !ruby/object:Gem::Dependency
-  name: coffee-script-source
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.6.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.6.2
-- !ruby/object:Gem::Dependency
-  name: uglifier
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -313,37 +265,7 @@ files:
 - conf/config.rb
 - web/404.html
 - web/apple-touch-icon.png
-- web/chat/coffeescripts/chat.coffee
-- web/chat/coffeescripts/init.coffee
-- web/chat/index.html
-- web/chat/javascripts/app.js
-- web/chat/stylesheets/chat.css
 - web/favicon.png
-- web/lib/coffeescripts/button.coffee
-- web/lib/coffeescripts/contact.coffee
-- web/lib/coffeescripts/filter.coffee
-- web/lib/coffeescripts/layout.coffee
-- web/lib/coffeescripts/login.coffee
-- web/lib/coffeescripts/logout.coffee
-- web/lib/coffeescripts/navbar.coffee
-- web/lib/coffeescripts/notification.coffee
-- web/lib/coffeescripts/router.coffee
-- web/lib/coffeescripts/session.coffee
-- web/lib/coffeescripts/transfer.coffee
-- web/lib/images/dark-gray.png
-- web/lib/images/default-user.png
-- web/lib/images/light-gray.png
-- web/lib/images/logo-large.png
-- web/lib/images/logo-small.png
-- web/lib/images/white.png
-- web/lib/javascripts/base.js
-- web/lib/javascripts/icons.js
-- web/lib/javascripts/jquery.cookie.js
-- web/lib/javascripts/jquery.js
-- web/lib/javascripts/raphael.js
-- web/lib/javascripts/strophe.js
-- web/lib/stylesheets/base.css
-- web/lib/stylesheets/login.css
 - test/cluster/publisher_test.rb
 - test/cluster/sessions_test.rb
 - test/cluster/subscriber_test.rb
@@ -420,7 +342,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4058394923438184029
+      hash: -1025629835892307549
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23

data/web/chat/coffeescripts/chat.coffee

@@ -1,362 +0,0 @@
-class @ChatPage
-  constructor: (@session) ->
-    @session.onRoster   ( ) => this.roster()
-    @session.onCard     (c) => this.card(c)
-    @session.onMessage  (m) => this.message(m)
-    @session.onPresence (p) => this.presence(p)
-    @chats = {}
-    @currentContact = null
-    @layout = null
-
-  datef: (millis) ->
-    d = new Date(millis)
-    meridian = if d.getHours() >= 12 then ' pm' else ' am'
-    hour = if d.getHours() > 12 then d.getHours() - 12 else d.getHours()
-    hour = 12 if hour == 0
-    minutes = d.getMinutes() + ''
-    minutes = '0' + minutes if minutes.length == 1
-    hour + ':' + minutes + meridian
-
-  card: (card) ->
-    this.eachContact card.jid, (node) =>
-      $('.vcard-img', node).attr 'src', @session.avatar card.jid
-
-  roster: ->
-    roster = $('#roster')
-
-    $('li', roster).each (ix, node) =>
-      jid = $(node).attr('data-jid')
-      $(node).remove() unless @session.roster[jid]
-
-    setName = (node, contact) ->
-      $('.text', node).text contact.name || contact.jid
-      node.attr 'data-name', contact.name || ''
-
-    for jid, contact of @session.roster
-      found = $("#roster li[data-jid='#{jid}']")
-      setName(found, contact)
-      if found.length == 0
-        node = $("""
-          <li data-jid="#{jid}" data-name="" class="offline">
-            <span class="text"></span>
-            <span class="status-msg">Offline</span>
-            <span class="unread" style="display:none;"></span>
-            <img class="vcard-img" alt="#{jid}" src="#{@session.avatar jid}"/>
-          </li>
-        """).appendTo roster
-        setName(node, contact)
-        node.click (event) => this.selectContact(event)
-
-  message: (message) ->
-    return unless message.type == 'chat' && message.text
-    this.queueMessage message
-    me   = message.from == @session.jid()
-    from = message.from.split('/')[0]
-
-    if me || from == @currentContact
-      bottom = this.atBottom()
-      this.appendMessage message
-      this.scroll() if bottom
-    else
-      chat = this.chat message.from
-      chat.unread++
-      this.eachContact from, (node) ->
-        $('.unread', node).text(chat.unread).show()
-
-  eachContact: (jid, callback) ->
-    for node in $("#roster li[data-jid='#{jid}']").get()
-      callback $(node)
-
-  appendMessage: (message) ->
-    from    = message.from.split('/')[0]
-    contact = @session.roster[from]
-    name    = if contact then (contact.name || from) else from
-    name    = 'Me' if message.from == @session.jid()
-    node    = $("""
-      <li data-jid="#{from}" style="display:none;">
-        <p></p>
-        <img alt="#{from}" src="#{@session.avatar from}"/>
-        <footer>
-          <span class="author"></span>
-          <span class="time">#{this.datef message.received}</span>
-        </footer>
-      </li>
-    """).appendTo '#messages'
-
-    $('p', node).text message.text
-    $('.author', node).text name
-    node.fadeIn 200
-
-  queueMessage: (message) ->
-    me   = message.from == @session.jid()
-    full = message[if me then 'to' else 'from']
-    chat = this.chat full
-    chat.jid = full
-    chat.messages.push message
-
-  chat: (jid) ->
-    bare = jid.split('/')[0]
-    chat = @chats[bare]
-    unless chat
-      chat = jid: jid, messages: [], unread: 0
-      @chats[bare] = chat
-    chat
-
-  presence: (presence) ->
-    from = presence.from.split('/')[0]
-    return if from == @session.bareJid()
-    if !presence.type || presence.offline
-      contact = @session.roster[from]
-      this.eachContact from, (node) ->
-        $('.status-msg', node).text contact.status()
-        if contact.offline()
-          node.addClass 'offline'
-        else
-          node.removeClass 'offline'
-
-    if presence.offline
-      this.chat(from).jid = from
-
-    if presence.type == 'subscribe'
-      node = $("""
-        <li data-jid="#{presence.from}" style="display:none;">
-          <form class="inset">
-            <h2>Buddy Approval</h2>
-            <p>#{presence.from} wants to add you as a buddy.</p>
-            <fieldset class="buttons">
-              <input type="button" value="Decline"/>
-              <input type="submit" value="Accept"/>
-            </fieldset>
-          </form>
-        </li>
-      """).appendTo '#notifications'
-      node.fadeIn 200
-      $('form', node).submit => this.acceptContact node, presence.from
-      $('input[type="button"]', node).click => this.rejectContact node, presence.from
-
-  acceptContact: (node, jid) ->
-    node.fadeOut 200, -> node.remove()
-    @session.sendSubscribed jid
-    @session.sendSubscribe  jid
-    false
-
-  rejectContact: (node, jid) ->
-    node.fadeOut 200, -> node.remove()
-    @session.sendUnsubscribed jid
-
-  selectContact: (event) ->
-    jid = $(event.currentTarget).attr 'data-jid'
-    contact = @session.roster[jid]
-    return if @currentContact == jid
-    @currentContact = jid
-
-    $('#roster li').removeClass 'selected'
-    $(event.currentTarget).addClass 'selected'
-    $('#chat-title').text('Chat with ' + (contact.name || contact.jid))
-    $('#messages').empty()
-
-    chat = @chats[jid]
-    messages = []
-    if chat
-      messages = chat.messages
-      chat.unread = 0
-      this.eachContact jid, (node) ->
-        $('.unread', node).text('').hide()
-
-    this.appendMessage msg for msg in messages
-    this.scroll()
-
-    $('#remove-contact-msg').html "Are you sure you want to remove " +
-      "<strong>#{@currentContact}</strong> from your buddy list?"
-    $('#remove-contact-form .buttons').fadeIn 200
-
-    $('#edit-contact-jid').text @currentContact
-    $('#edit-contact-name').val @session.roster[@currentContact].name
-    $('#edit-contact-form input').fadeIn 200
-    $('#edit-contact-form .buttons').fadeIn 200
-
-  scroll: ->
-    msgs = $ '#messages'
-    msgs.animate(scrollTop: msgs.prop('scrollHeight'), 400)
-
-  atBottom: ->
-    msgs = $('#messages')
-    bottom = msgs.prop('scrollHeight') - msgs.outerHeight()
-    msgs.scrollTop() >= bottom
-
-  send: ->
-    return false unless @currentContact
-    input = $('#message')
-    text = input.val().trim()
-    if text
-      chat = @chats[@currentContact]
-      jid = if chat then chat.jid else @currentContact
-      this.message
-        from: @session.jid()
-        text: text
-        to: jid
-        type: 'chat'
-        received: new Date()
-      @session.sendMessage jid, text
-    input.val ''
-    false
-
-  addContact: ->
-    this.toggleForm '#add-contact-form'
-    contact =
-      jid: $('#add-contact-jid').val()
-      name: $('#add-contact-name').val()
-      groups: ['Buddies']
-    @session.updateContact contact, true if contact.jid
-    false
-
-  removeContact: ->
-    this.toggleForm '#remove-contact-form'
-    @session.removeContact @currentContact
-    @currentContact = null
-
-    $('#chat-title').text 'Select a buddy to chat'
-    $('#messages').empty()
-
-    $('#remove-contact-msg').html "Select a buddy in the list above to remove."
-    $('#remove-contact-form .buttons').hide()
-
-    $('#edit-contact-jid').text "Select a buddy in the list above to update."
-    $('#edit-contact-name').val ''
-    $('#edit-contact-form input').hide()
-    $('#edit-contact-form .buttons').hide()
-    false
-
-  updateContact: ->
-    this.toggleForm '#edit-contact-form'
-    contact =
-      jid: @currentContact
-      name: $('#edit-contact-name').val()
-      groups: @session.roster[@currentContact].groups
-    @session.updateContact contact
-    false
-
-  toggleForm: (form, fn) ->
-    form = $(form)
-    $('form.overlay').each ->
-      $(this).hide() unless this.id == form.attr 'id'
-    if form.is ':hidden'
-      fn() if fn
-      form.fadeIn 100
-    else
-      form.fadeOut 100, =>
-        form[0].reset()
-        @layout.resize()
-        fn() if fn
-
-  draw: ->
-    unless @session.connected()
-      window.location.hash = ''
-      return
-
-    $('body').attr 'id', 'chat-page'
-    $('#container').hide().empty()
-    $("""
-      <div id="alpha" class="sidebar column y-fill">
-        <h2>Buddies <div id="search-roster-icon"></div></h2>
-        <div id="search-roster-form"></div>
-        <ul id="roster" class="selectable scroll y-fill"></ul>
-        <div id="alpha-controls" class="controls">
-          <div id="add-contact"></div>
-          <div id="remove-contact"></div>
-          <div id="edit-contact"></div>
-        </div>
-        <form id="add-contact-form" class="overlay" style="display:none;">
-          <h2>Add Buddy</h2>
-          <input id="add-contact-jid" type="email" maxlength="1024" placeholder="Account name"/>
-          <input id="add-contact-name" type="text" maxlength="1024" placeholder="Real name"/>
-          <fieldset class="buttons">
-            <input id="add-contact-cancel" type="button" value="Cancel"/>
-            <input id="add-contact-ok" type="submit" value="Add"/>
-          </fieldset>
-        </form>
-        <form id="remove-contact-form" class="overlay" style="display:none;">
-          <h2>Remove Buddy</h2>
-          <p id="remove-contact-msg">Select a buddy in the list above to remove.</p>
-          <fieldset class="buttons" style="display:none;">
-            <input id="remove-contact-cancel" type="button" value="Cancel"/>
-            <input id="remove-contact-ok" type="submit" value="Remove"/>
-          </fieldset>
-        </form>
-        <form id="edit-contact-form" class="overlay" style="display:none;">
-          <h2>Update Profile</h2>
-          <p id="edit-contact-jid">Select a buddy in the list above to update.</p>
-          <input id="edit-contact-name" type="text" maxlength="1024" placeholder="Real name" style="display:none;"/>
-          <fieldset class="buttons" style="display:none;">
-            <input id="edit-contact-cancel" type="button" value="Cancel"/>
-            <input id="edit-contact-ok" type="submit" value="Save"/>
-          </fieldset>
-        </form>
-      </div>
-      <div id="beta" class="primary column x-fill y-fill">
-        <h2 id="chat-title">Select a buddy to chat</h2>
-        <ul id="messages" class="scroll y-fill"></ul>
-        <form id="message-form">
-          <input id="message" name="message" type="text" maxlength="1024" placeholder="Type a message and press enter to send"/>
-        </form>
-      </div>
-      <div id="charlie" class="sidebar column y-fill">
-        <h2>Notifications</h2>
-        <ul id="notifications" class="scroll y-fill"></ul>
-        <div id="charlie-controls" class="controls">
-          <div id="clear-notices"></div>
-        </div>
-      </div>
-    """).appendTo '#container'
-
-    this.roster()
-
-    new Button '#clear-notices',  ICONS.no
-    new Button '#add-contact',    ICONS.plus
-    new Button '#remove-contact', ICONS.minus
-    new Button '#edit-contact',   ICONS.user
-
-    $('#message').focus -> $('form.overlay').fadeOut()
-    $('#message-form').submit  => this.send()
-
-    $('#clear-notices').click  -> $('#notifications li').fadeOut 200
-
-    $('#add-contact').click    => this.toggleForm '#add-contact-form'
-    $('#remove-contact').click => this.toggleForm '#remove-contact-form'
-    $('#edit-contact').click   => this.toggleForm '#edit-contact-form', =>
-      if @currentContact
-        $('#edit-contact-jid').text @currentContact
-        $('#edit-contact-name').val @session.roster[@currentContact].name
-
-    $('#add-contact-cancel').click    => this.toggleForm '#add-contact-form'
-    $('#remove-contact-cancel').click => this.toggleForm '#remove-contact-form'
-    $('#edit-contact-cancel').click   => this.toggleForm '#edit-contact-form'
-
-    $('#add-contact-form').submit    => this.addContact()
-    $('#remove-contact-form').submit => this.removeContact()
-    $('#edit-contact-form').submit   => this.updateContact()
-
-    $('#container').fadeIn 200
-    @layout = this.resize()
-
-    fn = =>
-      @layout.resize()
-      @layout.resize() # not sure why two are needed
-
-    new Filter
-      list: '#roster'
-      icon: '#search-roster-icon'
-      form: '#search-roster-form'
-      attrs: ['data-jid', 'data-name']
-      open:  fn
-      close: fn
-
-  resize: ->
-    a    = $ '#alpha'
-    b    = $ '#beta'
-    c    = $ '#charlie'
-    msg  = $ '#message'
-    form = $ '#message-form'
-    new Layout ->
-      c.css 'left', a.width() + b.width()
-      msg.width form.width() - 32