ki 0.4.9 → 0.4.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee2465764557ce14876065e4f99917fa50f25953
-  data.tar.gz: 30c2a6140f02460947eb0b59efce669c3fa02a8b
+  metadata.gz: e570dca285d0879a444188fe3f855404b7eea148
+  data.tar.gz: bd7f3d50f1e5c475b8e04e263c498a1878d76408
 SHA512:
-  metadata.gz: 25e62d3b33ea0c9e584b583bd0f985ac014686af0a8198da91b82524b49c1a6dbba70797cb89062a07d3f1885d0f85992b0449f9ac9936f21f7487a552f882ca
-  data.tar.gz: 94800b4aa250f56fb8bd028acb4101ac69926d83711410155395d03d2df050bb07e82e072ba8f1600e25fcb721226731b7c53a6b816bce8e3d16fadc2431962c
+  metadata.gz: 69ae313e5b0596c6d064ca51a4b805ae7b3dd5785450e6987982d454ac27a56cfd61b15201ef4aa1511a888892f4b500d2ab47eeed850525db5d83a959a59ce7
+  data.tar.gz: 5de90c09ce1b696cefa724cf8a3a1569fe39843617c0465d717ea8c1ef467da94d64911fd80dca983eb50195a0aad986726d2f7b7f738521eed8805b8bae04ff

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ki (0.4.9)
+    ki (0.4.10)
       bson_ext
       bundler (~> 1.5)
       coffee-script

data/lib/ki/orm.rb

@@ -154,8 +154,10 @@ module Ki
       #
       def delete(name, hash)
         hash = nourish_hash_id hash
-        @db[name].remove hash
-        {}
+        r = @db[name].remove hash
+        {
+          deleted_item_count: r["n"] || 0
+        }
       end
 
       # Count the number of hashes found in a specified collection, filtered

data/lib/ki/version.rb

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

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

@@ -2,7 +2,7 @@
 lock '3.1.0'
 
 set :application, 'json.northpole.ro'
-set :repo_url, 'git@bitbucket.org:mess110/ki.git'
+set :repo_url, 'git@github.com:mess110/ki.git'
 
 # Default branch is :master
 # ask :branch, proc { `git rev-parse --abbrev-ref HEAD`.chomp }

data/spec/examples/json.northpole.ro/public/javascripts/app.coffee

@@ -1,91 +1,13 @@
-userCreated = () ->
-  notify("user created", "label label-success")
-  $("#user").attr('disabled','disabled')
-  $("#pass").attr('disabled','disabled')
-  $("#signup")
-    .blur()
-    .fadeOut()
-  $("#extra-info").fadeIn()
-
-userNotCreated = (jqXHR) ->
-  result = JSON.parse(jqXHR.responseText)
-  notify(result['error'], "label label-important")
-
 reqSuccess = (data) ->
   str = JSON.stringify(data, `undefined`, 2)
   output = $('#parsedJson')
   if (output.length > 0)
     output[0].innerHTML = syntaxHighlight(str)
 
-storageNotCreated = (jqXHR) ->
-  $('#parsedJson')[0].innerHTML = syntaxHighlight("{}")
-
-signupPage = () ->
-  $("#user").focus()
-  notify("press enter to submit", "label label-info")
-
-  $("#pass").keypress (event) ->
-    if event.which is 13
-      event.preventDefault()
-      user = $('#user').val()
-      pass = $('#pass').val()
-      jNorthPole.createUser(user, pass, userCreated, userNotCreated)
-
-addTryRow = (keyVal, valVal) ->
-  clone = $('.templateTr').clone().removeClass('templateTr')
-  clone.find('.templateKey').val(keyVal)
-  clone.find('.templateValue').val(valVal)
-  clearButton = clone.find('.clearButton')
-  clearButton.show()
-  clearButton.click () ->
-    $(this).parent().parent().remove()
-  $('#tryNowTable tr:last').after(clone)
-  $('#tryNowTable tr:last input:first').focus()
-
-tryNowPage = () ->
-  npSecret = $('#tryNowTable').data('npsecret')
-  npGuestSecret = $('#tryNowTable').data('npguestsecret')
-
-  addTryRow(npSecret, npGuestSecret)
-  addTryRow('color', 'green')
-
-  $("#addTableRow").click ->
-    addTryRow('', '')
-
-  $("#postButton").click ->
-    data = getDataFromTable()
-    jNorthPole.createStorage(data, reqSuccess)
-
-  $("#getButton").click ->
-    data = getDataFromTable()
-    jNorthPole.getStorage(data, reqSuccess)
-
-  $("#putButton").click ->
-    data = getDataFromTable()
-    jNorthPole.putStorage(data, reqSuccess)
-
-  $("#deleteButton").click ->
-    data = getDataFromTable()
-    jNorthPole.deleteStorage(data, reqSuccess)
-
 if typeof String::endsWith isnt "function"
   String::endsWith = (suffix) ->
     @indexOf(suffix, @length - suffix.length) isnt -1
 
-window.syntaxHighlight = (json) ->
-  json = json.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;")
-  json.replace /("(\\u[a-zA-Z0-9]{4}|\\[^u]|[^\\"])*"(\s*:)?|\b(true|false|null)\b|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?)/g, (match) ->
-    cls = "number"
-    if /^"/.test(match)
-      if /:$/.test(match)
-        cls = "key"
-      else
-        cls = "string"
-    else if /true|false/.test(match)
-      cls = "boolean"
-    else cls = "null"  if /null/.test(match)
-    "<span class=\"" + cls + "\">" + match + "</span>"
-
 setActiveMenuClass = () ->
   checkFor = (s) ->
     if document.URL.endsWith(s)
@@ -93,11 +15,26 @@ setActiveMenuClass = () ->
 
   checkFor 'playground'
   checkFor 'examples'
+  checkFor 'faq'
 
 randomlyFlipBear = () ->
   if Math.random() > 0.5
     $(".bear").toggleClass('flipit')
 
+window.syntaxHighlight = (json) ->
+  json = json.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;")
+  json.replace /("(\\u[a-zA-Z0-9]{4}|\\[^u]|[^\\"])*"(\s*:)?|\b(true|false|null)\b|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?)/g, (match) ->
+    cls = "number value"
+    if /^"/.test(match)
+      if /:$/.test(match)
+        cls = "key"
+      else
+        cls = "string value"
+    else if /true|false/.test(match)
+      cls = "boolean value"
+    else cls = "null value"  if /null/.test(match)
+    "<span class=\"" + cls + "\">" + match + "</span>"
+
 $(document).ready ->
   setActiveMenuClass()
   setInterval(randomlyFlipBear, 1000)
@@ -111,23 +48,20 @@ $(document).ready ->
   $('#myTab a').click (e) ->
     e.preventDefault()
     $(this).tab('show')
+    window.location.hash = $(this)[0].hash
+
+  if window.location.hash?
+    $("#myTab a[href='#{window.location.hash}']").tab('show')
 
   $('#npAction').click () ->
     verb = $('#verb').text();
-    if verb == 'GET'
-      verb = 'SEARCH'
+    verb = 'SEARCH' if verb == 'GET'
+
     resource = $('#resource').text()
     try
       jsonObj = JSON.parse(($('#playground').val()))
     catch err
-      reqSuccess(JSON.parse('{}'))
-      return 0
+      reqSuccess(JSON.parse('{"error": "invalid json input"}'))
+      return
 
-    $.ajax
-      type: verb
-      url: "/" + resource + ".json"
-      data: JSON.stringify(jsonObj)
-      success: (data, textStatus, jqXHR) ->
-        reqSuccess(data)
-      error: (jqXHR, textstatus, errorthrown) ->
-        reqSuccess(JSON.parse(jqXHR.responseText))
+    jNorthPole.genericRequest(jsonObj, verb, resource, reqSuccess)

data/spec/examples/json.northpole.ro/public/javascripts/jnorthpole.coffee

@@ -1,34 +1,51 @@
 window.jNorthPole =
-  root: Math.sqrt,
-  square: (x) -> x * x,
-  cube: (x) -> x * this.square x,
-  createUser: (api_key, secret, success, failer) ->
+
+  BASE_URL: '/'
+
+  help: """
+    NorthPole JS wrapper example usage:
+
+    responseHandler = function (data) {
+      console.log(data);
+    };
+
+    jNorthPole.BASE_URL = '/';
+    jNorthPole.getStorage(json, responseHandler);
+    """
+
+  genericRequest: (jsonObj, method, endPoint, responseHandler, errorHandler=responseHandler) ->
+    throw 'responseHandler function missing' unless responseHandler?
+
+    r = new XMLHttpRequest
+    r.open method, "#{@BASE_URL}#{endPoint}.json", true
+
+    r.onreadystatechange = ->
+      return if r.readyState != 4
+      if status == 200
+        responseHandler(JSON.parse(r.responseText), r.status)
+      else
+        errorHandler(JSON.parse(r.responseText), r.status)
+      return
+    r.send JSON.stringify(jsonObj)
+    return
+
+  createUser: (api_key, secret, success, failure) ->
     jsonObj = {'api_key': api_key, 'secret': secret}
-    $.ajax
-      type: "POST"
-      url: "/user.json"
-      data: JSON.stringify(jsonObj)
-      success: (data, textStatus, jqXHR) ->
-        success()
-      error: (jqXHR, textstatus, errorthrown) ->
-        failer(jqXHR)
-  genericRequest: (jsonObj, method, responseHandler) ->
-    $.ajax
-      type: method
-      url: "/storage.json"
-      data: JSON.stringify(jsonObj)
-      success: (data, textStatus, jqXHR) ->
-        responseHandler(data)
-      error: (jqXHR, textstatus, errorthrown) ->
-        console.log(jqXHR.responseText)
-        responseHandler(JSON.parse(jqXHR.responseText))
-  createStorage: (jsonObj, responseHandler) ->
-    this.genericRequest(jsonObj, 'POST', responseHandler)
-  putStorage: (jsonObj, responseHandler) ->
-    this.genericRequest(jsonObj, 'PUT', responseHandler)
-  getStorage: (jsonObj, responseHandler) ->
-    this.genericRequest(jsonObj, 'SEARCH', responseHandler)
-  deleteStorage: (jsonObj, responseHandler) ->
-    this.genericRequest(jsonObj, 'DELETE', responseHandler)
-  getUrl: (id) ->
-    "http://localhost:9292/storage.json?id=" + id
+    @genericRequest(jsonObj, 'POST', 'user', success, failure)
+    return
+
+  createStorage: (jsonObj, responseHandler, errorHandler) ->
+    @genericRequest(jsonObj, 'POST', 'storage', responseHandler, errorHandler)
+    return
+
+  putStorage: (jsonObj, responseHandler, errorHandler) ->
+    @genericRequest(jsonObj, 'PUT', 'storage', responseHandler, errorHandler)
+    return
+
+  getStorage: (jsonObj, responseHandler, errorHandler) ->
+    @genericRequest(jsonObj, 'SEARCH', 'storage', responseHandler, errorHandler)
+    return
+
+  deleteStorage: (jsonObj, responseHandler, errorHandler) ->
+    @genericRequest(jsonObj, 'DELETE', 'storage', responseHandler, errorHandler)
+    return

data/spec/examples/json.northpole.ro/public/javascripts/music/angular-youtube-embed.js

@@ -0,0 +1,251 @@
+if (!angular && require){
+    var angular = require('angular');
+}
+
+/* global YT */
+angular.module('youtube-embed', ['ng'])
+.service ('youtubeEmbedUtils', ['$window', '$rootScope', function ($window, $rootScope) {
+    var Service = {}
+
+    // adapted from http://stackoverflow.com/a/5831191/1614967
+    var youtubeRegexp = /https?:\/\/(?:[0-9A-Z-]+\.)?(?:youtu\.be\/|youtube(?:-nocookie)?\.com\S*[^\w\s-])([\w-]{11})(?=[^\w-]|$)(?![?=&+%\w.-]*(?:['"][^<>]*>|<\/a>))[?=&+%\w.-]*/ig;
+    var timeRegexp = /t=(\d+)[ms]?(\d+)?s?/;
+
+    function contains(str, substr) {
+        return (str.indexOf(substr) > -1);
+    }
+
+    Service.getIdFromURL = function getIdFromURL(url) {
+        var id = url.replace(youtubeRegexp, '$1');
+
+        if (contains(id, ';')) {
+            var pieces = id.split(';');
+
+            if (contains(pieces[1], '%')) {
+                // links like this:
+                // "http://www.youtube.com/attribution_link?a=pxa6goHqzaA&amp;u=%2Fwatch%3Fv%3DdPdgx30w9sU%26feature%3Dshare"
+                // have the real query string URI encoded behind a ';'.
+                // at this point, `id is 'pxa6goHqzaA;u=%2Fwatch%3Fv%3DdPdgx30w9sU%26feature%3Dshare'
+                var uriComponent = decodeURIComponent(id.split(';')[1]);
+                id = ('http://youtube.com' + uriComponent)
+                        .replace(youtubeRegexp, '$1');
+            } else {
+                // https://www.youtube.com/watch?v=VbNF9X1waSc&amp;feature=youtu.be
+                // `id` looks like 'VbNF9X1waSc;feature=youtu.be' currently.
+                // strip the ';feature=youtu.be'
+                id = pieces[0];
+            }
+        } else if (contains(id, '#')) {
+            // id might look like '93LvTKF_jW0#t=1'
+            // and we want '93LvTKF_jW0'
+            id = id.split('#')[0];
+        }
+
+        return id;
+    };
+
+    Service.getTimeFromURL = function getTimeFromURL(url) {
+        url = url || '';
+
+        // t=4m20s
+        // returns ['t=4m20s', '4', '20']
+        // t=46s
+        // returns ['t=46s', '46']
+        // t=46
+        // returns ['t=46', '46']
+        var times = url.match(timeRegexp);
+
+        if (!times) {
+            // zero seconds
+            return 0;
+        }
+
+        // assume the first
+        var full = times[0],
+            minutes = times[1],
+            seconds = times[2];
+
+        // t=4m20s
+        if (typeof seconds !== 'undefined') {
+            seconds = parseInt(seconds, 10);
+            minutes = parseInt(minutes, 10);
+
+        // t=4m
+        } else if (contains(full, 'm')) {
+            minutes = parseInt(minutes, 10);
+            seconds = 0;
+
+        // t=4s
+        // t=4
+        } else {
+            seconds = parseInt(minutes, 10);
+            minutes = 0;
+        }
+
+        // in seconds
+        return seconds + (minutes * 60);
+    };
+
+    Service.ready = false;
+
+    function applyServiceIsReady() {
+        $rootScope.$apply(function () {
+            Service.ready = true;
+        });
+    };
+
+    // If the library isn't here at all,
+    if (typeof YT === "undefined") {
+        // ...grab on to global callback, in case it's eventually loaded
+        $window.onYouTubeIframeAPIReady = applyServiceIsReady;
+    } else if (YT.loaded) {
+        Service.ready = true;
+    } else {
+        YT.ready(applyServiceIsReady);
+    }
+
+    return Service;
+}])
+.directive('youtubeVideo', ['youtubeEmbedUtils', function (youtubeEmbedUtils) {
+    var uniqId = 1;
+
+    // from YT.PlayerState
+    var stateNames = {
+        '-1': 'unstarted',
+        0: 'ended',
+        1: 'playing',
+        2: 'paused',
+        3: 'buffering',
+        5: 'queued'
+    };
+
+    var eventPrefix = 'youtube.player.';
+
+    return {
+        restrict: 'EA',
+        scope: {
+            videoId: '=?',
+            videoUrl: '=?',
+            player: '=?',
+            playerVars: '=?',
+            playerHeight: '=?',
+            playerWidth: '=?'
+        },
+        link: function (scope, element, attrs) {
+            // allows us to $watch `ready`
+            scope.utils = youtubeEmbedUtils;
+
+            // player-id attr > id attr > directive-generated ID
+            var playerId = attrs.playerId || element[0].id || 'unique-youtube-embed-id-' + uniqId++;
+            element[0].id = playerId;
+
+            // Attach to element
+            scope.playerHeight = scope.playerHeight || 390;
+            scope.playerWidth = scope.playerWidth || 640;
+            scope.playerVars = scope.playerVars || {};
+
+            // YT calls callbacks outside of digest cycle
+            function applyBroadcast () {
+                var args = Array.prototype.slice.call(arguments);
+                scope.$apply(function () {
+                    scope.$emit.apply(scope, args);
+                });
+            }
+
+            function onPlayerStateChange (event) {
+                var state = stateNames[event.data];
+                if (typeof state !== 'undefined') {
+                    applyBroadcast(eventPrefix + state, scope.player, event);
+                }
+                scope.$apply(function () {
+                    scope.player.currentState = state;
+                });
+            }
+
+            function onPlayerReady (event) {
+                applyBroadcast(eventPrefix + 'ready', scope.player, event);
+            }
+
+            function onPlayerError (event) {
+                applyBroadcast(eventPrefix + 'error', scope.player, event);
+            }
+
+            function createPlayer () {
+                var playerVars = angular.copy(scope.playerVars);
+                playerVars.start = playerVars.start || scope.urlStartTime;
+                var player = new YT.Player(playerId, {
+                    height: scope.playerHeight,
+                    width: scope.playerWidth,
+                    videoId: scope.videoId,
+                    playerVars: playerVars,
+                    events: {
+                        onReady: onPlayerReady,
+                        onStateChange: onPlayerStateChange,
+                        onError: onPlayerError
+                    }
+                });
+
+                player.id = playerId;
+                return player;
+            }
+
+            function loadPlayer () {
+                if (scope.videoId || scope.playerVars.list) {
+                    if (scope.player && typeof scope.player.destroy === 'function') {
+                        scope.player.destroy();
+                    }
+
+                    scope.player = createPlayer();
+                }
+            };
+
+            var stopWatchingReady = scope.$watch(
+                function () {
+                    return scope.utils.ready
+                        // Wait until one of them is defined...
+                        && (typeof scope.videoUrl !== 'undefined'
+                        ||  typeof scope.videoId !== 'undefined'
+                        ||  typeof scope.playerVars.list !== 'undefined');
+                },
+                function (ready) {
+                    if (ready) {
+                        stopWatchingReady();
+
+                        // URL takes first priority
+                        if (typeof scope.videoUrl !== 'undefined') {
+                            scope.$watch('videoUrl', function (url) {
+                                scope.videoId = scope.utils.getIdFromURL(url);
+                                scope.urlStartTime = scope.utils.getTimeFromURL(url);
+
+                                loadPlayer();
+                            });
+
+                        // then, a video ID
+                        } else if (typeof scope.videoId !== 'undefined') {
+                            scope.$watch('videoId', function () {
+                                scope.urlStartTime = null;
+                                loadPlayer();
+                            });
+
+                        // finally, a list
+                        } else {
+                            scope.$watch('playerVars.list', function () {
+                                scope.urlStartTime = null;
+                                loadPlayer();
+                            });
+                        }
+                    }
+            });
+
+            scope.$watchCollection(['playerHeight', 'playerWidth'], function() {
+                if (scope.player) {
+                    scope.player.setSize(scope.playerWidth, scope.playerHeight);
+                }
+            });
+
+            scope.$on('$destroy', function () {
+                scope.player && scope.player.destroy();
+            });
+        }
+    };
+}]);