carte-server 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81e563d2f145372384e814a906391a8dcbfd9c90
-  data.tar.gz: e32d135bfd79cae9602708a24cee742bb83cf046
+  metadata.gz: ba996bbb2d71cf1b95ae1955737496ffe9b2a27a
+  data.tar.gz: 19aa30df9a3807971d76e5a7a256eca9fb554228
 SHA512:
-  metadata.gz: d0ab2c1163049dda3b0eed605b56ce8ac010ac8dfef5e490c9e284814b59377390882c2512bc82954395d59c39ff77c2cae21ad334e6ef1e2ec688d0a0d8e959
-  data.tar.gz: 7e54aab85fbaa0958e7430ae93f271c63b36d9a2862d12158d6084ca5fbd8b9d13be68fe1213bf3dfdd1ad4f7d8180119095675b9751f156306752f3dd0885c9
+  metadata.gz: c12da1320c1311ae74b500d6de2e1ff903adc5aeb7b90a87ca2e05881b15a03c4bef831b07c8c1edfb419dc6ac78321ab2923e657964feb8137af3a10e56c284
+  data.tar.gz: ae179b634d6bf222611497408d54fe21e31255fba216ca8810db75a26b4961ffed8560b205f9ffff512b81e27b7deb78f07b2198d623524459064566af672ddd

data/config.json

@@ -4,15 +4,5 @@
   "public_folder": "public",
   "script_path": "public/app.js",
   "link_color": "yellow",
-  "api_path": "",
-  "models": {
-    "card": {
-      "title": {
-        "length": {"maximum": "170"}
-      },
-      "description": {
-        "length": {"maximum": "170"}
-      }
-    }
-  }
+  "api_path": ""
 }

data/gulpfile.coffee

@@ -1,17 +1,3 @@
 gulp = require 'gulp'
 Carte = require './lib/carte'
-
-carte = new Carte()
-path = 'public/app.js'
-
-gulp.task 'build', ->
-  carte.build
-    watch: false
-    minify: true
-    config: __dirname + '/config.json'
-
-gulp.task 'watch', ->
-  carte.build
-    watch: true
-    minifty: false
-    config: __dirname + '/config.json'
+new Carte().install(gulp, __dirname + '/config.json')

data/lib/carte.coffee

@@ -10,6 +10,18 @@ uglify = require 'gulp-uglify'
 streamify = require 'gulp-streamify'
 
 module.exports = class Carte
+  install: (gulp, config)->
+    gulp.task 'build', =>
+      @build
+        watch: false
+        minify: true
+        config: config
+    gulp.task 'watch', =>
+      @build
+        watch: true
+        minifty: false
+        config: config
+
   build: (options)->
     config = require(options.config)
     fs.writeFileSync(__dirname + '/carte/shared/config.json', JSON.stringify(config))

data/lib/carte/client/router.coffee

@@ -13,15 +13,6 @@ module.exports = class Router extends Backbone.Router
     @query = querystring.parse(string)
     console.log @query
 
-  new: ()->
-    console.log 'new'
-    @current = 'new'
-
-  edit: (title)->
-    console.log 'edit', title
-    @current = 'edit'
-    @title = title
-
   show: (title)->
     console.log 'show', title
     @current = 'show'

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

@@ -14,7 +14,7 @@ module.exports = React.createClass
   render: ->
     Button = require('react-bootstrap/lib/Button')
     <div>
-      <Header key='header' />
+      <Header key='header' router={@props.router} />
       <Content key='content' router={@props.router} />
       <Footer key='footer' />
     </div>

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

@@ -5,30 +5,36 @@ Card = require('./card')
 module.exports = React.createClass
   displayName: 'Cards'
 
+  getInitialState: ()->
+    error: false
+
   componentDidMount: ()->
     console.log 'component did mount'
     @props.cards.on 'sync', @forceUpdate.bind(@, null)
+    @props.card.on 'sync', @forceUpdate.bind(@, null)
+    @props.card.on 'error', (model, response)=>
+      @setState error: response
+      @forceUpdate.bind(@, null)
 
   render: ->
-    console.log 'render cards', @props.cards
-    if !@props.cards.fetching
-      console.log 'cards loaded'
-      cards = @props.cards.map (card)-> <Card key={card.get("title")} card={card} />
-      <div className='row'>{cards}</div>
-    else if @props.cards.error
+    console.log 'render cards', @props.cards, @state
+    if @state.error
       <div className='row'>
         {
           for i in [1..9]
             <div className='col-sm-4' style={padding:'5px'} onMouseOver={@onMouseOver} onMouseLeave={@onMouseLeave}>
               <div className='list-group'style={margin:'0px',padding:'0px'}>
                 <div className='list-group-item' style={height:'220px'}>
-                  <i className='glyphicon glyphicon-alert' />
-                  {@props.cards.error}
+                  <i className='glyphicon glyphicon-alert' /> {@state.error.status} {@state.error.statusText}
                 </div>
               </div>
             </div>
         }
       </div>
+    else if !@props.cards.fetching
+      console.log 'cards loaded'
+      cards = @props.cards.map (card)-> <Card key={card.get("title")} card={card} />
+      <div className='row'>{cards}</div>
     else
       console.log 'cards loading'
       <div className='row'>

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

@@ -37,7 +37,7 @@ module.exports = React.createClass
         title = 'search: ' + cards.query.title + ' (' + title + ')' if cards.query.title
         title += ' - ' + config.title
         document.title = title
-        <List key='list' router={@props.router} cards={cards} showNav=true />
+        <List key='list' router={@props.router} cards={cards} />
       when "show"
         console.log 'show'
         cards = new CardCollection()
@@ -60,7 +60,8 @@ module.exports = React.createClass
               cards.add cardModel
             cards.fetching = false
           error: (card, response)=>
-            console.log response
+            console.log 'error!!!!!!!!!!!!!!!!!!!!!!!!', response
+            cards.fetching = false
         document.title = card.get('title') + ' - ' + config.title
         <List key='show' cards={cards} card={card} />
       else

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

@@ -15,13 +15,29 @@ module.exports = React.createClass
 
   componentWillMount: ()->
     console.log 'header mounted'
-    @card = new CardModel()
-    @card._isNew = true
-    @card.on 'sync', (model)=>
-      console.log 'sync!!!'
+    @onSync = ()=>
+      console.log 'model new calback'
       @card = new CardModel()
       @card._isNew = true
+      @card.on 'sync', @onSync
       @forceUpdate()
+    @onSync()
+
+    @callback = ()=>
+      if @props.router.query
+        searchText = []
+        if @props.router.query.tags
+          for tag in @props.router.query.tags.split(',')
+            searchText.push '#' + tag
+        if @props.router.query.title
+          searchText.push @props.router.query.title
+        @setState searchText: searchText.join(' ')
+        @forceUpdate()
+    @props.router.on "route", @callback
+
+  componentWillUnmount: ->
+    console.log 'componentWillMount un'
+    @props.router.off "route", @callback
 
   onChangeSearchText: ()->
     @setState searchText: event.target.value
@@ -30,7 +46,16 @@ module.exports = React.createClass
     if event.keyCode == 13 # ENTER
       console.log '13 enter'
       event.preventDefault()
-      query = {title: @state.searchText}
+      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)
 
   render: ->

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

@@ -48,11 +48,6 @@ module.exports = React.createClass
               <li><a onClick={helpers.reload} 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 onClick={helpers.reload} href={"#/?" + @randomParam()} style={{padding:'6px 12px',fontWeight: if @props.cards.query.order == 'random' then 'bold' else 'normal'}}>Random</a></li>
               <li><a href={config.api_path + "/api/cards.xml?" + @queryParam({}, [])} style={{padding:'6px 12px'}}><i className="fa fa-rss" /></a></li>
-              {
-                if @props.cards.query.tags
-                  @props.cards.query.tags.split(',').map (tag)=>
-                    <li><a href={"#/?" + @tagParam(tag)} style={padding:'6px 12px'}><i className="glyphicon glyphicon-tag" />&nbsp;{tag}</a></li>
-              }
             </ul>
           </div>
           <div className="col-sm-6" style={{padding:"0px"}}>
@@ -86,7 +81,7 @@ module.exports = React.createClass
           </div>
         </div>
       } 
-      <Cards cards={@props.cards} />
+      <Cards cards={@props.cards} card={@props.card} />
       {
         if !@props.card && helpers.isMobile()
           <div className="row">

data/lib/carte/server/version.rb

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

data/lib/carte/shared/default.json

@@ -0,0 +1,32 @@
+{
+  "title": "Carte Sandbox",
+  "description": "Sandbox for Carte",
+  "views": {
+    "menu": [],
+    "query": {}
+  },
+  "models": {
+    "card": {
+      "validations": {
+        "title": {
+          "presence": true,
+          "length": 70
+        },
+        "description": {
+          "presence": true,
+          "length": {
+            "maximum": 70
+          }
+        },
+        "tags": {
+          "length": 3,
+          "array": {
+            "length": {
+              "maximum": 10
+            }
+          } 
+        }
+      }
+    }
+  }
+}

data/package.json

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: carte-server
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - tily
@@ -250,6 +250,7 @@ files:
 - lib/carte/server/views/cards.builder
 - lib/carte/server/views/index.haml
 - lib/carte/shared/.keep
+- lib/carte/shared/default.json
 - mongoid.yml
 - package.json
 - public/images/icon.png