carte-server 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ad405840ee8644a09530f58b55f06d6577e7f47
-  data.tar.gz: 02712abc98c52f3b2e84b721b6a09d921f3f0847
+  metadata.gz: 62e6b5113d7bafffdb2e35701cabd5a01ae26532
+  data.tar.gz: 8f4dd2dee37acd726a75e5c4477e5d7ec325e4ab
 SHA512:
-  metadata.gz: 0880fb449f7b45ccd725f0d6688c9ce36eb988fdc919261e47fb57171a091701ecb47ad80f06558a190dc1d77912f8d33a3c31e77e3e43bdef56aec5f8ca1ee5
-  data.tar.gz: 76cbdd005b7ea7b876dbf822f6e5f0c7eb27daf28e6a07316df3bb712600f2e1c18215492dcc92f8cd99216ef75d3781721ba846f1f458dd3db08076b42fc481
+  metadata.gz: af45cdb68b5f9de14cfc855e1199453ba0762f41bd6a781dd0e9f5db467f86713da9bd29f138d419e77b8d3bfbff7de045a30a972baf2f28b1631fdc9029853c
+  data.tar.gz: 015f9690877ab8a0f6ac5ca9f982b1774163ed38a9fef3fe237f02a516b1278403af5897a1d6f9e4f9113b6eb141030a84f94639b80dee25de4b13f3059fc299

data/.rspec

@@ -0,0 +1 @@
+--format documentation --color

data/Rakefile

@@ -1,49 +1,3 @@
 require "bundler/gem_tasks"
-require "carte/server"
+require "carte/server/tasks"
 Carte::Server.configure { Mongoid.load!('mongoid.yml') }
-include Carte::Server::Models
-
-namespace :carte do
-  desc 'analyze'
-  task :analyze do
-    title, content = {max: 0, min: 0}, {max: 0, min: 0}
-    count = Hash.new(0)
-    Card.all.each do |card|
-      title[:max] = [card.title.length, title[:max]].max
-      title[:min] = [card.title.length, title[:min]].min
-      content[:max] = [card.content.length, content[:max]].max
-      content[:min] = [card.content.length, content[:min]].min
-      if card.content == ''
-        puts "#{card.title} : content is empty"
-      end
-      count[card.title] += 1
-    end
-    puts "title: #{title}, content: #{content}"
-    count.each do |card, count|
-      puts "#{card}: #{count} items" if count != 1
-    end
-  end
-  
-  desc 'import fr.txt'
-  task :import do
-    entries = []
-    file = File.open(ENV['FILE'])
-    lines = file.read.split("\n")
-    lines.each_slice(2) do |title, content|
-      Card.create!(title: title, content: content)
-    end
-  end
-  
-  desc 'export'
-  task :export do
-    Card.all.each do |card|
-      puts card.title
-      puts card.content
-    end
-  end
-  
-  desc 'reset'
-  task :reset do
-    Card.delete_all
-  end
-end

data/config.json

@@ -1,7 +1,7 @@
 {
-  "title": "carte sandbox",
-  "description": "sandbox for carte",
+  "title": "Carte Sandbox",
+  "description": "Sandbox for Carte",
   "public_folder": "public",
   "script_path": "public/app.js",
-  "link_color": "#2C21A6"
+  "link_color": "yellow"
 }

data/lib/carte/client/helpers.coffee

@@ -0,0 +1,4 @@
+
+module.exports =
+  isMobile: ()->
+    /(iPhone|iPod|iPad).*AppleWebKit/i.test(navigator.userAgent)

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

@@ -1,4 +1,5 @@
 Backbone = require('backbone')
+config = require('../../shared/config.json')
 
 module.exports = class Card extends Backbone.Model
   idAttribute: 'title'
@@ -10,10 +11,13 @@ module.exports = class Card extends Backbone.Model
     if @isNew()
       console.log @
       console.log 'url is new'
-      '/api/cards.json'
+      url = '/api/cards.json'
     else
       console.log 'url is not new'
-      '/api/cards/' + @get('title') + '.json'
+      url = '/api/cards/' + @get('title') + '.json'
+    if config.api_path
+      url = config.api_path + url
+    url
 
   parse: (response)->
     if response.card then response.card else response

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

@@ -1,12 +1,16 @@
 Backbone = require('backbone')
 CardModel = require('./card')
 $ = require('jquery')
+config = require('../../shared/config.json')
 
 module.exports = class Cards extends Backbone.Collection
   model: CardModel
   query: {}
   url: ()->
-      '/api/cards.json?' + $.param(@query)
+    url = '/api/cards.json?' + $.param(@query)
+    if config.api_path
+      url = config.api_path + url
+    url
   parse: (response)->
     console.log response
     @page = response.page

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

@@ -3,10 +3,10 @@ React = require('react')
 Edit = require('./edit')
 ModalTrigger = require('react-bootstrap/lib/ModalTrigger')
 markdownIt = require('markdown-it')(linkify: true)
+helpers = require('../helpers')
 
 module.exports = React.createClass
   displayName: 'Card'
-  isSafariOrUiWebView: /(iPhone|iPod|iPad).*AppleWebKit/i.test(navigator.userAgent)
 
   componentDidMount: ->
     @props.card.on 'change', @forceUpdate.bind(@, null)
@@ -38,7 +38,7 @@ module.exports = React.createClass
             <strong>
               {@props.card.get('title')}
             </strong>
-            <span className='pull-right tools' style={{visibility: if @isSafariOrUiWebView || @state.showTools then 'visible' else 'hidden'}}>
+            <span className='pull-right tools' style={{visibility: if helpers.isMobile() || @state.showTools then 'visible' else 'hidden'}}>
               <ModalTrigger modal={<Edit card={@props.card} />}>
                 <a href="javascript:void(0)">
                   <i className='glyphicon glyphicon-edit' />
@@ -54,7 +54,7 @@ module.exports = React.createClass
           <div style={overflow:'hidden',width:'100%',height:'75%',wordWrap:'break-word'}>
             <div dangerouslySetInnerHTML={__html: markdownIt.render @props.card.get('content')} />
           </div>
-          <div style={{visibility: if @isSafariOrUiWebView || @state.showTools then 'visible' else 'hidden'}}>
+          <div style={{visibility: if helpers.isMobile() || @state.showTools then 'visible' else 'hidden'}}>
           {
             if @props.card.get("tags")
               @props.card.get("tags").map (tag)->

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

@@ -3,6 +3,7 @@ React = require('react')
 List = require('./list')
 CardCollection = require('../models/cards')
 CardModel = require('../models/card')
+String = require('string')
 config = require('../../shared/config.json')
 
 module.exports = React.createClass
@@ -31,7 +32,7 @@ module.exports = React.createClass
         title = []
         for k, v of cards.query
           if k != 'title'
-            title.push(k + ': ' + v)
+            title.push(String(k).capitalize() + ': ' + v)
         title = title.join(', ')
         title = 'search: ' + cards.query.title + ' (' + title + ')' if cards.query.title
         title += ' - ' + config.title

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

@@ -36,7 +36,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" href="#/" style={{paddingTop:"10px"}}>
+          <a className="navbar-brand" 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" href="#/">

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

@@ -3,6 +3,8 @@ $ = require('jquery')
 React = require('react')
 Cards = require('./cards')
 CardCollection = require('../models/cards')
+Pagination = require('./pagination')
+helpers = require('../helpers')
 
 module.exports = React.createClass
   displayName: 'List'
@@ -33,11 +35,6 @@ module.exports = React.createClass
     delete query.page
     $.param(query)
 
-  pageParam: (page)->
-    query = $.extend {}, @props.cards.query
-    query = $.extend query, {page: page}
-    $.param(query)
-
   tagParam: (tag)->
     query = $.extend {}, @props.cards.query
     query = $.extend query, {tags: tag}
@@ -78,48 +75,7 @@ module.exports = React.createClass
                   </li>
                 </ul>
               else
-                <ul className="nav nav-pills pull-right">
-                  <li>
-                    {
-                      if @props.cards.page
-                        if @props.cards.page.current > 1
-                          href = "/#/?" + @pageParam(@props.cards.page.current - 1)
-                        else
-                          href = "/#/?" + @pageParam(@props.cards.page.total)
-                      else
-                        href = "javascript:void(0)"
-                      <a href={href} aria-label="Previous" style={{padding:'6px 12px'}}>
-                        <span aria-hidden="true">&laquo;</span>
-                      </a>
-                    }
-                  </li>
-                  <li style={width:'4.0em',textAlign:'center'}>
-                    {
-                      if @props.cards.page
-                        <a href={"/#/?" + @pageParam(@props.cards.page.current)} style={{padding:'6px 12px'}}>
-                          {@props.cards.page.current} / {@props.cards.page.total}
-                        </a>
-                      else
-                        <a href="javascript:void(0)" style={{padding:'6px 12px'}}>
-                          <i className="glyphicon glyphicon-refresh glyphicon-refresh-animate" />
-                        </a>
-                    }
-                  </li>
-                  <li>
-                    {
-                      if @props.cards.page
-                        if @props.cards.page.current < @props.cards.page.total
-                          href = "/#/?" + @pageParam(@props.cards.page.current + 1)
-                        else
-                          href = "/#/?" + @pageParam(1)
-                      else
-                        href = "javascript:void(0)"
-                      <a href={href} aria-label="Next" style={{padding:'6px 12px'}}>
-                        <span aria-hidden="true">&raquo;</span>
-                      </a>
-                    }
-                  </li>
-                </ul>
+                <Pagination cards={@props.cards} />
             }
           </div>
         </div>
@@ -133,4 +89,12 @@ module.exports = React.createClass
         </div>
       } 
       <Cards cards={@props.cards} />
+      {
+        if !@props.card && helpers.isMobile()
+          <div className="row">
+            <div className="col-sm-12" style={{padding:"0px"}}>
+              <Pagination cards={@props.cards} />
+            </div>
+          </div>
+      }
     </div>

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

@@ -0,0 +1,55 @@
+# @cjsx React.DOM 
+$ = require('jquery')
+React = require('react')
+
+module.exports = React.createClass
+  displayName: 'Pagination'
+
+  pageParam: (page)->
+    query = $.extend {}, @props.cards.query
+    query = $.extend query, {page: page}
+    $.param(query)
+
+  render: ->
+    <ul className="nav nav-pills pull-right">
+      <li>
+        {
+          if @props.cards.page
+            if @props.cards.page.current > 1
+              href = "/#/?" + @pageParam(@props.cards.page.current - 1)
+            else
+              href = "/#/?" + @pageParam(@props.cards.page.total)
+          else
+            href = "javascript:void(0)"
+          <a href={href} aria-label="Previous" style={{padding:'6px 12px'}}>
+            <span aria-hidden="true">&laquo;</span>
+          </a>
+        }
+      </li>
+      <li style={width:'4.0em',textAlign:'center'}>
+        {
+          if @props.cards.page
+            <a href={"/#/?" + @pageParam(@props.cards.page.current)} style={{padding:'6px 12px'}}>
+              {@props.cards.page.current} / {@props.cards.page.total}
+            </a>
+          else
+            <a href="javascript:void(0)" style={{padding:'6px 12px'}}>
+              <i className="glyphicon glyphicon-refresh glyphicon-refresh-animate" />
+            </a>
+        }
+      </li>
+      <li>
+        {
+          if @props.cards.page
+            if @props.cards.page.current < @props.cards.page.total
+              href = "/#/?" + @pageParam(@props.cards.page.current + 1)
+            else
+              href = "/#/?" + @pageParam(1)
+          else
+            href = "javascript:void(0)"
+          <a href={href} aria-label="Next" style={{padding:'6px 12px'}}>
+            <span aria-hidden="true">&raquo;</span>
+          </a>
+        }
+      </li>
+    </ul>

data/lib/carte/server.rb

@@ -4,6 +4,7 @@ require 'mongoid'
 require 'mongoid_auto_increment_id'
 require 'will_paginate_mongoid'
 require 'mongoid-simple-tags'
+require 'carte/server/validators'
 require 'carte/server/models'
 
 module Carte

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

@@ -22,6 +22,9 @@ module Carte
         validates :content,
           presence: true,
           length: {maximum: 560}
+        validates :tags,
+          length: {maximum: 3, message: 'are too many (maximum is 3 tags)'},
+          array: {length: {maximum: 10}}
       
         has_many :histories
       

data/lib/carte/server/tasks.rb

@@ -0,0 +1,47 @@
+require 'carte/server'
+include Carte::Server::Models
+
+namespace :carte do
+  desc 'analyze data'
+  task :analyze do
+    title, content = {max: 0, min: 0}, {max: 0, min: 0}
+    count = Hash.new(0)
+    Card.all.each do |card|
+      title[:max] = [card.title.length, title[:max]].max
+      title[:min] = [card.title.length, title[:min]].min
+      content[:max] = [card.content.length, content[:max]].max
+      content[:min] = [card.content.length, content[:min]].min
+      if card.content == ''
+        puts "#{card.title} : content is empty"
+      end
+      count[card.title] += 1
+    end
+    puts "title: #{title}, content: #{content}"
+    count.each do |title, count|
+      puts "duplicate: #{title}: #{count} items" if count != 1
+    end
+  end
+  
+  desc 'import pdic one line format data'
+  task :import do
+    entries = []
+    file = File.open(ENV['FILE'])
+    lines = file.read.split("\n")
+    lines.each_slice(2) do |title, content|
+      Card.create!(title: title, content: content)
+    end
+  end
+  
+  desc 'export data as pdic one line format'
+  task :export do
+    Card.all.each do |card|
+      puts card.title
+      puts card.content
+    end
+  end
+  
+  desc 'reset database'
+  task :reset do
+    Card.delete_all
+  end
+end

data/lib/carte/server/validators.rb

@@ -0,0 +1 @@
+require 'carte/server/validators/array_validator'

data/lib/carte/server/validators/array_validator.rb

@@ -0,0 +1,24 @@
+
+class ArrayValidator < ActiveModel::EachValidator
+  def validate_each(record, attribute, values)
+    [values].flatten.each do |value|
+      options.each do |key, args|
+        validator_options = { attributes: attribute }
+        validator_options.merge!(args) if args.is_a?(Hash)
+
+        next if value.nil? && validator_options[:allow_nil]
+        next if value.blank? && validator_options[:allow_blank]
+
+        validator_class_name = "#{key.to_s.camelize}Validator"
+        validator_class = begin
+          validator_class_name.constantize
+        rescue NameError
+          "ActiveModel::Validations::#{validator_class_name}".constantize
+        end
+
+        validator = validator_class.new(validator_options)
+        validator.validate_each(record, attribute, value)
+      end
+    end
+  end
+end

data/lib/carte/server/version.rb

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

data/package.json

@@ -1,7 +1,7 @@
 {
   "name": "carte-client",
   "description": "something like dictionary, wiki, or information card",
-  "version": "0.0.7",
+  "version": "0.0.8",
   "main": "lib/carte.coffee",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
@@ -35,6 +35,7 @@
     "react": "^0.13.2",
     "react-bootstrap": "^0.21.0",
     "react-tagsinput": "^1.3.2",
+    "string": "^3.1.1",
     "vinyl-source-stream": "^1.1.0",
     "watchify": "^3.1.2"
   }

data/spec/server_spec.rb

@@ -10,7 +10,7 @@ end
 
 class DictionaryClient
   include HTTParty
-  base_uri 'http://localhost/api/'
+  base_uri 'http://localhost:9393/api/'
   format :json
 end
 
@@ -40,32 +40,44 @@ describe 'API' do
       it 'returns error when the title is not specified' do
         response = client.post('/cards.json', body: {content: 'content1'}.to_json) 
         expect(response.code).to eq(400)
-        expect(response['card']['errors']).to eq({'title' => ['が入力されていません']})
+        expect(response['card']['errors']).to eq({'title' => ["can't be blank"]})
       end
 
       it 'returns error when the content is not specified' do
         response = client.post('/cards.json', body: {title: 'card1'}.to_json) 
         expect(response.code).to eq(400)
-        expect(response['card']['errors']).to eq({'content' => ['が入力されていません']})
+        expect(response['card']['errors']).to eq({'content' => ["can't be blank"]})
       end
 
       it 'returns error when the title is not unique' do
         response = client.post('/cards.json', body: {title: 'card1', content: 'content1'}.to_json) 
         response = client.post('/cards.json', body: {title: 'card1', content: 'content1'}.to_json) 
         expect(response.code).to eq(400)
-        expect(response['card']['errors']).to eq({'title' => ['は既に存在します']})
+        expect(response['card']['errors']).to eq({'title' => ['is already taken']})
       end
 
       it 'returns error when the title is too long' do
         response = client.post('/cards.json', body: {title: 'w' * 71, content: 'content1'}.to_json) 
         expect(response.code).to eq(400)
-        expect(response['card']['errors']).to eq({'title' => ['は 70 文字以内で入力してください']})
+        expect(response['card']['errors']).to eq({'title' => ['is too long (maximum is 70 characters)']})
       end
 
       it 'returns error when the content is too long' do
         response = client.post('/cards.json', body: {title: 'card1', content: 'd' * 561}.to_json) 
         expect(response.code).to eq(400)
-        expect(response['card']['errors']).to eq({'content' => ['は 560 文字以内で入力してください']})
+        expect(response['card']['errors']).to eq({'content' => ['is too long (maximum is 560 characters)']})
+      end
+
+      it 'returns error when the tags is too many' do
+        response = client.post('/cards.json', body: {title: 'card1', content: 'content1', tags: %w(tag1 tag2 tag3 tag4)}.to_json)
+        expect(response.code).to eq(400)
+        expect(response['card']['errors']).to eq({'tags' => ['are too many (maximum is 3 tags)']})
+      end
+
+      it 'returns error when one of the tags is too long' do
+        response = client.post('/cards.json', body: {title: 'card1', content: 'content1', tags: ['a' * 11]}.to_json)
+        expect(response.code).to eq(400)
+        expect(response['card']['errors']).to eq({'tags' => ['is too long (maximum is 10 characters)']})
       end
     end
   end
@@ -126,21 +138,35 @@ describe 'API' do
         response = client.post('/cards.json', body: {title: 'card2', content: 'content2'}.to_json) 
         response = client.put("/cards/card2.json", body: {new_title: 'card1', content: 'content1'}.to_json)
 	expect(response.code).to eq(400)
-        expect(response['card']['errors']).to eq({'title' => ['は既に存在します']})
+        expect(response['card']['errors']).to eq({'title' => ['is already taken']})
       end
 
       it 'returns error when the title is too long' do
         response = client.post('/cards.json', body: {title: 'card1', content: 'content1'}.to_json) 
         response = client.put("/cards/card1.json", body: {new_title: 'w' * 71}.to_json) 
 	expect(response.code).to eq(400)
-        expect(response['card']['errors']).to eq({'title' => ['は 70 文字以内で入力してください']})
+        expect(response['card']['errors']).to eq({'title' => ['is too long (maximum is 70 characters)']})
       end
 
       it 'returns error when the content is too long' do
         response = client.post('/cards.json', body: {title: 'card1', content: 'content1'}.to_json) 
         response = client.put("/cards/card1.json", body: {content: 'd' * 561}.to_json) 
 	expect(response.code).to eq(400)
-        expect(response['card']['errors']).to eq({'content' => ['は 560 文字以内で入力してください']})
+        expect(response['card']['errors']).to eq({'content' => ['is too long (maximum is 560 characters)']})
+      end
+
+      it 'returns error when the tags is too many' do
+        response = client.post('/cards.json', body: {title: 'card1', content: 'content1'}.to_json)
+        response = client.put("/cards/card1.json", body: {tags: %w(tag1 tag2 tag3 tag4)}.to_json)
+	expect(response.code).to eq(400)
+        expect(response['card']['errors']).to eq({'tags' => ['are too many (maximum is 3 tags)']})
+      end
+
+      it 'returns error when one of the tags is too long' do
+        response = client.post('/cards.json', body: {title: 'card1', content: 'content1'}.to_json)
+        response = client.put("/cards/card1.json", body: {tags: ['a' * 11]}.to_json)
+	expect(response.code).to eq(400)
+        expect(response['card']['errors']).to eq({'tags' => ['is too long (maximum is 10 characters)']})
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carte-server
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - tily
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-02 00:00:00.000000000 Z
+date: 2015-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -200,6 +200,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -211,6 +212,7 @@ files:
 - lib/carte.coffee
 - lib/carte.rb
 - lib/carte/client.coffee
+- lib/carte/client/helpers.coffee
 - lib/carte/client/models/card.coffee
 - lib/carte/client/models/cards.coffee
 - lib/carte/client/router.coffee
@@ -222,10 +224,14 @@ files:
 - lib/carte/client/views/footer.cjsx
 - lib/carte/client/views/header.cjsx
 - lib/carte/client/views/list.cjsx
+- lib/carte/client/views/pagination.cjsx
 - lib/carte/server.rb
 - lib/carte/server/models.rb
 - lib/carte/server/models/card.rb
 - lib/carte/server/models/history.rb
+- lib/carte/server/tasks.rb
+- lib/carte/server/validators.rb
+- lib/carte/server/validators/array_validator.rb
 - lib/carte/server/version.rb
 - lib/carte/server/views/cards.builder
 - lib/carte/server/views/index.haml