Search

.travis.yml

@@ -1,6 +1,8 @@
 language: node_js
 
-services: mongodb
+services:
+  - mongodb
+  - elasticsearch
 
 before_install:
   - npm install -g grunt-cli

app.json

@@ -15,5 +15,5 @@
     "BUILDPACK_URL": "https://github.com/mbuchetics/heroku-buildpack-nodejs-grunt.git",
     "NODE_ENV": "production"
   },
-  "addons": ["mongohq", "mandrill"]
+  "addons": ["mongohq", "mandrill", "searchbox"]
 }

bower.json

@@ -27,7 +27,8 @@
     "fastclick": "~1.0.2",
     "gsap": "~1.13.1",
     "seedrandom": "~2.3.6",
-    "Sortable": "~0.3.0"
+    "Sortable": "~0.3.0",
+    "typeahead.js": "~0.10.5"
   },
   "exportsOverride": {
     "jquery.formParams": {

client/source/controllers/buckets_controller.coffee

@@ -55,7 +55,7 @@ module.exports = class BucketsController extends Controller
       compose: (options) ->
         @entries = new Entries
 
-        @entries.fetch( data: {bucket: bucket.get('slug'), status: ''}, processData: yes ).done =>
+        @entries.fetchWithParams( bucket: bucket.get('slug'), status: '' ).done =>
           @view = new EntriesBrowser
             collection: @entries
             bucket: bucket

client/source/helpers.coffee

@@ -37,7 +37,7 @@ Handlebars.registerHelper 'timeAgo', (dateTime) ->
   expanded = Handlebars.helpers.simpleDateTime dateTime
 
   new Handlebars.SafeString """
-    <span title="#{expanded}" class="show-tooltip">
+    <span title="#{expanded}" class="show-tooltip" data-placement="right">
       #{moment(dateTime).fromNow()}
     </span>
   """

client/source/models/entries.coffee

@@ -9,5 +9,8 @@ module.exports = class Entries extends Collection
     @url += "?#{$.param(bucketId: bucketId)}"
     @fetch()
 
+  fetchWithParams: (params={}) ->
+    @fetch({data: params}, processData: yes)
+
   comparator: (entry) ->
     - new Date(entry.get('publishDate')).getTime()

client/source/templates/buckets/dashboard.hbs

@@ -3,5 +3,8 @@
 <div class="row">
   <div class="col-md-6">
     <p class="lead">Buckets is an open-source CMS, built in Node.js, which is being actively developed by <a href="https://assembly.com/buckets" target="_blank">the community at Assembly</a>.</p>
+
+    <input type="search" name="search" class="form-control input-lg" placeholder="Search">
+
   </div>
 </div>

client/source/templates/entries/suggestion.hbs

@@ -0,0 +1 @@
+<span class="color-{{bucket.color}}">{{icon bucket.icon}}</span> <strong>{{title}}</strong> <br><span class="text-muted">{{timeAgo publishDate}}</span>

client/source/views/buckets/dashboard.coffee

@@ -1,6 +1,48 @@
+_ = require 'underscore'
+Chaplin = require 'chaplin'
 PageView = require 'views/base/page'
 
+mediator = require 'mediator'
+
+suggestionTpl = require 'templates/entries/suggestion'
 tpl = require 'templates/buckets/dashboard'
 
 module.exports = class DashboardView extends PageView
   template: tpl
+
+  events:
+    'typeahead:selected': 'selectItem'
+
+  render: ->
+    super
+
+    engine = new Bloodhound
+      datumTokenizer: Bloodhound.tokenizers.obj.whitespace('value')
+      queryTokenizer: Bloodhound.tokenizers.whitespace
+      prefetch: '/api/entries'
+      remote: '/api/entries/?query=%QUERY*'
+
+    engine.initialize()
+    engine.clearRemoteCache();
+
+    @$search = @$('[name="search"]').typeahead
+      highlight: yes
+    ,
+      name: 'entries',
+      displayKey: 'title'
+      templates: {
+          empty: """
+           <div class="tt-empty text-muted">
+              No matching entries.
+            </div>
+          """
+          suggestion: suggestionTpl
+        }
+      source: engine.ttAdapter()
+
+    _.defer => @$search.focus()
+
+  selectItem: (e, item) ->
+    Chaplin.utils.redirectTo 'buckets#browse',
+      slug: item.bucket.slug
+      entryID: item.id

client/style/index.styl

@@ -18,10 +18,9 @@ $sans = 'Avenir Next', Avenir, 'Helvetica Neue', Helvetica, 'Segoe UI', Segoe, R
 
 body
   background-color #fcfcfc
-  display table
   width 100%
+  overflow-x hidden
   display flex
-  min-height 100vh
   flex-direction column
 
 #bkts-content
@@ -157,3 +156,45 @@ input[type="text"].form-control, textarea.form-control
 .pageBreadcrumb
   margin 10px 0
   background-color #f1f1f1
+
+
+.tt-query
+  width 300px
+  outline none
+
+.tt-hint
+  color: #999
+
+.tt-highlight
+  background-color rgba(lighten($yellow, 30), .5)
+
+.tt-dropdown-menu
+  margin-top 12px
+  padding 2px 0
+  background-color #fff
+  border 1px solid #ccc
+  border 1px solid rgba(0, 0, 0, 0.2)
+  border-radius 2px
+  width 100%
+  color #555
+
+  .icon
+    vertical-align middle
+    display inline-block
+    font-size 24px
+
+.tt-suggestion
+  padding: 3px 20px
+  font-size: 18px
+  line-height: 24px
+
+.tt-suggestion.tt-cursor
+  color #222
+  background-color lighten($primary, 30)
+  cursor pointer
+
+.tt-suggestion p
+  margin: 0
+
+.tt-empty
+  padding: 3px 20px

migrations/20140810052927866_sync_with_es.coffee

@@ -0,0 +1,27 @@
+Bucket = require '../server/models/bucket'
+Entry = require '../server/models/entry'
+
+http = require 'http'
+config = require '../server/config'
+
+module.exports =
+  requiresDowntime: no # true or false
+
+  up: (done) ->
+    Entry.update {content: null}, {content: {}}, {multi: yes}, (e, entries) ->
+      throw e if e
+
+      Entry.createMapping (err) ->
+        throw e if e
+        stream = Entry.synchronize()
+        count = 0
+
+        stream.on 'data', (e, doc) -> count++
+        stream.on 'close', ->
+          console.log('Indexed ' + count + ' entries into ElasticSearch')
+          done()
+
+        stream.on 'error', (e) -> throw e
+
+  down: (done) ->
+    done()

package.json

@@ -18,7 +18,7 @@
   "author": "David Kaneda <dk@morfunk.com> (http://www.davidkaneda.com)",
   "license": "AGPL-3.0",
   "bugs": {
-    "url": "https://assemblymade.com/buckets/wips"
+    "url": "https://assembly.com/buckets/wips"
   },
   "keywords": [
     "cms",
@@ -78,6 +78,7 @@
     "inflection": "^1.3.6",
     "marked": "^0.3.2",
     "moment": "^2.7.0",
+    "mongoosastic": "^0.4.0",
     "mongoose": "^3.8.15",
     "mongoose-regexp": "0.0.1",
     "mongoose-unique-validator": "^0.3.0",

server/config.coffee

@@ -14,6 +14,9 @@ config =
     catchAll: yes
     autoStart: yes
     db: "mongodb://localhost/buckets_#{env}"
+    elasticsearch:
+      url: process.env.SEARCHBOX_SSL_URL || 'http://127.0.0.1:9200'
+      index: "buckets_entries_#{env}"
   production:
     smtp:
       service: 'Mandrill'

server/models/bucket.coffee

@@ -8,7 +8,6 @@ db = require '../lib/database'
 fieldSchema = new mongoose.Schema
   name:
     type: String
-    unique: no
     required: yes
   slug:
     type: String
@@ -21,8 +20,7 @@ fieldSchema = new mongoose.Schema
     required: yes
   settings: mongoose.Schema.Types.Mixed
 
-fieldSchema
-  .path 'slug'
+fieldSchema.path 'slug'
   .validate (val) ->
     val not in [
       'title'
@@ -58,12 +56,30 @@ bucketSchema = new mongoose.Schema
     required: yes
   icon:
     type: String
-    enum: ['edit', 'photos', 'calendar', 'movie', 'music-note', 'map-pin', 'quote', 'artboard', 'contacts-1']
+    enum: [
+      'edit'
+      'photos'
+      'calendar'
+      'movie'
+      'music-note'
+      'map-pin'
+      'quote'
+      'artboard'
+      'contacts-1'
+    ]
     default: 'edit'
     required: yes
   color:
     type: String
-    enum: ['teal', 'purple', 'red', 'yellow', 'blue', 'orange', 'green']
+    enum: [
+      'teal'
+      'purple'
+      'red'
+      'yellow'
+      'blue'
+      'orange'
+      'green'
+    ]
     default: 'teal'
     required: yes
   urlPattern: String
@@ -95,7 +111,7 @@ bucketSchema.path('urlPattern').validate (value) ->
 bucketSchema.plugin uniqueValidator, message: '“{VALUE}” is already taken.'
 
 bucketSchema.post 'remove', ->
-  @model('Entry').remove(bucket: @_id).exec()
+  @model('Entry').find(bucket: @_id).remove().exec()
 
 bucketSchema.methods.getMembers = (callback) ->
   @model('User').find