joosy 1.2.0.alpha.4 → 1.2.0.alpha.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02b11c8b16a833bce2041755884857abb5ebc8d7
-  data.tar.gz: 325c12aabae0052cdd11a098e1d2551e59962e77
+  metadata.gz: 8395d61d74334b79dff75dfac8d41a983da6cd7d
+  data.tar.gz: f8bc1d0db984fa3c4bd689a5ad00defe632c3f19
 SHA512:
-  metadata.gz: c70a1a3d66b29e5b3c35bbd9e989128441ab28d680805b17dcc624ae5edabb1be2a13154ca6becf56f048ba059d442ec9ed8ff5dae8d47c3299690cf43f3a5c6
-  data.tar.gz: a92fe9856fab357b6953bed3e31744470b5a67028741af7419575bc11295a40f4122224601425c00731dc2f0bf7b5ce7605294da1db17443d265a4b6d7fe77e3
+  metadata.gz: bf279fa42a0b35c7fb01950e28af1f33701aa762ae82747b4854da0dd46bfd04e16dd4d56f81fed3c48ce7845b17973236f0846f155fc59d2c9028e1cb03d278
+  data.tar.gz: 4a33c7dd7ff43dc198842f133d5ed2a31307f3f5173fc87b0aa431291334eca0e37d548f0194fa1a9b95ffc5a6db08998e7d25fc360c12b29a6ff63a4a2a2f7a

data/README.md

@@ -65,7 +65,7 @@ Now run basic application generator with the following command:
 
     joosy new dummy
 
-Now you can `grunt server` to get Joosy placeholder at [localhost:4000/](http://localhost:4000/). Generated application will consist of one `Layout` and one `Page` both including very basic practices of Joosy.
+The main application code will appear at `source` directory. `stylesheets` is for Stylus-based styles and the main canvas of page is defined at `source/index.haml`. Now you can `grunt joosy:server` to start development server at [localhost:4000/](http://localhost:4000/).
 
 To generate assets statically prior to the deployment run
 

data/bower.json

@@ -1,6 +1,6 @@
 {
   "name": "joosy",
-  "version": "1.2.0-alpha.4",
+  "version": "1.2.0-alpha.5",
   "main": "lib/joosy.js",
   "ignore": [
     "bin",

data/lib/joosy.rb

@@ -1,5 +1,5 @@
-require 'haml_coffee_assets'
 require 'json'
+require 'haml_coffee_assets'
 
 module Joosy
   PACKAGE = File.expand_path("../../package.json", __FILE__)
@@ -13,4 +13,12 @@ module Joosy
       File.dirname(HamlCoffeeAssets.helpers_path)
     ]
   end
+
+  def self.generators_path
+    File.expand_path '../../src/joosy/generators', __FILE__
+  end
+
+  def self.templates_path
+    File.expand_path '../../templates', __FILE__
+  end
 end

data/package.json

@@ -4,7 +4,7 @@
   "keywords": [
     "joosy"
   ],
-  "version": "1.2.0-alpha.4",
+  "version": "1.2.0-alpha.5",
   "author": "Boris Staal <boris@staal.io>",
   "bin": {
     "joosy": "bin/joosy"

data/src/joosy/generators/{generator.coffee → base.coffee}

@@ -1,14 +1,15 @@
-File      = require('grunt').file
-Log       = require('grunt').log
-Path      = require('path')
-EJS       = require('ejs')
-Commander = require('commander')
-
-module.exports = class
-  constructor: (destination, templates) ->
-    @destination = destination || process.cwd()
-    @templates   = templates || @join(__dirname, '..', '..', '..', 'templates')
-    @actions     = []
+if module?
+  File      = require('grunt').file
+  Log       = require('grunt').log
+  Path      = require('path')
+  EJS       = require('ejs')
+  Commander = require('commander')
+
+class Base
+  constructor: (@destination, @templates) ->
+    @destination ||= process?.cwd()
+    @templates   ||= @join(__dirname, '..', '..', '..', 'templates') if __dirname?
+    @actions       = []
 
   getNamespace: (name) ->
     name = name.split('/')
@@ -23,9 +24,7 @@ module.exports = class
     source = @join(@templates, source...) if source instanceof Array
     destination = @join(destination...) if destination instanceof Array
 
-    result = @compileTemplate source, data
-
-    @actions.push ['template', destination, result]
+    @actions.push ['template', destination, source, data]
 
   file: (destination, content='') ->
     destination = @join(destination...) if destination instanceof Array
@@ -38,18 +37,28 @@ module.exports = class
 
     @actions.push ['copy', destination, source]
 
-  #
-  # Required but Node-only methods
-  #
+  camelize: (string) ->
+    parts = (part.charAt(0).toUpperCase() + part.substr(1) for part in string.split(/_|-/))
+    parts.join ''
+
   join: ->
-    Path.join arguments...
+    if Path?
+      Path.join arguments...
+    else
+      Array.prototype.slice.call(arguments, 0).join('/')
 
-  compileTemplate: (source, data) ->
-    EJS.render File.read(source), data
+  #
+  # Methods that have to be overrided outside of Node.js
+  #
+  version: ->
+    require('../../../package.json').version
 
   #
   # Node-base performer
   #
+  compileTemplate: (source, data) ->
+    EJS.render File.read(source), data
+
   perform: (callback) ->
     actions = @actions.clone()
     @performAction actions.pop(), actions, callback
@@ -90,4 +99,10 @@ module.exports = class
       write()
       callback()
       
-  performTemplateAction: -> @performFileAction arguments...
+  performTemplateAction: (callback, destination, source, data) ->
+    @performFileAction callback, destination, @compileTemplate(source, data)
+
+if module?
+  module.exports = Base
+else
+  @Base = Base

data/src/joosy/generators/layout.coffee

@@ -1,6 +1,6 @@
-Generator = require './generator'
+@Base = require './base' if module?
 
-module.exports = class extends Generator
+class Layout extends @Base
   constructor: (@name, destination, templates) ->
     super(destination, templates)
     @destination = @join @destination, 'source'
@@ -11,10 +11,15 @@ module.exports = class extends Generator
     template  = if namespace.length > 0 then 'namespaced' else 'basic'
 
     @template ['layout', "#{template}.coffee"], ['layouts', @join(namespace...), "#{basename}.coffee"],
-      namespace_name: namespace.map (x) -> x.camelize()
-      class_name: basename.camelize()
+      namespace_name: (@camelize(x) for x in namespace).join('.')
+      class_name: @camelize(basename)
       view_name: basename
 
     @file ['templates', 'layouts', @join(namespace...), "#{basename}.jst.hamlc"]
 
-    @actions
+    @actions
+
+if module?
+  module.exports = Layout
+else
+  @Generator = Layout

data/src/joosy/generators/page.coffee

@@ -1,6 +1,6 @@
-Generator = require './generator'
+@Base = require './base' if module?
 
-module.exports = class extends Generator
+class Page extends @Base
   constructor: (@name, destination, templates) ->
     super(destination, templates)
     @destination = @join @destination, 'source'
@@ -11,10 +11,15 @@ module.exports = class extends Generator
     template  = if namespace.length > 0 then 'namespaced' else 'basic'
 
     @template ['page', "#{template}.coffee"], ['pages', @join(namespace...), "#{basename}.coffee"],
-      namespace_name: namespace.map (x) -> x.camelize()
-      class_name: basename.camelize()
+      namespace_name: (@camelize(x) for x in namespace).join('.')
+      class_name: @camelize(basename)
       view_name: basename
 
     @file ['templates', 'pages', @join(namespace...), "#{basename}.jst.hamlc"]
 
-    @actions
+    @actions
+
+if module?
+  module.exports = Page
+else
+  @Generator = Page

data/src/joosy/generators/project/base.coffee

@@ -1,8 +1,9 @@
-Generator = require '../generator'
+@Base = require '../base' if module?
 
-module.exports = class extends Generator
-  constructor: (@name, destination, templates) ->
+class ProjectBase extends @Base
+  constructor: (name, destination, templates) ->
     super(destination, templates)
+    @name = name.split('/').pop()
     @destination = @join @destination, 'source'
 
   generate: ->
@@ -25,4 +26,9 @@ module.exports = class extends Generator
     @template ['application', 'base', 'application.coffee'], ['application.coffee'],
       application: @name
 
-    @actions
+    @actions
+
+if module?
+  module.exports = ProjectBase
+else
+  @Generator = ProjectBase

data/src/joosy/generators/project/standalone.coffee

@@ -1,9 +1,8 @@
-meta      = require '../../../../package.json'
-Generator = require '../generator'
+@Base = require '../base' if module?
 
-module.exports = class extends Generator
+class ProjectStandalone extends @Base
   constructor: (@name, destination, templates) ->
-    destination = @join (destination || process.cwd()), @name unless destination?
+    destination = @join process.cwd(), @name  if !destination? && process?
     super(destination, templates)
 
   generate: ->
@@ -20,6 +19,11 @@ module.exports = class extends Generator
                                        ['stylesheets', 'application.styl']
 
     @template ['application', 'standalone', 'package.json'], ['package.json'],
-      joosy_version: meta.version
+      joosy_version: @version()
 
-    @actions
+    @actions
+
+if module?
+  module.exports = ProjectStandalone
+else
+  @Generator = ProjectStandalone

data/src/joosy/generators/widget.coffee

@@ -1,6 +1,6 @@
-Generator = require './generator'
+@Base = require './base' if module?
 
-module.exports = class extends Generator
+class Widget extends @Base
   constructor: (@name, destination, templates) ->
     super(destination, templates)
     @destination = @join @destination, 'source'
@@ -11,10 +11,15 @@ module.exports = class extends Generator
     template  = if namespace.length > 0 then 'namespaced' else 'basic'
 
     @template ['widget', "#{template}.coffee"], ['widgets', @join(namespace...), "#{basename}.coffee"],
-      namespace_name: namespace.map (x) -> x.camelize()
-      class_name: basename.camelize()
+      namespace_name: (@camelize(x) for x in namespace).join('.')
+      class_name: @camelize(basename)
       view_name: basename
 
     @file ['templates', 'widgets', @join(namespace...), "#{basename}.jst.hamlc"]
 
-    @actions
+    @actions
+
+if module?
+  module.exports = Widget
+else
+  @Generator = Widget

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: joosy
 version: !ruby/object:Gem::Version
-  version: 1.2.0.alpha.4
+  version: 1.2.0.alpha.5
 platform: ruby
 authors:
 - Boris Staal
@@ -110,8 +110,8 @@ files:
 - src/joosy/core/router.coffee
 - src/joosy/core/templaters/rails_jst.coffee
 - src/joosy/core/widget.coffee
+- src/joosy/generators/base.coffee
 - src/joosy/generators/command.coffee
-- src/joosy/generators/generator.coffee
 - src/joosy/generators/layout.coffee
 - src/joosy/generators/page.coffee
 - src/joosy/generators/project.coffee