carte-server 1.0.9 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd3f472fe4bb7d487fcdaed6f4ac9d6e4fcc55ae
-  data.tar.gz: c52db06dafe184f6a745ce5c678be0603b38e581
+  metadata.gz: 4c5c8c38fa59498853115a057fe4fbe657ed3010
+  data.tar.gz: 382ae22af54b789f2ed191b31613cad17a445630
 SHA512:
-  metadata.gz: 14e3089137ea1bd9b1048eb573679eb85f5d5117f6de0eccabff4acf27d8c6590a6816db20877edef2e424c99e6743107ffe9294076808f74628f64ec2350b92
-  data.tar.gz: 3cac1e649934df4c691bc351325b0eaf3d91ed0d9305c1fba54afdcda896334472351d4a7db0da650cf1804945e9ab85bc0f53d884830cf05e8c4e0bae6d04d6
+  metadata.gz: 3e880ee9df09645de4c8cd440390efc58a88347ba96eaea38119287e23be8f59b1d96860c839a18f5a8b863eca8598710e7532ffafd2b4f78183fc8fc8996d7c
+  data.tar.gz: 7e3a84bd65e7b09ca4336a394ced5172c6594a06e67f525029b750b9cf7592230caea138bf97246fa3658bed4ff4c9c83a2f8aaa8a8f4dd2400a699953a3c511

data/carte.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "shotgun"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "httparty"
+  spec.add_development_dependency "rack-gzip-file"
   
   spec.add_dependency "sinatra"
   spec.add_dependency "sinatra-contrib"

data/config.ru

@@ -1,4 +1,5 @@
 require 'carte/server'
+require 'rack/gzip_static'
 require 'json'
 
 $config = JSON.parse(File.read('config.json'))
@@ -11,8 +12,7 @@ class Carte::Server
 end
 
 map('/') do
-  use Rack::Deflater
-  use Rack::Static, urls: [""], root: $config['root_dir'], index: $config['html_path']
+  use Rack::GzipStatic, urls: [""], root: $config['root_dir'], index: $config['html_path']
   run lambda {}
 end
 

data/lib/carte/client.css

@@ -105,7 +105,7 @@ ul.nav-pills li a {
   padding-right: 5px;
 }
 
-.carte-slideshow {
+.carte-flash {
   background-color: white;
   position : absolute;
   left: 0;
@@ -114,6 +114,10 @@ ul.nav-pills li a {
   bottom: 0;
 }
 
+.carte-strong {
+  font-weight: bold;
+}
+
 /* http://stackoverflow.com/questions/24511887/css-animation-works-in-chrome-but-not-in-firefox-resolved */
 .glyphicon-refresh-animate {
   -moz-animation: spin-moz .7s infinite linear;

data/lib/carte/client/helpers.coffee

@@ -5,3 +5,10 @@ module.exports =
 
   isMobile: ()->
     /(iPhone|iPod|iPad).*AppleWebKit/i.test(navigator.userAgent)
+
+  parseCardLink: (html)->
+    html.replace /\[\[(.+?)\]\]/g, (match, p1)->
+      if p1.match /<("[^"]*"|'[^']*'|[^'">])*>/g
+        match
+      else
+        ['<a href="#/', encodeURIComponent(p1), '">', p1, '</a>'].join('')

data/lib/carte/client/tasks.coffee

@@ -89,5 +89,5 @@ module.exports = class Carte
       .bundle()
       .pipe sourceStream file
       .pipe gulpIf(!@watching, streamify(uglify(compress: {drop_console: !@watching})))
-      #.pipe gulpIf(!@watching, gulpGzip())
+      .pipe gulpIf(!@watching, gulpGzip())
       .pipe gulp.dest dir

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

@@ -2,6 +2,7 @@
 React = require('react')
 Edit = require('./edit')
 ModalTrigger = require('react-bootstrap/lib/ModalTrigger')
+Glyphicon = require('react-bootstrap/lib/Glyphicon')
 markdownIt = require('markdown-it')(linkify: true)
 helpers = require('../helpers')
 classnames = require('classnames')
@@ -46,7 +47,7 @@ module.exports = React.createClass
           <div className="carte-card-header">
             {
               if @props.card.get('focused') || @props.card.query.context == 'none'
-                <i className='glyphicon glyphicon-star' />
+                <Glyphicon glyph='star' />
             }
             <strong>
               {@props.card.get('title')}
@@ -56,13 +57,13 @@ module.exports = React.createClass
                 <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' />
+                      <Glyphicon glyph='edit' />
                     </a>
                   </ModalTrigger>
                   &nbsp;
                   &nbsp;
                   <a href={'#/' + encodeURIComponent(@props.card.get('title'))}>
-                    <i className='glyphicon glyphicon-link' />
+                    <Glyphicon glyph='link' />
                   </a>
                 </span>
               else
@@ -76,9 +77,9 @@ module.exports = React.createClass
           <div className="carte-card-content">
             {
               if @props.card.fetching
-                <i className='glyphicon glyphicon-refresh glyphicon-refresh-animate' />
+                <Glyphicon glyph='refresh' className='glyphicon-refresh-animate' />
               else
-                <div dangerouslySetInnerHTML={__html: markdownIt.render @props.card.get('content') || ''} />
+                <div dangerouslySetInnerHTML={__html: helpers.parseCardLink markdownIt.render @props.card.get('content') || ''} />
             }
           </div>
           <div className={classnames('carte-hidden': !@showTools())}>
@@ -88,7 +89,7 @@ module.exports = React.createClass
                 <span className="pull-right tools">
                   &nbsp;&nbsp;
                   <a href={"#/?tags=" + tag}>
-                    <i className="glyphicon glyphicon-tag" />
+                    <Glyphicon glyph='tag' />
                     &nbsp;{tag}
                   </a>
                 </span>

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

@@ -3,7 +3,7 @@ $ = require('jquery')
 React = require('react')
 List = require('./list')
 Tags = require('./tags')
-Slideshow = require('./slideshow')
+Flash = require('./flash')
 CardCollection = require('../models/cards')
 CardHistoryCollection = require('../models/card_histories')
 CardModel = require('../models/card')
@@ -38,7 +38,7 @@ module.exports = React.createClass
               cards.query.auto = 'off' if !cards.query.auto
               cards.query.hide = 'none' if !cards.query.hide
               document.title = config.title + '、フラッシュ'
-              <Slideshow key='slideshow' router={@props.router} cards={cards} />
+              <Flash key='flash' router={@props.router} cards={cards} />
             else
               document.title = config.title
               <List key='list' router={@props.router} cards={cards} />

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

@@ -3,6 +3,7 @@ $ = require('jquery')
 React = require('react/addons')
 Modal = require('react-bootstrap/lib/Modal')
 Button = require('react-bootstrap/lib/Button')
+Glyphicon = require('react-bootstrap/lib/Glyphicon')
 TagsInput = require('react-tagsinput')
 CardModel = require('../models/card')
 
@@ -65,7 +66,7 @@ module.exports = React.createClass
         setTimeout (=> @setState shaking: false), 300
 
   render: ->
-    <Modal className={"animated infinite shake" if @state.shaking} {...@props} bsStyle='default' title={if @props.card.isNew() then <i className="glyphicon glyphicon-plus" /> else <i className="glyphicon glyphicon-edit" />} animation={false}>
+    <Modal className={"animated infinite shake" if @state.shaking} {...@props} bsStyle='default' title={if @props.card.isNew() then <Glyphicon glyph='plus' /> else <Glyphicon glyph='edit' />} animation={false}>
       <div className='modal-body'>
         {
           if @state.errors
@@ -80,7 +81,7 @@ module.exports = React.createClass
             </div>
           else if @state.createSuccess
             <div className="alert alert-success" role="alert">
-              <i className="glyphicon glyphicon-info-sign" />&nbsp;
+              <Glyphicon glyph='info-sign' />&nbsp;
               You created a card successfully. Let's create next one.
             </div>
         }
@@ -111,7 +112,7 @@ module.exports = React.createClass
             &nbsp;
             {
               if @state.updating
-                <i className='glyphicon glyphicon-refresh glyphicon-refresh-animate' />
+                <Glyphicon glyph='refresh' className='glyphicon-refresh-animate' />
             }
           </button>
         </div>

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

@@ -0,0 +1,13 @@
+# @cjsx React.DOM 
+React = require('react')
+OverlayMixin = require('react-bootstrap/lib/OverlayMixin')
+FlashContent = React.createFactory require('./flash_content')
+
+window.onerror = (error, url, line) -> alert error
+
+module.exports = React.createClass
+  displayName: 'Flash'
+  mixins: [OverlayMixin]
+  getDefaultProps: -> container: document.body
+  renderOverlay: -> FlashContent(@props)
+  render: -> null

data/lib/carte/client/views/{slideshow.cjsx → flash_content.cjsx}

@@ -2,7 +2,6 @@
 $ = require('jquery')
 React = require('react')
 CardCollection = require('../models/cards')
-config = require('../config')
 helpers = require('../helpers')
 classnames = require('classnames')
 markdownIt = require('markdown-it')(linkify: true)
@@ -13,11 +12,12 @@ Button = require('react-bootstrap').Button
 
 window.onerror = (error, url, line) -> alert error
 
-Flash = React.createClass
+module.exports = React.createClass
+  displayName: 'FlashContent'
   scrollEventNames: ['touchstart', 'touchmove', 'touchend', 'gesturestart', 'gesturechange', 'gestureend']
 
   componentDidMount: ->
-    console.log '[views/flash] componentDidMount', @props
+    console.log '[views/flash_content] componentDidMount', @props
     $(document).on 'keydown', @onKeyDown
     for eventName in @scrollEventNames
       $(document).on eventName, @preventScroll
@@ -37,7 +37,7 @@ Flash = React.createClass
           @forceUpdate.bind(@, null)
 
   componentWillUnmount: ->
-    console.log '[views/flash] FlashMain componentWillUnmount'
+    console.log '[views/flash_content] FlashMain componentWillUnmount'
     $(document).off 'keydown', @onKeyDown
     for eventName in @scrollEventNames
       $(document).off eventName, @preventScroll
@@ -64,23 +64,23 @@ Flash = React.createClass
 
   prevCard: ->
     _prevCard = @state.currCards.at(@currCardIndex() - 1)
-    console.log '[views/slideshow] prevCard', _prevCard
+    console.log '[views/flash_content] prevCard', _prevCard
     _prevCard
 
   nextCard: ->
     _nextCard = @state.currCards.at(@currCardIndex() + 1)
-    console.log '[views/slideshow] nextCard', _nextCard
+    console.log '[views/flash_content] nextCard', _nextCard
     _nextCard
 
   currCardIndex: ->
     _currCardIndex = @state.currCards.indexOf(@state.currCard)
-    console.log '[views/slideshow] currCardIndex, @state.currCard', @state.currCard
-    console.log '[views/slideshow] currCardIndex', _currCardIndex
+    console.log '[views/flash_content] currCardIndex, @state.currCard', @state.currCard
+    console.log '[views/flash_content] currCardIndex', _currCardIndex
     _currCardIndex
 
   currPage: ->
     _currPage = @state.currCards.pagination.current_page
-    console.log '[views/slideshow] currPage', _currPage
+    console.log '[views/flash_content] currPage', _currPage
     _currPage
 
   totalPages: ->
@@ -88,16 +88,16 @@ Flash = React.createClass
 
   nextPage: ->
     _nextPage = if @currPage() < @totalPages() then @currPage() + 1 else 1
-    console.log '[views/slideshow] nextPage', _nextPage
+    console.log '[views/flash_content] nextPage', _nextPage
     _nextPage
 
   prevPage: ->
     _prevPage = if @currPage() > 1 then @currPage() - 1 else @totalPages()
-    console.log '[views/slideshow] prevPage', _prevPage
+    console.log '[views/flash_content] prevPage', _prevPage
     _prevPage
 
   loadNextCards: ->
-    console.log '[views/slideshow] loadNextCards'
+    console.log '[views/flash_content] loadNextCards'
     nextCards = new CardCollection()
     nextCards.query = $.extend {}, @state.currCards.query, {page: @nextPage()}
     nextCards.fetching = true
@@ -105,7 +105,7 @@ Flash = React.createClass
     @setState nextCards: nextCards
 
   loadPrevCards: ->
-    console.log '[views/slideshow] loadPrevCards'
+    console.log '[views/flash_content] loadPrevCards'
     prevCards = new CardCollection()
     prevCards.query = $.extend {}, @state.currCards.query, {page: @prevPage()}
     prevCards.fetching = true
@@ -207,7 +207,7 @@ Flash = React.createClass
         when 'normal' then bpm = 60
         when 'slow' then bpm = 30 
       @interval = setInterval @onClickNext, 1000 * 60 / bpm
-    <div onTouchStart={@onTouchStart} onTouchMove={@onTouchMove} onTouchEnd={@onTouchEnd} style={overflow:'hidden',width:'100%',height:'100%'}>
+    <div onTouchStart={@onTouchStart} onTouchMove={@onTouchMove} onTouchEnd={@onTouchEnd} className="carte-flash">
       <div onTouchStart={@onTouchStartTools} style={position:'absolute',bottom:0,width:'100%',padding:'47px 0px 0px 0px'} onMouseOver={@onMouseOverTools} onMouseLeave={@onMouseLeaveTools}>
         <span className={classnames("pull-right":true, 'carte-hidden': !@state.showTools)}>
           <ButtonGroup>
@@ -246,41 +246,10 @@ Flash = React.createClass
               if @props.cards.query.hide == 'content' && @state.hiding == true
                 '???????'
               else
-                <div dangerouslySetInnerHTML={__html: markdownIt.render @state.currCard.get('content')} />
+                <div dangerouslySetInnerHTML={__html: helpers.parseCardLink markdownIt.render @state.currCard.get('content')} />
             else
               <i className="glyphicon glyphicon-refresh glyphicon-refresh-animate" />
           }
         </div>
       </div>
     </div>
-
-flash = React.createFactory Flash
-
-module.exports = React.createClass
-  displayName: 'FlashWrapper'
-
-  componentDidMount: ->
-    console.log '[views/slideshow] componentDidMount'
-    @node = document.createElement('div')
-    @node.className = 'carte-slideshow'
-    document.body.appendChild(@node)
-    @renderSlideshow()
-
-  componentWillReceiveProps: (nextProps)->
-    console.log '[views/slideshow] componentWillReceiveProps', nextProps
-    document.body.removeChild(@node) if @node
-    @node = document.createElement('div')
-    @node.className = 'carte-slideshow'
-    document.body.appendChild(@node)
-    React.render(flash(nextProps), @node)
-
-  componentWillUnmount: ->
-    console.log '[views/slideshow] componentWillUnmount'
-    React.unmountComponentAtNode(@node)
-    document.body.removeChild(@node)
-
-  renderSlideshow: ->
-    React.render(flash(@props), @node)
-
-  render: ->
-    null

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

@@ -2,12 +2,14 @@
 $ = require('jquery')
 Backbone = require('backbone')
 React = require('react')
+classnames = require('classnames')
 Cards = require('./cards')
 Card = require('./card')
 CardCollection = require('../models/cards')
 Pagination = require('./pagination')
 helpers = require('../helpers')
 config = require('../config')
+Glyphicon = require('react-bootstrap/lib/Glyphicon')
 
 module.exports = React.createClass
   displayName: 'List'
@@ -50,40 +52,25 @@ module.exports = React.createClass
                     when 'atoz'
                       <li key='atoz'>
                         <a onClick={helpers.reload} href={"#/?" + @atozParam()}>
-                          {
-                            if @props.cards.query.sort == 'title' and @props.cards.query.order != 'random'
-                              <strong>A to Z</strong>
-                            else
-                              <span>A to Z</span>
-                          }
+                          <span className={classnames('carte-strong': @props.cards.query.sort == 'title' and @props.cards.query.order != 'random')}>A to Z</span>
                         </a>
                       </li>
                     when 'latest'
                       <li key='latest'>
                         <a onClick={helpers.reload} href={"#/?" + @latestParam()}>
-                          {
-                            if @props.cards.query.sort == 'updated_at' and @props.cards.query.order != 'random'
-                              <strong>Latest</strong>
-                            else
-                              <span>Latest</span>
-                          }
+                          <span className={classnames('carte-strong': @props.cards.query.sort == 'updated_at' and @props.cards.query.order != 'random')}>Latest</span>
                         </a>
                       </li>
                     when 'random'
                       <li key='random'>
                         <a onClick={helpers.reload} href={"#/?" + @randomParam()}>
-                          {
-                            if @props.cards.query.order == 'random'
-                              <strong>Random</strong>
-                            else
-                              <span>Random</span>
-                          }
+                          <span className={classnames('carte-strong': @props.cards.query.order == 'random')}>Random</span>
                         </a>
                       </li>
               }
               <li>
                 <a href={"#/tags"}>
-                  <i className="glyphicon glyphicon-tag" />
+                  <Glyphicon glyph='tag' />
                 </a>
               </li>
               <li>
@@ -99,20 +86,20 @@ module.exports = React.createClass
             </ul>
           </div>
           <div className="col-sm-4">
-                <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>
+             <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
+                         <Glyphicon glyph='refresh' className='glyphicon-refresh-animate' />
+                     }
+                   </span>
+                 </a>
+               </li>
+             </ul>
           </div>
           <div className="col-sm-4">
             {
@@ -122,11 +109,11 @@ module.exports = React.createClass
                     {
                       if @props.cards.pagination
                         <a onClick={helpers.reload} href={"#/?" + @randomParam()}>
-                          <i className="glyphicon glyphicon-refresh" />
+                          <Glyphicon glyph='refresh' />
                         </a>
                       else
                         <a href="javascript:void(0)">
-                          <i className="glyphicon glyphicon-refresh glyphicon-refresh-animate" />
+                          <Glyphicon glyph='refresh' className='glyphicon-refresh-animate' />
                         </a>
                     }
                   </li>
@@ -146,42 +133,22 @@ module.exports = React.createClass
             <ul className="nav nav-pills">
               <li>
                 <a href={"#/" + encodeURIComponent(title) + '?context=title'}>
-                  {
-                    if @props.card && @props.card.query.context == 'title'
-                      <strong>A to Z</strong>
-                    else
-                      <span>A to Z</span>
-                  }
+                  <span className={classnames('carte-strong': @props.card && @props.card.query.context == 'title')}>A to Z</span>
                 </a>
               </li>
               <li>
                 <a href={"#/" + encodeURIComponent(title) + '?context=updated_at'}>
-                  {
-                    if @props.card && @props.card.query.context == 'updated_at'
-                      <strong>Latest</strong>
-                    else
-                      <span>Latest</span>
-                  }
+                  <span className={classnames('carte-strong': @props.card && @props.card.query.context == 'updated_at')}>Latest</span>
                 </a>
               </li>
               <li>
                 <a href={"#/" + encodeURIComponent(title) + '?context=none'}>
-                  {
-                    if @props.card && @props.card.query.context == 'none'
-                      <strong>Detail</strong>
-                    else
-                      <span>Detail</span>
-                  }
+                  <span className={classnames('carte-strong': @props.card && @props.card.query.context == 'none')}>Detail</span>
                 </a>
               </li>
               <li>
                 <a href={"#/" + encodeURIComponent(title) + '/history'}>
-                  {
-                    if @props.cards.collectionName == 'CardHistories'
-                      <strong>History</strong>
-                    else
-                      <span>History</span>
-                  }
+                  <span className={classnames('carte-strong': @props.cards.collectionName == 'CardHistories')}>History</span>
                 </a>
               </li>
             </ul>

data/lib/carte/server.rb

@@ -60,7 +60,19 @@ module Carte
 
       def markdown2html(markdown)
         renderer = Redcarpet::Render::HTML.new(filter_html:true)
-        Redcarpet::Markdown.new(renderer, autolink: true).render(markdown)
+        html = Redcarpet::Markdown.new(renderer, autolink: true).render(markdown)
+        parse_card_link(html)
+      end
+
+      def parse_card_link(html)
+        html.gsub(/\[\[(.+?)\]\]/) do |match|
+          title = $1.dup
+          if title.match(/<("[^"]*"|'[^']*'|[^'">])*>/)
+            match
+          else
+	    %Q(<a href="http://#{request.host}/#/#{URI.escape(title)}">#{title}</a>)
+          end
+        end
       end
     end
 

data/package.json

@@ -1,7 +1,7 @@
 {
   "name": "carte-client",
   "description": "something like dictionary, wiki, or information card",
-  "version": "1.0.9",
+  "version": "1.0.10",
   "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.9
+  version: 1.0.10
 platform: ruby
 authors:
 - tily
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-26 00:00:00.000000000 Z
+date: 2015-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack-gzip-file
+  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: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -277,12 +291,13 @@ files:
 - lib/carte/client/views/content.cjsx
 - lib/carte/client/views/edit.cjsx
 - lib/carte/client/views/edit_tag.cjsx
+- lib/carte/client/views/flash.cjsx
+- lib/carte/client/views/flash_content.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