Merge pull request #2 from paolochiodi/refactor

Refactoring

Author: rjrodger

README.md

@@ -7,6 +7,6 @@ nodezoo.com micro-service handling github meta data.
 # Running
 
 ```sh
-$ node github-service.js --seneca.options.from=dev.options.js --seneca.options.github.token=GITHUB-PERSONAL-ACCESS-TOKEN --seneca.log.all
+$ node srvs/github-dev.js --seneca.options.github.token=GITHUB-PERSONAL-ACCESS-TOKEN --seneca.log.all
 ```
 

dev.options.js

@@ -14,19 +14,18 @@ var gitapi  = new GitHubAPI({
 module.exports = function github( options ){
   var seneca = this
 
-
   seneca.add(
-    'role:github,cmd:get', 
+    'role:github,cmd:get',
     {
       name:   { required$:true, string$:true },
       giturl: { string$:true }
-    }, 
+    },
     cmd_get)
 
 
   seneca.add(
-    'role:github,cmd:query', 
-    { 
+    'role:github,cmd:query',
+    {
       name: { required$:true, string$:true },
       user: { required$:true, string$:true },
       repo: { required$:true, string$:true },
@@ -35,7 +34,7 @@ module.exports = function github( options ){
 
 
   seneca.add(
-    'role:github,cmd:parse', 
+    'role:github,cmd:parse',
     {
       giturl: { required$:true, string$:true },
     },
@@ -44,28 +43,28 @@ module.exports = function github( options ){
 
 
   function cmd_get( args, done ) {
-    var seneca  = this
-    var mod_ent = seneca.make$('mod')
+    var seneca      = this
+    var github_ent  = seneca.make$('github')
 
-    var mod_name = args.name
+    var github_name = args.name
 
-    mod_ent.load$( mod_name, function(err,mod){
+    github_ent.load$( github_name, function(err,github_mod){
       if( err ) return done(err);
 
-      if( mod ) {
-        return done(null,mod);
+      if( github_mod ) {
+        return done(null,github_mod);
       }
       else if( args.giturl ) {
         seneca.act(
           'role:github,cmd:parse',
-          {name:mod_name,giturl:args.giturl},
+          {name:github_name,giturl:args.giturl},
 
           function(err,out){
             if( err ) return done(err);
 
             seneca.act(
               'role:github,cmd:query',
-              {name:mod_name,user:out.user,repo:out.repo},
+              {name:github_name,user:out.user,repo:out.repo},
               done)
           })
       }
@@ -75,12 +74,12 @@ module.exports = function github( options ){
 
 
   function cmd_query( args, done ) {
-    var seneca  = this
-    var mod_ent = seneca.make$('mod')
+    var seneca      = this
+    var github_ent  = seneca.make$('github')
 
-    var mod_name = args.name
-    var user     = args.user
-    var repo     = args.repo
+    var github_name = args.name
+    var user        = args.user
+    var repo        = args.repo
 
     gitapi.authenticate({
       type:     "basic",
@@ -107,16 +106,16 @@ module.exports = function github( options ){
             last:    repo.pushed_at
           }
 
-          mod_ent.load$(mod_name, function(err,mod){
+          github_ent.load$(github_name, function(err,github_mod){
             if( err ) return done(err);
 
-            if( mod ) {
-              return mod.data$(data).save$(done);
+            if( github_mod ) {
+              return github_mod.data$(data).save$(done);
             }
             else {
-              data.id$ = mod_name
-              mod_ent.make$(data).save$(done);
-            } 
+              data.id$ = github_name
+              github_ent.make$(data).save$(done);
+            }
           })
         }
         else return done()
@@ -135,6 +134,6 @@ module.exports = function github( options ){
     }
     else return done();
   }
-  
-  
+
+
 }

github.js

@@ -1,5 +1,5 @@
 
 var seneca = require('seneca')()
       .use('jsonfile-store')
-      .use('./github.js')
+      .use('../github.js')
       .listen()

github-service.js srvs/github-dev.jsgithub-service.js renamed to srvs/github-dev.js

@@ -22,11 +22,11 @@ var seneca = require('seneca')()
             else {
               this.act(
                 'role:npm,cmd:get',
-                {name:args.name}, 
+                {name:args.name},
 
                 function(err,mod){
                   if( err ) return;
-                  
+
                   if( mod ) {
                     this.act(
                       'role:github,cmd:get',
@@ -51,4 +51,4 @@ var seneca = require('seneca')()
 
       .client({port:9001,pin:'role:npm'})
 
-      .listen(9002)
+      .listen()

srvs/github-prod.js

@@ -0,0 +1,8 @@
+module.exports = {
+  'jsonfile-store': {folder:__dirname+'/../data'},
+  transport:{
+    web: {
+      port: 9002
+    }
+  }
+}

srvs/seneca.options.js

@@ -51,7 +51,7 @@ describe('github', function() {
   it('get', function( fin ) {
     si.options({errhandler:make_errhandler(fin)})
 
-    si.make$('mod').load$('gex',function(err,out){
+    si.make$('github').load$('gex',function(err,out){
 
       if( out ) {
         out.remove$(do_get)
@@ -61,7 +61,7 @@ describe('github', function() {
       function do_get() {
         si.act(
           'role:github,cmd:get',
-          {name:'gex',giturl:'https://github.com/rjrodger/gex.git'}, 
+          {name:'gex',giturl:'https://github.com/rjrodger/gex.git'},
           function(err,out){
             assert.equal( out.id,   'gex')
             assert.equal( out.repo, 'gex')