carte-server 0.0.20 → 0.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 26dafc6e5255037410c3973431e017c31d42bdd9
-  data.tar.gz: 524bd7a234e6228c2d178fa6d5e59443bcf38710
+  metadata.gz: 578b63ee21c185a3eb2a97d8c12527666fe67004
+  data.tar.gz: 9d22c1637d7c67624ae59d45b4eb976b04528e01
 SHA512:
-  metadata.gz: 7acba901ddf7a430fe8b4bc04a3185e695ff29c399d6e9fe0783a959ec2168c56fd8adc7fa15a9ee359fec0522f06441c26cc80af04d3c25157362f8e30ee1a4
-  data.tar.gz: ffd3ae13a93ace4e9af3bd3a56aab0d76c9bf8ce2525bcc76a3e5bb2345e1a8697c7f72681ed515c82b92b524686220a534deefd128d34934f92c33bb64e6cd4
+  metadata.gz: 3ef6e662bb70e336fc4440e5722161a5431d94f1fa2b85e63ddcb13928e1ac29f12c8cd249b75f6a79caa509a899181d47eb5b9fbb0281dbf7d0c5f306be6ded
+  data.tar.gz: 947df6a57f8cb370607a05ac1536582f461a23caa48623ad4a9bb3bd9ca7be00dbc1e0c1a8922c8c575402e403c86a7e9a3a60224b4825a465ed7835da46fe32

data/Dockerfile

@@ -0,0 +1,28 @@
+FROM phusion/passenger-customizable:latest
+CMD ["/sbin/my_init"]
+
+# install ruby and node.js
+RUN /pd_build/ruby2.2.sh
+RUN /pd_build/nodejs.sh
+
+## configure nginx
+RUN rm /etc/nginx/sites-enabled/default
+ADD nginx.conf /etc/nginx/sites-enabled/carte.conf
+
+## add source code
+RUN mkdir /home/app/carte
+ADD . /home/app/carte
+
+## install dependencies
+RUN npm install gulp -g
+RUN cd /home/app/carte && bundle install
+RUN cd /home/app/carte && npm install
+
+## build client side code
+RUN cd /home/app/carte && gulp build
+
+## cleanup
+RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
+## enable nginx
+RUN rm -f /etc/service/nginx/down

data/README.md

@@ -28,6 +28,8 @@ Japanese introduction is [here](http://tily.tumblr.com/post/117678137942/carte).
  
 ## Deploy
 
+**Heroku**
+
 [![Deploy](https://www.herokucdn.com/deploy/button.png)](https://heroku.com/deploy?template=https://github.com/tily/carte-sandbox)
 
 Deploy your carte with the button above. After deployment, you may want to customize your carte.
@@ -38,3 +40,11 @@ $ vi config.json
 ## replace brand icon
 $ cp ~/Desktop/icon.png public/images/icon.png 
 ```
+
+**Docker**
+
+```bash
+$ docker build -t carte .
+$ docker run --name mongo -d mongo
+$ docker run --name carte --link mongo:mongo -p 80:80 -d carte
+```

data/carte.gemspec

@@ -1,11 +1,11 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'carte/server/version'
+require 'json'
 
 Gem::Specification.new do |spec|
   spec.name          = "carte-server"
-  spec.version       = Carte::Server::VERSION
+  spec.version       = JSON.parse(File.read("./package.json"))['version']
   spec.authors       = ["tily"]
   spec.email         = ["tidnlyam@gmail.com"]
   spec.summary       = %q{something like dictionary, wiki, or information card}

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

@@ -18,13 +18,13 @@ module.exports = React.createClass
     errors: false
     shaking: false
 
-  onChangeTitle: ->
+  onChangeTitle: (event)->
     @setState title: event.target.value
 
-  onChangeContent: ->
+  onChangeContent: (event)->
     @setState content: event.target.value
 
-  onClickOk: ()->
+  onClickOk: (event)->
     event.preventDefault()
     @setState updating: true
     if @props.card.isNew()

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

@@ -39,10 +39,10 @@ module.exports = React.createClass
     console.log 'componentWillMount un'
     @props.router.off "route", @callback
 
-  onChangeSearchText: ()->
+  onChangeSearchText: (event)->
     @setState searchText: event.target.value
 
-  onKeyPressSearchText: ()->
+  onKeyPressSearchText: (event)->
     if event.keyCode == 13 # ENTER
       console.log '13 enter'
       event.preventDefault()

data/mongoid.yml

@@ -8,3 +8,7 @@ production:
   sessions:
     default:
       uri: <%= ENV['MONGOLAB_URI'] %>
+docker:
+  sessions:
+    default:
+      uri: mongodb://mongo/carte

data/nginx.conf

@@ -0,0 +1,9 @@
+server {
+  listen 80;
+  server_name www.webapp.com;
+  root /home/app/carte/public;
+  passenger_enabled on;
+  passenger_user app;
+  passenger_ruby /usr/bin/ruby2.2;
+  passenger_app_env docker;
+}

data/package.json

@@ -1,7 +1,7 @@
 {
   "name": "carte-client",
   "description": "something like dictionary, wiki, or information card",
-  "version": "0.0.20",
+  "version": "0.0.21",
   "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.20
+  version: 0.0.21
 platform: ruby
 authors:
 - tily
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-07 00:00:00.000000000 Z
+date: 2015-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -229,6 +229,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- Dockerfile
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -269,6 +270,7 @@ files:
 - lib/carte/shared/.keep
 - lib/carte/shared/default.json
 - mongoid.yml
+- nginx.conf
 - package.json
 - public/images/icon.png
 - screenshot.png