@@ -23,8 +23,8 @@

 (defmacro+ps resource (name url params &body body)

   `(var ,name

         ($resource ,url ,(cons 'create params)

-                   ,@(loop for (name form) in body

-                           collect (list 'create name (cons 'create form))))))

+                   ,(cons 'create (loop for (name form) in body

+                                         append (list name (cons 'create form)))))))

 (defmacro+ps scope-function (name arguments &body body)

   `(scope-var ,name (lambda ,arguments

@@ -1,15 +1,29 @@

 (in-package :angular)

-

+;:action "/feeds/add?api=yes" :name "add-form" :id "add-form" :method "post" 

 (def-module whitespace '(ng-resource ng-sanitize)

   (defcontroller -Main-Ctrl ($http $resource $sce)

-    (resource feeds "feeds/json" nil)

-    (scope-var feeds (chain feeds (get)))

+    (resource feeds "/feeds" nil

+              (json (method "GET" url "/feeds/json"))

+              (add  (method "POST" url "/feeds/add")))

+

+    (scope-var feeds (chain feeds (json)))

     (scope-var data "hello world!")

+    (scope-var add-form (create url ""))

+

     (scope-function render-html (html-code)

       (chain $sce (trust-as-html html-code)))

+

     (scope-function toggle-closed (ent)

       (setf (@ ent closed) (not (@ ent closed))))

+

+    (scope-function add-feed ()

+      (chain feeds (add (create "url" ($s add-form url)

+                                "api" "yes"))

+             $promise

+             (then

+               (lambda (feed)

+                 ($s feeds result (unshift (@ feed result)))))))

     ))

 ; vim: ft=lisp

@@ -1,14 +1,20 @@

 var whitespace = angular.module('whitespace', ['ngResource', 'ngSanitize']);

 whitespace.controller('MainCtrl', ['$scope', '$http', '$resource', '$sce', function ($scope, $http, $resource, $sce) {

-    var feeds = $resource('feeds/json', {  });

-    $scope.feeds = feeds.get();

+    var feeds = $resource('/feeds', {  }, { json : { method : 'GET', url : '/feeds/json' }, add : { method : 'POST', url : '/feeds/add' } });

+    $scope.feeds = feeds.json();

     $scope.data = 'hello world!';

+    $scope.addForm = { url : '' };

     $scope.renderHtml = function (htmlCode) {

         return $sce.trustAsHtml(htmlCode);

     };

     $scope.toggleClosed = function (ent) {

         return ent.closed = !ent.closed;

     };

+    $scope.addFeed = function () {

+        return feeds.add({ 'url' : $scope.addForm.url, 'api' : 'yes' }).$promise.then(function (feed) {

+            return $scope.feeds.result.unshift(feed.result);

+        });

+    };

     return null;

 }]);