joosy 1.0.0.RC7 → 1.1.0.alpha.1

data/Gemfile.lock

@@ -1,6 +1,6 @@
 GIT
   remote: git://github.com/pivotal/jasmine-gem.git
-  revision: 63e8d46556a421cbb3b511b52cd8c2188d72b9db
+  revision: ff6fa02f3083b8f9423ddf0cdee5b41ff6d18de1
   specs:
     jasmine (1.3.2)
       jasmine-core (~> 1.3.1)
@@ -11,19 +11,14 @@ GIT
 PATH
   remote: .
   specs:
-    joosy (1.0.0.RC7)
-      coffee-rails
+    joosy (1.1.0.alpha.1)
       haml_coffee_assets
       i18n-js
-      jquery-rails
-      rails (>= 3.1.0)
+      sprockets
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.11)
-      actionpack (= 3.2.11)
-      mail (~> 2.4.4)
     actionpack (3.2.11)
       activemodel (= 3.2.11)
       activesupport (= 3.2.11)
@@ -37,26 +32,13 @@ GEM
     activemodel (3.2.11)
       activesupport (= 3.2.11)
       builder (~> 3.0.0)
-    activerecord (3.2.11)
-      activemodel (= 3.2.11)
-      activesupport (= 3.2.11)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    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)
-    arel (3.0.2)
     builder (3.0.4)
-    childprocess (0.3.6)
+    childprocess (0.3.7)
       ffi (~> 1.0, >= 1.0.6)
     coderay (1.0.8)
-    coffee-rails (3.2.2)
-      coffee-script (>= 2.2.0)
-      railties (~> 3.2.0)
     coffee-script (2.2.0)
       coffee-script-source
       execjs
@@ -70,18 +52,20 @@ GEM
       multi_json (~> 1.0)
     ffi (1.3.1)
     ffi (1.3.1-java)
-    guard (1.6.1)
+    guard (1.6.2)
       listen (>= 0.6.0)
       lumberjack (>= 1.0.2)
       pry (>= 0.9.10)
+      terminal-table (>= 1.4.3)
       thor (>= 0.14.6)
     guard-coffeescript (1.2.1)
       coffee-script (>= 2.2.0)
       guard (>= 1.1.0)
-    guard-sprockets (0.4.1)
+    guard-sprockets (0.4.2)
+      execjs (~> 1.0)
       guard (>= 1.1.0)
       sprockets (~> 2.0)
-    haml_coffee_assets (1.10.0)
+    haml_coffee_assets (1.11.1)
       coffee-script (>= 1.0.0)
       sprockets (>= 2.0.3)
       tilt (>= 1.3.3)
@@ -91,31 +75,22 @@ GEM
       i18n
     jasmine-core (1.3.1)
     journey (1.0.4)
-    jquery-rails (2.1.4)
+    jquery-rails (2.2.0)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     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.7.2)
     lumberjack (1.0.2)
-    mail (2.4.4)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
     method_source (0.8.1)
-    mime-types (1.19)
     multi_json (1.5.0)
-    polyglot (0.3.3)
-    pry (0.9.11.3)
+    pry (0.9.11.4)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.4)
-    pry (0.9.11.3-java)
+    pry (0.9.11.4-java)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.4)
@@ -127,14 +102,6 @@ GEM
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    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.11)
     railties (3.2.11)
       actionpack (= 3.2.11)
       activesupport (= 3.2.11)
@@ -154,13 +121,13 @@ GEM
     rspec-core (2.12.2)
     rspec-expectations (2.12.1)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.1)
+    rspec-mocks (2.12.2)
     rubyzip (0.9.9)
-    selenium-webdriver (2.27.2)
+    selenium-webdriver (2.29.0)
       childprocess (>= 0.2.5)
-      libwebsocket (~> 0.1.3)
       multi_json (~> 1.0)
       rubyzip
+      websocket (~> 1.0.4)
     slop (3.4.3)
     spoon (0.0.1)
     sprockets (2.2.2)
@@ -168,17 +135,14 @@ GEM
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
+    terminal-table (1.4.5)
     thin (1.5.0)
       daemons (>= 1.0.9)
       eventmachine (>= 0.12.6)
       rack (>= 1.0.0)
-    thor (0.16.0)
+    thor (0.17.0)
     tilt (1.3.3)
-    treetop (1.4.12)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.35)
-    websocket (1.0.6)
+    websocket (1.0.7)
 
 PLATFORMS
   java
@@ -190,6 +154,7 @@ DEPENDENCIES
   guard-sprockets
   jasmine!
   joosy!
+  jquery-rails
   libnotify
   rb-inotify
   thin

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

@@ -26,9 +26,9 @@
 # @include Joosy.Modules.Container
 #
 class Joosy.Form extends Joosy.Module
+  @include Joosy.Modules.Container
   @include Joosy.Modules.Log
   @include Joosy.Modules.Events
-  @include Joosy.Modules.Container
 
   #
   # Marks the CSS class to use to mark invalidated fields
@@ -114,7 +114,7 @@ class Joosy.Form extends Joosy.Module
     @__delegateEvents()
 
     method = @container.get(0).getAttribute('method')?.toLowerCase()
-    if method && !['get', 'post'].has method
+    if method && !['get', 'post'].any method
       @__markMethod method
       @container.attr 'method', 'POST'
 
@@ -196,13 +196,14 @@ class Joosy.Form extends Joosy.Module
             input.filter("[value='#{val}']").attr 'checked', 'checked'
           else
             input.val val
-        if Object.isObject(val) || Object.isArray(val)
-          filler val, key
-        else if val instanceof Joosy.Resource.REST
-          filler val.data, @concatFieldName(scope, "[#{property}_attributes][0]")
-        else if val instanceof Joosy.Resource.RESTCollection
+        if val instanceof Joosy.Resource.RESTCollection
           for entity, i in val.data
             filler entity.data, @concatFieldName(scope, "[#{property}_attributes][#{i}]")
+        else if val instanceof Joosy.Resource.REST
+          filler val.data, @concatFieldName(scope, "[#{property}_attributes][0]")
+        else if Object.isObject(val) || Object.isArray(val)
+          filler val, key
+        else 
       delete data.__joosy_form_filler_lock
 
     filler data, resource.__entityName || options.resourceName

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

@@ -45,7 +45,7 @@ class Joosy.Layout extends Joosy.Module
   #   preparations are done you should call that function.
   #
   # @example Sample before painter
-  #   @beforePaint (complete) ->
+  #   @beforePaint (container, page, complete) ->
   #     if !@data # checks if parallel fetching finished
   #       $('preloader').slideDown -> complete()
   #
@@ -63,7 +63,7 @@ class Joosy.Layout extends Joosy.Module
   #   preparations are done you should call that function.
   #
   # @example Sample painter
-  #   @paint (complete) ->
+  #   @paint (container, page, complete) ->
   #     @container.fadeIn -> complete()
   #
   @paint: (callback) ->
@@ -81,7 +81,7 @@ class Joosy.Layout extends Joosy.Module
   #   access layout data from that. Think twice if you are doing it right though.
   #
   # @example Sample eraser
-  #   @erase (complete) ->
+  #   @erase (container, page, complete) ->
   #     @container.fadeOut -> complete()
   #
   @erase: (callback) ->

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

@@ -73,7 +73,7 @@ Joosy.Modules.Events =
         callback data...
     if @__boundEvents
       for [events, callback] in @__boundEvents
-        if events.has event
+        if events.any event
           callback data...
 
   #

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

@@ -1,5 +1,3 @@
-moduleKeywords = ['included', 'extended']
-
 #
 # Base Joosy class extending Coffee class with module-like injections
 #   and other tiny stuff.
@@ -95,8 +93,8 @@ class Joosy.Module
     unless object
       throw new Error 'include(object) requires obj'
 
-    Object.each object, (key, value) =>
-      if key not in moduleKeywords
+    for key, value of object
+      if key != 'included' && key != 'extended'
         this::[key] = value
 
     object.included?.apply this

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

@@ -74,7 +74,7 @@ class Joosy.Page extends Joosy.Module
   #   preparations are done you should call that function.
   #
   # @example Sample before painter
-  #   @beforePaint (complete) ->
+  #   @beforePaint (container, complete) ->
   #     if !@data # checks if parallel fetching finished
   #       $('preloader').slideDown -> complete()
   #
@@ -92,7 +92,7 @@ class Joosy.Page extends Joosy.Module
   #   preparations are done you should call that function.
   #
   # @example Sample painter
-  #   @paint (complete) ->
+  #   @paint (container, complete) ->
   #     @container.fadeIn -> complete()
   #
   @paint: (callback) ->
@@ -113,7 +113,7 @@ class Joosy.Page extends Joosy.Module
   #   access page data from that. Think twice if you are doing it right though.
   #
   # @example Sample eraser
-  #   @erase (complete) ->
+  #   @erase (container, complete) ->
   #     @container.fadeOut -> complete()
   #
   @erase: (callback) ->

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

@@ -26,13 +26,19 @@ Joosy.Router =
   # need) and actual executors
   #
   routes: Object.extended()
-
+  
   #
   # The regexp to restrict the next loading url. By default set to false and
   # therefore no restrictions apply.
   #
   restrictPattern: false
-
+  
+  #
+  # TODO: Write readme
+  #
+  __namespace: ""
+  __asNamespace: ""
+  
   #
   # Set the restriction pattern. If the requested url does not match this it
   # will not load. Set `false` to avoid check.
@@ -45,6 +51,17 @@ Joosy.Router =
   reset: ->
     @rawRoutes = Object.extended()
     @routes = Object.extended()
+    @__namespace = ""
+    @__asNamespace = ""
+    
+    
+  #
+  # Draws the routes similar to Ruby on Rails
+  #
+  # @param [Function] block   callback for child commands
+  #
+  draw: (block)->
+    block.call(this) if Object.isFunction(block)
 
   #
   # Registers the set of raw routes
@@ -78,7 +95,68 @@ Joosy.Router =
         , 2 # jQuery.hashchange checks hash changing every 1ms
       else
         history[if options.replaceState then 'replaceState' else 'pushState'] {}, '', '#'+path
+        
+  #
+  # Match route (ads it to @rawRoutes)
+  #
+  # @param [String] route       similar to ones sent in map hash
+  # 
+  # @param  options [String] to  function to which the route routes
+  # @option options [String] as  name of the route, used for reverse routing
+  #
+  match: (route, options={}) ->
+    if @__asNamespace
+      as = @__asNamespace + options["as"].capitalize()
+    else
+      as = options["as"]
+    
+    routeName = @__namespace + route
 
+    map = {}
+    map[route] = options["to"]
+    
+    Joosy.Module.merge @rawRoutes, map
+    
+    @__injectReverseUrl(as, routeName)
+  
+  #
+  # Shortcut to match "/"
+  #
+  # @param  options [String] to  function to which the route routes
+  # @option options [String] as  name of the route, used for reverse routing
+  #                              default it is "root"
+  #
+  root: (options={}) ->
+    as = options["as"] || "root"
+    @match("/", to: options["to"], as: as)
+    
+  #
+  # Routes the 404
+  #
+  # @param options [String] to  function to which the route routes
+  #
+  notFound: (options={}) ->
+    @match(404, to: options["to"])
+ 
+  #
+  # Namespaces a match route
+  #
+  # @param [String] name     name of the namespace, prefixes other commands
+  #
+  # @option [Hash] options   "as", prefixes all other "as" commands
+  # @param [Function] block  callback for child commands
+  namespace: (name, options={}, block) ->
+    if Object.isFunction(options)
+      block = options
+      options = {}
+      
+    newScope = $.extend({}, this)
+    newScope.rawRoutes = {}
+    newScope.__namespace += name
+    newScope.__asNamespace += "#{options["as"]}" if options["as"]
+    block.call(newScope) if Object.isFunction(block)
+    @rawRoutes[name] = newScope.rawRoutes
+    
   #
   # Inits the routing system and loads the current route
   # Binds the window hashchange event and therefore should only be called once
@@ -199,5 +277,31 @@ Joosy.Router =
           params[pair[0]] = pair[1]
 
     params
+    
+  #
+  # Injects reverse routing function into global namespace
+  # @param [String] as     The name for the route, ex: for "projects" 
+  #                        builds "projects_url" and "projects_path" functions
+  # @param [String] route  Entire route, joined by namespaces, ex:
+  #                        "/projects/":
+  #                             "/:id" :
+  #                               "/edit": TestPage
+  #                        joins to "/projects/:id/edit"
+  #
+  __injectReverseUrl: (as, route) ->
+    return if as == undefined
+    
+    fnc = (options) ->
+      url = route
+      (route.match(/\/:[^\/]+/g) || []).each (str) ->
+        url = url.replace(str.substr(1), options[str.substr(2)])
+      "#!#{url}"
+
+    Joosy.Helpers.Application["#{as}Path"] = (options) ->
+      fnc(options)
+      
+    Joosy.Helpers.Application["#{as}Url"] = (options) ->
+      url = 'http://' + window.location.host + window.location.pathname
+      "#{url}#{fnc(options)}"
 
 Joosy.Module.merge Joosy.Router, Joosy.Modules.Events

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

@@ -1,5 +1,4 @@
 #= require jquery
-#= require jquery_ujs
 #= require jquery.hashchange
 #= require jquery.form
 #= require sugar

data/joosy.gemspec

@@ -1,8 +1,8 @@
-require File.expand_path("../lib/joosy/rails/version", __FILE__)
+require File.expand_path("../lib/joosy/version", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "joosy"
-  s.version     = Joosy::Rails::VERSION
+  s.version     = Joosy::VERSION
   s.platform    = Gem::Platform::RUBY
   s.summary     = "Joosy Framework support for Ruby on Rails"
   s.email       = "boris@roundlake.ru"
@@ -13,12 +13,10 @@ Gem::Specification.new do |s|
   s.files         = `git ls-files`.split("\n")
   s.require_paths = ["lib"]
 
-  s.add_dependency 'rails', ">= 3.1.0"
-  s.add_dependency 'coffee-rails'
-  s.add_dependency 'jquery-rails'
+  s.add_dependency 'sprockets'
   s.add_dependency 'haml_coffee_assets'
-  s.add_dependency 'i18n-js'
 
+  s.add_development_dependency 'jquery-rails'
   s.add_development_dependency 'guard'
   s.add_development_dependency 'guard-coffeescript'
   s.add_development_dependency 'guard-sprockets'

data/lib/joosy/rails/engine.rb

@@ -1,6 +1,10 @@
 require 'rails/engine'
 
 module Joosy
+  def self.resources(namespaces=nil)
+    Joosy::SprocketsHelper.joosy_resources(namespaces).to_json
+  end
+
   module Rails
     class Engine < ::Rails::Engine
 

data/lib/joosy/version.rb

@@ -0,0 +1,3 @@
+module Joosy
+  VERSION = "1.1.0.alpha.1"
+end

data/lib/joosy.rb

@@ -1,16 +1,17 @@
 require 'haml_coffee_assets'
-require 'jquery-rails'
-require 'coffee-rails'
-
-require 'joosy/rails/engine'
-require 'joosy/rails/version'
-require 'rails/resources_with_joosy'
-
-require 'i18n-js'
+require 'joosy/version'
 
+if defined?(Rails)
+  require 'joosy/rails/engine'
+  require 'rails/resources_with_joosy'
+end
 
 module Joosy
-  def self.resources(namespaces=nil)
-    Joosy::SprocketsHelper.joosy_resources(namespaces).to_json
+  def self.assets_paths
+    [
+        File.expand_path('../../app/assets/javascripts', __FILE__),
+        File.expand_path('../../vendor/assets/javascripts', __FILE__),
+        File.dirname(HamlCoffeeAssets.helpers_path)
+    ]
   end
 end

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

@@ -140,4 +140,95 @@ describe "Joosy.Router", ->
     expect(Joosy.Application.setCurrentPage.args.last()).toEqual [TestPage, Object.extended()]
 
     Joosy.Application.setCurrentPage.restore()
-    Joosy.Router.restrict false
+    Joosy.Router.restrict false
+    
+  it "should DRAW simple routes, only using match and root", ->
+    Joosy.Router.map
+      '/': spies.root
+      '/page': TestPage
+      404: spies.wildcard
+    raw_routes_for_map = Joosy.Router.rawRoutes
+
+    Joosy.Router.reset()
+    
+    Joosy.Router.draw ->
+      @root to: spies.root
+      @match '/page', to: TestPage
+      @notFound to: spies.wildcard
+      
+    expect(Joosy.Router.rawRoutes).toEqual(raw_routes_for_map)
+    
+  it "should DRAW namespaced routes", ->
+    Joosy.Router.map
+      '/': spies.root
+      '/page': TestPage
+      '/section':
+        '/page/:id': spies.section
+        '/page2/:more': TestPage
+      404: spies.wildcard
+    rawRoutesForMap = Joosy.Router.rawRoutes
+
+    Joosy.Router.reset()
+    
+    Joosy.Router.draw ->
+      @root to: spies.root
+      @match '/page', to: TestPage
+      @namespace '/section', ->
+        @match '/page/:id', to: spies.section
+        @match '/page2/:more', to: TestPage
+      @notFound to: spies.wildcard
+      
+    expect(Joosy.Router.rawRoutes).toEqual(rawRoutesForMap)
+    
+  it "should DRAW simple route reverses, only using match and root", ->
+    Joosy.Router.draw ->
+      @root to: spies.root
+      @match '/page', to: TestPage, as: "page"
+      @match '/page/:id', to: TestPage, as: "pageFor"
+      @notFound to: spies.wildcard
+      
+    validate = ->
+      expect(@rootUrl).not.toEqual undefined
+      expect(@rootPath).not.toEqual undefined
+    
+      expect(@rootPath()).toEqual "#!/"
+      expect(@pagePath()).toEqual "#!/page"
+      expect(@pageForPath(id: 3)).toEqual "#!/page/3"
+    validate.call(Joosy.Helpers.Application)
+    
+  it "should DRAW more complex reverses using namespaces", ->
+    Joosy.Router.draw ->
+      @namespace '/projects', as: "projects", ->
+        @match "/", to: TestPage, as: "index"
+        @namespace "/:id", ->
+          @match "/", to: TestPage, as: "show"
+          @match "/edit", to: TestPage, as: "edit"
+          @match "/delete", to: TestPage, as: "delete"
+          
+      @namespace '/tickets', ->
+        @match "/", to: TestPage, as: "tasksIndex"
+        
+      @namespace '/activities', ->
+        @root to: TestPage, as: "activities"
+
+    validate = ->
+      expect(@projectsIndexPath).not.toEqual undefined
+      expect(@projectsIndexPath()).not.toEqual "#!/projects"
+      expect(@projectsIndexPath()).toEqual "#!/projects/"
+    
+      expect(@projectsShowPath(id: 3)).toEqual "#!/projects/3/"
+      expect(@projectsEditPath(id: 3)).toEqual "#!/projects/3/edit"
+      expect(@projectsDeletePath(id: 3)).toEqual "#!/projects/3/delete"
+    
+      expect(@tasksIndexPath()).toEqual "#!/tickets/"
+      expect(@activitiesPath()).toEqual "#!/activities/"
+    validate.call(Joosy.Helpers.Application)
+    
+  it "should return reverse url with hostname and pathname", ->
+    Joosy.Router.draw ->
+      @match "/projects/", to: TestPage, as: "projectsIndex"
+        
+    validate = ->
+      expect(@projectsIndexPath()).toEqual "#!/projects/"
+      expect(@projectsIndexUrl()).toEqual "http://localhost:8888/#!/projects/"
+    validate.call(Joosy.Helpers.Application)

data/vendor/assets/javascripts/jquery.hashchange.js

@@ -297,7 +297,7 @@
     // vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
     // vvvvvvvvvvvvvvvvvvv REMOVE IF NOT SUPPORTING IE6/7/8 vvvvvvvvvvvvvvvvvvv
     // vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
-    $.browser.msie && !supports_onhashchange && (function(){
+    !supports_onhashchange && (function(){
       // Not only do IE6/7 need the "magical" Iframe treatment, but so does IE8
       // when running in "IE7 compatibility" mode.