0.1: support auto $apply, bugfix

ready for shipping

Author: guo-yu

.npmignore

@@ -4,4 +4,5 @@ node_modules
 psd
 thumb
 *.log
-bower_*
+bower_*
+examples

README.md

@@ -22,11 +22,10 @@ See more examples in `./examples`, or just run `$ npm run example`
 angular.module('myApp',['duoshuo'])
 .controller('myController', function($scope, $duoshuo){
   // high level api
-  $duoshuo.threads.create({
+  $duoshuo.post('threads/create', {
     title: 'new thread',
     content: 'blablablabla'
-  }, function(err, response, data){
-    if (err) return console.error(err);
+  }, function(data){
     console.log(data);
   });
 });

bower.json

@@ -20,7 +20,8 @@
     "node_modules",
     "bower_components",
     "test",
-    "tests"
+    "tests",
+    "examples"
   ],
   "dependencies": {
     "angular": "*"

examples/example.js

@@ -1,10 +1,17 @@
 var app = angular.module('app', ['duoshuo']);
 
-app.controller('duoshuo', function($scope, $duoshuo){
+app.controller('duoshuo', function($scope, $duoshuo) {
+  // console.log($duoshuo);
   // inspect current user 
   $duoshuo.on('ready', function(err, data) {
     console.log(data);
     $scope.responseJSON = JSON.stringify(data);
-    $scope.$apply();
   });
-});
+  // using lowlevel `get` method
+  $duoshuo.get('threads/list', {
+    page: 1,
+    limit: 30
+  }, function(data) {
+    $scope.threads = data.response;
+  });
+});

examples/index.html

@@ -21,6 +21,9 @@
   <div id="angular-duoshuo" class="angular-duoshuo" ng-controller="duoshuo">
     <h3 ng-show="responseJSON">当前用户数据:</h3>
     <div class="response" ng-bind="responseJSON"></div>
+    <div class="threads" ng-repeat="thread in threads">
+      <h3 ng-bind="thread.title" ng-show="thread.title !== ''"></h3>
+    </div>
   </div>
   <script>
     var duoshuoQuery = {

src/duoshuo.js

@@ -9,31 +9,35 @@
   if (!configs.short_name) throw new Error('duoshuo short_name required!');
 
   angular.module('duoshuo', [])
-    .factory('$duoshuo', function() {
-      return new Duoshuo(configs);
-    });
-
-  function Duoshuo() {
-    this.configs = configs;
-    this.events = ['reset', 'ready'];
-  }
+  .service('$duoshuo', function($rootScope) {
+    var self = this;
 
-  // lowlevel api set
-  Duoshuo.prototype.get = API.get;
-  Duoshuo.prototype.post = API.post;
-  Duoshuo.prototype.ajax = API.ajax;
-
-  // events
-  Duoshuo.prototype.on = function(eve, callback) {
-    if (this.events.indexOf(eve) === 0) return callback(new Error('event not found'));
-    var e = eve;
-    if (e === 'ready') e = 'reset';
-    return DUOSHUO.visitor.on(e, function() {
-      var self = this;
-      var data = this.data;
-      return callback(null, data, self);
+    // lowlevel api set
+    angular.forEach(['get', 'post', 'ajax'], function(method) {
+      self[method] = function(endpoint, data, callback, skipCheck) {
+        return API[method](endpoint, data, function(d) {
+          callback(d);
+          if (!skipCheck) $rootScope.$apply();
+          return;
+        });
+      }
     });
-  };
+
+    // event wrapper
+    this.on = function(eve, callback, skipCheck) {
+      if (['reset', 'ready'].indexOf(eve) === 0) 
+        return callback(new Error('event not found'));
+      var e = eve;
+      if (e === 'ready') e = 'reset';
+      return DUOSHUO.visitor.on(e, function() {
+        var self = this;
+        var data = this.data;
+        callback(null, data, self);
+        if (!skipCheck) $rootScope.$apply();
+        return;
+      });
+    };
+  });
 
 })(
   window.angular,