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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bca3233835310754afca28be9330ec70a839b55e
-  data.tar.gz: fcd2fbff79196181a4f6babbf812d84ee5778ec0
+  metadata.gz: 3026cc5a8fa556721dea56bca1cd26624997d893
+  data.tar.gz: 7b33f80118d9b346b6e878f65155b5de68c2ddc2
 SHA512:
-  metadata.gz: ba8c3caae6da6816987fcab5008ed02fb6a3a62c99accf8af987a15ab564a1afbbe0bae233777a405fabc87c2dd07d777f81fa486ec6f087139095e11d9f7044
-  data.tar.gz: 78f4d74388d85d3ae2cb05c88061cea9e153fa5edfb1d85c6538e081aaf098d845f4f5354dd01e3896df0c4b8c0cfed1101d2c2348d61938feaa2217d89017d7
+  metadata.gz: 12407f1b9f3f29b45cfab2fcacf1a918c2e9a5148fd8b7d9140ec44cb91608cd66ab5d6e71f5413fac82798c6bec8aabf621c93f548473f65b571a74a3c915aa
+  data.tar.gz: f22ccf20ee0fc3b87b19ffe598914fdca3241841f2a7de90d0fb678bb0dd9e2dfbe0264051c5bd4e1914ab8117f3b3bbf0d39fefae79d287f4fc368789e1663b

data/.gitignore

@@ -2,9 +2,12 @@ node_modules
 bower_components
 .grunt
 *.html
-spec/*.html
+spec/*.json
 *.gem
 Gemfile.lock
 .idea/
 doc
 doc.tmp
+libpeerconnection.log
+.DS_Store
+testem.log

data/.travis.yml

@@ -2,9 +2,10 @@ language: node_js
 node_js:
   - 0.10
 before_script:
+  - npm install -g phantomjs
   - npm install -g grunt-cli
   - ./node_modules/.bin/bower -V install
-script: "grunt test"
+script: "grunt"
 branches:
   except:
     - 1.0

data/Gruntfile.coffee

@@ -1,10 +1,6 @@
-module.exports = (grunt) ->
-
-  Sugar  = require 'sugar'
-  Mincer = require 'mincer'
-  FS     = require 'fs'
-  semver = require 'semver'
+require 'sugar'
 
+module.exports = (grunt) ->
   #
   # Locations
   #
@@ -14,76 +10,31 @@ module.exports = (grunt) ->
       path: 'source'
       build: 'build/joosy.js'
       extensions: (name) ->
-        root: "joosy/extensions/#{name}"
-        build: "build/joosy/extensions/#{name}.js"
+        root: "joosy/extensions/#{name || '*'}"
+        build: "build/joosy/extensions/#{name || '**/*'}.js"
     specs:
-      units:
-        environments: 'spec/joosy/environments/*_spec.*'
-        core: 'spec/joosy/core/**/*_spec.*'
-        extensions: 'spec/joosy/extensions/**/*_spec.*'
-      helpers: 'spec/helpers/**/*.*'
-      build: '.grunt'
-
-  specOptions = (category, specs, vendor=[]) ->
-    host: 'http://localhost:8888/'
-    keepRunner: true
-    outfile: "spec/#{category}.html"
-    vendor: [
-      'bower_components/sinonjs/sinon.js',
-      'bower_components/sugar/release/sugar-full.min.js'
-    ].concat(vendor),
-    specs: "#{locations.specs.build}/#{specs}"
-    helpers: locations.specs.build + '/' + locations.specs.helpers
+      helpers: [
+        'bower_components/sinonjs/sinon.js',
+        'bower_components/sugar/release/sugar-full.min.js',
+        'spec/helpers/*.coffee'
+      ]
 
   #
   # Grunt extensions
   #
-  grunt.loadNpmTasks 'grunt-contrib-connect'
-  grunt.loadNpmTasks 'grunt-contrib-coffee'
-  grunt.loadNpmTasks 'grunt-contrib-jasmine'
-  grunt.loadNpmTasks 'grunt-contrib-watch'
+  grunt.loadTasks 'lib/tasks'
   grunt.loadNpmTasks 'grunt-coffeelint'
   grunt.loadNpmTasks 'grunt-release'
 
+  #
+  # Config
+  #
   grunt.initConfig
-    release:
-      options:
-        bump: false
-        add: false
-        commit: false
-        push: false
-
-    connect:
-      specs:
-        options:
-          port: 8888
-
-    watch:
-      source:
-        files: [locations.source.path + '/**/*']
-        tasks: ['mince']
-      specs:
-        options:
-          nospawn: true
-        files: [ locations.specs.helpers ].add(Object.values locations.specs.units)
-        tasks: ['coffee']
-
-    coffee:
-      specs:
-        expand: true
-        src: [ locations.specs.helpers ].add(Object.values locations.specs.units)
-        dest: locations.specs.build
-        ext: '.js'
-
     mince:
       core:
         include: [locations.source.path]
         src: locations.source.root
         dest: locations.source.build
-      preloaders:
-        include: [locations.source.path]
-        src: locations.source.extensions('preloaders').root
-        dest: locations.source.extensions('preloaders').build
       resources:
         include: [locations.source.path]
         src: locations.source.extensions('resources').root
@@ -101,170 +52,52 @@ module.exports = (grunt) ->
           'max_line_length':
             level: 'ignore'
 
-    jasmine:
+    testem:
       core:
-        options: specOptions('core', locations.specs.units.core, [
-            'bower_components/jquery/jquery.js'
-          ])
-        src: locations.source.build
-
+        src: locations.specs.helpers
+          .include('bower_components/jquery/jquery.js')
+          .include(locations.source.build)
+          .include('spec/joosy/core/**/*_spec.coffee')
       zepto:
-        options: specOptions('zepto', locations.specs.units.core, [
-            'bower_components/zepto/zepto.js'
-          ])
-        src: locations.source.build
-
+        src: locations.specs.helpers
+          .include('bower_components/zepto/zepto.js')
+          .include(locations.source.build)
+          .include('spec/joosy/core/**/*_spec.coffee')
       'environments-global':
-        options: specOptions('environments-global', ['spec/joosy/environments/global*'], [
-            'bower_components/jquery/jquery.js'
-          ])
-        src: locations.source.build
-
+        src: locations.specs.helpers
+          .include('bower_components/jquery/jquery.js')
+          .include(locations.source.build)
+          .include('spec/joosy/environments/global_spec.coffee')
       'environments-amd':
-        options: specOptions('environments-amd', ['spec/joosy/environments/amd*'], [
-            'bower_components/jquery/jquery.js',
-            'bower_components/requirejs/require.js'
-          ])
-        src: locations.source.build
-
+        src: locations.specs.helpers
+          .include('bower_components/jquery/jquery.js')
+          .include('bower_components/requirejs/require.js')
+          .include(locations.source.build)
+          .include('spec/joosy/environments/amd_spec.coffee')
       extensions:
-        options: specOptions('extensions', locations.specs.units.extensions, [
-            'bower_components/jquery/jquery.js',
-            'bower_components/jquery-form/jquery.form.js'
-          ])
-        src: [locations.source.build].include ['preloaders', 'resources', 'resources-form'].map (x) ->
-          locations.source.extensions(x).build
-
-  #
-  # Preparations
-  #
-  grunt.registerTask 'prepare', ->
-    complete = @async()
-
-    base = process.cwd()
-    git = (args, callback) ->
-      grunt.util.spawn {cmd: "git", args: args, opts: {stdio: [0,1,2]}}, callback
-
-    if grunt.file.exists 'doc'
-      grunt.fatal "Documentation directory exists. Please remove it"
-
-    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()
-
-  #
-  # Builders
-  #
-  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 'default', ['connect', 'build', 'watch']
-
-  grunt.registerTask 'build', ['mince', 'coffee', 'jasmine:core:build', 'jasmine:extensions:build', 'bowerize']
-
-  grunt.registerTask 'test', ['connect', 'mince', 'coffee', 'bowerize', 'jasmine']
-
-  grunt.registerTask 'bowerize', ->
-    bower = require './bower.json'
-    meta  = require './package.json'
-
-    bower.version = meta.version
-    FS.writeFileSync 'bower.json', JSON.stringify(bower, null, 2)
-
-  #
-  # Documentation
-  #
-  grunt.registerTask 'doc', ->
-    complete = @async()
-    version = require('./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()
+        src: locations.specs.helpers
+          .include('bower_components/jquery/jquery.js')
+          .include('bower_components/jquery-form/jquery.form.js')
+          .include(locations.source.build)
+          .include(locations.source.extensions().build)
+          .include('spec/joosy/extensions/**/*_spec.coffee')
 
+    release:
+      options:
+        bump: false
+        add: false
+        commit: false
+        push: false
 
   #
-  # Publishing
+  # Main tasks
   #
-  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
+  grunt.registerTask 'default', ['testem:generate', 'testem:ci']
 
-      gem = "joosy-#{meta.version.replace('-', '.')}.gem"
-      grunt.log.ok "Built #{gem}"
+  grunt.registerTask 'test', ->
+    grunt.fatal "Specify module to run manual tests for" unless @args[0]
 
-      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)
+    grunt.task.run "testem:generate:#{@args[0]}"
+    grunt.task.run "testem:run:#{@args[0]}"
 
-  grunt.registerTask 'publish', ['test', 'publish:ensureCommits', 'doc', 'release', 'publish:gem']
+  grunt.registerTask 'publish', ['testem:ci', 'publish:ensureCommits', 'doc', 'release', 'publish:gem']

data/bin/joosy

@@ -5,7 +5,7 @@
 var resolve  = require('resolve').sync
 var path     = require('path')
 var base     = ''
-var location = path.join('generators', 'command', 'command')
+var location = path.join('lib', 'generators', 'command', 'command')
 
 try {
   base = resolve('joosy', {

data/bower.json

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

data/build/joosy.js

@@ -1965,18 +1965,18 @@
       if (this.config.html5) {
         this.config.prefix = ('/' + this.config.prefix + '/').replace(/\/{2,}/g, '/');
       }
-      if (respond) {
-        this.respond(this.canonizeLocation());
-      }
       if (this.config.html5) {
-        return this.listener = this.bind('popstate pushstate', function() {
+        this.listener = this.bind('popstate pushstate', function() {
           return _this.respond(_this.canonizeLocation());
         });
       } else {
-        return $(window).bind('hashchange.JoosyRouter', function() {
+        $(window).bind('hashchange.JoosyRouter', function() {
           return _this.respond(_this.canonizeLocation());
         });
       }
+      if (respond) {
+        return this.respond(this.canonizeLocation());
+      }
     };
 
     Router.reset = function() {

data/{generators → lib/generators}/base.coffee

@@ -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/{generators → lib/generators}/command/command.coffee

@@ -1,7 +1,7 @@
 module.exports = ->
   Sugar = require 'sugar'
   cli   = require 'command-router'
-  meta  = require '../../package.json'
+  meta  = require '../../../package.json'
   grunt = require 'grunt'
   path  = require 'path'
 

data/{generators → lib/generators}/project.coffee

@@ -12,7 +12,7 @@ module.exports = class
                             """
 
     @standalone = new Standalone(@options)
-    @base       = new Base(@options, Path.join(@standalone.destination, 'source/javascript'))
+    @base       = new Base(@options, Path.join(@standalone.destination, 'app/javascript'))
 
   generate: ->
     @standalone.generate()

data/{generators → lib/generators}/project/standalone.coffee

@@ -18,11 +18,15 @@ class ProjectStandalone extends @Base
     @copy ['application', 'standalone', 'Gruntfile.coffee'],     ['Gruntfile.coffee']
     @copy ['application', 'standalone', 'Procfile'],             ['Procfile']
 
-    @copy ['application', 'standalone', 'source', 'haml', 'index.haml'],
-                                       ['source', 'haml', 'index.haml']
+    @copy ['application', 'standalone', 'app', 'haml', 'index.haml'],
+                                       ['app', 'haml', 'index.haml']
 
-    @copy ['application', 'standalone', 'source', 'stylesheets', 'application.styl'],
-                                       ['source', 'stylesheets', 'application.styl']
+    @copy ['application', 'standalone', 'app', 'stylesheets', 'application.styl'],
+                                       ['app', 'stylesheets', 'application.styl']
+
+    @file ['app', 'images', '.gitkeep']
+
+    @file ['app', 'fonts', '.gitkeep']
 
     @copy ['application', 'standalone', 'tasks', 'spec.coffee'],
                                        ['tasks', 'spec.coffee']
@@ -35,6 +39,7 @@ class ProjectStandalone extends @Base
 
     @template ['application', 'standalone', 'bower.json'],   ['bower.json'],
       application: @options.name
+
     @template ['application', 'standalone', 'package.json'], ['package.json'],
       joosy_version: @version()