joosy 1.2.0.alpha.59 → 1.2.0.alpha.62

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

@@ -11,43 +11,29 @@ module.exports = (grunt) ->
   #
   grunt.initConfig
     joosy:
-      # Pass data to Stylus and HAML templates
+      assets:
+        root: 'application.*'
+        greedy: '/'
+
+      # Pass static data to Stylus and HAML templates
       # config: require('./config.json')
 
       # Setup built-in development proxy to workaround Cross-Origin
-      # server:
-      #   proxy: [
-      #     {src: '/joosy', dest: 'http://joosy.ws'}
-      #   ]
-
-      assets:
-        application:
-          src:  'application.coffee'
-          dest: 'public/assets/application.js'
-        styles:
-          src:  'application.styl'
-          dest: 'public/assets/application.css'
-      haml:
-        application:
-          path:  '/'
-          src:   'index.haml'
-          dest:  'public/index.html'
-          url:   '/'
-          greedy: true
+      # proxy: '/joosy': 'http://joosy.ws'
 
     uglify:
       application:
         files:
-          'public/assets/application.js': 'public/assets/application.js'
+          'public/application.js': 'public/application.js'
 
     cssmin:
-      styles:
+      application:
         files:
-          'public/assets/application.css': 'public/assets/application.css'
+          'public/application.css': 'public/application.css'
 
     jasmine:
       application:
-        src: 'public/assets/application.js'
+        src: 'public/application.js'
         options: 
           keepRunner: true
           outfile: 'spec/application.html'
@@ -64,4 +50,4 @@ module.exports = (grunt) ->
 
   grunt.registerTask 'spec', ['coffee', 'joosy:compile', 'jasmine']
 
-  grunt.registerTask 'joosy:postinstall', ['joosy:bower', 'joosy:compile:production']
+  grunt.registerTask 'joosy:postinstall', ['joosy:bower', 'joosy:compile']

data/{generators → lib/generators}/templates/application/standalone/_gitignore

@@ -1,5 +1,5 @@
 bower_components
 node_modules
+public
 .DS_Store
-public/assets
-public/index.html
+Thumbs.db

data/{generators → lib/generators}/templates/application/standalone/package.json

@@ -1,6 +1,9 @@
 {
   "dependencies": {
     "joosy": "~<%= joosy_version %>",
+    "haml-coffee": "~1.11.1",
+    "stylus": "~0.32.1",
+    "nib": "~0.9.1",
     "grunt": "~0.4.1",
     "grunt-cli": "~0.1.9",
     "grunt-contrib-uglify": "~0.2.2",

data/lib/joosy.rb

@@ -13,10 +13,10 @@ module Joosy
   end
 
   def self.generators_path
-    File.expand_path '../../generators', __FILE__
+    File.expand_path '../../lib/generators', __FILE__
   end
 
   def self.templates_path
-    File.expand_path '../../generators/templates', __FILE__
+    File.expand_path '../../lib/generators/templates', __FILE__
   end
 end

data/lib/tasks/build.coffee

@@ -0,0 +1,16 @@
+Mincer = require 'mincer'
+
+module.exports = (grunt) ->
+
+  grunt.registerMultiTask 'mince', ->
+    Mincer.CoffeeEngine.configure bare: false
+    environment = new Mincer.Environment
+    environment.appendPath x for x in @data.include
+    grunt.file.write @data.dest, environment.findAsset(@data.src).toString()
+
+  grunt.registerTask 'bowerize', ->
+    bower = require '../../bower.json'
+    meta  = require '../../package.json'
+
+    bower.version = meta.version
+    grunt.file.write 'bower.json', JSON.stringify(bower, null, 2)

data/lib/tasks/doc.coffee

@@ -0,0 +1,80 @@
+semver = require 'semver'
+
+module.exports = (grunt) ->
+
+  grunt.registerTask 'doc', ['doc:prepare', 'doc:generate']
+
+  grunt.registerTask 'doc:generate', ->
+    complete = @async()
+    version = JSON.parse(grunt.file.read 'package.json').version.split('-')
+    version = version[0]+'-'+version[1]?.split('.')[0]
+    destination = "doc/#{version}"
+    args = ['source', '--output-dir', destination]
+
+    git = (args, callback) ->
+      grunt.util.spawn {cmd: "git", args: args, opts: {stdio: [0,1,2], cwd: 'doc'}}, callback
+
+    date = (version) ->
+      return undefined unless version
+      Date.create(grunt.file.read "doc/#{version}/DATE").format "{d} {Month} {yyyy}"
+
+    git ['pull'], (error, result) ->
+      grunt.fatal "Error pulling from git" if error
+
+      grunt.file.delete destination if grunt.file.exists destination
+      grunt.util.spawn {cmd: "codo", args: args, opts: {stdio: [0,1,2]}}, (error, result) ->
+        grunt.fatal "Error generating docs" if error
+        grunt.file.write "#{destination}/DATE", (new Date).toISOString()
+
+        versions = []
+        for version in grunt.file.expand({cwd: 'doc'}, '*')
+          versions.push version if semver.valid(version)
+
+        versions = versions.sort(semver.rcompare)
+        edge     = versions.find (x) -> x.has('-')
+        stable   = versions.find (x) -> !x.has('-')
+        versions = versions.remove edge, stable
+
+        versions = {
+          edge:
+            version: edge
+            date: date(edge)
+          stable:
+            version: stable
+            date: date(stable)
+          versions: versions.map (x) -> { version: x, date: date(x) }
+        }
+        grunt.file.write 'doc/versions.js', "window.versions = #{JSON.stringify(versions)}"
+
+        git ['add', '-A'], (error, result) ->
+          grunt.fatal "Error adding files" if error
+
+          git ['commit', '-m', "Updated at #{(new Date).toISOString()}"], (error, result) ->
+            grunt.fatal "Error commiting" if error
+
+            git ['push', 'origin', 'gh-pages'], (error, result) ->
+              grunt.fatal "Error pushing" if error
+              complete()
+
+  grunt.registerTask 'doc:prepare', ->
+    if grunt.file.exists 'doc'
+      unless grunt.file.exists 'doc/.git'
+        grunt.fatal "Documentation directory exists. Please remove it"
+      else
+        return
+
+    complete = @async()
+
+    base = process.cwd()
+    git = (args, callback) ->
+      grunt.util.spawn {cmd: "git", args: args, opts: {stdio: [0,1,2]}}, callback
+
+    git ["clone", "git@github.com:joosy/joosy.git", "doc"], (error, result) ->
+      grunt.fatal "Erorr cloning repo" if error
+      process.chdir 'doc'
+
+      git ["checkout", "gh-pages"], (error, result) ->
+        grunt.fatal "Erorr checking branch out" if error
+
+        process.chdir base
+        complete()

data/lib/tasks/publish.coffee

@@ -0,0 +1,29 @@
+module.exports = (grunt) ->
+
+  grunt.registerTask 'publish:ensureCommits', ->
+    complete = @async()
+
+    grunt.util.spawn {cmd: "git", args: ["status", "--porcelain" ]}, (error, result) ->
+      if !!error || result.stdout.length > 0
+        console.log ""
+        console.log "Uncommited changes found. Please commit prior to release or use `--force`.".bold
+        console.log ""
+        complete false
+      else
+        complete true
+
+  grunt.registerTask 'publish:gem', ->
+    meta     = require '../../package.json'
+    complete = @async()
+
+    grunt.util.spawn {cmd: "gem", args: ["build", "joosy.gemspec"]}, (error, result) ->
+      return complete false if error
+
+      gem = "joosy-#{meta.version.replace('-', '.')}.gem"
+      grunt.log.ok "Built #{gem}"
+
+      grunt.util.spawn {cmd: "gem", args: ["push", gem]}, (error, result) ->
+        return complete false if error
+        grunt.log.ok "Published #{gem}"
+        grunt.file.delete gem
+        complete(true)

data/lib/tasks/testem.coffee

@@ -0,0 +1,58 @@
+Path = require 'path'
+
+module.exports = (grunt) ->
+
+  grunt.registerTask 'testem:generate', ->
+    unless @args[0]
+      grunt.config.requires 'testem'
+      return Object.each grunt.config.get('testem'), (key, value) ->
+        grunt.task.run "testem:generate:#{key}"
+
+    grunt.config.requires "testem.#{@args[0]}"
+
+    coffee = []
+    source = grunt.file.expand grunt.config.get("testem.#{@args[0]}.src")
+
+    serve  = source.map (name) ->
+      if Path.extname(name) == '.coffee'
+        destination = ".grunt/#{Path.dirname(name)}/#{Path.basename(name, '.coffee')}.js"
+        coffee.push "coffee -o #{Path.dirname(destination)} -c #{name}"
+        destination
+      else
+        name
+
+    result =
+      framework: 'jasmine',
+      src_files: source
+      serve_files: serve
+      before_tests: 'grunt mince;'+coffee.join(';')
+      launch_in_dev: ['PhantomJS'],
+      launch_in_ci: ['PhantomJS', 'Chrome', 'Firefox', 'Safari', 'IE7', 'IE8', 'IE9']
+
+    grunt.file.write "spec/#{@args[0]}.json", JSON.stringify(result, null, 2)
+
+  grunt.registerTask 'testem:ci', ->
+    unless @args[0]
+      grunt.config.requires 'testem'
+      return Object.each grunt.config.get('testem'), (key, value) ->
+        grunt.task.run "testem:ci:#{key}"
+
+    complete = @async()
+
+    grunt.config.requires "testem.#{@args[0]}"
+
+    command = "node_modules/.bin/testem"
+    options = ['ci', '-f', "spec/#{@args[0]}.json", '-R', 'dot', '-P', '8']
+
+    grunt.util.spawn {cmd: command, args: options, opts: {stdio: [0,1,2]}}, (error, result) ->
+      grunt.fatal "Tests did not succed" if error
+      complete()
+
+  grunt.registerTask 'testem:run', ->
+    complete = @async()
+
+    command = "node_modules/.bin/testem"
+    options = ['-f', "spec/#{@args[0]}.json"]
+
+    grunt.util.spawn {cmd: command, args: options, opts: {stdio: [0,1,2]}}, (error, result) ->
+      complete()

data/package.json

@@ -4,7 +4,7 @@
   "keywords": [
     "joosy"
   ],
-  "version": "1.2.0-alpha.59",
+  "version": "1.2.0-alpha.62",
   "author": "Boris Staal <boris@staal.io>",
   "homepage": "http://joosy.ws/",
   "repository": {
@@ -18,27 +18,22 @@
     "node": ">=0.4.0"
   },
   "dependencies": {
-    "grill": "~1.0.0-alpha.3",
-    "sugar": "~1.3.8",
+    "grunt": "~0.4.1",
     "coffee-script": "~1.6.3",
+    "sugar": "~1.3.8",
+    "grill": "~1.0.0-alpha.5",
     "command-router": "0.0.5",
     "resolve": "~0.4.0",
     "ejs": "~0.8.4",
     "commander": "~1.2.0",
-    "colors": "~0.6.0-1",
-    "grunt": "~0.4.1",
-    "mincer": ">= 0.5.5",
-    "stylus": "~0.32.1",
-    "nib": "~0.9.1"
+    "colors": "~0.6.0-1"
   },
   "devDependencies": {
-    "grunt-contrib-jasmine": "~0.5.1",
-    "grunt-contrib-watch": "~0.4.4",
-    "grunt-contrib-coffee": "~0.7.0",
-    "grunt-contrib-connect": "~0.3.0",
-    "grunt-coffeelint": "0.0.6",
-    "grunt-release": "~0.3.5",
+    "bower": "~1.1.2",
+    "mincer": ">= 0.5.5",
     "semver": "~2.1.0",
-    "bower": "~1.1.2"
+    "testem": "~0.3.24",
+    "grunt-coffeelint": "0.0.6",
+    "grunt-release": "~0.3.5"
   }
 }

data/source/joosy/helpers/widgets.coffee

@@ -7,7 +7,7 @@ Joosy.helpers 'Application', ->
 
   #
   # Injects widget
-  # 
+  #
   # @param [String] tag             Tag name to use a widget container
   # @param [Object] options         Tag attributes
   # @param [Joosy.Widget] widget    Class or instance of {Joosy.Widget} to register

data/source/joosy/modules/events.coffee

@@ -138,7 +138,7 @@ Joosy.Modules.Events =
       context.actions.each (action) =>
         action.call @, ->
           if ++counter >= context.actions.length
-            context.after.call(@) 
+            context.after.call(@)
 
   __splitEvents: (events) ->
     if Object.isString events

data/source/joosy/router.coffee

@@ -129,8 +129,6 @@ class Joosy.Router extends Joosy.Module
     @config.prefix ||= ''
     @config.prefix   = ('/'+@config.prefix+'/').replace(/\/{2,}/g, '/') if @config.html5
 
-    @respond @canonizeLocation() if respond
-
     if @config.html5
       @listener = @bind 'popstate pushstate', =>
         @respond @canonizeLocation()
@@ -139,6 +137,8 @@ class Joosy.Router extends Joosy.Module
       $(window).bind 'hashchange.JoosyRouter', =>
         @respond @canonizeLocation()
 
+    @respond @canonizeLocation() if respond
+
   #
   # Clears current map of routes and deactivates bindings
   #

data/source/joosy/templaters/jst.coffee

@@ -26,7 +26,7 @@ class Joosy.Templaters.JST
         "templates/#{name}"
       ]
 
-    for path in haystack 
+    for path in haystack
       return window.JST[path] if window.JST[path]
 
     throw new Error "Template '#{name}' not found. Checked at: '#{haystack.join(', ')}'"

data/source/joosy/widget.coffee

@@ -22,7 +22,7 @@
 # "dependent chains" that will be rendered together (HTML will be injected into DOM atomically). Such chains
 # use paint filters of the top elements. Independent widgets on the other hand load on their own behalf and
 # use their own paint filters. To understand this better, here is the sample:
-# 
+#
 # Let's say we have 4 widgets A, B, C and D nested into each other:
 #
 # A is the root widget
@@ -31,7 +31,7 @@
 # D is nested into C. It does not define itself as an independent and therefore defaults to dependent rendering
 #
 # Then total chain of asynchronous callbacks goes with the following scenario.
-# 
+#
 # 1. A collects all the fetches from the whole tree recursively and starts them in parallel.
 #
 # 2. A runs erase on the previous same-level widget (attribute `@previous`) if one is given.

data/spec/joosy/core/helpers/routes_spec.coffee

@@ -2,8 +2,14 @@ describe "Joosy.Helpers.Routes", ->
 
   it "renders data-joosy links", ->
     link = Joosy.Helpers.Routes.linkTo 'test', '/app/link', nice: true
-    expect(link).toEqual '<a nice="true" data-joosy="true" href="/app/link">test</a>'
+    expect(link).toBeTag 'a', 'test',
+      'data-joosy': 'true'
+      nice: 'true'
+      href: '/app/link'
 
   it "renders data-joosy links yielding block", ->
     link = Joosy.Helpers.Routes.linkTo '/app/link', nice: true, -> 'test'
-    expect(link).toEqual '<a nice="true" data-joosy="true" href="/app/link">test</a>'
+    expect(link).toBeTag 'a', 'test',
+      'data-joosy': 'true'
+      nice: 'true'
+      href: '/app/link'