carte-server 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0bfef4c6ba86e6cce646264ebf2e52818ec097f
-  data.tar.gz: 693f0efaf70c3ec9b5e35e5b5c20838f1a51cdb3
+  metadata.gz: 05fe3f4e42f3d067dbac24787cab7c81c131d10d
+  data.tar.gz: d6d15321dddf1b368e836d3a1a65762c03c7e85f
 SHA512:
-  metadata.gz: d679b7217daad508664271b41e9238433cc56d49ee1f335113489c2f8b6afcaffd98be5e38f11fd2c854b066939a847e61880876a201b4d2a9f2f2d27205601f
-  data.tar.gz: b3c674856434d6a70e069a23c419b4c0a26977647325ca81503e5cd08f2c659ad5babed67de1c89883088a87535b85e5cb8a1a11dcbeb04f4545f12be052307e
+  metadata.gz: 63aa6e882126fd60d9d878326af349a847219bcfd0dd554dbf80e234648b7df3181b7bf31dc3546879e041f0444cb9b2a274a5730c6cd37318a86ebe3c7bdfb5
+  data.tar.gz: ecd5f98f70dd2f6bb6e39251208abe70b96b39222022dde21754403b257d2f1e1e8230213089c63b30c2bf561bdf663e576ad93973fbbce96637b97e045932c2

data/carte.gemspec

@@ -31,4 +31,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "will_paginate_mongoid"
   spec.add_dependency "activesupport"
   spec.add_dependency "haml"
+  spec.add_dependency "mongoid-simple-tags"
 end

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

@@ -30,7 +30,7 @@ module.exports = React.createClass
     console.log 'Card: render'
     <div className='col-sm-4 col-xs-12 list-group' style={marginBottom:'0px',padding:"5px"} onMouseOver={@onMouseOver} onMouseLeave={@onMouseLeave}>
         <div className='list-group-item' style={height:'220px'}>
-          <div>
+          <div style={marginBottom:'10px'}>
             {
               if @props.card.get('focused')
                 <i className='glyphicon glyphicon-star' style={marginRight:'5px'} />
@@ -51,8 +51,15 @@ module.exports = React.createClass
               </a>
             </span>
           </div>
-          <div style={overflow:'hidden',width:'100%',height:'80%',wordWrap:'break-word'}>
-            <p dangerouslySetInnerHTML={__html: markdownIt.render @props.card.get('content')} />
+          <div style={overflow:'hidden',width:'100%',height:'75%',wordWrap:'break-word'}>
+            <div dangerouslySetInnerHTML={__html: markdownIt.render @props.card.get('content')} />
+          </div>
+          <div style={{visibility: if @isSafariOrUiWebView || @state.showTools then 'visible' else 'hidden'}}>
+          {
+            if @props.card.get("tags")
+              @props.card.get("tags").map (tag)->
+                <span className="pull-right tools">&nbsp;&nbsp;<a href={"/#/?tags=" + tag}><i className="glyphicon glyphicon-tag" />&nbsp;{tag}</a></span>
+          }
           </div>
       </div>
     </div>

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

@@ -1,16 +1,20 @@
 # @cjsx React.DOM 
 $ = require('jquery')
-React = require('react')
+React = require('react/addons')
 Modal = require('react-bootstrap/lib/Modal')
 Button = require('react-bootstrap/lib/Button')
+TagsInput = require('react-tagsinput')
 
 module.exports = React.createClass
+  mixins: [React.addons.LinkedStateMixin]
+
   displayName: 'Edit'
 
   getInitialState: ()->
     updating: false
     title: @props.card.get('title')
     content: @props.card.get('content')
+    tags: @props.card.get('tags') || []
     errors: false
 
   onChangeTitle: ->
@@ -23,9 +27,9 @@ module.exports = React.createClass
     event.preventDefault()
     @setState updating: true
     if @props.card.isNew()
-      attributes = {title: @state.title, content: @state.content}
+      attributes = {title: @state.title, content: @state.content, tags: @state.tags}
     else
-      attributes = {new_title: @state.title, content: @state.content}
+      attributes = {new_title: @state.title, content: @state.content, tags: @state.tags}
     @props.card.save attributes,
       success: ()=>
         @setState updating: false
@@ -61,6 +65,10 @@ module.exports = React.createClass
           <label class="control-label">Content</label>
           <textarea rows="10" className="form-control" value={@state.content} onChange={@onChangeContent} disabled={@state.updating} />
         </div>
+        <div className="form-group">
+          <label class="control-label">Tags</label>
+          <TagsInput ref='tags' valueLink={this.linkState('tags')} />
+        </div>
         <div className="form-group" style={{paddingBottom:'17px'}}>
           <button className="btn btn-default pull-right" onClick={@onClickOk} disabled={@state.updating}>
             &nbsp;

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

@@ -38,6 +38,11 @@ module.exports = React.createClass
     query = $.extend query, {page: page}
     $.param(query)
 
+  tagParam: (tag)->
+    query = $.extend {}, @props.cards.query
+    query = $.extend query, {tags: tag}
+    $.param(query)
+
   render: ->
     console.log 'render', @props.cards.query
     <div className="container" style={{paddingLeft:"5px",paddingRight:"5px"}}>
@@ -48,6 +53,11 @@ module.exports = React.createClass
               <li><a href={"/#/?" + @atozParam()} style={{padding:'6px 12px',fontWeight: if @props.cards.query.sort == 'title' and @props.cards.query.order != 'random' then 'bold' else 'normal'}}>A to Z</a></li>
               <li><a href={"/#/?" + @latestParam()} style={{padding:'6px 12px',fontWeight: if @props.cards.query.sort == 'updated_at' and @props.cards.query.order != 'random' then 'bold' else 'normal'}}>Latest</a></li>
               <li><a href={"/#/?" + @randomParam()} style={{padding:'6px 12px',fontWeight: if @props.cards.query.order == 'random' then 'bold' else 'normal'}}>Random</a></li>
+              {
+                if @props.cards.query.tags
+                  @props.cards.query.tags.split(',').map (tag)->
+                    <li><a href={"/#/?" + @tagParam()} style={padding:'6px 12px'}><i className="glyphicon glyphicon-tag" />&nbsp;{tag}</a></li>
+              }
             </ul>
           </div>
           <div className="col-sm-6" style={{padding:"0px"}}>

data/lib/carte/server.rb

@@ -3,6 +3,7 @@ require 'sinatra/namespace'
 require 'mongoid'
 require 'mongoid_auto_increment_id'
 require 'will_paginate_mongoid'
+require 'mongoid-simple-tags'
 require 'carte/server/models'
 
 module Carte
@@ -33,6 +34,10 @@ module Carte
         if title = params[:title]
           cards = cards.any_of({title: /#{title}/})
         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}/})
         end
@@ -60,18 +65,18 @@ module Carte
           current_page = cards.current_page.to_i
           total_pages = cards.total_pages
         end
-        cards = cards.map {|card| {id: card.id, title: card.title, content: card.content, version: card.version}}
+        cards = cards.map {|card| {id: card.id, title: card.title, content: card.content, version: card.version, tags: card.tags}}
         {cards: cards, page: {current: current_page, total: total_pages}}.to_json
       end
       
       get '/cards/:title.json' do
         card = Card.where(title: params[:title]).first
         halt 404 if card.nil?
-        {card: {id: card.id, title: card.title, content: card.content, version: card.version, lefts: card.lefts(4), rights: card.rights(4)}}.to_json
+        {card: {id: card.id, title: card.title, content: card.content, version: card.version, tags: card.tags, lefts: card.lefts(4), rights: card.rights(4)}}.to_json
       end
 
       post '/cards.json' do
-        card = Card.new(json_data)
+        card = Card.new(json_data.slice('title', 'content', 'tags'))
         if card.save
           status 201
           {card: {id: card.id}}.to_json
@@ -85,7 +90,8 @@ module Carte
         card = Card.where(title: params[:title]).first
         halt 404 if card.nil?
         card.histories.create!
-        if card.update_attributes(json_data.slice('new_title', 'content').compact)
+        p json_data.slice('new_title', 'content', 'tags').compact
+        if card.update_attributes(json_data.slice('new_title', 'content', 'tags').compact)
           status 201
           {}.to_json
         else
@@ -106,6 +112,10 @@ module Carte
         {history: card.histories}.to_json
       end
 
+      get '/tags.json' do
+        {tags: Card.all_tags}.to_json
+      end
+
       error(404) do
         {}.to_json
       end

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

@@ -5,6 +5,7 @@ module Carte
         include Mongoid::Document
         include Mongoid::Timestamps
         include Mongoid::Attributes::Dynamic
+        include Mongoid::Document::Taggable
       
         field :title, type: String
         field :new_title, type: String
@@ -29,8 +30,10 @@ module Carte
         end
       
         before_validation(on: :update) do
-          self.title = self.new_title
-          self.new_title = nil
+          if self.new_title
+            self.title = self.new_title
+            self.new_title = nil
+          end
         end
       
         def self.sample(size=1)

data/lib/carte/server/version.rb

@@ -2,6 +2,6 @@ require 'sinatra/base'
 
 module Carte
   class Server < Sinatra::Base
-    VERSION = "0.0.5"
+    VERSION = "0.0.6"
   end
 end

data/lib/carte/server/views/index.haml

@@ -38,5 +38,62 @@
         from { transform: scale(1) rotate(0deg);}
         to { transform: scale(1) rotate(360deg);}
       }
+
+      /* https://github.com/olahol/react-tagsinput/blob/master/react-tagsinput.css */
+      .react-tagsinput {
+        border: 1px solid #ccc;
+        background: #fff;
+        padding: 10px;
+        overflow-y: auto;
+        border-radius: 3px;
+      }
+      
+      .react-tagsinput-tag {
+        display: block;
+        /*border: 1px solid #a5d24a;*/
+        /*background: #cde69c;*/
+        /*color: #638421;*/
+        /*font-size: 12px;*/
+        /*font-family: 'Helvetica Neue', 'Arial', sans-serif;*/
+        float: left;
+        /*padding: 5px;*/
+        margin-right: 5px;
+        /*margin-bottom: 5px;*/
+        text-decoration: none;
+        border-radius: 2px;
+      }
+      
+      .react-tagsinput-invalid {
+        background: #FBD8DB !important;
+        color: #90111A !important;
+      }
+      
+      .react-tagsinput-validating {
+        /* background: #FFFACD !important; */
+      }
+      
+      .react-tagsinput-remove {
+        font-weight: bold;
+        /* color: #638421; */
+        text-decoration: none;
+        font-size: 11px;
+        cursor: pointer;
+      }
+      
+      .react-tagsinput-remove:before {
+        /* content: " x"; */
+      }
+      
+      .react-tagsinput-input {
+        background: transparent;
+        /* color: #777; */
+        border: 0;
+        /* font-size: 13px; */
+        /* font-family: 'Helvetica Neue', 'Arial', sans-serif; */
+        /*padding: 5px;*/
+        margin: 0;
+        width: 80px;
+        outline: none;
+      }
   %body
     #app

data/package.json

@@ -1,7 +1,7 @@
 {
   "name": "carte-client",
   "description": "something like dictionary, wiki, or information card",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "main": "lib/carte.coffee",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
@@ -34,6 +34,7 @@
     "markdown-it": "^4.2.0",
     "react": "^0.13.2",
     "react-bootstrap": "^0.21.0",
+    "react-tagsinput": "^1.3.2",
     "vinyl-source-stream": "^1.1.0",
     "watchify": "^3.1.2"
   }

data/spec/server_spec.rb

@@ -171,4 +171,41 @@ describe 'API' do
       end
     end
   end
+
+  context 'Tags' do
+    it 'can create and get a card with tags' do
+      response = client.post('/cards.json', body: {title: 'card1', content: 'content1', tags: %w(tag1 tag2 tag3)}.to_json)
+      expect(response.code).to eq(201)
+      response = client.get("/cards/card1.json")
+      expect(response['card']['tags']).to eq %w(tag1 tag2 tag3)
+    end
+
+    it 'can update card with tags' do
+      response = client.post('/cards.json', body: {title: 'card1', content: 'content1', tags: %w(tag1 tag2 tag3)}.to_json)
+      response = client.put("/cards/card1.json", body: {tags: %w(tag4 tag5 tag6)}.to_json)
+      expect(response.code).to eq(201)
+      response = client.get("/cards/card1.json")
+      expect(response['card']['tags']).to eq %w(tag4 tag5 tag6)
+    end
+
+    it 'can list cards with tags' do
+      response = client.post('/cards.json', body: {title: 'card1', content: 'content1', tags: %w(tag1 tag2 tag3)}.to_json)
+      response = client.get("/cards.json", query: {name: '^cards1$'})
+      expect(response['cards'].first['tags']).to eq %w(tag1 tag2 tag3)
+    end
+
+    it 'can search cards by tags' do
+      response = client.post('/cards.json', body: {title: 'card1', content: 'content1', tags: %w(tag1 tag2 tag3)}.to_json)
+      response = client.get("/cards.json", query: {tags: 'tag1,tag2,tag3'})
+      expect(response['cards'].size).to eq(1)
+      expect(response['cards'].first['tags']).to eq %w(tag1 tag2 tag3)
+    end
+
+    it 'can get tags' do
+      response = client.post('/cards.json', body: {title: 'card1', content: 'content1', tags: %w(tag1 tag2 tag3)}.to_json)
+      response = client.post('/cards.json', body: {title: 'card2', content: 'content2', tags: %w(tag4 tag5 tag6)}.to_json)
+      response = client.get("/tags.json")
+      expect(response['tags'].size).to eq(6)
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: carte-server
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - tily
@@ -178,6 +178,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mongoid-simple-tags
+  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