tawork 0.0.21 → 0.0.22

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZWJiZDIzZWI5OWE4NzM5OTljMTFjODA0YmJkMWU4ODAzNTFmMjdmMA==
+  data.tar.gz: !binary |-
+    NWIxOTIxODQwOWVhYzViNzM3ZWY1NTYxOTYyYTgwOWU5NDI5YTdlZQ==
+SHA512:
+  metadata.gz: !binary |-
+    N2E3MDg0NGIwOWE4NmM5NmM5ZTAyYmYxYjRiYWQzMGE5OTBmMDgyNTU2Yjgx
+    ODk1NmZmYTA4MjM1MmUwYWJmNWMwM2YyY2UzNGU3ZmFjODRiMTYxOGI1N2Y0
+    M2E3OGY3Y2E3YTY3OGM5YmJjNmM2MWEwNDY2ZWNiNzVhYzQ4ZDI=
+  data.tar.gz: !binary |-
+    OWNmMmI1OTVlM2YyOTc1ZWIzNmYyNDkwNDFhMTJjNTBmZjYxZjBiMzNlMjEw
+    OTg1OWE3MzljYjY2YjQ2YzE4NWZlMDE1MTNhMTAyZjhiNTE1NzlhMWVjNDY1
+    OTk2NmI0YWU4YjhkODIzNjFmNjhlOTc5ZGYxNzdjOWVjNGE3N2I=

data/.gitignore

@@ -15,3 +15,4 @@
 /log/*.log
 /tmp
 tawork.git
+vendor/bundle

data/Gemfile

@@ -9,6 +9,11 @@ gem 'rails', "4.1.0.rc1"
 gem 'mysql2'
 gem 'bootstrap-sass'
 
+gem 'kaminari'
+gem 'elasticsearch',       git: 'git://github.com/elasticsearch/elasticsearch-ruby.git'
+gem 'elasticsearch-model', git: 'git://github.com/elasticsearch/elasticsearch-rails.git'
+gem 'elasticsearch-rails', git: 'git://github.com/elasticsearch/elasticsearch-rails.git'
+
 gem "haml-rails"
 gem 'haml-contrib'
 
@@ -22,8 +27,6 @@ gem 'acts-as-taggable-on'
 gem 'public_activity'
 gem 'diffy'
 gem 'gollum-lib'
-gem 'tire'
-gem 'kaminari'
 
 gem 'RedCloth'
 gem 'github-markdown'

data/Gemfile.lock

@@ -1,3 +1,26 @@
+GIT
+  remote: git://github.com/elasticsearch/elasticsearch-rails.git
+  revision: cdc175f21185692ad9df095f02a323a28f481b7d
+  specs:
+    elasticsearch-model (0.1.0)
+      activesupport (> 3)
+      elasticsearch (> 0.4)
+      hashie
+    elasticsearch-rails (0.1.0)
+
+GIT
+  remote: git://github.com/elasticsearch/elasticsearch-ruby.git
+  revision: 90d7511d14e8d50a29af5a390de0a24d842c6e9d
+  specs:
+    elasticsearch (1.0.1)
+      elasticsearch-api (= 1.0.1)
+      elasticsearch-transport (= 1.0.1)
+    elasticsearch-api (1.0.1)
+      multi_json
+    elasticsearch-transport (1.0.1)
+      faraday
+      multi_json
+
 GIT
   remote: git://github.com/rusanu/blockuijs-rails.git
   revision: 56e727429fa876fa03eade459404c98d74bf32e8
@@ -56,7 +79,6 @@ GEM
       rails (>= 3, < 5)
     ancestry (2.0.0)
       activerecord (>= 3.0.0)
-    ansi (1.4.3)
     arel (5.0.0)
     atomic (1.1.15)
     awesome_print (1.2.0)
@@ -102,6 +124,8 @@ GEM
     erubis (2.7.0)
     eventmachine (1.0.3)
     execjs (2.0.2)
+    faraday (0.9.0)
+      multipart-post (>= 1.2, < 3)
     font-awesome-rails (4.0.3.1)
       railties (>= 3.2, < 5.0)
     foreman (0.63.0)
@@ -135,7 +159,6 @@ GEM
       haml (>= 3.1, < 5.0)
       railties (>= 4.0.1)
     hashie (2.0.5)
-    hashr (0.0.22)
     hike (1.2.3)
     hirb (0.7.1)
     i18n (0.6.9)
@@ -170,6 +193,7 @@ GEM
     mini_portile (0.5.2)
     minitest (5.3.0)
     multi_json (1.9.0)
+    multipart-post (2.0.0)
     mysql2 (0.3.15)
     nokogiri (1.6.1)
       mini_portile (~> 0.5.0)
@@ -248,8 +272,6 @@ GEM
     rdoc (4.1.1)
       json (~> 1.4)
     redcarpet (3.1.1)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
     rouge (1.3.3)
     ruby-openid (2.5.0)
     sanitize (2.0.6)
@@ -285,14 +307,6 @@ GEM
     thread_safe (0.2.0)
       atomic (>= 1.1.7, < 2)
     tilt (1.4.1)
-    tire (0.6.2)
-      activemodel (>= 3.0)
-      activesupport
-      ansi
-      hashr (~> 0.0.19)
-      multi_json (~> 1.3)
-      rake
-      rest-client (~> 1.6)
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
@@ -323,6 +337,9 @@ DEPENDENCIES
   coffee-rails (~> 4.0.0)
   devise
   diffy
+  elasticsearch!
+  elasticsearch-model!
+  elasticsearch-rails!
   font-awesome-rails
   foreman
   github-markdown
@@ -351,6 +368,5 @@ DEPENDENCIES
   simple_form
   thin
   tinymce-rails!
-  tire
   turbolinks
   uglifier (>= 1.3.0)

data/app/assets/javascripts/global_search.js.coffee

@@ -1,6 +1,7 @@
 class window.GlobalSearch extends Backbone.View
   events:
     'keyup #global-search': 'search'
+    'submit form': "submit"
 
   initialize: (options = {}) -> 
     @$field = $("#global-search")
@@ -8,6 +9,9 @@ class window.GlobalSearch extends Backbone.View
     @$results.css
       right: @$field.offset().left - @$field.outerWidth() - @$results.outerWidth()
 
+  submit: (event) ->
+    false
+
   search: (event) ->
     value = $.trim @$field.val()
 

data/app/controllers/search_controller.rb

@@ -1,14 +1,7 @@
 class SearchController < ApplicationController
   def index
-    q = params[:term] + "*"
-    search_group = "spaces,pages,attachments"
-
-    query = Tire.search(search_group, load: true) do
-      query do
-        string q
-      end
-    end
-    @results = query.results
+    q = params[:term]
+    @searcher = Searcher.search q
 
     render layout: false
   end
@@ -60,4 +53,5 @@ class SearchController < ApplicationController
 
     json
   end
+
 end

data/app/models/attachment.rb

@@ -1,6 +1,6 @@
 class Attachment < ActiveRecord::Base
-  include Tire::Model::Search
-  include Tire::Model::Callbacks
+  include Elasticsearch::Model
+  include Elasticsearch::Model::Callbacks
 
   # after_save :save_to_git
   belongs_to :attachable, :polymorphic => true
@@ -69,6 +69,13 @@ class Attachment < ActiveRecord::Base
     end
   end
 
+  def as_indexed_json(options = {})
+    json = self.as_json
+    json[:tag] = [self.class.to_s.underscore]
+
+    json
+  end
+
   protected
 
   def wiki_attachment_data

data/app/models/page.rb

@@ -1,17 +1,20 @@
 class Page < ActiveRecord::Base
   include PublicActivity::Common
 
-  include Tire::Model::Search
-  include Tire::Model::Callbacks
-
-  mapping do
-    indexes :id,           :index    => :not_analyzed
-    indexes :ancestry,     :index    => :not_analyzed
-    indexes :title,        :analyzer => 'snowball', :boost => 100
-    indexes :body,         :analyzer => 'snowball'
-    indexes :tags,         :as       => "tag_list"
-    indexes :created_at,   :type => 'date', :include_in_all => false
-    indexes :updated_at,   :type => 'date', :include_in_all => false
+  include Elasticsearch::Model
+  include Elasticsearch::Model::Callbacks
+
+  settings do
+    mappings dynamic: 'false' do
+      indexes :id,           :index    => :not_analyzed
+      indexes :kind,         :as       => :type
+      indexes :ancestry,     :index    => :not_analyzed
+      indexes :title,        :analyzer => 'snowball', :boost => 100
+      indexes :body,         :analyzer => 'snowball'
+      indexes :tag,          :as       => 'tag_list'
+      indexes :created_at,   :type => 'date', :include_in_all => false
+      indexes :updated_at,   :type => 'date', :include_in_all => false
+    end
   end
  
   has_ancestry #touch: true
@@ -82,10 +85,10 @@ class Page < ActiveRecord::Base
     Page.where(id: (ancestor_ids + old_ancestor_ids).uniq).update_all(updated_at: Time.now)
   end
 
-  def to_indexed_json
+  def as_indexed_json(options = {})
     json = self.as_json
-    json[:tag] = self.tag_list
-    json.to_json
+    json[:tag] = self.tag_list << self.class.to_s.underscore
+    json
   end
 
   private

data/app/models/ticket.rb

@@ -2,8 +2,8 @@ class Ticket < ActiveRecord::Base
   include AASM
   include PublicActivity::Common
 
-  include Tire::Model::Search
-  include Tire::Model::Callbacks
+  # include Tire::Model::Search
+  # include Tire::Model::Callbacks
 
 
 

data/app/models/user.rb

@@ -1,6 +1,6 @@
 class User < ActiveRecord::Base
-  include Tire::Model::Search
-  include Tire::Model::Callbacks
+  # include Tire::Model::Search
+  # include Tire::Model::Callbacks
 
   # Include default devise modules. Others available are:
   # :confirmable, :lockable, :timeoutable and :omniauthable

data/app/views/layouts/_nav_header.html.haml

@@ -31,7 +31,7 @@
         %li
           #global-search-container
             %form.navbar-form
-              %input#global-search.form-control{type: "text", placeholder: "Search...", style: "width: 400px;"}
+              %input#global-search.form-control{type: "text", placeholder: "Search...", style: "width: 400px;", autocomplete: "off"}
             #global-search-results.hide
             :coffeescript
               view = new GlobalSearch(el: $("#global-search-container"))

data/app/views/search/index.html.haml

@@ -1,8 +1,8 @@
 %p
-  #{pluralize(@results.total, "item")} found
+  #{pluralize(@searcher.results.total, "item")} found
 
 %ul.results.list-unstyled
-  - @results.each_with_hit do |result, hit|
+  - @searcher.results_with_hits do |result, hit|
     %li.result
-      = render "#{hit['_type']}", result: result, hit: hit
+      = render "#{result.class.to_s.underscore}", result: result, hit: hit
 

data/config/application.rb

@@ -21,6 +21,8 @@ module Tawork
     # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
     # config.time_zone = 'Central Time (US & Canada)'
 
+    config.autoload_paths += %W(#{config.root}/lib)
+
     # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
     # config.i18n.default_locale = :de

data/config/initializers/elasticsearch.rb

@@ -1,9 +1,9 @@
 # create indices
-User.create_elasticsearch_index
-Project.create_elasticsearch_index
-Story.create_elasticsearch_index
-Task.create_elasticsearch_index
-Bug.create_elasticsearch_index
-Space.create_elasticsearch_index
-Page.create_elasticsearch_index
-Attachment.create_elasticsearch_index
+# User.create_elasticsearch_index
+# Project.create_elasticsearch_index
+# Story.create_elasticsearch_index
+# Task.create_elasticsearch_index
+# Bug.create_elasticsearch_index
+# Space.create_elasticsearch_index
+# Page.create_elasticsearch_index
+# Attachment.create_elasticsearch_index

data/lib/searcher.rb

@@ -0,0 +1,41 @@
+class Searcher
+  attr_reader :results
+
+  def initialize query
+    @query = query
+  end
+
+  def self.search query
+    searcher = Searcher.new query
+    searcher.search
+
+    searcher
+  end
+
+  def search
+    q = @query
+    q = q.split(" ").collect{|x| "_all:" + x + "*"}.join(" AND ")
+    client = Page.__elasticsearch__.client
+    search_group = "pages,attachments"
+    query = client.search index: search_group, 
+      size: 30,
+      q: q
+
+    @results = Hashie::Mash.new query['hits']
+  end
+
+  def results_with_hits 
+    grouped_results = {}
+
+    hits = @results.hits
+    hits.group_by(&:_type).each do |type, values|
+      klass = type.classify.constantize
+      ids = values.collect{|value| value._source.id }
+      grouped_results[type] = klass.find(ids).group_by(&:id)
+    end
+
+    hits.each do |hit|
+      yield grouped_results[hit._type][hit._source.id].first, hit
+    end
+  end
+end

data/lib/tawork/version.rb

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

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: tawork
 version: !ruby/object:Gem::Version
-  version: 0.0.21
-  prerelease: 
+  version: 0.0.22
 platform: ruby
 authors:
 - Adnan Ali
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-15 00:00:00.000000000 Z
+date: 2014-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -228,6 +225,7 @@ files:
 - db/seeds.rb
 - init.rb
 - lib/assets/.keep
+- lib/searcher.rb
 - lib/tasks/.keep
 - lib/tawork.rb
 - lib/tawork/engine.rb
@@ -302,27 +300,26 @@ files:
 homepage: ''
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Wiki and Tickets
 test_files: []
 has_rdoc: