carte-server 1.0.8 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10e4c87356c4d71772d5534102215a6ebee7bfa6
-  data.tar.gz: dd8e7c1fd85b46173178451cd93c113bec50f86f
+  metadata.gz: cd3f472fe4bb7d487fcdaed6f4ac9d6e4fcc55ae
+  data.tar.gz: c52db06dafe184f6a745ce5c678be0603b38e581
 SHA512:
-  metadata.gz: 16593c18c820bc4a76eae61d999daf1fe18ec8b4f6d6d8f5f17846dda80e26c4e370efc770ccf6c0b885c1a6ab25cacd0b7f2de9ca44ea3a3c407f55ec58497c
-  data.tar.gz: e9b46b510b2a640e17a2390f0a1e79f5fe9626bf0f6eee9c8637958031908716511a3db7fbe19e4689680bd2d776484371724fa059e141d8435863ae6fe6c50c
+  metadata.gz: 14e3089137ea1bd9b1048eb573679eb85f5d5117f6de0eccabff4acf27d8c6590a6816db20877edef2e424c99e6743107ffe9294076808f74628f64ec2350b92
+  data.tar.gz: 3cac1e649934df4c691bc351325b0eaf3d91ed0d9305c1fba54afdcda896334472351d4a7db0da650cf1804945e9ab85bc0f53d884830cf05e8c4e0bae6d04d6

data/lib/carte/client/models/tag.coffee

@@ -0,0 +1,9 @@
+Backbone = require('backbone')
+config = require('../config')
+querystring = require('querystring')
+$ = require('jquery')
+
+module.exports = class Tag extends Backbone.Model
+  modelName: 'Tag'
+  idAttribute: 'name'
+  url: ()-> config.root_path + config.api_path + '/tags/' + encodeURIComponent(@get('name')) + '.json'

data/lib/carte/client/models/tags.coffee

@@ -0,0 +1,10 @@
+Backbone = require('backbone')
+Tag = require('./tag')
+$ = require('jquery')
+config = require('../config')
+
+module.exports = class Tags extends Backbone.Collection
+  collectionName: 'Tags'
+  model: Tag
+  url: config.root_path + config.api_path + '/tags.json'
+  parse: (response)-> response.tags

data/lib/carte/client/router.coffee

@@ -3,10 +3,15 @@ Backbone = require('backbone')
 
 module.exports = class Router extends Backbone.Router
   routes:
+    'tags': 'tags'
     '': 'list'
     ':title': 'show'
     ':title/history': 'history'
 
+  tags: ->
+    console.log '[router] tags'
+    @current = 'tags'
+
   list: (string)->
     console.log '[router] list', string
     location.hash = '/' if location.hash == ''

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

@@ -2,10 +2,12 @@
 $ = require('jquery')
 React = require('react')
 List = require('./list')
+Tags = require('./tags')
 Slideshow = require('./slideshow')
 CardCollection = require('../models/cards')
 CardHistoryCollection = require('../models/card_histories')
 CardModel = require('../models/card')
+TagCollection = require('../models/tags')
 String = require('string')
 config = require('../config')
 
@@ -73,6 +75,13 @@ module.exports = React.createClass
             cards.fetch success: ()-> cards.fetching = false
             document.title = config.title + '、ヒストリー'
             <List key='list' router={@props.router} cards={cards} />
+          when "tags"
+            console.log '[views/content] tags', @props
+            tags = new TagCollection()
+            tags.fetching = true
+            tags.fetch success: ()-> tags.fetching = false
+            document.title = config.title + '、タグ一覧'
+            <Tags tags={tags} />
           else
             null
       }

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

@@ -53,7 +53,7 @@ module.exports = React.createClass
           else
             @props.onRequestHide()
             @props.card.set 'title', @state.title
-            location.hash = '/' + @state.title
+            location.hash = '/' + encodeURIComponent(@state.title)
         else
           @props.onRequestHide()
           @props.card = new CardModel()

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

@@ -0,0 +1,66 @@
+# @cjsx React.DOM 
+$ = require('jquery')
+React = require('react/addons')
+Modal = require('react-bootstrap/lib/Modal')
+Button = require('react-bootstrap/lib/Button')
+
+module.exports = React.createClass
+  mixins: [React.addons.LinkedStateMixin]
+
+  displayName: 'EditTag'
+
+  getInitialState: ()->
+    updating: false
+    name: @props.tag.get('name')
+    errors: false
+    shaking: false
+
+  onChangeName: (event)->
+    @setState name: event.target.value
+
+  onClickOk: (event)->
+    event.preventDefault()
+    @setState updating: true
+    attributes = {new_name: @state.name}
+    @props.tag.save attributes,
+      success: ()=>
+        @props.tag.set 'name', @state.name
+        @props.onRequestHide()
+      error: (model, response, options)=>
+        @setState errors: response.responseJSON.tag.errors
+        @setState updating: false
+        @setState shaking: true
+        setTimeout (=> @setState shaking: false), 300
+
+  render: ->
+    <Modal className={"animated infinite shake" if @state.shaking} {...@props} bsStyle='default' title={<i className="glyphicon glyphicon-edit" />} animation={false}>
+      <div className='modal-body'>
+        {
+          if @state.errors
+            <div className="alert alert-danger" role="alert">
+              <ul>
+                {
+                  for key, errors of @state.errors
+                    for error in errors
+                      <li>{key + ' ' + error}</li>
+                }
+              </ul>
+            </div>
+        }
+        <div className="form-group">
+          <label className="control-label">Name</label>
+          <input type="text" className="form-control" value={@state.name} onChange={@onChangeName} disabled={@state.updating} id="inputError1" />
+        </div>
+        <div className="form-group">
+          <button className="btn btn-default pull-right" onClick={@onClickOk} disabled={@state.updating}>
+            &nbsp;
+            OK
+            &nbsp;
+            {
+              if @state.updating
+                <i className='glyphicon glyphicon-refresh glyphicon-refresh-animate' />
+            }
+          </button>
+        </div>
+      </div>
+    </Modal>

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

@@ -81,6 +81,11 @@ module.exports = React.createClass
                         </a>
                       </li>
               }
+              <li>
+                <a href={"#/tags"}>
+                  <i className="glyphicon glyphicon-tag" />
+                </a>
+              </li>
               <li>
                 <a href={config.root_path + config.api_path + "/cards.xml?" + @queryParam({}, [])}>
                   <i className="fa fa-rss" />
@@ -94,16 +99,20 @@ module.exports = React.createClass
             </ul>
           </div>
           <div className="col-sm-4">
-                <a href="javascript:void(0)" className="center-block text-center">
-                  <span className="badge">
-                    {
-                      if @props.cards.pagination
-                        @props.cards.pagination.total_entries
-                      else
-                        <i className="glyphicon glyphicon-refresh glyphicon-refresh-animate" />
-                    }
-                  </span>
-                </a>
+                <ul className="nav nav-pills nav-justified">
+                  <li>
+                    <a href="javascript:void(0)" className="center-block text-center">
+                      <span className="badge">
+                        {
+                          if @props.cards.pagination
+                            @props.cards.pagination.total_entries
+                          else
+                            <i className="glyphicon glyphicon-refresh glyphicon-refresh-animate" />
+                        }
+                      </span>
+                    </a>
+                  </li>
+                </ul>
           </div>
           <div className="col-sm-4">
             {
@@ -136,7 +145,7 @@ module.exports = React.createClass
           <div className="col-sm-12">
             <ul className="nav nav-pills">
               <li>
-                <a href={"#/" + title + '?context=title'}>
+                <a href={"#/" + encodeURIComponent(title) + '?context=title'}>
                   {
                     if @props.card && @props.card.query.context == 'title'
                       <strong>A to Z</strong>
@@ -146,7 +155,7 @@ module.exports = React.createClass
                 </a>
               </li>
               <li>
-                <a href={"#/" + title + '?context=updated_at'}>
+                <a href={"#/" + encodeURIComponent(title) + '?context=updated_at'}>
                   {
                     if @props.card && @props.card.query.context == 'updated_at'
                       <strong>Latest</strong>
@@ -156,7 +165,7 @@ module.exports = React.createClass
                 </a>
               </li>
               <li>
-                <a href={"#/" + title + '?context=none'}>
+                <a href={"#/" + encodeURIComponent(title) + '?context=none'}>
                   {
                     if @props.card && @props.card.query.context == 'none'
                       <strong>Detail</strong>
@@ -166,7 +175,7 @@ module.exports = React.createClass
                 </a>
               </li>
               <li>
-                <a href={"#/" + title + '/history'}>
+                <a href={"#/" + encodeURIComponent(title) + '/history'}>
                   {
                     if @props.cards.collectionName == 'CardHistories'
                       <strong>History</strong>

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

@@ -0,0 +1,65 @@
+# @cjsx React.DOM 
+$ = require('jquery')
+Backbone = require('backbone')
+React = require('react')
+EditTag = require('./edit_tag')
+ModalTrigger = require('react-bootstrap/lib/ModalTrigger')
+
+module.exports = React.createClass
+  displayName: 'Tags'
+
+  componentDidMount: ->
+    console.log '[views/tags] component did mount'
+    @props.tags.on 'sync', @forceUpdate.bind(@, null)
+
+  componentWillReceiveProps: (nextProps)->
+    console.log '[views/tags] component will receive props'
+    nextProps.tags.on 'sync', @forceUpdate.bind(@, null)
+
+  render: ->
+    <div className="container carte-list">
+        <div className="row">
+          <div className="col-sm-12">
+            <ul className="nav nav-pills">
+               <li>
+                 <a href="#/">
+                   <i className="glyphicon glyphicon-arrow-left" />
+                 </a>
+               </li>
+            </ul>
+          </div>
+        </div>
+
+        <div className="row">
+          {
+            if @props.tags.fetching
+              <div className="list-group col-sm-4">
+                <div className="list-group-item">
+                  <i className="glyphicon glyphicon-refresh glyphicon-refresh-animate" />
+                </div>
+              </div>
+            else
+              @props.tags.map (tag)->
+                <div className="list-group col-sm-4">
+                  <div className="list-group-item">
+                    <i className="glyphicon glyphicon-tag" />
+                    &nbsp;
+                    {tag.get('name')}
+                    &nbsp;
+                    (
+                    <a href={'#/?tags=' + encodeURIComponent(tag.get('name'))}>
+                      {tag.get('count')}
+                    </a>
+                    )
+                    <span className="pull-right tools">
+                      <ModalTrigger modal={<EditTag tag={tag} />}>
+                        <a href="javascript:void(0)">
+                          <i className="glyphicon glyphicon-edit" />
+                        </a>
+                      </ModalTrigger>
+                    </span>
+                  </div>
+                </div>
+          }
+        </div>
+    </div>

data/lib/carte/server.rb

@@ -135,6 +135,23 @@ module Carte
       {tags: Card.all_tags}.to_json
     end
 
+    put '/tags/:name.json' do
+      # TODO: existence and length validation
+      if json_data['new_name']
+        cards = Card.collection.where(tags: params[:name])
+	cards.update( 
+          {'$push' => {tags: json_data['new_name']}},
+          {:multi => true}
+        )
+	cards.update( 
+          {'$pull' => {tags: params[:name]}},
+          {:multi => true}
+        )
+      end
+      status 201
+      {}.to_json
+    end
+
     error(404) do
       {}.to_json
     end

data/package.json

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carte-server
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
 platform: ruby
 authors:
 - tily
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-23 00:00:00.000000000 Z
+date: 2015-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -267,6 +267,8 @@ files:
 - lib/carte/client/models/card_histories.coffee
 - lib/carte/client/models/card_history.coffee
 - lib/carte/client/models/cards.coffee
+- lib/carte/client/models/tag.coffee
+- lib/carte/client/models/tags.coffee
 - lib/carte/client/router.coffee
 - lib/carte/client/tasks.coffee
 - lib/carte/client/views/app.cjsx
@@ -274,12 +276,14 @@ files:
 - lib/carte/client/views/cards.cjsx
 - lib/carte/client/views/content.cjsx
 - lib/carte/client/views/edit.cjsx
+- lib/carte/client/views/edit_tag.cjsx
 - lib/carte/client/views/footer.cjsx
 - lib/carte/client/views/header.cjsx
 - lib/carte/client/views/list.cjsx
 - lib/carte/client/views/message.cjsx
 - lib/carte/client/views/pagination.cjsx
 - lib/carte/client/views/slideshow.cjsx
+- lib/carte/client/views/tags.cjsx
 - lib/carte/server.rb
 - lib/carte/server/models.rb
 - lib/carte/server/models/card.rb