carte-server 0.0.21 → 0.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 578b63ee21c185a3eb2a97d8c12527666fe67004
-  data.tar.gz: 9d22c1637d7c67624ae59d45b4eb976b04528e01
+  metadata.gz: 2c467e1cd99ce718cb1debd0ccec6d12ced89426
+  data.tar.gz: 83d79a8bc6e1fadadb298dba101fc0c90ba16464
 SHA512:
-  metadata.gz: 3ef6e662bb70e336fc4440e5722161a5431d94f1fa2b85e63ddcb13928e1ac29f12c8cd249b75f6a79caa509a899181d47eb5b9fbb0281dbf7d0c5f306be6ded
-  data.tar.gz: 947df6a57f8cb370607a05ac1536582f461a23caa48623ad4a9bb3bd9ca7be00dbc1e0c1a8922c8c575402e403c86a7e9a3a60224b4825a465ed7835da46fe32
+  metadata.gz: 36231df14cd93e7afd5596b694051b27c71a9592ee95bf1f44bcbe12ac86741b3f2645067bd62d89b3286743b58b7f6d001d804087aa19cc644d6b2711f9515c
+  data.tar.gz: 332122281586ce0350b0a616948dfd8b8671a19d3eae60d55dbbed6b0a150ea5f20795709e0c3432baf18022ccb6777597d15a4320918a75cb782d6c267346c8

data/.gitignore

@@ -15,5 +15,6 @@ mkmf.log
 /node_modules/
 /public/app.js
 /public/app.html
+/public/vendor
 /lib/carte/shared/custom.json
 .env

data/README.md

@@ -9,6 +9,8 @@ Something like dictionary, wiki, or information card.
 
 ![](screenshot.png)
 
+You can try carte on [sandbox](http://carte-sandbox.herokuapp.com/#/). There is also [a French-Japanese dictionary version](https://carte-francais.herokuapp.com/#/).
+
 ## Features
 
 * Manage your data fragments with cards
@@ -16,7 +18,6 @@ Something like dictionary, wiki, or information card.
 * View your card with the cards around it (like paper dictionary)
 * No user concept, super simple system like wiki
 
-You can try carte on [sandbox](http://carte-sandbox.herokuapp.com/#/).
 Japanese introduction is [here](http://tily.tumblr.com/post/117678137942/carte).
 
 ## Components

data/carte.gemspec

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

data/lib/carte.coffee

@@ -8,6 +8,8 @@ browserify = require 'browserify'
 watchify = require 'watchify'
 uglify = require 'gulp-uglify'
 streamify = require 'gulp-streamify'
+coffeeReactify = require 'coffee-reactify'
+browserifyCss = require 'browserify-css'
 _ = require 'lodash'
 jade = require 'gulp-jade'
 rename = require 'gulp-rename'
@@ -45,9 +47,8 @@ module.exports = class Carte
       entries: [__dirname + '/carte/client.coffee']
       extensions: ['.coffee', '.js', '.cjsx', '.css']
     browserify
-      .transform 'coffee-reactify'
-      .transform 'debowerify'
-      .transform 'browserify-css',
+      .transform coffeeReactify
+      .transform browserifyCss,
         rootDir: 'public'
         processRelativeUrl: (relativeUrl)->
           stripQueryStringAndHashFromPath = (url)-> url.split('?')[0].split('#')[0]

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

@@ -11,6 +11,6 @@ module.exports = class Cards extends Backbone.Collection
     config.root_path + config.api_path + url
   parse: (response)->
     console.log response
-    @page = response.page
+    @pagination = response.pagination
     console.log @page
     response.cards

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

@@ -62,7 +62,7 @@ module.exports = React.createClass
                 <ul className="nav nav-pills pull-right">
                   <li>
                     {
-                      if @props.cards.page
+                      if @props.cards.pagination
                         <a onClick={helpers.reload} href={"#/?" + @randomParam()} style={{padding:'6px 12px'}}>
                           <i className="glyphicon glyphicon-refresh" />
                         </a>

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

@@ -16,11 +16,11 @@ module.exports = React.createClass
     <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)
+          if @props.cards.pagination
+            if @props.cards.pagination.current_page > 1
+              href = "#/?" + @pageParam(@props.cards.pagination.current_page - 1)
             else
-              href = "#/?" + @pageParam(@props.cards.page.total)
+              href = "#/?" + @pageParam(@props.cards.pagination.total_pages)
           else
             href = "javascript:void(0)"
           <a href={href} aria-label="Previous" style={{padding:'6px 12px'}}>
@@ -30,9 +30,9 @@ module.exports = React.createClass
       </li>
       <li style={width:'7.5em',textAlign:'center'}>
         {
-          if @props.cards.page
-            <a href={"#/?" + @pageParam(@props.cards.page.current)} onClick={helpers.reload} style={{padding:'6px 12px'}}>
-              {@props.cards.page.current} / {@props.cards.page.total}
+          if @props.cards.pagination
+            <a href={"#/?" + @pageParam(@props.cards.pagination.current_page)} onClick={helpers.reload} style={{padding:'6px 12px'}}>
+              {@props.cards.pagination.current_page} / {@props.cards.pagination.total_pages}
             </a>
           else
             <a href="javascript:void(0)" style={{padding:'6px 12px'}}>
@@ -42,9 +42,9 @@ module.exports = React.createClass
       </li>
       <li>
         {
-          if @props.cards.page
-            if @props.cards.page.current < @props.cards.page.total
-              href = "#/?" + @pageParam(@props.cards.page.current + 1)
+          if @props.cards.pagination
+            if @props.cards.pagination.current_page < @props.cards.pagination.total_pages
+              href = "#/?" + @pageParam(@props.cards.pagination.current_page + 1)
             else
               href = "#/?" + @pageParam(1)
           else

data/lib/carte/server.rb

@@ -67,25 +67,30 @@ module Carte
     
     get '/cards.json' do
       cards = search(params)
-      if cards.respond_to?(:current_page) && cards.respond_to?(:total_pages)
-        current_page = cards.current_page.to_i
-        total_pages = cards.total_pages
-      end
-      cards = cards.map {|card| {id: card.id, title: card.title, content: card.content, version: card.version, tags: card.tags}}
-      {cards: cards, page: {current: current_page, total: total_pages}}.to_json
+      {
+        cards: cards.as_json(only: %w(title content version tags)),
+        pagination: {current_page: cards.current_page, total_pages: cards.total_pages, total_entries: cards.total_entries}
+      }.to_json
     end
     
     get '/cards/:title.json' do
+      context = (params[:context] && %w(title created_at updated_at).include?(params[:context])) ? params[:context] : 'created_at'
       card = Card.where(title: params[:title]).first
       halt 404 if card.nil?
-      {card: {id: card.id, title: card.title, content: card.content, version: card.version, tags: card.tags, lefts: card.lefts(4), rights: card.rights(4)}}.to_json
+      {
+        card: card.as_json(only: %w(title content version tags)).update(
+          version: card.version,
+          lefts: card.lefts(4).as_json(only: %w(title content version tags)),
+          rights: card.rights(4).as_json(only: %w(title content version tags))
+        )
+      }.to_json
     end
 
     post '/cards.json' do
       card = Card.new(json_data.slice('title', 'content', 'tags'))
       if card.save
         status 201
-        {card: {id: card.id}}.to_json
+        {}.to_json
       else
         status 400
         {card: {errors: card.errors}}.to_json
@@ -114,7 +119,7 @@ module Carte
     get '/cards/:title/history.json' do
       card = Card.where(title: params[:title]).first
       halt 404 if card.nil?
-      {history: card.histories}.to_json
+      {history: card.histories.as_json(only: %w(title content version tags))}.to_json
     end
 
     get '/tags.json' do

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

@@ -48,23 +48,25 @@ module Carte
         def self.random
           self.near(random_point: [Random.rand, 0])
         end
-      
-        def lefts(size=1)
-          ids = []
-          count = self.class.all.count
-          1.upto(size) do |i|
-            ids << (self.id - i > 0 ? self.id - i : count + (self.id - i))
+
+        def lefts(size, context=:created_at)
+          result = Card.lt(context => self.send(context)).limit(size).to_a
+          shortage = size - result.size
+          if shortage > 0
+            addition = self.class.lte(context => Card.max(context)).gt(context => self.send(context)).limit(shortage).to_a
+            result = addition + result
           end
-          self.class.in(id: ids)
+          result
         end
-      
-        def rights(size=1)
-          ids = []
-          count = self.class.all.count
-          1.upto(size) do |i|
-            ids << (self.id + i <= count ? self.id + i : self.id + i - count)
+
+        def rights(size, context=:created_at)
+          result = self.class.gt(context => self.send(context)).limit(size).to_a
+          shortage = size - result.size
+          if shortage > 0
+            addition = self.class.gt(context => 0).lt(context => self.send(context)).limit(shortage).to_a
+            result = result + addition
           end
-          self.class.in(id: ids)
+          result
         end
       end
     end

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

@@ -7,12 +7,14 @@ module Carte
         field :title, type: String
         field :content, type: String
         field :version, type: Integer
+        field :tags, type: Array
         belongs_to :card
       
         before_create do
           self.title = self.card.title
           self.content = self.card.content
           self.version = self.card.version
+          self.tags = self.card.tags
         end
       end
     end

data/lib/carte/server/tasks.rb

@@ -1,4 +1,5 @@
 require 'carte/server'
+require 'pry'
 include Carte::Server::Models
 
 namespace :carte do
@@ -57,4 +58,9 @@ namespace :carte do
       card.save!
     end
   end
+
+  desc 'start console'
+  task :console do
+    binding.pry
+  end
 end

data/package.json

@@ -1,7 +1,7 @@
 {
   "name": "carte-client",
   "description": "something like dictionary, wiki, or information card",
-  "version": "0.0.21",
+  "version": "0.0.22",
   "main": "lib/carte.coffee",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
@@ -25,7 +25,6 @@
     "coffee-reactify": "^3.0.0",
     "coffee-script": "^1.9.2",
     "coffeeify": "^1.0.0",
-    "debowerify": "^1.2.1",
     "extend": "^2.0.1",
     "font-awesome": "^4.3.0",
     "fs-extra": "^0.18.2",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carte-server
 version: !ruby/object:Gem::Version
-  version: 0.0.21
+  version: 0.0.22
 platform: ruby
 authors:
 - tily
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-08 00:00:00.000000000 Z
+date: 2015-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -220,6 +220,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  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
@@ -267,7 +281,6 @@ files:
 - lib/carte/server/validators/array_validator.rb
 - lib/carte/server/version.rb
 - lib/carte/server/views/cards.builder
-- lib/carte/shared/.keep
 - lib/carte/shared/default.json
 - mongoid.yml
 - nginx.conf