carte-server 0.0.23 → 0.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0423f8aecc07a944fb1faf5c5bb2af43c106493
-  data.tar.gz: d68c7838e9d0af04b83db3e4a92945cbb0bad565
+  metadata.gz: 78815b0f269198095f1608e9a498820bb5d0c771
+  data.tar.gz: 8d2833dc30b92f2bca88f3c865333f3dc6edf4ca
 SHA512:
-  metadata.gz: de01034eff57261dbc18adb567f0996c5b71a80309179175584b94d7a77528733cbc55ed0b21dfe2320023082e094465954a8db221f9e2d5b37bf7b8a4461dc6
-  data.tar.gz: 9f6df969ae49d51467b1a8671c216ab4e9d9dbe743372673e366514d9c1d4a4302356ec704a49a02f4bfa6f59dac93316b93e2a57fcc8f3355eecfb931e54c73
+  metadata.gz: ab54463ad01c2b6f1a1e3b98e71077f33997c539a7b38ec27bb9e27df448ce70e5fd8d6044bb15ffaf2b425542e5428e57652e3d56ba683d01947af1ffc092cb
+  data.tar.gz: ae2b69ccf3300a2b96cdf02d5340774e55f0a91e8dff0f3d52c62fa7606ed993e049e99189c0ac60663556b77d2adb4e58d71924d7e6faa1102b18747f32a56b

data/.buildpacks

@@ -0,0 +1,2 @@
+https://github.com/heroku/heroku-buildpack-nodejs.git
+https://github.com/heroku/heroku-buildpack-ruby.git

data/.gitignore

@@ -1,6 +1,5 @@
 /.bundle/
 /.yardoc
-/Gemfile.lock
 /_yardoc/
 /coverage/
 /doc/

data/.travis.yml

@@ -0,0 +1,14 @@
+language: ruby
+rvm:
+- 2.0.0
+- 1.9.3
+#- jruby-19mode
+#- rbx-2
+deploy:
+  provider: heroku
+  api_key:
+    secure: kLO43BYTj0Uo1fGJPYvO0CHZMWBRF2s0nN4SdxkKpHVNlYVPMnuU13s38TVzrFxvoGlUVqJ0UWJ0SFgEpLbLGZ/31rXkS+y+89Ul4qgL8AaC5gEKZE6vQ/b9V7i4Vd3BkUaEEhh2gvv6zwmH/o82/tKS6H8hoktHDNbfuSSCKuY=
+  app: carte-test
+  on:
+    repo: tily/carte
+  run: bundle exec rspec spec/

data/Gemfile.lock

@@ -0,0 +1,120 @@
+PATH
+  remote: .
+  specs:
+    carte-server (0.0.23)
+      activesupport
+      haml
+      mongoid
+      mongoid-geospatial
+      mongoid-simple-tags
+      mongoid_auto_increment_id (= 0.6.5)
+      pry
+      redcarpet
+      rspec
+      sinatra
+      sinatra-contrib
+      will_paginate_mongoid
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (4.2.1)
+      activesupport (= 4.2.1)
+      builder (~> 3.1)
+    activesupport (4.2.1)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    backports (3.6.4)
+    bson (2.3.0)
+    builder (3.2.2)
+    coderay (1.1.0)
+    connection_pool (2.2.0)
+    diff-lcs (1.2.5)
+    haml (4.0.6)
+      tilt
+    httparty (0.13.3)
+      json (~> 1.8)
+      multi_xml (>= 0.5.2)
+    i18n (0.7.0)
+    json (1.8.2)
+    method_source (0.8.2)
+    minitest (5.6.1)
+    mongoid (4.0.2)
+      activemodel (~> 4.0)
+      moped (~> 2.0.0)
+      origin (~> 2.1)
+      tzinfo (>= 0.3.37)
+    mongoid-geospatial (4.0.1)
+      mongoid (>= 4.0.0)
+    mongoid-simple-tags (0.1.3)
+      json (~> 1.8)
+      mongoid (>= 3.0.3)
+    mongoid_auto_increment_id (0.6.5)
+      mongoid (>= 3.1.0, < 4.1.0)
+    moped (2.0.4)
+      bson (~> 2.2)
+      connection_pool (~> 2.0)
+      optionable (~> 0.2.0)
+    multi_json (1.11.0)
+    multi_xml (0.5.5)
+    optionable (0.2.0)
+    origin (2.1.1)
+    pry (0.10.1)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    rack (1.6.0)
+    rack-protection (1.5.3)
+      rack
+    rack-test (0.6.3)
+      rack (>= 1.0)
+    rake (10.4.2)
+    redcarpet (3.2.3)
+    rspec (3.2.0)
+      rspec-core (~> 3.2.0)
+      rspec-expectations (~> 3.2.0)
+      rspec-mocks (~> 3.2.0)
+    rspec-core (3.2.3)
+      rspec-support (~> 3.2.0)
+    rspec-expectations (3.2.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.2.0)
+    rspec-mocks (3.2.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.2.0)
+    rspec-support (3.2.2)
+    shotgun (0.9.1)
+      rack (>= 1.0)
+    sinatra (1.4.6)
+      rack (~> 1.4)
+      rack-protection (~> 1.4)
+      tilt (>= 1.3, < 3)
+    sinatra-contrib (1.4.2)
+      backports (>= 2.0)
+      multi_json
+      rack-protection
+      rack-test
+      sinatra (~> 1.4.0)
+      tilt (~> 1.3)
+    slop (3.6.0)
+    thread_safe (0.3.5)
+    tilt (1.4.1)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+    will_paginate (3.0.7)
+    will_paginate_mongoid (2.0.1)
+      mongoid
+      will_paginate (~> 3.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 1.7)
+  carte-server!
+  httparty
+  rake (~> 10.0)
+  shotgun

data/Procfile

@@ -0,0 +1 @@
+web: gulp build && rackup -p $PORT

data/README.md

@@ -1,7 +1,7 @@
 # Carte
 
-[![npm version](https://badge.fury.io/js/carte-client.svg)](http://badge.fury.io/js/carte-client)
-[![gem Version](https://badge.fury.io/rb/carte-server.svg)](http://badge.fury.io/rb/carte-server)
+* client: [![npm version](https://badge.fury.io/js/carte-client.svg)](http://badge.fury.io/js/carte-client) [![npm dependencies](https://david-dm.org/tily/carte.svg)](https://david-dm.org/tily/carte)
+* server: [![gem version](https://badge.fury.io/rb/carte-server.svg)](http://badge.fury.io/rb/carte-server) [![Code Climate](https://codeclimate.com/github/tily/carte/badges/gpa.svg)](https://codeclimate.com/github/tily/carte) [![Build Status](https://travis-ci.org/tily/carte.svg?branch=master)](https://travis-ci.org/tily/carte)
 
 Something like dictionary, wiki, or information card.
 

data/Rakefile

@@ -1,3 +1,4 @@
 require "bundler/gem_tasks"
 require "carte/server/tasks"
 Carte::Server.configure { Mongoid.load!('mongoid.yml') }
+task(:default) { exit 0 }

data/carte.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "shotgun"
-  spec.add_development_dependency "rspec"
+  #spec.add_development_dependency "rspec"
   spec.add_development_dependency "httparty"
   
   spec.add_dependency "sinatra"
@@ -35,4 +35,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "mongoid-geospatial"
   spec.add_dependency "redcarpet"
   spec.add_dependency "pry"
+  spec.add_dependency "rspec"
 end

data/lib/carte/client/views/header.cjsx

@@ -12,6 +12,7 @@ module.exports = React.createClass
 
   getInitialState: ()->
     searchText: ''
+    isCheckedIncludeContent: false
 
   componentWillMount: ()->
     console.log 'header mounted'
@@ -32,6 +33,8 @@ module.exports = React.createClass
         if @props.router.query.title
           searchText.push @props.router.query.title
         @setState searchText: searchText.join(' ')
+        if @props.router.query.content
+          @setState isCheckedIncludeContent: true
         @forceUpdate()
     @props.router.on "route", @callback
 
@@ -39,24 +42,34 @@ module.exports = React.createClass
     console.log 'componentWillMount un'
     @props.router.off "route", @callback
 
+  onChangeIncludeContent: (event)->
+    @setState isCheckedIncludeContent: !@state.isCheckedIncludeContent, ()=>
+      @search() if @state.searchText != ''
+
   onChangeSearchText: (event)->
     @setState searchText: event.target.value
 
-  onKeyPressSearchText: (event)->
+  onKeyDownSearchText: (event)->
+    console.log 'press', event
     if event.keyCode == 13 # ENTER
       console.log '13 enter'
       event.preventDefault()
-      tags = []
-      titles = []
-      for searchText in @state.searchText.split(' ')
-        if match = searchText.match(/^#(.+)/)
-          tags.push(match[1])
-        else
-          titles.push(searchText)
-      query = {}
-      query.title = titles.join(' ') if titles.length > 0
-      query.tags = tags.join(',') if tags.length > 0
-      location.hash = '/?' + $.param(query)
+      @search()
+
+  search: ->
+    console.log @state
+    tags = []
+    titles = []
+    for searchText in @state.searchText.split(' ')
+      if match = searchText.match(/^#(.+)/)
+        tags.push(match[1])
+      else
+        titles.push(searchText)
+    query = {}
+    query.title = titles.join(' ') if titles.length > 0
+    query.content = titles.join(' ') if titles.length > 0 && @state.isCheckedIncludeContent
+    query.tags = tags.join(',') if tags.length > 0
+    location.hash = '/?' + $.param(query)
 
   render: ->
     <nav className="navbar navbar-default" style={{padding:"0px",backgroundColor:"white",marginBottom:"5px"}}>
@@ -72,7 +85,13 @@ module.exports = React.createClass
         <div>
           <form className="navbar-form navbar-left" role="search">
             <div className="form-group">
-              <input type="text" className="form-control" value={@state.searchText} onChange={@onChangeSearchText} onKeyPress={@onKeyPressSearchText} placeholder='Search ...' />
+              <input type="text" className="form-control" value={@state.searchText} onChange={@onChangeSearchText} onKeyDown={@onKeyDownSearchText} placeholder='Search ...' />
+            </div>
+            &nbsp;
+            <div className="checkbox">
+              <label>
+                <input type="checkbox" checked={@state.isCheckedIncludeContent} onChange={@onChangeIncludeContent} /> Include content
+              </label>
             </div>
           </form>
           <ul className="nav navbar-nav navbar-right">

data/lib/carte/client/views/list.cjsx

@@ -57,12 +57,16 @@ module.exports = React.createClass
             </ul>
           </div>
           <div className="col-sm-4" style={{padding:"0px"}}>
-            {
-              if @props.cards.pagination
-                <a href="javascript:void(0)" className="center-block text-center" style={padding:'6px 12px'}>
-                  <span className="badge text-center" style={backgroundColor:'#333'}>{@props.cards.pagination.total_entries}</span>
-                </a>
-            }
+            <a href="javascript:void(0)" className="center-block text-center" style={padding:'6px 12px'}>
+              <span className="badge text-center" style={backgroundColor:'#333'}>
+                {
+                  if @props.cards.pagination
+                    @props.cards.pagination.total_entries
+                  else
+                    <i className="glyphicon glyphicon-refresh glyphicon-refresh-animate" />
+                }
+              </span>
+            </a>
           </div>
           <div className="col-sm-4" style={{padding:"0px"}}>
             {

data/lib/carte/server.rb

@@ -41,16 +41,20 @@ module Carte
         else
           cards = Card.send(order, sort)
         end
+        conditions = []
         if title = params[:title]
-          cards = cards.any_of({title: /#{title}/i})
+          conditions << {title: /#{title}/i}
+        end
+        if content = params[:content]
+          conditions << {content: /#{content}/i}
+        end
+        if conditions.size > 0
+          cards = cards.any_of(conditions)
         end
         if params[:tags]
           tags = params[:tags].split(',')
           cards = cards.tagged_with_all(tags)
         end
-        if content = params[:content]
-          cards = cards.any_of({content: /#{content}/i})
-        end
         cards = cards.paginate(per_page: 9, page: params[:page])
       end
 
@@ -68,7 +72,7 @@ module Carte
     get '/cards.json' do
       cards = search(params)
       {
-        cards: cards.as_json(only: %w(title content version tags)),
+        cards: cards.map {|card| card.as_json(only: %w(title content tags)).update(version: card.version) },
         pagination: {current_page: cards.current_page, total_pages: cards.total_pages, total_entries: cards.total_entries}
       }.to_json
     end

data/lib/carte/server/models/history.rb

@@ -13,7 +13,7 @@ module Carte
         before_create do
           self.title = self.card.title
           self.content = self.card.content
-          self.version = self.card.version
+          self.version = self.card.version - 1
           self.tags = self.card.tags
         end
       end

data/package.json

@@ -1,7 +1,7 @@
 {
   "name": "carte-client",
   "description": "something like dictionary, wiki, or information card",
-  "version": "0.0.23",
+  "version": "0.0.24",
   "main": "lib/carte.coffee",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"

data/spec/server_spec.rb

@@ -8,14 +8,14 @@ class Carte::Server
   end
 end
 
-class DictionaryClient
+class CarteClient
   include HTTParty
-  base_uri 'http://localhost:9393/api/'
+  base_uri ENV['CARTE_API_ENDPOINT'] || 'http://localhost:9393/api/'
   format :json
 end
 
 def client
-  @client ||= DictionaryClient
+  @client ||= CarteClient
 end
 
 describe 'API' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carte-server
 version: !ruby/object:Gem::Version
-  version: 0.0.23
+  version: 0.0.24
 platform: ruby
 authors:
 - tily
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-09 00:00:00.000000000 Z
+date: 2015-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,20 +52,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
@@ -234,6 +220,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: something like dictionary, wiki, or information card
 email:
 - tidnlyam@gmail.com
@@ -241,11 +241,15 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .buildpacks
 - .gitignore
 - .rspec
+- .travis.yml
 - Dockerfile
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
+- Procfile
 - README.md
 - Rakefile
 - carte.gemspec