joosy 1.2.0.alpha.41 → 1.2.0.alpha.51

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

@@ -8,7 +8,7 @@ if module?
 class Base
   constructor: (@options, @destination, @templates) ->
     @destination ||= process?.cwd()
-    @templates   ||= @join(__dirname, '..', '..', '..', 'templates') if __dirname?
+    @templates   ||= @join(__dirname, 'templates') if __dirname?
     @actions       = []
 
   getNamespace: (name) ->
@@ -51,7 +51,7 @@ class Base
   # Methods that have to be overrided outside of Node.js
   #
   version: ->
-    require('../../../package.json').version
+    require('../package.json').version
 
   #
   # Node-base performer

data/{src/joosy/generators → generators/command}/command.coffee

@@ -1,10 +1,22 @@
 module.exports = ->
   Sugar = require 'sugar'
   cli   = require 'command-router'
-  meta  = require '../../../package.json'
+  meta  = require '../../package.json'
   grunt = require 'grunt'
   path  = require 'path'
 
+  cli.command /help\s?(.*)/, ->
+    name = cli.params.splats[0]
+    commands = ['new', 'generate']
+    name = 'banner' if  name == ''
+
+    if  !commands.some(name) && name != 'banner'
+      console.error "Unknown command '#{name}'. Possible values: #{commands.join(', ')}."
+      process.exit 1
+
+    helper = require('./help')
+    helper[name]()
+
   cli.command /new\s?(.*)?/, ->
     name = cli.params.splats[0]
 
@@ -12,7 +24,7 @@ module.exports = ->
       console.error "Usage: `new :name`. Run `help` for details."
       process.exit(1)
 
-    generator = require('./project')
+    generator = require('../project')
     generator = new generator(name: name)
     generator.generate()
     generator.perform -> process.exit 0
@@ -36,11 +48,12 @@ module.exports = ->
       console.error "Failed: `source' directory not found. Are you in the root of project?"
       process.exit 1
 
-    generator = require("./#{entity}")
+    generator = require("../#{entity}")
     generator = new generator({name: name}, path.join(process.cwd(), 'source'))
     generator.generate()
     generator.perform -> process.exit 0
 
+
   cli.on 'notfound', (action) ->
     if action.length > 0
       console.error "'#{action}' is an unknown action :("

data/generators/command/help.coffee

@@ -0,0 +1,38 @@
+module.exports =
+
+  generate: ->
+    console.log 'Usage:'
+    console.log '  joosy generate :generator'
+    console.log ''
+    console.log 'Description:'
+    console.log '  Runs one of the following generators to create something for you:'
+    console.log ''
+    console.log '  page         create new page'
+    console.log '  resource     create new resource'
+    console.log '  widget       create new widget'
+    console.log '  layout       create new layout'
+
+  new: ->
+    console.log 'Usage:'
+    console.log '  joosy new :name'
+    console.log ''
+    console.log 'Description:'
+    console.log '  Generates brand new Joosy application named :name (directory with the name of application will be created)'
+
+  banner: ->
+    console.log '     __________________________'
+    console.log '    /_    ____ ____ ____ __ __/'
+    console.log '   __/  /    /    / ___/  /  /'
+    console.log '  / /  / /  /  / /__  /  /  /'
+    console.log ' /____/____/____/____/__   /'
+    console.log '/_________________________/'
+    console.log ''
+    console.log 'Usage:'
+    console.log '  joosy COMMAND [ARGS]'
+    console.log ''
+    console.log 'Available commands:'
+    console.log '  generate    Insert new entity in the application (short-cut alias "g")'
+    console.log '  new         Create a new application'
+    console.log ''
+    console.log 'Description:'
+    console.log '  Help is also available on per-command basis (joosy help command)'

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

@@ -9,9 +9,6 @@ class ProjectBase extends @Base
   constructor: (@options, destination, templates) ->
     super(@options, destination, templates)
 
-    @options.name ||= 'application'
-    @options.name   = @options.name.split('/').pop()
-
   generate: ->
     @file ['resources', '.gitkeep']
     @file ['widgets', '.gitkeep']
@@ -31,7 +28,8 @@ class ProjectBase extends @Base
 
 
     @template ['application', 'base', 'application.coffee'], ['application.coffee'],
-      application: @options.name
+      templaterPrefix: @options.templaterPrefix || null
+      enableHTML5: !!@options.enableHTML5
       dependencies: @options.dependencies.replace /^\s+|\s+$/g, ''
 
     @actions

data/{src/joosy/generators → generators}/project/standalone.coffee

@@ -15,16 +15,17 @@ class ProjectStandalone extends @Base
     @file ['vendor', '.gitkeep']
 
     @copy ['application', 'standalone', '_gitignore'],           ['.gitignore']
-    @copy ['application', 'standalone', 'bower.json'],           ['bower.json']
     @copy ['application', 'standalone', 'Gruntfile.coffee'],     ['Gruntfile.coffee']
     @copy ['application', 'standalone', 'Procfile'],             ['Procfile']
 
-    @copy ['application', 'standalone', 'source', 'haml', 'index.haml'], 
+    @copy ['application', 'standalone', 'source', 'haml', 'index.haml'],
                                        ['source', 'haml', 'index.haml']
 
     @copy ['application', 'standalone', 'source', 'stylesheets', 'application.styl'],
                                        ['source', 'stylesheets', 'application.styl']
 
+    @template ['application', 'standalone', 'bower.json'],   ['bower.json'],
+      application: @options.name
     @template ['application', 'standalone', 'package.json'], ['package.json'],
       joosy_version: @version()
 
@@ -33,4 +34,4 @@ class ProjectStandalone extends @Base
 if module?
   module.exports = ProjectStandalone
 else
-  @Generator = ProjectStandalone
+  @Generator = ProjectStandalone

data/generators/templates/application/base/application.coffee

@@ -0,0 +1,13 @@
+<%= dependencies %>
+#
+#= require joosy
+#
+#= require_tree ./
+#= require_self
+
+$ ->
+  Joosy.Application.initialize 'body',
+    router:
+      html5: <%= enableHTML5 %><% if (templaterPrefix && templaterPrefix.length > 0) { %>
+    templater:
+      prefix: '<%= templaterPrefix %>'<% } %>

data/{templates → generators/templates}/application/standalone/Gruntfile.coffee

@@ -23,6 +23,7 @@ module.exports = (grunt) ->
           path: '/'
           src: 'index.haml'
           dest: 'public/index.html'
+          url: ['/', '/index.html']
 
     uglify:
       application:

data/generators/templates/application/standalone/bower.json

@@ -0,0 +1,17 @@
+{
+  "name": "<%= application %>",
+  "version": "0.0.1",
+  "main": "source/haml/index.html",
+  "ignore": [
+    "**/.*",
+    "node_modules",
+    "bower_components",
+    "test",
+    "tests"
+  ],
+  "dependencies": {
+    "jquery": "~2.0.2",
+    "sugar": "~1.3.9",
+    "jquery-form": "~3.37.0"
+  }
+}

data/lib/joosy.rb

@@ -8,15 +8,15 @@ module Joosy
 
   def self.assets_paths
     [
-      File.expand_path('../../src', __FILE__)
+      File.expand_path('../../source', __FILE__)
     ]
   end
 
   def self.generators_path
-    File.expand_path '../../src/joosy/generators', __FILE__
+    File.expand_path '../../generators', __FILE__
   end
 
   def self.templates_path
-    File.expand_path '../../templates', __FILE__
+    File.expand_path '../../generators/templates', __FILE__
   end
 end

data/package.json

@@ -4,7 +4,7 @@
   "keywords": [
     "joosy"
   ],
-  "version": "1.2.0-alpha.41",
+  "version": "1.2.0-alpha.51",
   "author": "Boris Staal <boris@staal.io>",
   "homepage": "http://joosy.ws/",
   "repository": {
@@ -28,7 +28,7 @@
     "commander": "~1.2.0",
     "colors": "~0.6.0-1",
     "grunt": "~0.4.1",
-    "mincer": "~0.4.6",
+    "mincer": "~0.5.2",
     "connect": "~2.7.11",
     "haml-coffee": "~1.11.1",
     "proxy-middleware": "~0.4.0",
@@ -37,7 +37,6 @@
     "nib": "~0.9.1"
   },
   "devDependencies": {
-    "grunt-mincer": "~0.3.2",
     "grunt-contrib-jasmine": "~0.5.1",
     "grunt-contrib-watch": "~0.4.4",
     "grunt-contrib-coffee": "~0.7.0",

data/source/joosy/application.coffee

@@ -0,0 +1,95 @@
+#= require joosy/joosy
+#= require joosy/router
+#= require_tree ./templaters
+#= require_tree ./resources
+#= require_tree ./helpers
+
+#
+# Joosy Application container
+#
+# @mixin
+#
+Joosy.Application =
+  Pages: {}
+  Layouts: {}
+  Controls: {}
+
+  initialized: false
+  loading: true
+
+  config:
+    debug:    false
+    templater:
+      prefix: ''
+    router:
+      html5:  false
+      base:   ''
+      prefix: ''
+
+  #
+  # Starts Joosy application by binding to element and bootstraping routes
+  #
+  # @param [String] name        Name of app (the dir its located in)
+  # @param [String] selector    jQuery-compatible selector of root application element
+  # @param [Object] options
+  #
+  initialize: (@selector, options={}) ->
+    if @initialized
+      throw new Error 'Attempted to initialize Application twice'
+
+    Object.merge @config, window.JoosyEnvironment, true if window.JoosyEnvironment?
+    Object.merge @config, options, true
+
+    Joosy.templater new Joosy.Templaters.JST(@config.templater)
+    Joosy.debug @config.debug
+
+    Joosy.Router.setup @config.router, (action, params) =>
+      if Joosy.Module.hasAncestor action, Joosy.Page
+        @changePage action, params
+      else if Object.isFunction(action)
+        action(params)
+      else
+        throw new "Unknown kind of route action"
+
+    @initialized = true
+
+  reset: ->
+    Joosy.Router.reset()
+    Joosy.templater false
+    Joosy.debug false
+
+    @page?.__unload()
+    delete @page
+
+    @loading = true
+    @initialized = false
+
+  navigate: ->
+    @router.navigate arguments...
+
+  #
+  # Gets current application root node
+  #
+  content: ->
+    $(@selector)
+
+  #
+  # Switches to given page
+  #
+  # @param [Joosy.Page] page      The class (not object) of page to load
+  # @param [Object] params        Hash of page params
+  #
+  changePage: (page, params) ->
+    attempt = new page params, @page
+
+    unless attempt.halted
+      if attempt.layoutShouldChange && attempt.layout
+        attempt.layout.__bootstrapDefault attempt, @content()
+      else
+        attempt.__bootstrapDefault @content()
+
+      @page = attempt
+
+# AMD wrapper
+if define?.amd?
+  define 'joosy/application', -> Joosy.Application

data/source/joosy/events/namespace.coffee

@@ -0,0 +1,24 @@
+#
+# Events namespace
+#
+# Creates unified collection of bindings to a particular instance
+# that can be unbinded alltogether
+#
+# @example
+#   namespace = Joosy.Events.Namespace(something)
+#
+#   namespace.bind 'event1', ->
+#   namespace.bind 'event2', ->
+#   namespace.unbind() # unbinds both bindings
+#
+class Joosy.Events.Namespace
+  #
+  # @param [Object] @parent         Any instance that can trigger events
+  #
+  constructor: (@parent) ->
+    @bindings = []
+
+  bind: (args...) -> @bindings.push @parent.bind(args...)
+  unbind: ->
+    @parent.unbind b for b in @bindings
+    @bindings = []

data/{src → source}/joosy/extensions/resources/base.coffee

@@ -63,7 +63,7 @@ class Joosy.Resources.Base extends Joosy.Module
   #
   # Creates the proxy of current resource binded as a child of given entity
   #
-  @at: (entity) ->
+  @at: (args...) ->
     #
     # Class inheritance used to create proxy
     #
@@ -71,13 +71,21 @@ class Joosy.Resources.Base extends Joosy.Module
     #
     class Clone extends this
 
-    if entity instanceof Joosy.Resources.Base
-      Clone.__source  = entity.memberPath()
-      Clone.__source += '/' + @::__entityName.pluralize() if @::__entityName
+    if args.length == 1 && Object.isArray(args[0])
+      @at(args[0]...)
     else
-      Clone.__source = entity
+      Clone.__source = args.reduce (path, arg) ->
+        path += if arg instanceof Joosy.Resources.Base
+          arg.memberPath()
+        else
+          arg.replace(/^\/?/, '/')
+
+      , ''
+
+      if @::__entityName && args[args.length - 1] instanceof Joosy.Resources.Base
+        Clone.__source += '/' + @::__entityName.pluralize()
 
-    Clone
+      Clone
 
   #
   # Sets the entity text name:
@@ -166,7 +174,7 @@ class Joosy.Resources.Base extends Joosy.Module
       data = {}
       data[shim.__primaryKey] = id
 
-    if Joosy.Application.identity
+    if Joosy.Resources.Base.identity
       id = data[shim.__primaryKey]
 
       if id? && Joosy.Resources.Base.identity[klass][id]
@@ -193,7 +201,7 @@ class Joosy.Resources.Base extends Joosy.Module
     @data[@__primaryKey]
 
   knownAttributes: ->
-    @data.keys()
+    Object.keys @data
 
   #
   # Set the resource data manually

data/{src → source}/joosy/extensions/resources-form/form.coffee

@@ -17,10 +17,10 @@
 #
 # @include Joosy.Modules.Log
 # @include Joosy.Modules.Events
-# @include Joosy.Modules.Container
+# @include Joosy.Modules.DOM
 #
 class Joosy.Form extends Joosy.Module
-  @include Joosy.Modules.Container
+  @include Joosy.Modules.DOM
   @include Joosy.Modules.Log
   @include Joosy.Modules.Events
 
@@ -53,7 +53,7 @@ class Joosy.Form extends Joosy.Module
   #
   @submit: (form, options={}) ->
     form = new @(form, options)
-    form.container.submit()
+    form.$container.submit()
     form.unbind()
     null
 
@@ -101,18 +101,18 @@ class Joosy.Form extends Joosy.Module
       Object.each options, (key, value) =>
         @[key] = value
 
-    @container = $(form)
-    return if @container.length == 0
+    @$container = $(form)
+    return if @$container.length == 0
 
     @__assignElements()
     @__delegateEvents()
 
-    method = @container.get(0).getAttribute('method')?.toLowerCase()
+    method = @$container.get(0).getAttribute('method')?.toLowerCase()
     if method && !['get', 'post'].any method
       @__markMethod method
-      @container.attr 'method', 'POST'
+      @$container.attr 'method', 'POST'
 
-    @container.ajaxForm
+    @$container.ajaxForm
       dataType: 'json'
       beforeSend: =>
         return false if @__debounce arguments...
@@ -141,8 +141,8 @@ class Joosy.Form extends Joosy.Module
       delete @resource
 
     if @action?
-      @container.attr 'action', @action
-      @container.attr 'method', 'POST'
+      @$container.attr 'action', @action
+      @$container.attr 'method', 'POST'
 
     if @method?
       @__markMethod @method
@@ -151,7 +151,7 @@ class Joosy.Form extends Joosy.Module
   # Resets form submit behavior to default
   #
   unbind: ->
-    @container.unbind('submit').find('input:submit,input:image,button:submit').unbind('click')
+    @$container.unbind('submit').find('input:submit,input:image,button:submit').unbind('click')
 
   #
   # Links current form with given resource and sets values of form inputs from with it.
@@ -202,19 +202,19 @@ class Joosy.Form extends Joosy.Module
 
     filler data, resource.__entityName || options.resourceName
 
-    $('input[name=_method]', @container).remove()
+    $('input[name=_method]', @$container).remove()
     @__markMethod(options?.method || 'PUT') if resource.id()
 
     url = options?.action || (if resource.id()? then resource.memberPath() else resource.collectionPath())
 
-    @container.attr 'action', url
-    @container.attr 'method', 'POST'
+    @$container.attr 'action', url
+    @$container.attr 'method', 'POST'
 
   #
   # Submit the HTML Form
   #
   submit: ->
-    @container.submit()
+    @$container.submit()
 
   #
   # Serializes form into query string.
@@ -224,7 +224,7 @@ class Joosy.Form extends Joosy.Module
   # @return [String]
   #
   serialize: (skipMethod=true) ->
-    data = @container.serialize()
+    data = @$container.serialize()
     data = data.replace /\&?\_method\=put/i, '' if skipMethod
 
     data
@@ -278,7 +278,7 @@ class Joosy.Form extends Joosy.Module
   __debounce: (xhr) ->
     @debugAs this, "debounce: pending_request == #{@__pending_request}"
     if @__pending_request && @debounce != false
-      if @debounce || Joosy.Application.debounceForms
+      if @debounce || Joosy.Form.debounceForms
         xhr.abort()
         @debugAs this, "debounce: xhr aborted"
         return true
@@ -306,7 +306,7 @@ class Joosy.Form extends Joosy.Module
       name: '_method'
       value: method
     )
-    @container.append method
+    @$container.append method
 
   #
   # Prepares server response for default error handler

data/{src → source}/joosy/extensions/resources-form/helpers/form.coffee

@@ -61,7 +61,7 @@ Joosy.helpers 'Application', ->
     d = description(resource, method, options.extendIds)
     delete options.extendIds
 
-    @tag 'label', Joosy.Module.merge(options, for: d.id), content
+    @contentTag 'label', content, Joosy.Module.merge(options, for: d.id)
 
   ['text', 'file', 'hidden', 'password'].each (type) =>
     @[type+'Field'] = (resource, method, options={}) -> input type, resource, method, options
@@ -85,15 +85,15 @@ Joosy.helpers 'Application', ->
       delete htmlOptions.includeBlank
       opts.unshift ['', '']
     opts = opts.reduce (str, vals) =>
-      params = if Object.isArray vals then ['option', { value: vals[1] }, vals[0]] else ['option', {}, vals]
+      params = if Object.isArray vals then ['option', vals[0], { value: vals[1] }] else ['option', vals, {}]
       if htmlOptions.value == (if Object.isArray(vals) then vals[1] else vals)
-        params[1].selected = 'selected'
-      str += @.tag.apply @, params
+        params[2].selected = 'selected'
+      str += @contentTag.apply @, params
     , ''
     extendIds = htmlOptions.extendIds
     delete htmlOptions.value
     delete htmlOptions.extendIds
-    @tag 'select', Joosy.Module.merge(description(resource, method, extendIds), htmlOptions), opts
+    @contentTag 'select', opts, Joosy.Module.merge(description(resource, method, extendIds), htmlOptions)
 
   @textArea = (resource, method, options={}) ->
     value     = options.value
@@ -101,4 +101,4 @@ Joosy.helpers 'Application', ->
     delete options.value
     delete options.extendIds
 
-    @tag 'textarea', Joosy.Module.merge(description(resource, method, extendIds), options), value
+    @contentTag 'textarea', value, Joosy.Module.merge(description(resource, method, extendIds), options)

data/source/joosy/helpers/routes.coffee

@@ -0,0 +1,10 @@
+#= require joosy/joosy
+#= require joosy/helpers/view
+
+#
+# Rendering and string representation helpers
+#
+Joosy.helpers 'Routes', ->
+
+  @linkTo = (name='', url='', tagOptions={}) ->
+    Joosy.Helpers.Application.contentTag 'a', name, Joosy.Module.merge(tagOptions, 'data-joosy': true, href: url)