tawork 0.0.22 → 0.0.23

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZWJiZDIzZWI5OWE4NzM5OTljMTFjODA0YmJkMWU4ODAzNTFmMjdmMA==
+    YzE1NTgxMWQxYjI4MTJkMGJlYjEwM2U4YTY2ZWQ3OGVkMDE0NWRiNw==
   data.tar.gz: !binary |-
-    NWIxOTIxODQwOWVhYzViNzM3ZWY1NTYxOTYyYTgwOWU5NDI5YTdlZQ==
+    ZTcwMzg0NzBkOTQ0NWRkNDNmMDcwM2Q1ZTVhZTlkMGM3ZGRjNmE4YQ==
 SHA512:
   metadata.gz: !binary |-
-    N2E3MDg0NGIwOWE4NmM5NmM5ZTAyYmYxYjRiYWQzMGE5OTBmMDgyNTU2Yjgx
-    ODk1NmZmYTA4MjM1MmUwYWJmNWMwM2YyY2UzNGU3ZmFjODRiMTYxOGI1N2Y0
-    M2E3OGY3Y2E3YTY3OGM5YmJjNmM2MWEwNDY2ZWNiNzVhYzQ4ZDI=
+    MGExNzkxNWY4ODExNTJkNGZmMWVkNDAyM2QxNTkxMTM3NjBlMjk1ZWVmZDc2
+    MDllZTBhY2ZjZTc0OWUyYTY0ZTk4NzVmNmJhMDgwOWUzZjFiMjkzNTMxMjdl
+    NThlMmZlNDU4NTQ2ZjAwODU4YTk5NmQ0NjQ5NTUyYmNiNTU4MDA=
   data.tar.gz: !binary |-
-    OWNmMmI1OTVlM2YyOTc1ZWIzNmYyNDkwNDFhMTJjNTBmZjYxZjBiMzNlMjEw
-    OTg1OWE3MzljYjY2YjQ2YzE4NWZlMDE1MTNhMTAyZjhiNTE1NzlhMWVjNDY1
-    OTk2NmI0YWU4YjhkODIzNjFmNjhlOTc5ZGYxNzdjOWVjNGE3N2I=
+    NDkzMzZiOWI4NDZkYzdjYzVjMjM0MDNiMzhkMzUxMWVmNzBlYjIxMDdhMTM0
+    NzM5N2FhYTYzOTZlMGM5NDViOGJkMzI4N2JmZmYyYjRhYWFkMmE1OWVlOTFi
+    NDkxY2QyZmVmNzBmNWUwNjNhYWFjMDZiOTI0YTljYWM1ZmZlOGY=

data/app/controllers/search_controller.rb

@@ -1,7 +1,7 @@
 class SearchController < ApplicationController
   def index
     q = params[:term]
-    @searcher = Searcher.search q
+    @searcher = Searcher.search query: q
 
     render layout: false
   end
@@ -9,44 +9,44 @@ class SearchController < ApplicationController
   def mentions
     q = params[:query]
     delimiter = params[:delimiter]
-    search_group = "spaces,pages,projects,bugs,tasks,stories,users,attachments"
 
+    search_group = "pages,attachments"
     if delimiter == "!"
       search_group = "attachments"
     end
 
-    query = Tire.search(search_group) do
-      query do
-        boolean do
-          should { string "title:#{q}*" }
-          should { string "filename:#{q}*" }
-          should { string "name:#{q}*" }
-          should { string "email:#{q}*" }
-        end
-      end
-    end
+    q = ["title:#{q}*", "filename:#{q}*", "name:#{q}*", "email:#{q}*"].join(" OR ")
+    @searcher = Searcher.search q: q, search_group: search_group
 
-    render json: query.results.map{|result| process_result(result) }
+    results = []
+    @searcher.results_with_hits{|result, hit| results << process_result(result, hit) }
+    render json: results
   end
 
   protected
 
   #TODO: dirty. fix.
-  def process_result(result)
+  def process_result(result, hit)
     json = {}
-    json[:type] = result._type
-    if ["space", "page"].include?(result._type)
+    json[:type] = result.class.to_s.underscore
+    if ["space", "page"].include?(hit._type)
       json[:name] = result.title
       json[:url] = wiki_page_url(result.id)
-      json[:space] = result.load.root.title
-    elsif ["project", "bug", "task", "story"].include?(result._type)
+      json[:space] = result.root.title
+      if json[:type] == "space"
+        json[:icon] = "fa-bullseye"
+      else
+        json[:icon] = "fa-file"
+      end
+    elsif ["project", "bug", "task", "story"].include?(hit._type)
       json[:name] = result.title
       json[:url] = ticket_url(result.id)
-      json[:project] = result.load.root.title
-    elsif result._type == "attachment"
+      json[:project] = result.root.title
+    elsif hit._type == "attachment"
       json[:name] = result.filename
       json[:url] = attachment_url(result.id)
-    elsif result._type == "user"
+      json[:icon] = "fa-paperclip"
+    elsif hit._type == "user"
       json[:name] = result.name
       json[:email] = result.email
     end

data/app/models/attachment.rb

@@ -6,6 +6,17 @@ class Attachment < ActiveRecord::Base
   belongs_to :attachable, :polymorphic => true
   validates_presence_of :attachable
 
+  settings do
+    mappings dynamic: 'false' do
+      indexes :id,           :index    => :not_analyzed
+      indexes :type,         :as       => :type, :boost => 100
+      indexes :filename,     :analyzer => 'snowball', :boost => 100
+      indexes :content_type, :analyzer => 'snowball'
+      indexes :created_at,   :type => 'date', :include_in_all => false
+      indexes :updated_at,   :type => 'date', :include_in_all => false
+    end
+  end
+
   def self.create_from_uploaded_file(file, user, options = {})
     filename = file.original_filename
     attachment = Attachment.create( options.merge(
@@ -71,7 +82,7 @@ class Attachment < ActiveRecord::Base
 
   def as_indexed_json(options = {})
     json = self.as_json
-    json[:tag] = [self.class.to_s.underscore]
+    json[:type] = self.class.to_s.underscore
 
     json
   end

data/app/models/page.rb

@@ -7,7 +7,7 @@ class Page < ActiveRecord::Base
   settings do
     mappings dynamic: 'false' do
       indexes :id,           :index    => :not_analyzed
-      indexes :kind,         :as       => :type
+      indexes :type,         :as       => :type, :boost => 100
       indexes :ancestry,     :index    => :not_analyzed
       indexes :title,        :analyzer => 'snowball', :boost => 100
       indexes :body,         :analyzer => 'snowball'
@@ -87,7 +87,9 @@ class Page < ActiveRecord::Base
 
   def as_indexed_json(options = {})
     json = self.as_json
-    json[:tag] = self.tag_list << self.class.to_s.underscore
+    json[:body] = Nokogiri::HTML(self.body || "").text
+    json[:tag] = self.tag_list 
+    json[:type] = self.class.to_s.underscore
     json
   end
 

data/app/views/wiki/pages/_display.html.haml

@@ -118,7 +118,7 @@
               text = item.type + ": " + item.project + " -> " + item.name
 
             return '<li>' +
-              '<a href="javascript:;"><span>' + text + '</span></a>' +
+              '<a href="javascript:;"><i style="margin: 0 4px;" class="fa ' + (item.icon or "") + '"/><span>' + text + '</span></a>' +
               '</li>'
           insert: (item, delimiter) ->
             $html = $("<span>").text(item.name)

data/lib/searcher.rb

@@ -1,12 +1,19 @@
 class Searcher
   attr_reader :results
 
-  def initialize query
-    @query = query
+  def initialize options = {}
+    @options = options
+
+    @query = options[:query]
+    @q = options[:q]
+
+    @search_group = options[:search_group] || "pages,attachments"
+    @type = options[:type]
+    @comparator = options[:comparator] || "AND"
   end
 
-  def self.search query
-    searcher = Searcher.new query
+  def self.search options = {}
+    searcher = Searcher.new options
     searcher.search
 
     searcher
@@ -14,9 +21,18 @@ class Searcher
 
   def search
     q = @query
-    q = q.split(" ").collect{|x| "_all:" + x + "*"}.join(" AND ")
+
+    if @q
+      q = @q
+    else
+      q = q.split(" ").collect{|x| "_all:" + x + "*"}.join(" #{@comparator} ")
+    end
+
+    if @type
+      q = "(#{q}) AND type:#{@type}"
+    end
+
     client = Page.__elasticsearch__.client
-    search_group = "pages,attachments"
     query = client.search index: search_group, 
       size: 30,
       q: q
@@ -38,4 +54,8 @@ class Searcher
       yield grouped_results[hit._type][hit._source.id].first, hit
     end
   end
+
+  def search_group
+    @search_group
+  end
 end

data/lib/tawork/version.rb

@@ -1,3 +1,3 @@
 module Tawork
-  VERSION = '0.0.22'
+  VERSION = '0.0.23'
 end

data/vendor/assets/javascripts/tinymce/mention/plugin.js

@@ -194,7 +194,7 @@
             var rtePosition = $(container).offset();
             var contentAreaPosition = $(this.editor.getContentAreaContainer() || this.editor.bodyElement).position();
             var nodePosition = $(this.editor.dom.select('span#autocomplete')).position();
-            var top = rtePosition.top + nodePosition.top + $(this.editor.selection.getNode()).innerHeight() - $(this.editor.getDoc()).scrollTop() + 5;
+            var top = rtePosition.top + nodePosition.top + $(this.editor.selection.getNode()).innerHeight(); // - $(this.editor.getDoc()).scrollTop() + 5;
             var left = rtePosition.left + nodePosition.left;
 
             this.$dropdown = $(this.renderDropdown())

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tawork
 version: !ruby/object:Gem::Version
-  version: 0.0.22
+  version: 0.0.23
 platform: ruby
 authors:
 - Adnan Ali