ki 0.4.10 → 0.4.11

data/lib/ki/middleware/api_handler.rb

@@ -9,6 +9,7 @@ module Ki
     # json output from the url, instead it will redirect to the url given
     class ApiHandler
       include BaseMiddleware
+      include Helpers::RedirectTo
 
       def call(env)
         req = BaseRequest.new env
@@ -26,26 +27,20 @@ module Ki
           fail InvalidUrlError.new("invalid url '#{req.path}'", 404)
         end
 
-        model = klass.new(req.to_action, req.params)
-        if req.params['redirect_to'].nil? # TODO: document this
-          render model
-        else
-          redirect_to req.params['redirect_to'] # TODO: check for injection
-        end
+        model = klass.new(req)
+        render model
       rescue ApiError => e
         render e
       end
 
-      def redirect_to(s)
-        resp = Rack::Response.new
-        resp.redirect(s)
-        resp.finish
-      end
-
-      def render(r)
-        resp = Rack::Response.new(r.result.to_json, r.status)
-        resp['Content-Type'] = 'application/json'
-        resp.finish
+      def render(model)
+        if model.is_a?(ApiError) || model.params['redirect_to'].nil?
+          resp = Rack::Response.new(model.result.to_json, model.status)
+          resp['Content-Type'] = 'application/json'
+          resp.finish
+        else
+          redirect_to model.params['redirect_to']
+        end
       end
     end
   end

data/lib/ki/middleware/helpers/redirect_to_helper.rb

@@ -0,0 +1,13 @@
+module Ki
+  module Middleware
+    module Helpers
+      module RedirectTo
+        def redirect_to(path)
+          resp = Rack::Response.new
+          resp.redirect(path)
+          resp.finish
+        end
+      end
+    end
+  end
+end

data/lib/ki/middleware/realtime.rb

@@ -0,0 +1,81 @@
+module Ki
+  module Middleware #:nodoc:
+    class Realtime
+      include BaseMiddleware
+
+      def call(env)
+        req = BaseRequest.new env
+        if req.path.to_s == '/realtime/info'
+          show_stats
+        elsif req.path.to_s == '/realtime' && Faye::WebSocket.websocket?(env)
+          handle_websocket env
+        else
+          @app.call env
+        end
+      end
+
+      def ws_send(ws, hash)
+        ws.send(hash.to_json.to_s)
+      end
+
+      def show_stats
+        hash = {
+          sockets: ::Ki::ChannelManager.sockets
+        }
+        resp = Rack::Response.new(hash.to_json, 200)
+        resp['Content-Type'] = 'application/json'
+        resp.finish
+      end
+
+      def handle_websocket(env)
+        ws = Faye::WebSocket.new(env)
+
+        socket = ::Ki::ChannelManager.connect
+        ws_send(ws, socket)
+
+        ws.on :message do |event|
+          on_message(ws, socket, event.data)
+        end
+
+        timer = EventMachine::PeriodicTimer.new(1) do
+          msgs = ::Ki::ChannelManager.tick(socket_id: socket['id'])
+          ws_send(ws, { messages: msgs }) if msgs.count > 0
+        end
+
+        ws.on :close do # |event|
+          timer.cancel
+          ::Ki::ChannelManager.disconnect socket
+          ws = nil
+        end
+
+        ws.rack_response
+      end
+
+      def on_message(ws, socket, data)
+        json = JSON.parse(data)
+        json['socket_id'] = socket['id']
+        if json['type'] == 'subscribe'
+          channel_manager_action(json, ws, 'subscribe')
+        elsif json['type'] == 'unsubscribe'
+          output = ::Ki::ChannelManager.unsubscribe json
+          ws_send(ws, output)
+        elsif json['type'] == 'publish'
+          channel_manager_action(json, ws, 'publish')
+        else
+          ws_send(ws, { message: 'Please specify a valid type' })
+        end
+      rescue JSON::ParserError
+        ws_send(ws, { message: 'Please send a valid json string' })
+      end
+
+      def channel_manager_action(json, ws, action)
+        if json['channel_name']
+          output = ::Ki::ChannelManager.send(action, json)
+          ws_send(ws, output)
+        else
+          ws_send(ws, { message: 'Please specify a channel_name' })
+        end
+      end
+    end
+  end
+end

data/lib/ki/model.rb

@@ -4,12 +4,14 @@ module Ki
     extend Restrictions
     include Callbacks
     include ModelHelper
+    include Middleware::Helpers::RedirectTo
 
-    attr_accessor :action, :result, :params, :status
+    attr_accessor :action, :result, :params, :status, :req
 
-    def initialize(action, params)
-      @action = action
-      @params = params
+    def initialize(req)
+      @req = req
+      @action = req.to_action
+      @params = req.params
       @status = 200
 
       fail ForbiddenAction if forbidden_actions.include? @action

data/lib/ki/modules/restrictions.rb

@@ -28,13 +28,10 @@ module Ki
       private
 
       def generic_restriction(method_name, attributes)
-        send :define_method, method_name do
-          attributes
-        end
-
-        eigen_class = class << self; self; end
-        eigen_class.send(:define_method, method_name) do
-          attributes
+        [:define_method, :define_singleton_method].each do |definition_means|
+          send definition_means, method_name do
+            attributes
+          end
         end
       end
     end

data/lib/ki/orm.rb

@@ -103,7 +103,14 @@ module Ki
       #
       def find(name, hash = {})
         hash = nourish_hash_id hash
-        @db[name].find(hash).to_a.stringify_ids
+        a = nourish_hash_limit hash
+        hash = a[0]
+        limit = a[1]
+        a = nourish_hash_sort hash
+        hash = a[0]
+        sort = a[1]
+
+        @db[name].find(hash, limit).sort(sort).to_a.stringify_ids
       end
 
       # Update a hash from the database
@@ -156,7 +163,7 @@ module Ki
         hash = nourish_hash_id hash
         r = @db[name].remove hash
         {
-          deleted_item_count: r["n"] || 0
+          deleted_item_count: r['n'] || 0
         }
       end
 
@@ -198,6 +205,35 @@ module Ki
         end
         hash
       end
+
+      def nourish_hash_limit(hash)
+        tmp = {}
+        if hash['__limit']
+          # really need to work on hash_with_indifferent access
+          # if you change how you access the symbol you will have a bad time
+          tmp[:limit] = hash['__limit']
+          hash.delete('__limit')
+        end
+        [hash, tmp]
+      end
+
+      def nourish_hash_sort(hash)
+        tmp = {}
+        if hash['__sort']
+          if hash['__sort'].class != Hash
+            tmp = {}
+          else
+            # TODO: validate for size and number of elements
+            # TODO: validate value
+            # TODO: handle sorting by id
+            hash['__sort'].to_a.each do |e|
+              tmp[e[0].to_sym] = e[1].to_sym
+            end
+          end
+          hash.delete('__sort')
+        end
+        [hash, tmp]
+      end
     end
   end
 end

data/lib/ki/version.rb

@@ -1,3 +1,3 @@
 module Ki
-  VERSION = '0.4.10'
+  VERSION = '0.4.11'
 end

data/spec/examples/json.northpole.ro/.bowerrc

@@ -0,0 +1,3 @@
+{
+  "directory": "public/components/"
+}

data/spec/examples/json.northpole.ro/Gemfile

@@ -2,5 +2,6 @@ source "https://rubygems.org"
 
 gem 'ki', :path => '../../..'
 gem 'passenger', '4.0.40'
+gem 'thin'
 gem 'capistrano'
 gem 'capistrano-rvm'

data/spec/examples/json.northpole.ro/bower.json

@@ -0,0 +1,17 @@
+{
+  "name": "json.northpole.ro",
+  "version": "0.4.10",
+  "homepage": "https://github.com/mess110/ki",
+  "authors": [
+    "Cristian Mircea Messel <mess110@gmail.com>"
+  ],
+  "license": "MIT",
+  "ignore": [
+    "**/.*",
+    "node_modules",
+    "bower_components",
+    "public/components/",
+    "test",
+    "tests"
+  ]
+}

data/spec/examples/json.northpole.ro/config.ru

@@ -1,3 +1,6 @@
 require './app'
+unless `hostname`.include?('glassic-jenkins')
+  Faye::WebSocket.load_adapter('thin')
+end
 use Rack::Reloader, 0
 run Ki::Ki.new

data/spec/examples/json.northpole.ro/config.yml

@@ -2,7 +2,9 @@ development:
   database:
     name: np_development
     host: 127.0.0.1
+    # host: 172.17.0.3
     port: 27017
+  add_middleware: 'Realtime'
 
 test:
   database:
@@ -14,4 +16,6 @@ production:
   database:
     name: np
     host: 127.0.0.1
+    # host: 172.17.0.3
     port: 27017
+  add_middleware: 'Realtime'

data/spec/examples/json.northpole.ro/config.yml.backup

@@ -0,0 +1,18 @@
+development:
+  database:
+    name: np_development
+    host: 172.17.0.3
+    port: 27017
+
+test:
+  database:
+    name: np_test
+    host: 127.0.0.1
+    port: 27017
+
+production:
+  database:
+    name: np
+    host: 127.0.0.1
+    port: 27017
+  add_middleware: 'Realtime'

data/spec/examples/json.northpole.ro/config/deploy.rb

@@ -30,7 +30,7 @@ set :deploy_to, '/home/kiki/json.northpole.ro'
 
 # Default value for default_env is {}
 # set :default_env, { path: "/opt/ruby/bin:$PATH" }
-set :rvm_ruby_version, '2.1.0@coinmarketcap'
+set :rvm_ruby_version, '2.1.2@json.northpole.ro'
 
 # Default value for keep_releases is 5
 # set :keep_releases, 5
@@ -42,6 +42,7 @@ namespace :deploy do
     on roles(:app), in: :sequence, wait: 5 do
       # Your restart mechanism here, for example:
       # execute :touch, release_path.join('tmp/restart.txt')
+      # run "#{sudo} service nginx #{command}"
     end
   end
 

data/spec/examples/json.northpole.ro/config/deploy/production.rb

@@ -1,39 +1,5 @@
-# Simple Role Syntax
-# ==================
-# Supports bulk-adding hosts to roles, the primary
-# server in each group is considered to be the first
-# unless any hosts have the primary property set.
-# Don't declare `role :all`, it's a meta role
-role :app, %w{kiki@northpole.ro}
-role :web, %w{kiki@northpole.ro}
-role :db,  %w{kiki@northpole.ro}
+role :app, %w{mace@glassic.northpole.ro}
+role :web, %w{mace@glassic.northpole.ro}
+role :db,  %w{mace@glassic.northpole.ro}
 
-# Extended Server Syntax
-# ======================
-# This can be used to drop a more detailed server
-# definition into the server list. The second argument
-# something that quacks like a hash can be used to set
-# extended properties on the server.
-# server 'example.com', user: 'deploy', roles: %w{web app}, my_property: :my_value
-
-# you can set custom ssh options
-# it's possible to pass any option but you need to keep in mind that net/ssh understand limited list of options
-# you can see them in [net/ssh documentation](http://net-ssh.github.io/net-ssh/classes/Net/SSH.html#method-c-start)
-# set it globally
-#  set :ssh_options, {
-#    keys: %w(/home/rlisowski/.ssh/id_rsa),
-#    forward_agent: false,
-#    auth_methods: %w(password)
-#  }
-# and/or per server
-# server 'example.com',
-#   user: 'user_name',
-#   roles: %w{web app},
-#   ssh_options: {
-#     user: 'user_name', # overrides user setting above
-#     keys: %w(/home/user_name/.ssh/id_rsa),
-#     forward_agent: false,
-#     auth_methods: %w(publickey password)
-#     # password: 'please use keys'
-#   }
-# setting per server overrides global ssh_options
+set :deploy_to, '/home/mace/json.northpole.ro'

data/spec/examples/json.northpole.ro/public/app/.bowerrc

@@ -0,0 +1,3 @@
+{
+  "directory": "bower_components"
+}

data/spec/examples/json.northpole.ro/public/app/.gitignore

@@ -0,0 +1,9 @@
+logs/*
+!.gitkeep
+node_modules/
+bower_components/
+tmp
+.DS_Store
+.idea
+app/jspm_packages
+build/

data/spec/examples/json.northpole.ro/public/app/.jshintrc

@@ -0,0 +1,13 @@
+{
+  "globalstrict": true,
+  "globals": {
+    "angular": false,
+    "describe": false,
+    "it": false,
+    "expect": false,
+    "beforeEach": false,
+    "afterEach": false,
+    "module": false,
+    "inject": false
+  }
+}

data/spec/examples/json.northpole.ro/public/app/.travis.yml

@@ -0,0 +1,14 @@
+language: node_js
+node_js:
+  - "0.10"
+
+before_script:
+  - export DISPLAY=:99.0
+  - sh -e /etc/init.d/xvfb start
+  - npm start > /dev/null &
+  - npm run update-webdriver
+  - sleep 1 # give server time to start
+
+script:
+  - node_modules/.bin/karma start karma.conf.js --no-auto-watch --single-run --reporters=dots --browsers=Firefox
+  - node_modules/.bin/protractor e2e-tests/protractor.conf.js --browser=firefox

data/spec/examples/json.northpole.ro/public/app/LICENSE

@@ -0,0 +1,22 @@
+The MIT License
+
+Copyright (c) 2010-2014 Google, Inc. http://angularjs.org
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+