joosy 1.0.0.RC6 → 1.0.0.RC7

data/Gemfile.lock

@@ -1,6 +1,6 @@
 GIT
   remote: git://github.com/pivotal/jasmine-gem.git
-  revision: 478c6027a19f391c4fc3ca0faef001915ee7906f
+  revision: 63e8d46556a421cbb3b511b52cd8c2188d72b9db
   specs:
     jasmine (1.3.2)
       jasmine-core (~> 1.3.1)
@@ -11,7 +11,7 @@ GIT
 PATH
   remote: .
   specs:
-    joosy (1.0.0.RC5)
+    joosy (1.0.0.RC7)
       coffee-rails
       haml_coffee_assets
       i18n-js
@@ -21,12 +21,12 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.9)
-      actionpack (= 3.2.9)
+    actionmailer (3.2.11)
+      actionpack (= 3.2.11)
       mail (~> 2.4.4)
-    actionpack (3.2.9)
-      activemodel (= 3.2.9)
-      activesupport (= 3.2.9)
+    actionpack (3.2.11)
+      activemodel (= 3.2.11)
+      activesupport (= 3.2.11)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
@@ -34,18 +34,18 @@ GEM
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.2.1)
-    activemodel (3.2.9)
-      activesupport (= 3.2.9)
+    activemodel (3.2.11)
+      activesupport (= 3.2.11)
       builder (~> 3.0.0)
-    activerecord (3.2.9)
-      activemodel (= 3.2.9)
-      activesupport (= 3.2.9)
+    activerecord (3.2.11)
+      activemodel (= 3.2.11)
+      activesupport (= 3.2.11)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.9)
-      activemodel (= 3.2.9)
-      activesupport (= 3.2.9)
-    activesupport (3.2.9)
+    activeresource (3.2.11)
+      activemodel (= 3.2.11)
+      activesupport (= 3.2.11)
+    activesupport (3.2.11)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     addressable (2.3.2)
@@ -68,10 +68,10 @@ GEM
     eventmachine (1.0.0-java)
     execjs (1.4.0)
       multi_json (~> 1.0)
-    ffi (1.2.0)
-    ffi (1.2.0-java)
-    guard (1.5.4)
-      listen (>= 0.4.2)
+    ffi (1.3.1)
+    ffi (1.3.1-java)
+    guard (1.6.1)
+      listen (>= 0.6.0)
       lumberjack (>= 1.0.2)
       pry (>= 0.9.10)
       thor (>= 0.14.6)
@@ -81,7 +81,7 @@ GEM
     guard-sprockets (0.4.1)
       guard (>= 1.1.0)
       sprockets (~> 2.0)
-    haml_coffee_assets (1.8.2)
+    haml_coffee_assets (1.10.0)
       coffee-script (>= 1.0.0)
       sprockets (>= 2.0.3)
       tilt (>= 1.3.3)
@@ -94,14 +94,14 @@ GEM
     jquery-rails (2.1.4)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-    json (1.7.5)
-    json (1.7.5-java)
+    json (1.7.6)
+    json (1.7.6-java)
     libnotify (0.8.0)
       ffi (>= 1.0.11)
     libwebsocket (0.1.7.1)
       addressable
       websocket
-    listen (0.6.0)
+    listen (0.7.2)
     lumberjack (1.0.2)
     mail (2.4.4)
       i18n (>= 0.4.0)
@@ -111,39 +111,39 @@ GEM
     mime-types (1.19)
     multi_json (1.5.0)
     polyglot (0.3.3)
-    pry (0.9.10)
+    pry (0.9.11.3)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
-      slop (~> 3.3.1)
-    pry (0.9.10-java)
+      slop (~> 3.4)
+    pry (0.9.11.3-java)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
-      slop (~> 3.3.1)
+      slop (~> 3.4)
       spoon (~> 0.0)
-    rack (1.4.1)
+    rack (1.4.4)
     rack-cache (1.2)
       rack (>= 0.4)
     rack-ssl (1.3.2)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.9)
-      actionmailer (= 3.2.9)
-      actionpack (= 3.2.9)
-      activerecord (= 3.2.9)
-      activeresource (= 3.2.9)
-      activesupport (= 3.2.9)
+    rails (3.2.11)
+      actionmailer (= 3.2.11)
+      actionpack (= 3.2.11)
+      activerecord (= 3.2.11)
+      activeresource (= 3.2.11)
+      activesupport (= 3.2.11)
       bundler (~> 1.0)
-      railties (= 3.2.9)
-    railties (3.2.9)
-      actionpack (= 3.2.9)
-      activesupport (= 3.2.9)
+      railties (= 3.2.11)
+    railties (3.2.11)
+      actionpack (= 3.2.11)
+      activesupport (= 3.2.11)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
     rake (10.0.3)
-    rb-inotify (0.8.8)
+    rb-inotify (0.9.0)
       ffi (>= 0.5.0)
     rdoc (3.12)
       json (~> 1.4)
@@ -154,14 +154,14 @@ GEM
     rspec-core (2.12.2)
     rspec-expectations (2.12.1)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.0)
+    rspec-mocks (2.12.1)
     rubyzip (0.9.9)
     selenium-webdriver (2.27.2)
       childprocess (>= 0.2.5)
       libwebsocket (~> 0.1.3)
       multi_json (~> 1.0)
       rubyzip
-    slop (3.3.3)
+    slop (3.4.3)
     spoon (0.0.1)
     sprockets (2.2.2)
       hike (~> 1.2)

data/app/assets/javascripts/joosy/core/application.js.coffee

@@ -51,5 +51,5 @@ Joosy.Application =
   # @param [Object] params        Hash of page params
   #
   setCurrentPage: (page, params) ->
-    #if @page not instanceof page
-    @page = new page params, @page
+    attempt = new page(params, @page)
+    @page = attempt unless attempt.halted

data/app/assets/javascripts/joosy/core/modules/filters.js.coffee

@@ -33,7 +33,6 @@ Joosy.Modules.Filters =
     return true unless @["__#{filter}s"]
 
     @["__#{filter}s"].reduce (flag, func) =>
-      unless Object.isFunction func
-        func = @[func]
+      func = @[func] unless Object.isFunction func
       flag && func.apply(@, opts) != false
     , true

data/app/assets/javascripts/joosy/core/page.js.coffee

@@ -33,6 +33,8 @@ class Joosy.Page extends Joosy.Module
   @include Joosy.Modules.WidgetsManager
   @include Joosy.Modules.Filters
 
+  halted: false
+
   #
   # Default layout is no layout.
   #
@@ -209,11 +211,11 @@ class Joosy.Page extends Joosy.Module
   # @params [Joosy.Page] previous     Previous page to unload
   #
   constructor: (@params, @previous) ->
-    Joosy.Application.loading = true
-
     @__layoutClass ||= ApplicationLayout
 
-    if @__runBeforeLoads @params, @previous
+    unless @halted = !@__runBeforeLoads(@params, @previous)
+      Joosy.Application.loading = true
+
       if !@previous?.layout?.uuid? || @previous?.__layoutClass != @__layoutClass
         @__bootstrapLayout()
       else

data/lib/joosy/rails/version.rb

@@ -1,5 +1,5 @@
 module Joosy
   module Rails
-    VERSION = "1.0.0.RC6"
+    VERSION = "1.0.0.RC7"
   end
 end

data/spec/javascripts/joosy/core/form_spec.js.coffee

@@ -81,7 +81,7 @@ describe "Joosy.Form", ->
       marker = @putForm.find "input[name=_method]"
       expect(marker.length).toEqual 1
       expect(marker.attr 'value').toEqual 'PUT'
-      form.fill Test
+      form.fill @Test
       marker = @putForm.find "input[name=_method]"
       expect(marker.length).toEqual 0
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: joosy
 version: !ruby/object:Gem::Version
-  version: 1.0.0.RC6
+  version: 1.0.0.RC7
   prerelease: 6
 platform: ruby
 authors:
@@ -12,11 +12,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-09 00:00:00.000000000 Z
+date: 2013-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70125953693180 !ruby/object:Gem::Requirement
+  requirement: &70223417433300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +24,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70125953693180
+  version_requirements: *70223417433300
 - !ruby/object:Gem::Dependency
   name: coffee-rails
-  requirement: &70125953692180 !ruby/object:Gem::Requirement
+  requirement: &70223417432440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -35,10 +35,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70125953692180
+  version_requirements: *70223417432440
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &70125953691180 !ruby/object:Gem::Requirement
+  requirement: &70223417431840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -46,10 +46,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70125953691180
+  version_requirements: *70223417431840
 - !ruby/object:Gem::Dependency
   name: haml_coffee_assets
-  requirement: &70125953689800 !ruby/object:Gem::Requirement
+  requirement: &70223417430980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -57,10 +57,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70125953689800
+  version_requirements: *70223417430980
 - !ruby/object:Gem::Dependency
   name: i18n-js
-  requirement: &70125953491060 !ruby/object:Gem::Requirement
+  requirement: &70223417429940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -68,10 +68,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70125953491060
+  version_requirements: *70223417429940
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70125953487880 !ruby/object:Gem::Requirement
+  requirement: &70223417429280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -79,10 +79,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70125953487880
+  version_requirements: *70223417429280
 - !ruby/object:Gem::Dependency
   name: guard-coffeescript
-  requirement: &70125953487340 !ruby/object:Gem::Requirement
+  requirement: &70223417474980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -90,10 +90,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70125953487340
+  version_requirements: *70223417474980
 - !ruby/object:Gem::Dependency
   name: guard-sprockets
-  requirement: &70125953486620 !ruby/object:Gem::Requirement
+  requirement: &70223417474460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -101,10 +101,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70125953486620
+  version_requirements: *70223417474460
 - !ruby/object:Gem::Dependency
   name: jasmine
-  requirement: &70125953485680 !ruby/object:Gem::Requirement
+  requirement: &70223417473780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -112,7 +112,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70125953485680
+  version_requirements: *70223417473780
 description: A gem wrapper to include Joosy via the asset pipeline.
 email: boris@roundlake.ru
 executables: []