carte-server 0.0.13 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d197ea3d1133844e5dd56466724f421dad8cf957
-  data.tar.gz: ef1e33d03996bbcef1eccd41a386e5ec7787b728
+  metadata.gz: 94f92bcba2bb68b4e76f4380f0d4bcd508db2470
+  data.tar.gz: ce41c8cdd0b3f0221c3e2b3cad4dae76ce5547f6
 SHA512:
-  metadata.gz: c28c72d2e4ba717cfe840d3417d10fe3703936defb7185f069800a9b92008031574cce3328eadcb1117572d20b5481157aed8186204153e935a2e473919ba3dc
-  data.tar.gz: d62efdbf04e13578de0060504acb695b8405c382581f22bf05ff5dad21367409d48c109a6c6f0c129135ad92f1c8c4d9a2f6cad0d1db823fbc2d1dc20421463f
+  metadata.gz: 73b8fca305b006462412bc800b10cf00cc65675538cb1fb07681edbdcc72478b51583390e423742cd81c7d23a1a03f5966e6928a30f9e3c3a541b608e6feb572
+  data.tar.gz: ba3a2d310e97f4eee0ca9fa2c57d88ff08cf8ef7a09843e6ef58a593d8569d2cdb7a5be504a90991af6187580af08018d3348b5022ff49fa9ed90fc4d902c0c8

data/.gitignore

@@ -15,3 +15,4 @@ mkmf.log
 /node_modules/
 /public/app.js
 /lib/carte/shared/custom.json
+.env

data/README.md

@@ -21,9 +21,11 @@ Japanese introduction is [here](http://tily.tumblr.com/post/117678137942/carte).
 
 ## Components
 
-* [carte-server](https://rubygems.org/gems/carte-server)
-* [carte-client](https://www.npmjs.com/package/carte-client)
-
+| Package Name | Description |
+|--------------|-------------|
+| [carte-server](https://rubygems.org/gems/carte-server)     | provides JSON API (document is [here](https://github.com/tily/carte/wiki/API))  |
+| [carte-client](https://www.npmjs.com/package/carte-client) | builds client side javascript         |
+ 
 ## Deploy
 
 [![Deploy](https://www.herokucdn.com/deploy/button.png)](https://heroku.com/deploy?template=https://github.com/tily/carte-sandbox)

data/carte.gemspec

@@ -33,4 +33,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "haml"
   spec.add_dependency "mongoid-simple-tags"
   spec.add_dependency "mongoid-geospatial"
+  spec.add_dependency "redcarpet"
 end

data/config.json

@@ -1,9 +1,9 @@
 {
   "title": "Carte Sandbox (custom)",
   "description": "Sandbox for Carte",
+  "icon_link": "http://www.google.com",
   "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/client.coffee

@@ -8,6 +8,7 @@ Router = require('./client/router')
 Backbone.$ = $
 cssify.byUrl('//maxcdn.bootstrapcdn.com/bootstrap/3.3.4/css/bootstrap.min.css')
 cssify.byUrl('//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css')
+cssify.byUrl('//cdnjs.cloudflare.com/ajax/libs/animate.css/3.2.6/animate.min.css')
 
 $(document).ready ()->
   AppView = React.createFactory(AppViewComponent)

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

@@ -25,7 +25,7 @@ module.exports = React.createClass
       when "list"
         console.log 'list', @props.router.query
         cards = new CardCollection()
-        cards.query = $.extend config.default_query, @props.router.query
+        cards.query = $.extend {}, config.default_query, @props.router.query
         cards.fetching = true
         cards.fetch success: ()-> cards.fetching = false
         title = []

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

@@ -16,6 +16,7 @@ module.exports = React.createClass
     content: @props.card.get('content')
     tags: @props.card.get('tags') || []
     errors: false
+    shaking: false
 
   onChangeTitle: ->
     @setState title: event.target.value
@@ -41,9 +42,11 @@ module.exports = React.createClass
         console.log response.responseJSON
         @setState errors: response.responseJSON.card.errors
         @setState updating: false
+        @setState shaking: true
+        setTimeout (=> @setState shaking: false), 300
 
   render: ->
-    <Modal {...@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 <i className="glyphicon glyphicon-plus" /> else <i className="glyphicon glyphicon-edit" />} animation={false}>
       <div className='modal-body'>
         {
           if @state.errors

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

@@ -62,7 +62,7 @@ module.exports = React.createClass
     <nav className="navbar navbar-default" style={{padding:"0px",backgroundColor:"white",marginBottom:"5px"}}>
       <div className="container-fluid">
         <div className="navbar-header">
-          <a className="navbar-brand" onClick={helpers.reload} href={if config.icon_link then config.icon_link else "#/"} style={{paddingTop:"10px"}}>
+          <a className="navbar-brand" onClick={helpers.reload if !config.icon_link} href={if config.icon_link then config.icon_link else "#/"} style={{paddingTop:"10px"}}>
             <img alt="Brand" src="/images/icon.png" width="30" height="30" />
           </a>
           <a className="navbar-brand" onClick={helpers.reload} href="#/">

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

@@ -31,8 +31,7 @@ module.exports = React.createClass
     @queryParam {tag: tag}, ['seed']
 
   queryParam: (param, deleteKeys)->
-    query = $.extend {}, @props.cards.query
-    query = $.extend query, param
+    query = $.extend {}, @props.cards.query, param
     for key in deleteKeys
       delete query[key]
     $.param(query)

data/lib/carte/server.rb

@@ -5,6 +5,7 @@ require 'mongoid_auto_increment_id'
 require 'will_paginate_mongoid'
 require 'mongoid-simple-tags'
 require 'mongoid/geospatial'
+require 'redcarpet'
 require 'carte/server/validators'
 require 'carte/server/models'
 
@@ -53,6 +54,11 @@ module Carte
         end
         cards = cards.paginate(per_page: 9, page: params[:page])
       end
+
+      def markdown2html(markdown)
+        renderer = Redcarpet::Render::HTML.new(filter_html:true)
+        Redcarpet::Markdown.new(renderer, autolink: true).render(markdown)
+      end
     end
 
     get '/' do

data/lib/carte/server/models/card.rb

@@ -20,13 +20,13 @@ module Carte
 	  on: :create
         validates :title,
           uniqueness: true,
-          length: {maximum: 70}
+          length: {maximum: (ENV['CARTE_TITLE_MAX_LENGTH'] || 70).to_i}
         validates :content,
           presence: true,
-          length: {maximum: 560}
+          length: {maximum: (ENV['CARTE_DESCRIPTION_MAX_LENGTH'] || 560).to_i}
         validates :tags,
-          length: {maximum: 3, message: 'are too many (maximum is 3 tags)'},
-          array: {length: {maximum: 10}}
+          length: {maximum: (ENV['CARTE_TAGS_MAX_SIZE'] || 3).to_i, message: 'are too many (maximum is 3 tags)'},
+          array: {length: {maximum: (ENV['CARTE_TAG_MAX_LENGTH'] || 10).to_i}}
       
         has_many :histories
       

data/lib/carte/server/version.rb

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

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

@@ -8,7 +8,7 @@ xml.rss version: "2.0", :"xmlns:atom" => "http://www.w3.org/2005/Atom" do
     @cards.each do |card|
       xml.item do
         xml.title(card.title)
-        xml.description card.content
+        xml.description markdown2html(card.content)
         xml.link("http://#{request.host}/#/#{URI.escape(card.title)}")
         xml.pubDate card.updated_at.rfc822
         xml.guid({isPermaLink: false}, "http://#{request.host}/#/#{URI.escape(card.title)}##{card.updated_at.to_i}")

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

@@ -23,8 +23,14 @@
         color: #333333 !important;
         text-decoration: none !important;
       }
-      a, a:hover, a:visited, a:active {
-        color: #{config['link_color']}; 
+      a {
+        color: #{config['link_color']};
+        text-decoration: none;
+      }
+      a:hover,
+      a:focus {
+        color: #{config['link_active_color']};
+        text-decoration: underline;
       }
       .glyphicon-refresh-animate {
         -animation: spin .7s infinite linear;

data/lib/carte/shared/default.json

@@ -3,7 +3,8 @@
   "description": "Sandbox for Carte",
   "public_folder": "public",
   "script_path": "public/app.js",
-  "link_color": "yellow",
+  "link_color": "#337ab7",
+  "link_active_color": "#23527c",
   "api_path": "",
   "menu_items": ["atoz", "latest", "random"],
   "default_query": {"sort": "title", "order": "asc"},

data/package.json

@@ -1,7 +1,7 @@
 {
   "name": "carte-client",
   "description": "something like dictionary, wiki, or information card",
-  "version": "0.0.13",
+  "version": "0.0.14",
   "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: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors:
 - tily
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-04 00:00:00.000000000 Z
+date: 2015-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -206,6 +206,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: redcarpet
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: something like dictionary, wiki, or information card
 email:
 - tidnlyam@gmail.com