vines-services 0.1.0 → 0.1.1

data/lib/vines/services/roster.rb

@@ -1,70 +1,109 @@
 # encoding: UTF-8
+
 module Vines
   class Storage
     class CouchDB < Storage
+      alias :_services_find_user :find_user
+
+      # Override the user's roster with an auto-populated roster containing
+      # the services and systems to which the user has permission to access.
+      def find_user(jid)
+        user = _services_find_user(jid)
+        return unless user
+        user.roster = []
+
+        systems, users = find_users.partition {|u| u['system'] }
+        systems.map! {|u| u['_id'].sub('user:', '') }
+        return user if systems.include?(user.jid.to_s)
+        services = find_services(user.jid)
+
+        users.each do |row|
+          id = row['_id'].sub('user:', '')
+          user.roster << Contact.new(
+            :jid => id,
+            :name => row['name'],
+            :subscription => 'both',
+            :groups => ['People']) unless id == jid.to_s
+        end
+
+        services.each do |row|
+          user.roster << Contact.new(
+            :jid => row['jid'],
+            :name => row['name'],
+            :subscription => 'to',
+            :groups => ['Services'])
+        end
+
+        find_systems(services).each do |name, groups|
+          id = JID.new(name.dup, user.jid.domain).to_s
+          user.roster << Contact.new(
+            :jid => id,
+            :name => name,
+            :subscription => 'to',
+            :groups => ['Systems', *groups]) if systems.include?(id)
+        end
 
-      ALL_SERVICES = '/_design/Service/_view/by_name'.freeze
+        user.roster << Contact.new(
+          :jid => "vines.#{user.jid.domain}",
+          :name => 'Vines',
+          :subscription => 'to')
+        user
+      end
 
-      # The existing storage class needs another method for our custom roster queries
-      # The default escaping in URLs makes this method necessary
-      def get_services
-        http = EM::HttpRequest.new("#{@url}#{ALL_SERVICES}").get
-        http.errback { yield }
+      # Return the User documents for all users and systems.
+      def find_users
+        url = "%s/_design/User/_view/all?reduce=false&include_docs=true" % @url
+        http = EM::HttpRequest.new(url).get
+        http.errback { yield [] }
         http.callback do
           doc = if http.response_header.status == 200
-            JSON.parse(http.response) rescue nil
+            rows = JSON.parse(http.response)['rows'] rescue []
+            rows.map {|row| row['doc'] }
           end
-          yield doc
+          yield doc || []
         end
       end
+      fiber :find_users
 
-      #In order to supply the correct vines roster logic, we need to over ride the default
-      #User creation of in the vines server. This method is much more effecient than
-      #looking up roster memberships each time the roster is sent.
-      def find_user(jid)
-        jid = JID.new(jid || '').bare.to_s
-        if jid.empty? then yield; return end
-        get("user:#{jid}") do |doc|
-          user = if doc && doc['type'] == 'User'
-            User.new(:jid => jid).tap do |user|
-              user.name, user.password = doc.values_at('name', 'password')
-              if doc['roster'] != ""
-                (doc['roster'] || {}).each_pair do |jid, props|
-                  user.roster << Contact.new(
-                    :jid => jid,
-                    :name => props['name'],
-                    :subscription => props['subscription'],
-                    :ask => props['ask'],
-                    :groups => props['groups'] || [])
-                end
-              end
-              add_user_roster_services(user)
-            end
+      # Return the Service documents to which this JID has permission to
+      # access.
+      def find_services(jid)
+        url = "%s/_design/Service/_view/by_user?reduce=false&key=%s" % [@url, escape(jid.to_s).to_json]
+        http = EM::HttpRequest.new(url).get
+        http.errback { yield [] }
+        http.callback do
+          doc = if http.response_header.status == 200
+            rows = JSON.parse(http.response)['rows'] rescue []
+            rows.map {|row| row['value'] }
           end
-          yield user
+          yield doc || []
         end
       end
-      fiber :find_user
+      fiber :find_services
 
-      # We will go find each service that contains this user jid in the
-      # users of the service document.
-      def add_user_roster_services(user)
-        self.get_services do |cdoc|
-          if cdoc
-            rows = cdoc['rows'].map do |row|
-              if row['value']['users'].include?(user.jid.to_s)
-                jid = JID.new("#{row['value']['jid']}").bare.to_s
-                user.roster << Contact.new(
-                  :jid => jid,
-                  :name => row['value']['name'],
-                  :subscription => "both",
-                  :ask => "subscribe",
-                  :groups => ["Vines"])
+      # Find the systems that belong to these services. Return a Hash of
+      # system name to list of service names to which it belongs.
+      def find_systems(services)
+        keys = services.map {|row| [0, row['_id']] }
+        url = "%s/_design/System/_view/memberships?reduce=false" % @url
+        http = EM::HttpRequest.new(url).post(
+          head: {'Content-Type' => 'application/json'},
+          body: {keys: keys}.to_json)
+        http.errback { yield [] }
+        http.callback do
+          doc = if http.response_header.status == 200
+            rows = JSON.parse(http.response)['rows'] rescue []
+            Hash.new {|h, k| h[k] = [] }.tap do |systems|
+              rows.each do |row|
+                service = services.find {|s| s['_id'] == row['key'][1] }
+                systems[row['value']['name']] << service['name']
               end
             end
           end
+          yield doc || []
         end
       end
+      fiber :find_systems
     end
   end
 end

data/lib/vines/services/storage/couchdb/service.rb

@@ -6,7 +6,7 @@ module Vines
       class Service < CouchRest::Model::Base
         extend Storage::CouchDB::ClassMethods
 
-        KEYS      = %w[_id name code accounts users jid created_at modified_at].freeze
+        KEYS      = %w[_id name code accounts users jid created_at updated_at].freeze
         VIEW_ID   = "_design/System".freeze
         VIEW_NAME = "System/memberships".freeze
 

data/lib/vines/services/storage/couchdb/system.rb

@@ -6,7 +6,7 @@ module Vines
       class System < CouchRest::Model::Base
         extend Storage::CouchDB::ClassMethods
 
-        KEYS      = %w[_id ohai created_at modified_at].freeze
+        KEYS      = %w[_id ohai created_at updated_at].freeze
         VIEW_NAME = "System/memberships".freeze
 
         attr_writer :services

data/lib/vines/services/storage/couchdb/upload.rb

@@ -6,7 +6,7 @@ module Vines
       class Upload < CouchRest::Model::Base
         extend Storage::CouchDB::ClassMethods
 
-        KEYS = %w[_id name size labels created_at modified_at].freeze
+        KEYS = %w[_id name size labels created_at updated_at].freeze
 
         property :name, String
         property :size, Integer

data/lib/vines/services/storage/couchdb/user.rb

@@ -6,7 +6,7 @@ module Vines
       class User < CouchRest::Model::Base
         extend Storage::CouchDB::ClassMethods
 
-        KEYS = %w[_id name permissions system created_at modified_at].freeze
+        KEYS = %w[_id name permissions system created_at updated_at].freeze
 
         before_save :enforce_constraints
         after_destroy :remove_references
@@ -51,6 +51,16 @@ module Vines
           end
         end
 
+        # Grant this user all possible permissions.
+        def admin!
+          write_attribute('permissions', {
+            'systems'  => true,
+            'services' => true,
+            'files'    => true,
+            'users'    => true
+          })
+        end
+
         def permissions=(perms)
           perms ||= {}
           self.manage_systems = perms['systems']
@@ -59,7 +69,7 @@ module Vines
           self.manage_users = perms['users']
         end
 
-        def password=(desired)
+        def plain_password=(desired)
           desired = (desired || '').strip
           raise 'password too short' if desired.size < (system ? 128 : 8)
           write_attribute('password', BCrypt::Password.create(desired))
@@ -68,7 +78,7 @@ module Vines
         def change_password(previous, desired)
           hash = BCrypt::Password.new(password) rescue nil
           raise 'password failure' unless hash && hash == previous
-          self.password = desired
+          self.plain_password = desired
         end
 
         def jid

data/lib/vines/services/storage/couchdb.rb

@@ -100,20 +100,13 @@ module Vines
         end
 
         def create_views
-          # FIXME Use views in CouchRest::Model classes to populate db
-          designs = {}
-
           EM.run do
-            http('', :put) do # create db
-              designs.each do |name, views|
-                get("/_design/#{name}") do |doc|
-                  doc ||= {"_id" => "_design/#{name}"}
-                  doc['language'] = 'javascript'
-                  doc['views'] = views
-                  save(doc) { EM.stop }
-                end
+            Fiber.new do
+              CouchRest::Model::Base.subclasses.each do |klass|
+                klass.save_design_doc! if klass.respond_to?(:save_design_doc!)
               end
-            end
+              EM.stop
+            end.resume
           end
         end
 
@@ -146,6 +139,9 @@ module Vines
           *url, _ = @url.split('/')
           server = CouchRest::Server.new(url.join('/'))
           CouchRest::Model::Base.database = server.database(database)
+          CouchRest::Model::Base.configure do |config|
+            config.auto_update_design_doc = false
+          end
         end
 
         def escape(jid)

data/lib/vines/services/version.rb

@@ -2,6 +2,6 @@
 
 module Vines
   module Services
-    VERSION = '0.1.0'
+    VERSION = '0.1.1'
   end
 end

data/test/priority_queue_test.rb

@@ -18,6 +18,6 @@ class PriorityQueueTest < MiniTest::Unit::TestCase
     end
     assert queue.empty?
     assert_equal 0, queue.size
-    assert_equal nums.sort {|a, b| -(a <=> b) }, popped
+    assert_equal nums.sort, popped
   end
 end

data/web/coffeescripts/api.coffee

@@ -1,5 +1,11 @@
 class Api
+  USERS = 'http://getvines.com/protocol/users'
+
   constructor: (@session) ->
+    @user = null
+    @session.onRoster =>
+      this.get USERS, jid: @session.bareJid(), (result) =>
+        @user = result
 
   jid: -> "vines.#{@session.bareJid().split('@')[1]}"
 

data/web/coffeescripts/files.coffee

@@ -9,8 +9,7 @@ class FilesPage
       jid: @api.jid
       size: this.size
       complete: (file) =>
-        this.fileNode(file)
-        this.findFiles name: file.name
+        this.findFile file.name
 
   findLabels: ->
     $('#labels').empty()
@@ -20,7 +19,7 @@ class FilesPage
   labelNodeList: (label)->
     text = if label.size == 1 then 'file' else 'files'
     node = $("""
-      <li data-name="" style='display:none;'>
+      <li data-name="">
         <span class="text"></span>
         <span class="count">#{label.size} #{text}</span>
       </li>
@@ -28,7 +27,6 @@ class FilesPage
     $('.text', node).text label.name
     node.attr 'data-name', label.name
     node.click (event) => this.selectLabel(event)
-    node.fadeIn(100)
 
   selectLabel: (event) ->
     name = $(event.currentTarget).attr 'data-name'
@@ -41,19 +39,35 @@ class FilesPage
     @api.get FILES, criteria, (result) =>
       this.fileNode row for row in result.rows
 
-  fileNode: (file) ->
+  findFile: (name) ->
+    @api.get FILES, name: name, (result) =>
+      this.fileNode result
+
+  updateFileNode: (file) ->
+    node = $ "#files li[data-id='#{file.id}']"
     size = this.size file.size
-    if !file.created_at
-      file.created_at = Date()
     time = this.date file.created_at
+    node.data 'file', file
+    $('h2', node).text file.name
+    $('.size', node).text size
+    $('.time', node).text time
+    node.attr 'data-name', file.name
+    node.attr 'data-size', size
+    node.attr 'data-created', time
+
+  fileNode: (file) ->
+    if $("#files li[data-id='#{file.id}']").length > 0
+      this.updateFileNode file
+      return
+
     node = $("""
-      <li data-id="#{file.id}" data-name="" data-size="#{size}" data-created="#{time}">
+      <li data-id="#{file.id}">
         <div class="file-icon">
-          <span class="size">#{size}</span>
+          <span class="size"></span>
         </div>
         <h2></h2>
         <footer>
-          <span class="time">#{time}</span>
+          <span class="time"></span>
           <ul class="labels"></ul>
           <form class="add-label">
             <div class="add-label-button"></div>
@@ -68,10 +82,6 @@ class FilesPage
       </li>
     """).appendTo '#files'
 
-    node.data 'file', file
-    $('h2', node).text file.name
-    node.attr 'data-name', file.name
-
     new Button $('.file-icon', node).get(0), ICONS.page2,
       scale: 1.0
       translation: '-2 0'
@@ -87,7 +97,8 @@ class FilesPage
     $('.add-label-button', node).click ->
       $('form.add-label input[type="text"]', node).show()
 
-    this.labelNode node, label for label in file.labels
+    this.updateFileNode file
+    this.labelNode(node, label) for label in file.labels
 
   labelNode: (node, label) ->
     labels = $('.labels', node)
@@ -115,8 +126,9 @@ class FilesPage
     file = node.data 'file'
     file.labels.push label for label in labels
     @api.save FILES, file, (result) ->
-    this.labelNode node, label for label in labels
-    this.findLabels()
+    for label in labels
+      this.labelNode node, label
+      this.updateLabelCount label, 1
     false
 
   removeLabel: (node, item) ->
@@ -125,10 +137,21 @@ class FilesPage
     file.labels = (label for label in file.labels when label != remove)
     @api.save FILES, file, (result) ->
     item.fadeOut 200, -> item.remove()
-    this.findLabels()
+    this.updateLabelCount remove, -1
+
+  updateLabelCount: (name, inc) ->
+    el = $ "#labels li[data-name='#{name}'] .count"
+    if el.length > 0
+      count = parseInt(el.text().split(' ')[0]) + inc
+      text = if count == 1 then 'file' else 'files'
+      el.text "#{count} #{text}"
+    else
+      this.labelNodeList(name: name, size: 1)
 
   deleteFile: (node) ->
     @api.remove FILES, node.attr('data-id'), (result) =>
+      for label in node.data('file').labels
+        this.updateLabelCount label, -1
       node.fadeOut 200, -> node.remove()
     false
 
@@ -188,31 +211,35 @@ class FilesPage
       </div>
     """).appendTo '#container'
 
-    $('#file-chooser').change (event) =>
-      @uploads.queue event.target.files
-      $('#file-chooser').val ''
+    if @api.user.permissions.files
+      $('#file-chooser').change (event) =>
+        @uploads.queue event.target.files
+        $('#file-chooser').val ''
 
-    $('#file-form').submit ->
-      $('#file-chooser').click()
-      false
+      $('#file-form').submit ->
+        $('#file-chooser').click()
+        false
 
-    $('#upload-dnd').bind 'dragenter', (event) ->
-      event.stopPropagation()
-      event.preventDefault()
-      $('#upload-dnd').css 'color', '#444'
+      $('#upload-dnd').bind 'dragenter', (event) ->
+        event.stopPropagation()
+        event.preventDefault()
+        $('#upload-dnd').css 'color', '#444'
 
-    $('#upload-dnd').bind 'dragleave', (event) ->
-      $('#upload-dnd').css 'color', '#ababab'
+      $('#upload-dnd').bind 'dragleave', (event) ->
+        $('#upload-dnd').css 'color', '#ababab'
 
-    $('#upload-dnd').bind 'dragover', (event) ->
-      event.stopPropagation()
-      event.preventDefault()
+      $('#upload-dnd').bind 'dragover', (event) ->
+        event.stopPropagation()
+        event.preventDefault()
 
-    $('#upload-dnd').bind 'drop', (event) =>
-      event.stopPropagation()
-      event.preventDefault()
-      $('#upload-dnd').css 'color', '#ababab'
-      @uploads.queue event.originalEvent.dataTransfer.files
+      $('#upload-dnd').bind 'drop', (event) =>
+        event.stopPropagation()
+        event.preventDefault()
+        $('#upload-dnd').css 'color', '#ababab'
+        @uploads.queue event.originalEvent.dataTransfer.files
+    else
+      $('#upload-dnd').text "Your account cannot upload files."
+      $('#file-form').remove()
 
     this.findLabels()
     this.findFiles()
@@ -278,7 +305,6 @@ class FilesPage
         upload.start()
       else
         @sending = null
-        this.fileNode(upload.file)
 
     find: (file) ->
       (up for up in @uploads when up.file.name == file.name).shift()

data/web/coffeescripts/services.coffee

@@ -173,9 +173,10 @@ class ServicesPage
           criteria you define. Send a command to the service and it runs
           on every system in the group.
         </p>
-        <input type="submit" id="blank-slate-add" value="Create a New Service"/>
+        <input type="submit" id="blank-slate-add" value="Add Service"/>
       </form>
     """).appendTo '#beta'
+    $('#blank-slate-add').remove() unless @api.user.permissions.services
     $('#blank-slate').submit =>
       this.drawEditor()
       false
@@ -218,6 +219,8 @@ class ServicesPage
     new Button '#add-service',    ICONS.plus
     new Button '#remove-service', ICONS.minus
 
+    $('#alpha-controls div').remove() unless @api.user.permissions.services
+
     this.drawBlankSlate()
 
     $('#add-service').click           => this.drawEditor()
@@ -272,7 +275,7 @@ class ServicesPage
               <input id="name" type="text"/>
               <p id="name-error" class="error"></p>
               <label for="syntax">Criteria</label>
-              <textarea id="syntax" placeholder="fqdn like 'www.*' and platform in ['fedora', 'mac_os_x']"></textarea>
+              <textarea id="syntax" placeholder="fqdn starts with 'www.' and platform is 'mac_os_x'"></textarea>
               <p id="syntax-status"></p>
             </fieldset>
           </section>

data/web/coffeescripts/setup.coffee

@@ -31,7 +31,7 @@ class SetupPage
       """).appendTo '#services'
       $('label', node).text service.name
     $('#services input[type="checkbox"]').val @selected.services if @selected
-    if @selected && !@selected.permissions['services']
+    if @selected && !@api.user.permissions.services
       $('#services input[type="checkbox"]').prop 'disabled', true
 
   findUsers: ->
@@ -48,17 +48,15 @@ class SetupPage
 
   userNode: (user) ->
     node = $("""
-      <li data-name="" data-jid="" id="#{user.jid}">
+      <li data-name="" data-jid="#{user.jid}" id="#{user.jid}">
         <span class="text"></span>
-        <span class="jid"></span>
+        <span class="jid">#{user.jid}</span>
       </li>
     """).appendTo '#users'
 
     name = this.userName(user)
     $('.text', node).text name
-    $('.jid', node).text user.jid
     node.attr 'data-name', name
-    node.attr 'data-jid', user.jid
     node.click (event) => this.selectUser event.currentTarget
     node
 
@@ -105,10 +103,18 @@ class SetupPage
         $('#beta-header').text 'Users'
         this.drawUsers()
         this.drawUserBlankSlate()
+        if @api.user.permissions.users
+          $('#beta-controls div').show()
+        else
+          $('#beta-controls div').hide()
       when 'systems-nav'
         $('#beta-header').text 'Systems'
         this.drawUsers()
         this.drawSystemBlankSlate()
+        if @api.user.permissions.systems
+          $('#beta-controls div').show()
+        else
+          $('#beta-controls div').hide()
 
   toggleForm: (form, fn) ->
     form = $(form)
@@ -136,6 +142,12 @@ class SetupPage
         $('#password-error').text 'Password must be at least 8 characters.'
         valid = false
 
+      # admin updating a user's password
+      if @session.bareJid() != @selected.jid
+        if password1 != password2
+          $('#password-error').text 'Passwords must match.'
+          valid = false
+
     else # new user
       if node == ''
         $('#user-name-error').text 'User name is required.'
@@ -160,7 +172,7 @@ class SetupPage
     valid
 
   saveUser: ->
-    return unless this.validateUser()
+    return false unless this.validateUser()
     user =
       jid: $('#jid').val()
       username: $('#user-name').val()
@@ -201,7 +213,7 @@ class SetupPage
     valid
 
   saveSystem: ->
-    return unless this.validateSystem()
+    return false unless this.validateSystem()
     user =
       jid: $('#jid').val()
       username: $('#user-name').val()
@@ -229,14 +241,18 @@ class SetupPage
 
   drawUserBlankSlate: ->
     $('#charlie').empty()
+    msg = if @api.user.permissions.users
+      'Select a user account to update or add a new user.'
+    else
+      'Select a user account to update.'
+
     $("""
       <form id="blank-slate">
-        <p>
-          Select a user account to edit or add a new user.
-        </p>
+        <p>#{msg}</p>
         <input type="submit" id="blank-slate-add" value="Add User"/>
       </form>
     """).appendTo '#charlie'
+    $('#blank-slate-add').remove() unless @api.user.permissions.users
     $('#blank-slate').submit =>
       this.drawUserEditor()
       false
@@ -252,6 +268,7 @@ class SetupPage
         <input type="submit" id="blank-slate-add" value="Add System"/>
       </form>
     """).appendTo '#charlie'
+    $('#blank-slate-add').remove() unless @api.user.permissions.systems
     $('#blank-slate').submit =>
       this.drawSystemEditor()
       false
@@ -295,6 +312,7 @@ class SetupPage
       </div>
       <div id="charlie" class="primary column x-fill y-fill"></div>
     """).appendTo '#container'
+
     this.drawUserBlankSlate()
 
     $('#setup li').click (event) => this.selectTask event
@@ -308,6 +326,9 @@ class SetupPage
     new Button '#add-user',    ICONS.plus
     new Button '#remove-user', ICONS.minus
 
+    $('#beta-controls div').hide() unless @api.user.permissions.users
+    $('#systems-nav').hide() unless @api.user.permissions.systems
+
     $('#add-user').click =>
       if $('#users-nav').hasClass 'selected'
         this.drawUserEditor()
@@ -326,7 +347,7 @@ class SetupPage
       list: '#users'
       icon: '#search-users-icon'
       form: '#search-users-form'
-      attrs: ['data-jid']
+      attrs: ['data-jid', 'data-name']
       open:  fn
       close: fn
 
@@ -402,7 +423,9 @@ class SetupPage
       """).prependTo '#jid-fields'
 
       $('#name').focus()
-
+      if @session.bareJid() != user.jid
+        $('#password1-label').text 'Password'
+        $('#password2-label').text 'Password Again'
       $('#jid').val user.jid
       $('#name').val user.name
       $('#user-name').val user.jid.split('@')[0]