carte-server 1.0.7 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d81ce3e8c26a94618aac1527f475ba4a8fae8a7a
-  data.tar.gz: c555caad49ebb424cd41bcd65a2328cab83d3374
+  metadata.gz: 10e4c87356c4d71772d5534102215a6ebee7bfa6
+  data.tar.gz: dd8e7c1fd85b46173178451cd93c113bec50f86f
 SHA512:
-  metadata.gz: 820d0748a05bc04fcfd3aa45d48c85cf71799157ae7996b0c13aa07c72762bc1ea6ddeef8ee63de61a9a012f364bb38e72ad4c58e4a8e0680e07c25fe7c6b2b2
-  data.tar.gz: 62f67eb92f36ffcccfc4f92b87f18e3e8b0604c4d9f2399367e118a8ce18f3f42406c404e5a500be33f325e4e7a6a0677bf2e28e2cf5762d7c4daea8d1db2b72
+  metadata.gz: 16593c18c820bc4a76eae61d999daf1fe18ec8b4f6d6d8f5f17846dda80e26c4e370efc770ccf6c0b885c1a6ab25cacd0b7f2de9ca44ea3a3c407f55ec58497c
+  data.tar.gz: e9b46b510b2a640e17a2390f0a1e79f5fe9626bf0f6eee9c8637958031908716511a3db7fbe19e4689680bd2d776484371724fa059e141d8435863ae6fe6c50c

data/lib/carte/client.css

@@ -48,7 +48,7 @@ ul.nav-pills li a {
   padding: 5px;
 }
 
-.list-group-item {
+.carte-card-height {
   height: 200px;
 }
 

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

@@ -1,10 +1,15 @@
 Backbone = require('backbone')
 config = require('../config')
 querystring = require('querystring')
+$ = require('jquery')
 
 module.exports = class Card extends Backbone.Model
+  modelName: 'Card'
+
   idAttribute: 'title'
 
+  query: {}
+
   isNew: ()->
     @_isNew
 
@@ -13,6 +18,7 @@ module.exports = class Card extends Backbone.Model
       url = '/cards.json'
     else
       url = '/cards/' + encodeURIComponent(@get('title')) + '.json'
+      url = url + '?' + $.param(@query) if @query != {}
     config.root_path + config.api_path + url
 
   parse: (response)->

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

@@ -0,0 +1,19 @@
+Backbone = require('backbone')
+CardHistoryModel = require('./card_history')
+$ = require('jquery')
+config = require('../config')
+
+module.exports = class CardHistories extends Backbone.Collection
+  collectionName: 'CardHistories'
+
+  model: CardHistoryModel
+
+  query: {}
+
+  url: ()->
+    url = '/cards/' + @title + '/history.json'
+    config.root_path + config.api_path + url
+
+  parse: (response)->
+    @pagination = response.pagination
+    response.history

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

@@ -0,0 +1,5 @@
+Card = require './card'
+
+module.exports = class CardHistory extends Card
+  modelName: 'CardHistory'
+  idAttribute: 'version'

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

@@ -4,6 +4,8 @@ $ = require('jquery')
 config = require('../config')
 
 module.exports = class Cards extends Backbone.Collection
+  collectionName: 'Cards'
+
   model: CardModel
   query: {}
   url: ()->

data/lib/carte/client/router.coffee

@@ -4,8 +4,8 @@ Backbone = require('backbone')
 module.exports = class Router extends Backbone.Router
   routes:
     '': 'list'
-    'slideshow': 'slideshow'
     ':title': 'show'
+    ':title/history': 'history'
 
   list: (string)->
     console.log '[router] list', string
@@ -13,12 +13,13 @@ module.exports = class Router extends Backbone.Router
     @current = 'list'
     @query = querystring.parse(string)
 
-  show: (title)->
+  show: (title, string)->
     console.log '[router] show', title
     @current = 'show'
     @title = title
-
-  slideshow: (string)->
-    console.log 'slideshow', string
-    @current = 'slideshow'
     @query = querystring.parse(string)
+
+  history: (title)->
+    console.log '[router] history', title
+    @current = 'history'
+    @title = title

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

@@ -29,31 +29,57 @@ module.exports = React.createClass
     helpers.isMobile() || @state.showTools
 
   render: ->
-    <div className='col-sm-4 col-xs-12 list-group' onMouseOver={@onMouseOver} onMouseLeave={@onMouseLeave}>
-        <div className='list-group-item'>
+    context = @props.card.query.context
+    <div
+      className={
+        classnames(
+          'list-group',
+          'col-sm-4': context != 'none',
+          'col-xs-12': context != 'none',
+          'col-sm-12': context == 'none'
+        )
+      }
+      onMouseOver={@onMouseOver}
+      onMouseLeave={@onMouseLeave}
+    >
+        <div className={classnames('list-group-item', 'carte-card-height': context != 'none')}>
           <div className="carte-card-header">
             {
-              if @props.card.get('focused')
+              if @props.card.get('focused') || @props.card.query.context == 'none'
                 <i className='glyphicon glyphicon-star' />
             }
             <strong>
               {@props.card.get('title')}
             </strong>
-            <span className={classnames('pull-right': true, 'tools': true, 'carte-hidden': !@showTools())}>
-              <ModalTrigger modal={<Edit card={@props.card} />}>
-                <a href="javascript:void(0)">
-                  <i className='glyphicon glyphicon-edit' />
-                </a>
-              </ModalTrigger>
-              &nbsp;
-              &nbsp;
-              <a href={'#/' + encodeURIComponent(@props.card.get('title'))}>
-                <i className='glyphicon glyphicon-link' />
-              </a>
-            </span>
+            {
+              if @props.card.modelName == 'Card'
+                <span className={classnames('pull-right': true, 'tools': true, 'carte-hidden': !@showTools())}>
+                  <ModalTrigger modal={<Edit card={@props.card} />}>
+                    <a href="javascript:void(0)">
+                      <i className='glyphicon glyphicon-edit' />
+                    </a>
+                  </ModalTrigger>
+                  &nbsp;
+                  &nbsp;
+                  <a href={'#/' + encodeURIComponent(@props.card.get('title'))}>
+                    <i className='glyphicon glyphicon-link' />
+                  </a>
+                </span>
+              else
+                <span className={classnames('pull-right': true)}>
+                  <i className="fa fa-clock-o" />
+                  &nbsp;
+                  {@props.card.get('version')}
+                </span>
+            }
           </div>
           <div className="carte-card-content">
-            <div dangerouslySetInnerHTML={__html: markdownIt.render @props.card.get('content')} />
+            {
+              if @props.card.fetching
+                <i className='glyphicon glyphicon-refresh glyphicon-refresh-animate' />
+              else
+                <div dangerouslySetInnerHTML={__html: markdownIt.render @props.card.get('content') || ''} />
+            }
           </div>
           <div className={classnames('carte-hidden': !@showTools())}>
           {

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

@@ -35,5 +35,5 @@ module.exports = React.createClass
         <i className='glyphicon glyphicon-alert' /> {@state.error.status} {@state.error.statusText}
       </Message>
     else
-      cards = @props.cards.map (card)-> <Card key={card.get("title")} card={card} />
+      cards = @props.cards.map (card)-> <Card key={card.get("title") + card.get("version")} card={card} />
       <div className='row'>{cards}</div>

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

@@ -4,6 +4,7 @@ React = require('react')
 List = require('./list')
 Slideshow = require('./slideshow')
 CardCollection = require('../models/cards')
+CardHistoryCollection = require('../models/card_histories')
 CardModel = require('../models/card')
 String = require('string')
 config = require('../config')
@@ -34,7 +35,7 @@ module.exports = React.createClass
             if cards.query.mode == 'flash'
               cards.query.auto = 'off' if !cards.query.auto
               cards.query.hide = 'none' if !cards.query.hide
-              document.title = config.title + '、スライドショー'
+              document.title = config.title + '、フラッシュ'
               <Slideshow key='slideshow' router={@props.router} cards={cards} />
             else
               document.title = config.title
@@ -43,8 +44,11 @@ module.exports = React.createClass
             cards = new CardCollection()
             cards.fetching = true
             card = new CardModel(title: @props.router.title)
+            card.query = $.extend {}, {context: 'updated_at'}, @props.router.query
+            card.fetching = true 
             card.fetch
               success: (card)->
+                card.fetching = false
                 for left in card.get("lefts")
                   cardModel = new CardModel(left)
                   cardModel.set 'focused', false
@@ -60,6 +64,15 @@ module.exports = React.createClass
                 cards.fetching = false
             document.title = config.title + '、' + card.get('title')
             <List key='show' cards={cards} card={card} />
+          when "history"
+            console.log '[views/content] history', @props
+            cards = new CardHistoryCollection()
+            console.log cards
+            cards.title = @props.router.title
+            cards.fetching = true
+            cards.fetch success: ()-> cards.fetching = false
+            document.title = config.title + '、ヒストリー'
+            <List key='list' router={@props.router} cards={cards} />
           else
             null
       }

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

@@ -3,6 +3,7 @@ $ = require('jquery')
 Backbone = require('backbone')
 React = require('react')
 Cards = require('./cards')
+Card = require('./card')
 CardCollection = require('../models/cards')
 Pagination = require('./pagination')
 helpers = require('../helpers')
@@ -39,7 +40,7 @@ module.exports = React.createClass
 
   render: ->
     <div className="container carte-list">
-      {if !@props.card
+      {if !@props.card && @props.cards.collectionName == 'Cards'
         <div className="row">
           <div className="col-sm-4">
             <ul className="nav nav-pills">
@@ -127,21 +128,65 @@ module.exports = React.createClass
           </div>
         </div>
       else
+        if @props.card
+          title = @props.card.get('title')
+        else
+          title = @props.router.title
         <div className="row">
           <div className="col-sm-12">
             <ul className="nav nav-pills">
               <li>
-                <a href={"#/" + @props.card.get('title')}>
-                  <strong>
-                    {@props.card.get('title')}
-                  </strong>
+                <a href={"#/" + title + '?context=title'}>
+                  {
+                    if @props.card && @props.card.query.context == 'title'
+                      <strong>A to Z</strong>
+                    else
+                      <span>A to Z</span>
+                  }
+                </a>
+              </li>
+              <li>
+                <a href={"#/" + title + '?context=updated_at'}>
+                  {
+                    if @props.card && @props.card.query.context == 'updated_at'
+                      <strong>Latest</strong>
+                    else
+                      <span>Latest</span>
+                  }
+                </a>
+              </li>
+              <li>
+                <a href={"#/" + title + '?context=none'}>
+                  {
+                    if @props.card && @props.card.query.context == 'none'
+                      <strong>Detail</strong>
+                    else
+                      <span>Detail</span>
+                  }
+                </a>
+              </li>
+              <li>
+                <a href={"#/" + title + '/history'}>
+                  {
+                    if @props.cards.collectionName == 'CardHistories'
+                      <strong>History</strong>
+                    else
+                      <span>History</span>
+                  }
                 </a>
               </li>
             </ul>
           </div>
         </div>
       } 
-      <Cards cards={@props.cards} card={@props.card} />
+      {
+        if @props.card && @props.card.query.context == 'none'
+          <div className='row'>
+            <Card key={@props.card.get("title")} card={@props.card} />
+          </div>
+        else 
+          <Cards cards={@props.cards} card={@props.card} />
+      }
       {
         if !@props.card && helpers.isMobile()
           <div className="row">

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

@@ -11,7 +11,7 @@ module.exports = React.createClass
         for i in [1..9]
           <div key={i} className='col-sm-4'>
             <div className='list-group'>
-              <div className='list-group-item'>
+              <div className='list-group-item carte-card-height'>
                 {@props.children}
               </div>
             </div>

data/lib/carte/server.rb

@@ -84,8 +84,8 @@ module Carte
       {
         card: card.as_json(only: %w(title content version tags)).update(
           version: card.version,
-          lefts: card.lefts(4).as_json(only: %w(title content version tags)),
-          rights: card.rights(4).as_json(only: %w(title content version tags))
+          lefts: card.lefts(4, context).as_json(only: %w(title content version tags)),
+          rights: card.rights(4, context).as_json(only: %w(title content version tags))
         )
       }.to_json
     end
@@ -123,7 +123,12 @@ module Carte
     get '/cards/:title/history.json' do
       card = Card.where(title: params[:title]).first
       halt 404 if card.nil?
-      {history: card.histories.as_json(only: %w(title content version tags))}.to_json
+      {
+        history: [
+          card.as_json(only: %w(title content version tags)).update(version: card.version),
+          card.histories.desc(:version).as_json(only: %w(title content version tags))
+        ].flatten
+      }.to_json
     end
 
     get '/tags.json' do

data/package.json

@@ -1,7 +1,7 @@
 {
   "name": "carte-client",
   "description": "something like dictionary, wiki, or information card",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "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.7
+  version: 1.0.8
 platform: ruby
 authors:
 - tily
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-17 00:00:00.000000000 Z
+date: 2015-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -264,6 +264,8 @@ files:
 - lib/carte/client/config.coffee
 - lib/carte/client/helpers.coffee
 - lib/carte/client/models/card.coffee
+- lib/carte/client/models/card_histories.coffee
+- lib/carte/client/models/card_history.coffee
 - lib/carte/client/models/cards.coffee
 - lib/carte/client/router.coffee
 - lib/carte/client/tasks.coffee