joosy 1.0.0.RC5 → 1.0.0.RC6

data/Gemfile

@@ -10,8 +10,6 @@ group :development do
 end
 
 group :test do
-  if RUBY_PLATFORM =~ /linux/
-    gem 'rb-inotify'
-    gem 'libnotify'
-  end
+  gem 'rb-inotify', :require => false
+  gem 'libnotify', :require => false
 end

data/Gemfile.lock

@@ -1,9 +1,9 @@
 GIT
   remote: git://github.com/pivotal/jasmine-gem.git
-  revision: 54b37cf9a51df49a77d15640e3e0caa46a508c1d
+  revision: 478c6027a19f391c4fc3ca0faef001915ee7906f
   specs:
-    jasmine (1.2.1)
-      jasmine-core (>= 1.2.0)
+    jasmine (1.3.2)
+      jasmine-core (~> 1.3.1)
       rack (~> 1.0)
       rspec (>= 1.3.1)
       selenium-webdriver (>= 0.1.3)
@@ -11,7 +11,7 @@ GIT
 PATH
   remote: .
   specs:
-    joosy (1.0.0.RC4)
+    joosy (1.0.0.RC5)
       coffee-rails
       haml_coffee_assets
       i18n-js
@@ -48,6 +48,7 @@ GEM
     activesupport (3.2.9)
       i18n (~> 0.6)
       multi_json (~> 1.0)
+    addressable (2.3.2)
     arel (3.0.2)
     builder (3.0.4)
     childprocess (0.3.6)
@@ -67,8 +68,8 @@ GEM
     eventmachine (1.0.0-java)
     execjs (1.4.0)
       multi_json (~> 1.0)
-    ffi (1.1.5)
-    ffi (1.1.5-java)
+    ffi (1.2.0)
+    ffi (1.2.0-java)
     guard (1.5.4)
       listen (>= 0.4.2)
       lumberjack (>= 1.0.2)
@@ -80,7 +81,7 @@ GEM
     guard-sprockets (0.4.1)
       guard (>= 1.1.0)
       sprockets (~> 2.0)
-    haml_coffee_assets (1.7.2)
+    haml_coffee_assets (1.8.2)
       coffee-script (>= 1.0.0)
       sprockets (>= 2.0.3)
       tilt (>= 1.3.3)
@@ -88,16 +89,19 @@ GEM
     i18n (0.6.1)
     i18n-js (2.1.2)
       i18n
-    jasmine-core (1.2.0)
+    jasmine-core (1.3.1)
     journey (1.0.4)
-    jquery-rails (2.1.3)
-      railties (>= 3.1.0, < 5.0)
-      thor (~> 0.14)
+    jquery-rails (2.1.4)
+      railties (>= 3.0, < 5.0)
+      thor (>= 0.14, < 2.0)
     json (1.7.5)
     json (1.7.5-java)
-    libwebsocket (0.1.6)
+    libnotify (0.8.0)
+      ffi (>= 1.0.11)
+    libwebsocket (0.1.7.1)
+      addressable
       websocket
-    listen (0.5.3)
+    listen (0.6.0)
     lumberjack (1.0.2)
     mail (2.4.4)
       i18n (>= 0.4.0)
@@ -105,7 +109,7 @@ GEM
       treetop (~> 1.4.8)
     method_source (0.8.1)
     mime-types (1.19)
-    multi_json (1.3.7)
+    multi_json (1.5.0)
     polyglot (0.3.3)
     pry (0.9.10)
       coderay (~> 1.0.5)
@@ -138,26 +142,28 @@ GEM
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    rake (10.0.1)
+    rake (10.0.3)
+    rb-inotify (0.8.8)
+      ffi (>= 0.5.0)
     rdoc (3.12)
       json (~> 1.4)
     rspec (2.12.0)
       rspec-core (~> 2.12.0)
       rspec-expectations (~> 2.12.0)
       rspec-mocks (~> 2.12.0)
-    rspec-core (2.12.0)
-    rspec-expectations (2.12.0)
+    rspec-core (2.12.2)
+    rspec-expectations (2.12.1)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.12.0)
     rubyzip (0.9.9)
-    selenium-webdriver (2.26.0)
+    selenium-webdriver (2.27.2)
       childprocess (>= 0.2.5)
       libwebsocket (~> 0.1.3)
       multi_json (~> 1.0)
       rubyzip
     slop (3.3.3)
     spoon (0.0.1)
-    sprockets (2.2.1)
+    sprockets (2.2.2)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
@@ -172,7 +178,7 @@ GEM
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.35)
-    websocket (1.0.3)
+    websocket (1.0.6)
 
 PLATFORMS
   java
@@ -184,4 +190,6 @@ DEPENDENCIES
   guard-sprockets
   jasmine!
   joosy!
+  libnotify
+  rb-inotify
   thin

data/Guardfile

@@ -1,3 +1,11 @@
+begin
+  if RUBY_PLATFORM.include?('linux')
+    require 'rb-notify'
+    require 'libnotify'
+  end
+rescue LoadError
+end
+
 require 'coffee_script'
 
 guard 'coffeescript', :output => 'tmp/spec/javascripts', :all_on_start => true do

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

@@ -13,6 +13,7 @@ Joosy.Application =
   loading: true
   identity: true
   debug: false
+  debounceForms: false
 
   #
   # Starts Joosy application by binding to element and bootstraping routes

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

@@ -98,6 +98,7 @@ class Joosy.Form extends Joosy.Module
   # @option options [String] resourceName                  The string to use as a resource name prefix for fields to match invalidation
   # @option options [String] action                        Action URL for the form
   # @option options [String] method                        HTTP method, for example PUT, that will passed in _method param
+  # @option options [Boolean] debounce                     Drop submit events while there is a pending submit request
   #
   constructor: (form, options={}) ->
     if Object.isFunction options
@@ -120,10 +121,18 @@ class Joosy.Form extends Joosy.Module
     @container.ajaxForm
       dataType: 'json'
       beforeSend: =>
+        return false if @__debounce arguments...
         @__before arguments...
+        @__pending_request = true
+        @debugAs this, 'beforeSend: pending_request = true'
+        true
       success: =>
+        @__pending_request = false
+        @debugAs this, 'success: pending_request = false'
         @__success arguments...
       error: =>
+        @__pending_request = false
+        @debugAs this, 'error: pending_request = false'
         @__error arguments...
       xhr: =>
         xhr = $.ajaxSettings.xhr()
@@ -133,16 +142,16 @@ class Joosy.Form extends Joosy.Module
               @progress (event.position / event.total * 100).round 2
         xhr
 
-    if options.resource?
-      @fill(options.resource, options)
+    if @resource?
+      @fill(@resource, options)
       delete @resource
 
-    if options.action?
-      @container.attr 'action', options.action
+    if @action?
+      @container.attr 'action', @action
       @container.attr 'method', 'POST'
 
-    if options.method?
-      @__markMethod options.method
+    if @method?
+      @__markMethod @method
 
   #
   # Resets form submit behavior to default
@@ -198,6 +207,7 @@ class Joosy.Form extends Joosy.Module
 
     filler data, resource.__entityName || options.resourceName
 
+    $('input[name=_method]', @container).remove()
     @__markMethod(options?.method || 'PUT') if resource.id()
 
     url = options?.action || (if resource.id()? then resource.memberPath() else resource.collectionPath())
@@ -267,6 +277,18 @@ class Joosy.Form extends Joosy.Module
 
     return false
 
+  #
+  # Aborts form submit if there is already another one pending XHR
+  #
+  __debounce: (xhr) ->
+    @debugAs this, "debounce: pending_request == #{@__pending_request}"
+    if @__pending_request && @debounce != false
+      if @debounce || Joosy.Application.debounceForms
+        xhr.abort()
+        @debugAs this, "debounce: xhr aborted"
+        return true
+    false
+
   #
   # Finds field by field name.
   # This is not inlined since we want to override

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

@@ -8,26 +8,38 @@ Joosy.Modules.Events =
   #
   # Waits for the list of given events to happen at least once. Then runs callback.
   #
-  # @param [String] events              List of events to wait for separated by space
+  # @param [String|Array] events        List of events to wait for separated by space
   # @param [Function] callback          Action to run when all events were triggered at least once
+  # @param [Hash] options               Options
   #
-  wait: (events, callback) ->
+  # @option options [Boolean] unique    Call has no effect if true and the given pair
+  #                                     of events and callback is already set up
+  #
+  wait: (events, callback, options = {}) ->
     events = @__splitEvents events
     @__validateEvents events
 
+    return if options.unique && @__isBound(events, callback, true)
+
     @__oneShotEvents ||= []
     @__oneShotEvents.push [events, callback]
 
   #
   # Binds action to run each time any of given even was triggered
   #
-  # @param [String] events              List of events separated by space
+  # @param [String|Array] events        List of events separated by space
   # @param [Function] callback          Action to run on trigger
+  # @param [Hash] options               Options
   #
-  bind: (events, callback) ->
+  # @option options [Boolean] unique    Call has no effect if true and the given pair
+  #                                     of events and callback is already set up
+  #
+  bind: (events, callback, options = {}) ->
     events = @__splitEvents events
     @__validateEvents events
 
+    return if options.unique && @__isBound(events, callback)
+
     @__boundEvents ||= []
     @__boundEvents.push [events, callback]
 
@@ -101,6 +113,20 @@ Joosy.Modules.Events =
     unless Object.isArray(events) && events.length > 0
       throw new Error "#{Joosy.Module.__className @}> bind invalid events: #{events}"
 
+  __isBound: (events, callback, oneShot = false) ->
+    haystack = if oneShot
+      @__oneShotEvents
+    else
+      @__boundEvents
+
+    return false unless haystack
+
+    result = haystack.find (item) ->
+      item[0].length == events.length &&
+        item[0].subtract(events).isEmpty() &&
+        item[1] == callback
+
+    !!result
 
 #
 # Internal representation of {Joosy.Modules.Events.synchronize} context

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

@@ -96,10 +96,6 @@ class Joosy.Page extends Joosy.Module
   @paint: (callback) ->
     @::__paint = callback
 
-  #
-  # @todo Does anybody have idea why we could need this method?
-  #   Looks like something should be removed from here and bootstrap proccess.
-  #
   @afterPaint: (callback) ->
     @::__afterPaint = callback
 
@@ -324,6 +320,7 @@ class Joosy.Page extends Joosy.Module
       @__fixHeight()
 
     @wait "stageClear dataReceived", =>
+      @previous?.__afterPaint?(callbacksParams)
       @__callSyncedThrough this, '__paint', callbacksParams, =>
         # Page HTML
         @swapContainer @layout.content(), @__renderer(@data || {})

data/app/assets/javascripts/joosy/core/resource/generic.js.coffee

@@ -173,8 +173,8 @@ class Joosy.Resource.Generic extends Joosy.Module
         shim = Joosy.Resource.Generic.identity[klass][id]
         shim.load data
       else
-        @apply shim, [data]
         Joosy.Resource.Generic.identity[klass][id] = shim
+        @apply shim, [data]
     else
       @apply shim, [data]
 

data/joosy.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.summary     = "Joosy Framework support for Ruby on Rails"
   s.email       = "boris@roundlake.ru"
-  s.homepage    = "http://github.com/roundlake/joosy"
+  s.homepage    = "http://github.com/joosy/joosy"
   s.description = "A gem wrapper to include Joosy via the asset pipeline."
   s.authors     = ['Boris Staal', 'Andrew Shaydurov', 'Peter Zotov', 'Alexander Pavlenko']
 

data/lib/joosy/rails/version.rb

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

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

@@ -69,11 +69,22 @@ describe "Joosy.Form", ->
 
     it "should hijack form method if it differs from POST/GET", ->
       form   = new Joosy.Form @putForm, callback=sinon.spy()
-      marker = @putForm.find "input[type=hidden]"
+      marker = @putForm.find "input[name=_method]"
       expect(@putForm.attr('method')?.toLowerCase()).toEqual 'post'
-      expect(marker.attr 'name').toEqual '_method'
+      expect(marker.attr 'type').toEqual 'hidden'
       expect(marker.attr 'value').toEqual 'put'
 
+    it "should not stack _method inputs", ->
+      form   = new Joosy.Form @putForm
+      3.times =>
+        form.fill @resource
+      marker = @putForm.find "input[name=_method]"
+      expect(marker.length).toEqual 1
+      expect(marker.attr 'value').toEqual 'PUT'
+      form.fill Test
+      marker = @putForm.find "input[name=_method]"
+      expect(marker.length).toEqual 0
+
   describe "Filling", ->
 
     beforeEach ->
@@ -159,6 +170,56 @@ describe "Joosy.Form", ->
       @nestedForm.fill @resource
       # expect(you).toBeAlive(), lol
 
+  describe 'Submit', ->
+
+    beforeEach ->
+      @xhr = sinon.useFakeXMLHttpRequest()
+      @requests = []
+      @xhr.onCreate = (xhr) =>
+        @requests.push xhr
+
+    afterEach ->
+      @xhr.restore()
+      delete @requests
+
+    describe 'Global debouncing disabled', ->
+
+      it 'should allow multiple submit', ->
+        @nudeForm = new Joosy.Form @nudeForm
+        3.times =>
+          @nudeForm.container.submit()
+        expect(@requests.length).toEqual 3
+
+      it 'should optionally prevent multiple submit', ->
+        @nudeForm = new Joosy.Form @nudeForm, debounce: true
+        [200, 404, 500].each (code) =>
+          3.times =>
+            @nudeForm.container.submit()
+          expect(@requests.length).toEqual 1
+          @requests[0].respond(code, {}, '{}')
+          expect(@requests.length).toEqual 1
+          @requests = []
+
+    describe 'Global debouncing enabled', ->
+
+      beforeEach ->
+        Joosy.Application.debounceForms = true
+
+      afterEach ->
+        Joosy.Application.debounceForms = false
+
+      it 'should optionally allow multiple submit', ->
+        @nudeForm = new Joosy.Form @nudeForm, debounce: false
+        3.times =>
+          @nudeForm.container.submit()
+        expect(@requests.length).toEqual 3
+
+      it 'should prevent multiple submit', ->
+        @nudeForm = new Joosy.Form @nudeForm
+        3.times =>
+          @nudeForm.container.submit()
+        expect(@requests.length).toEqual 1
+
   describe "Callbacks", ->
 
     beforeEach ->

data/spec/javascripts/joosy/core/modules/events_spec.js.coffee

@@ -54,6 +54,30 @@ describe "Joosy.Modules.Events", ->
     @box.trigger 'event'
     expect(callback.callCount).toEqual 3
 
+  it "should allow multiple binding", ->
+    callback = ->
+
+    3.times =>
+      @box.bind 'event', callback
+    expect(@box.__boundEvents).toEqual [[['event'], callback], [['event'], callback], [['event'], callback]]
+
+    3.times =>
+      @box.wait 'event', callback
+    expect(@box.__oneShotEvents).toEqual [[['event'], callback], [['event'], callback], [['event'], callback]]
+
+  it "should ignore multiple binding", ->
+    callback = ->
+
+    @box.bind 'event', callback
+    3.times =>
+      @box.bind 'event', callback, unique: true
+    expect(@box.__boundEvents).toEqual [[['event'], callback]]
+
+    @box.wait 'event', callback
+    3.times =>
+      @box.wait 'event', callback, unique: true
+    expect(@box.__oneShotEvents).toEqual [[['event'], callback]]
+
   it "should handle inheritance well", ->
     callback = sinon.spy()
     @sub.wait 'foo', callback

data/spec/javascripts/joosy/core/modules/renderer_spec.js.coffee

@@ -112,6 +112,40 @@ describe "Joosy.Modules.Renderer", ->
     runs ->
       expect(elem.text()).toBe "suck"
 
+  it "renders collections and track its new items", ->
+    class Foo extends Joosy.Resource.Generic
+      @entity 'foo'
+
+    data = new Joosy.Resource.Collection(Foo)
+    data.load [
+      {key: 1},
+      {key: 2}
+    ]
+
+    @TestContainer.view (locals) ->
+      template = -> @data.map((item) -> item('key')).join('')
+      @renderDynamic(template, locals)
+
+    elem = $("<div></div>")
+    @ground.append elem
+    elem.html @dummyContainer.__renderer(data)
+
+    waits 0
+
+    runs ->
+      expect(elem.text()).toBe "12"
+      data.add Foo.build(key: 3)
+
+    waits 0
+
+    runs ->
+      expect(elem.text()).toBe "123"
+      data.at(2)('key', 6)
+
+    waits 0
+
+    runs ->
+      expect(elem.text()).toBe "126"
 
   it "debounces morpher updates", ->
     @TestContainer.view (locals) ->

data/spec/javascripts/joosy/core/resource/generic_spec.js.coffee

@@ -7,6 +7,11 @@ describe "Joosy.Resource.Generic", ->
     @entity 'test'
     @map 'test_inlines', TestInline
 
+  class TestNode extends Joosy.Resource.Generic
+    @entity 'test_node'
+    @map 'children', TestNode
+    @map 'parent', TestNode
+
   beforeEach ->
     @resource = Joosy.Resource.Generic.build @data =
       foo: 'bar'
@@ -153,3 +158,10 @@ describe "Joosy.Resource.Generic", ->
       inline('foo', 'bar')
 
       expect(root('test_inlines').at(0)('foo')).toEqual 'bar'
+
+    it "handles nested bi-directional reference", ->
+      biDirectionTestNode = TestNode.build
+        id: 1
+        children: [{id: 2, parent: {id: 1}}]
+
+      expect(biDirectionTestNode).toEqual(biDirectionTestNode('children').at(0)('parent'))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: joosy
 version: !ruby/object:Gem::Version
-  version: 1.0.0.RC5
+  version: 1.0.0.RC6
   prerelease: 6
 platform: ruby
 authors:
@@ -12,11 +12,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-14 00:00:00.000000000 Z
+date: 2013-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70277116410620 !ruby/object:Gem::Requirement
+  requirement: &70125953693180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +24,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70277116410620
+  version_requirements: *70125953693180
 - !ruby/object:Gem::Dependency
   name: coffee-rails
-  requirement: &70277116408700 !ruby/object:Gem::Requirement
+  requirement: &70125953692180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -35,10 +35,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70277116408700
+  version_requirements: *70125953692180
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &70277116407280 !ruby/object:Gem::Requirement
+  requirement: &70125953691180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -46,10 +46,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70277116407280
+  version_requirements: *70125953691180
 - !ruby/object:Gem::Dependency
   name: haml_coffee_assets
-  requirement: &70277116405680 !ruby/object:Gem::Requirement
+  requirement: &70125953689800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -57,10 +57,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70277116405680
+  version_requirements: *70125953689800
 - !ruby/object:Gem::Dependency
   name: i18n-js
-  requirement: &70277116402480 !ruby/object:Gem::Requirement
+  requirement: &70125953491060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -68,10 +68,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70277116402480
+  version_requirements: *70125953491060
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70277116399260 !ruby/object:Gem::Requirement
+  requirement: &70125953487880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -79,10 +79,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70277116399260
+  version_requirements: *70125953487880
 - !ruby/object:Gem::Dependency
   name: guard-coffeescript
-  requirement: &70277116397960 !ruby/object:Gem::Requirement
+  requirement: &70125953487340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -90,10 +90,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70277116397960
+  version_requirements: *70125953487340
 - !ruby/object:Gem::Dependency
   name: guard-sprockets
-  requirement: &70277116396780 !ruby/object:Gem::Requirement
+  requirement: &70125953486620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -101,10 +101,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70277116396780
+  version_requirements: *70125953486620
 - !ruby/object:Gem::Dependency
   name: jasmine
-  requirement: &70277116396020 !ruby/object:Gem::Requirement
+  requirement: &70125953485680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -112,7 +112,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70277116396020
+  version_requirements: *70125953485680
 description: A gem wrapper to include Joosy via the asset pipeline.
 email: boris@roundlake.ru
 executables: []
@@ -220,12 +220,12 @@ files:
 - spec/javascripts/support/jasmine_config.rb
 - spec/javascripts/support/jasmine_runner.rb
 - spec/javascripts/support/sinon-1.3.1.js
-- spec/javascripts/support/sinon-ie-1.3.1.js
+- spec/javascripts/support/sinon-ie-1.3.1.js.skip
 - vendor/assets/javascripts/jquery.form.js
 - vendor/assets/javascripts/jquery.hashchange.js
 - vendor/assets/javascripts/metamorph.js
 - vendor/assets/javascripts/sugar.js
-homepage: http://github.com/roundlake/joosy
+homepage: http://github.com/joosy/joosy
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -250,3 +250,4 @@ signing_key:
 specification_version: 3
 summary: Joosy Framework support for Ruby on Rails
 test_files: []
+has_rdoc: