carte-server 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba996bbb2d71cf1b95ae1955737496ffe9b2a27a
-  data.tar.gz: 19aa30df9a3807971d76e5a7a256eca9fb554228
+  metadata.gz: d197ea3d1133844e5dd56466724f421dad8cf957
+  data.tar.gz: ef1e33d03996bbcef1eccd41a386e5ec7787b728
 SHA512:
-  metadata.gz: c12da1320c1311ae74b500d6de2e1ff903adc5aeb7b90a87ca2e05881b15a03c4bef831b07c8c1edfb419dc6ac78321ab2923e657964feb8137af3a10e56c284
-  data.tar.gz: ae179b634d6bf222611497408d54fe21e31255fba216ca8810db75a26b4961ffed8560b205f9ffff512b81e27b7deb78f07b2198d623524459064566af672ddd
+  metadata.gz: c28c72d2e4ba717cfe840d3417d10fe3703936defb7185f069800a9b92008031574cce3328eadcb1117572d20b5481157aed8186204153e935a2e473919ba3dc
+  data.tar.gz: d62efdbf04e13578de0060504acb695b8405c382581f22bf05ff5dad21367409d48c109a6c6f0c129135ad92f1c8c4d9a2f6cad0d1db823fbc2d1dc20421463f

data/.gitignore

@@ -14,4 +14,4 @@
 mkmf.log
 /node_modules/
 /public/app.js
-/lib/carte/shared/config.json
+/lib/carte/shared/custom.json

data/config.json

@@ -1,8 +1,10 @@
 {
-  "title": "Carte Sandbox",
+  "title": "Carte Sandbox (custom)",
   "description": "Sandbox for Carte",
   "public_folder": "public",
   "script_path": "public/app.js",
   "link_color": "yellow",
+  "menu_items": ["latest", "random", "atoz"],
+  "default_query": {"sort": "updated_at", "order": "desc"},
   "api_path": ""
 }

data/lib/carte.coffee

@@ -24,7 +24,7 @@ module.exports = class Carte
 
   build: (options)->
     config = require(options.config)
-    fs.writeFileSync(__dirname + '/carte/shared/config.json', JSON.stringify(config))
+    fs.writeFileSync(__dirname + '/carte/shared/custom.json', JSON.stringify(config))
     dir = path.dirname config.script_path
     file = path.basename config.script_path
     minify = options.minify

data/lib/carte/client/config.coffee

@@ -0,0 +1,4 @@
+$ = require('jquery')
+_default = require('../shared/default')
+custom = require('../shared/custom')
+module.exports = $.extend _default, custom

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

@@ -1,5 +1,5 @@
 Backbone = require('backbone')
-config = require('../../shared/config.json')
+config = require('../config')
 querystring = require('querystring')
 
 module.exports = class Card extends Backbone.Model

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

@@ -1,7 +1,7 @@
 Backbone = require('backbone')
 CardModel = require('./card')
 $ = require('jquery')
-config = require('../../shared/config.json')
+config = require('../config')
 
 module.exports = class Cards extends Backbone.Collection
   model: CardModel

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

@@ -46,7 +46,7 @@ module.exports = React.createClass
               </ModalTrigger>
               &nbsp;
               &nbsp;
-              <a href={'#/' + @props.card.get('title')}>
+              <a href={'#/' + encodeURIComponent(@props.card.get('title'))}>
                 <i className='glyphicon glyphicon-link' />
               </a>
             </span>

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

@@ -11,10 +11,10 @@ module.exports = React.createClass
   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)
+    if @props.card
+      @props.card.on 'error', (model, response)=>
+        @setState error: response
+        @forceUpdate.bind(@, null)
 
   render: ->
     console.log 'render cards', @props.cards, @state

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

@@ -1,10 +1,11 @@
 # @cjsx React.DOM 
+$ = require('jquery')
 React = require('react')
 List = require('./list')
 CardCollection = require('../models/cards')
 CardModel = require('../models/card')
 String = require('string')
-config = require('../../shared/config.json')
+config = require('../config')
 
 module.exports = React.createClass
   displayName: 'Content'
@@ -24,9 +25,7 @@ module.exports = React.createClass
       when "list"
         console.log 'list', @props.router.query
         cards = new CardCollection()
-        cards.query = @props.router.query
-        cards.query.sort = 'title' if !cards.query.sort
-        cards.query.order = 'asc' if !cards.query.order
+        cards.query = $.extend config.default_query, @props.router.query
         cards.fetching = true
         cards.fetch success: ()-> cards.fetching = false
         title = []

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

@@ -5,7 +5,7 @@ Edit = require('./edit')
 CardModel = require('../models/card')
 ModalTrigger = require('react-bootstrap/lib/ModalTrigger')
 helpers = require('../helpers')
-config = require('../../shared/config.json')
+config = require('../config')
 
 module.exports = React.createClass
   displayName: 'Header'

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

@@ -6,7 +6,7 @@ Cards = require('./cards')
 CardCollection = require('../models/cards')
 Pagination = require('./pagination')
 helpers = require('../helpers')
-config = require('../../shared/config')
+config = require('../config')
 
 module.exports = React.createClass
   displayName: 'List'
@@ -44,9 +44,16 @@ module.exports = React.createClass
         <div className="row">
           <div className="col-sm-6" style={{padding:"0px"}}>
             <ul className="nav nav-pills">
-              <li><a onClick={helpers.reload} 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 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>
+              {
+                for menuItem in config.menu_items
+                  switch menuItem
+                    when 'atoz'
+                      <li><a onClick={helpers.reload} 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>
+                    when 'latest'
+                      <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>
+                    when 'random'
+                      <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>
             </ul>
           </div>
@@ -76,7 +83,7 @@ module.exports = React.createClass
         <div className="row">
           <div className="col-sm-12" style={{padding:"0px"}}>
             <ul className="nav nav-pills">
-              <li><a href={"#/" + @props.card.get('title')} style={fontWeight:'bold'}>{@props.card.get('title')}</a></li>
+              <li><a href={"#/" + @props.card.get('title')} style={padding:'6px 12px',fontWeight:'bold'}>{@props.card.get('title')}</a></li>
             </ul>
           </div>
         </div>

data/lib/carte/server.rb

@@ -18,10 +18,16 @@ module Carte
       set :protection, :except => :path_traversal
       set :views, File.join(File.dirname(__FILE__), 'server/views')
       set :public_folder, 'public'
+      set :default, JSON.parse(File.read(File.join(File.dirname(__FILE__), 'shared/default.json')))
+      set :carte, {}
       set :script_path, '/app.js'
     end
 
     helpers do
+      def config
+        @config ||= settings.default.update(settings.carte)
+      end
+
       def json_data
         request.body.rewind
         JSON.parse(request.body.read)

data/lib/carte/server/version.rb

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

data/lib/carte/server/views/cards.builder

@@ -2,8 +2,8 @@ xml.instruct! :xml, version: '1.0'
 xml.rss version: "2.0", :"xmlns:atom" => "http://www.w3.org/2005/Atom" do
   xml.channel do
     xml.tag! "atom:link", href: "http://#{request.host}/api/cards.xml?#{request.env['QUERY_STRING']}", rel: "self", type: "application/rss+xml"
-    xml.title settings.carte['title']
-    xml.description settings.carte['description']
+    xml.title config['title']
+    xml.description config['description']
     xml.link "http://#{request.host}/"
     @cards.each do |card|
       xml.item do

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

@@ -2,9 +2,9 @@
 %html
   %head
     %meta{charset:"utf-8"}
-    %title= settings.carte['title']
+    %title= config['title']
     %meta{name:"viewport",content:"width=device-width,initial-scale=1.0"}
-    %meta{name:"description",content:settings.carte['description']}
+    %meta{name:"description",content:config['description']}
     %script{type:"text/javascript",src:"/app.js"}
     :css
       .navbar-default a,
@@ -24,7 +24,7 @@
         text-decoration: none !important;
       }
       a, a:hover, a:visited, a:active {
-        color: #{settings.carte['link_color']}; 
+        color: #{config['link_color']}; 
       }
       .glyphicon-refresh-animate {
         -animation: spin .7s infinite linear;

data/lib/carte/shared/default.json

@@ -1,32 +1,14 @@
 {
   "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
-            }
-          } 
-        }
-      }
-    }
-  }
+  "public_folder": "public",
+  "script_path": "public/app.js",
+  "link_color": "yellow",
+  "api_path": "",
+  "menu_items": ["atoz", "latest", "random"],
+  "default_query": {"sort": "title", "order": "asc"},
+  "title_max_length": 70,
+  "description_max_length": 560,
+  "tags_max_size": 3,
+  "tag_max_length": 10
 }

data/package.json

@@ -1,7 +1,7 @@
 {
   "name": "carte-client",
   "description": "something like dictionary, wiki, or information card",
-  "version": "0.0.12",
+  "version": "0.0.13",
   "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.12
+  version: 0.0.13
 platform: ruby
 authors:
 - tily
@@ -226,6 +226,7 @@ files:
 - lib/carte.coffee
 - lib/carte.rb
 - lib/carte/client.coffee
+- lib/carte/client/config.coffee
 - lib/carte/client/helpers.coffee
 - lib/carte/client/models/card.coffee
 - lib/carte/client/models/cards.coffee