carte-server 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f6b43e925dea02cd986b8267fd5bf77d8ff88ef
-  data.tar.gz: df37f4fd415e613d6ae5af207c9db1f620c9e049
+  metadata.gz: c9924e7dfa9f1be40fac1767395cb53f4855c016
+  data.tar.gz: 79e9aaf3531ef5494142426b88ef6838a5886532
 SHA512:
-  metadata.gz: 5db00e8726f2a0a85986436437d857b9698d9ca92fa11c912bde8accaaff01dc7397b05d6a7c8dc6ae35c8ab431ae1a9c1edd863055158ddb3997b92b14dcd86
-  data.tar.gz: 06100017a72c998eafd854b558273c6b7b533170a7180163edff5105542a023878c62893db087a64f123c55ee252ec92880a400573ecb251e92742dd6a5040a0
+  metadata.gz: f5845160a604995b0ea42460a4b34bb66d5fe0ef2203ba94c341046ea23cd78b31cd70a68b75feeec9dfbb9928e63b954843e9510ae147f9d973d6e28a47183e
+  data.tar.gz: a2c858d32f6fe6b28aae28fbe1e63e8d91ef643c813b7fc3d1f1bfaef3d9a9d3e7ace4b445937ef090c48c273ef92fb539555bdf76e5e9427876230a54675636

data/carte.gemspec

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

data/lib/carte/client/helpers.coffee

@@ -1,4 +1,7 @@
-
+Backbone = require('backbone')
 module.exports =
+  reload: ()->
+    Backbone.history.loadUrl()
+
   isMobile: ()->
     /(iPhone|iPod|iPad).*AppleWebKit/i.test(navigator.userAgent)

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

@@ -1,5 +1,6 @@
 Backbone = require('backbone')
 config = require('../../shared/config.json')
+querystring = require('querystring')
 
 module.exports = class Card extends Backbone.Model
   idAttribute: 'title'
@@ -14,7 +15,7 @@ module.exports = class Card extends Backbone.Model
       url = '/api/cards.json'
     else
       console.log 'url is not new'
-      url = '/api/cards/' + @get('title') + '.json'
+      url = '/api/cards/' + encodeURIComponent(@get('title')) + '.json'
     if config.api_path
       url = config.api_path + url
     url

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' cards={cards} showNav=true />
+        <List key='list' router={@props.router} cards={cards} showNav=true />
       when "show"
         console.log 'show'
         cards = new CardCollection()

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

@@ -4,6 +4,7 @@ React = require('react')
 Edit = require('./edit')
 CardModel = require('../models/card')
 ModalTrigger = require('react-bootstrap/lib/ModalTrigger')
+helpers = require('../helpers')
 config = require('../../shared/config.json')
 
 module.exports = React.createClass
@@ -36,10 +37,10 @@ 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={if config.icon_link then config.icon_link else "#/"} style={{paddingTop:"10px"}}>
+          <a className="navbar-brand" onClick={helpers.reload} 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="#/">
+          <a className="navbar-brand" onClick={helpers.reload} href="#/">
             {config.title}
           </a>
         </div>

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

@@ -1,5 +1,6 @@
 # @cjsx React.DOM 
 $ = require('jquery')
+Backbone = require('backbone')
 React = require('react')
 Cards = require('./cards')
 CardCollection = require('../models/cards')
@@ -17,27 +18,22 @@ module.exports = React.createClass
     nextProps.cards.on 'sync', @forceUpdate.bind(@, null)
 
   atozParam: ()->
-    query = $.extend {}, @props.cards.query
-    query = $.extend query, {sort: 'title', order: 'asc', page: 1}
-    delete query.seed
-    $.param(query)
+    @queryParam {sort: 'title', order: 'asc', page: 1}, []
 
   latestParam: ()->
-    query = $.extend {}, @props.cards.query
-    query = $.extend query, {sort: 'updated_at', order: 'desc', page: 1}
-    delete query.seed
-    $.param(query)
+    @queryParam {sort: 'updated_at', order: 'desc', page: 1}, []
 
   randomParam: ()->
-    query = $.extend {}, @props.cards.query
-    query = $.extend query, {order: 'random', page: 1, seed: new Date().getTime()}
-    delete query.sort
-    delete query.page
-    $.param(query)
+    @queryParam {order: 'random'}, ['sort', 'page']
 
   tagParam: (tag)->
+    @queryParam {tag: tag}, ['seed']
+
+  queryParam: (param, deleteKeys)->
     query = $.extend {}, @props.cards.query
-    query = $.extend query, {tags: tag}
+    query = $.extend query, param
+    for key in deleteKeys
+      delete query[key]
     $.param(query)
 
   render: ->
@@ -47,9 +43,9 @@ module.exports = React.createClass
         <div className="row">
           <div className="col-sm-6" style={{padding:"0px"}}>
             <ul className="nav nav-pills">
-              <li><a 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 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 href={"#/?" + @randomParam()} style={{padding:'6px 12px',fontWeight: if @props.cards.query.order == 'random' then 'bold' else 'normal'}}>Random</a></li>
+              <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>
               {
                 if @props.cards.query.tags
                   @props.cards.query.tags.split(',').map (tag)=>
@@ -64,7 +60,7 @@ module.exports = React.createClass
                   <li>
                     {
                       if @props.cards.page
-                        <a href={"#/?" + @randomParam()} style={{padding:'6px 12px'}}>
+                        <a onClick={helpers.reload} href={"#/?" + @randomParam()} style={{padding:'6px 12px'}}>
                           <i className="glyphicon glyphicon-refresh" />
                         </a>
                       else

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

@@ -1,6 +1,8 @@
 # @cjsx React.DOM 
+Backbone = require('backbone')
 $ = require('jquery')
 React = require('react')
+helpers = require('../helpers')
 
 module.exports = React.createClass
   displayName: 'Pagination'
@@ -29,7 +31,7 @@ module.exports = React.createClass
       <li style={width:'4.0em',textAlign:'center'}>
         {
           if @props.cards.page
-            <a href={"#/?" + @pageParam(@props.cards.page.current)} style={{padding:'6px 12px'}}>
+            <a href={"#/?" + @pageParam(@props.cards.page.current)} onClick={helpers.reload} style={{padding:'6px 12px'}}>
               {@props.cards.page.current} / {@props.cards.page.total}
             </a>
           else

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 'mongoid/geospatial'
 require 'carte/server/validators'
 require 'carte/server/models'
 
@@ -14,6 +15,7 @@ module Carte
     include Carte::Server::Models
 
     configure do
+      set :protection, :except => :path_traversal
       set :views, File.join(File.dirname(__FILE__), 'server/views')
       set :public_folder, 'public'
       set :script_path, '/app.js'
@@ -29,18 +31,19 @@ module Carte
         order = (params[:order] && %w(asc desc random).include?(params[:order])) ? params[:order] : 'desc'
         sort = (params[:sort] && %w(title created_at updated_at).include?(params[:sort])) ? params[:sort] : 'updated_at'
         if order == 'random'
-          return Card.sample(9)
+          cards = Card.random
+        else
+          cards = Card.send(order, sort)
         end
-        cards = Card.send(order, sort)
         if title = params[:title]
-          cards = cards.any_of({title: /#{title}/})
+          cards = cards.any_of({title: /#{title}/i})
         end
         if params[:tags]
           tags = params[:tags].split(',')
           cards = cards.tagged_with_all(tags)
         end
         if content = params[:content]
-          cards = cards.any_of({content: /#{content}/})
+          cards = cards.any_of({content: /#{content}/i})
         end
         cards = cards.paginate(per_page: 9, page: params[:page])
       end

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

@@ -6,10 +6,12 @@ module Carte
         include Mongoid::Timestamps
         include Mongoid::Attributes::Dynamic
         include Mongoid::Document::Taggable
+        include Mongoid::Geospatial
       
         field :title, type: String
         field :new_title, type: String
         field :content, type: String
+        field :random_point, type: Point, spatial: true
 
         index({title: 1}, {unique: true, name: "title_index"})
       
@@ -38,9 +40,13 @@ module Carte
             self.new_title = nil
           end
         end
+
+        before_create do
+          self.random_point = [Random.rand, 0]
+        end
       
-        def self.sample(size=1)
-          self.in(id: (1..self.count).to_a.sample(size))
+        def self.random
+          self.near(random_point: [Random.rand, 0])
         end
       
         def lefts(size=1)

data/lib/carte/server/tasks.rb

@@ -44,4 +44,17 @@ namespace :carte do
   task :reset do
     Card.delete_all
   end
+
+  desc 'create indexes'
+  task :create_indexes do
+    Card.create_indexes
+  end
+
+  desc 'update random point'
+  task :update_random do
+    Card.all.each do |card|
+      card.random_point = [Random.rand, 0]
+      card.save!
+    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.9"
+    VERSION = "0.0.10"
   end
 end

data/package.json

@@ -1,7 +1,7 @@
 {
   "name": "carte-client",
   "description": "something like dictionary, wiki, or information card",
-  "version": "0.0.9",
+  "version": "0.0.10",
   "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.9
+  version: 0.0.10
 platform: ruby
 authors:
 - tily
@@ -192,6 +192,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mongoid-geospatial
+  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