joosy 1.1.0.alpha.3 → 1.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 9d9a1763a50a347c0706903668f7f81413c90f54
+  data.tar.gz: 3f2c91ba7364f24eb13c9895f5c1032cd2609819
+SHA512:
+  metadata.gz: 735b829073162a372a09307e81b7b3006efc43469c7e901effc43af77bd6154168f5a3f1eb40bab06b420b2f77d6a6981802b83dc9b7752a8a510665c9f59bb8
+  data.tar.gz: 6a059d4606eb83365012b9fe23f3242f1591a596249d57e2c312064e6c71572813e85c7f30e0f2df242680e8d1b73c424f42a219e8f37cabeccc7da22915a1a3

data/Gemfile.lock

@@ -11,7 +11,7 @@ GIT
 PATH
   remote: .
   specs:
-    joosy (1.1.0.alpha.2)
+    joosy (1.1.0)
       haml_coffee_assets
       sprockets
 
@@ -64,7 +64,7 @@ GEM
       execjs (~> 1.0)
       guard (>= 1.1.0)
       sprockets (~> 2.0)
-    haml_coffee_assets (1.11.1)
+    haml_coffee_assets (1.12.0)
       coffee-script (>= 1.0.0)
       sprockets (>= 2.0.3)
       tilt (>= 1.3.3)

data/README.md

@@ -45,9 +45,7 @@ http://localhost:8888/ <- they are here :)
 Credits
 -------
 
-<img src="http://roundlake.ru/assets/logo.png" align="right" />
-
-* Boris Staal ([@_inossidabile](http://twitter.com/#!/_inossidabile))
+* Boris Staal ([@_inossidabile](http://twitter.com/#!/_inossidabile)) [![endorse](http://api.coderwall.com/inossidabile/endorsecount.png)](http://coderwall.com/inossidabile)
 * Andrew Shaydurov ([@ImGearHead](http://twitter.com/#!/ImGearHead))
 * Alexander Pavlenko ([@alerticus](http://twitter.com/#!/alerticus))
 * Peter Zotov ([@whitequark](http://twitter.com/#!/whitequark))

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

@@ -155,6 +155,7 @@ class Joosy.Page extends Joosy.Module
   #
   @fetchSynchronized: (callback) ->
     @::__fetch = (complete) ->
+      @data = {}
       @synchronize (context) ->
         context.after -> complete()
         callback.call(this, context)

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

@@ -28,22 +28,45 @@ class Joosy.Resource.REST extends Joosy.Resource.Generic
     , ''
 
   #
-  # Builds member path based on the given id.
+  # Builds base path
   #
-  # @param [String] id          ID of entity to build member path for
   # @param [Hash] options       See {Joosy.Resource.REST.find} for possible options
   #
   # @example Basic usage
-  #   Resource.memberPath(1, from: 'foo') # /resources/1/foo
+  #   Resource.basePath() # /resources
   #
-  @memberPath: (id, options={}) ->
-    path  = ("/" + @::__entityName.pluralize())
-    path  = @__source if @__source? && !options.parent?
-    path += "/#{id}"
+  @basePath: (options={}) ->
+    if @__source
+      path = @__source
+    else
+      path = '/'
+      path += @__namespace__.map((s)-> s.underscore()).join('/') + '/' if @__namespace__.length > 0
+      path += @::__entityName.pluralize()
 
     if options.parent?
       path = @__parentsPath(if Object.isArray(options.parent) then options.parent else [options.parent]) + path
 
+    path
+
+  #
+  # Builds base path
+  #
+  # @see Joosy.Resource.REST.basePath
+  #
+  basePath: (options) ->
+    @constructor.basePath options
+
+  #
+  # Builds member path based on the given id.
+  #
+  # @param [String] id          ID of entity to build member path for
+  # @param [Hash] options       See {Joosy.Resource.REST.find} for possible options
+  #
+  # @example Basic usage
+  #   Resource.memberPath(1, from: 'foo') # /resources/1/foo
+  #
+  @memberPath: (id, options={}) ->
+    path  = @basePath(options) + "/#{id}"
     path += "/#{options.from}" if options.from?
     path
 
@@ -55,7 +78,7 @@ class Joosy.Resource.REST extends Joosy.Resource.Generic
   # @example Basic usage
   #   resource.memberPath(from: 'foo') # /resources/1/foo
   #
-  memberPath: (options={}) ->
+  memberPath: (options) ->
     @constructor.memberPath @id(), options
 
   #
@@ -67,12 +90,7 @@ class Joosy.Resource.REST extends Joosy.Resource.Generic
   #   Resource.collectionPath() # /resources/
   #
   @collectionPath: (options={}) ->
-    path = ("/" + @::__entityName.pluralize())
-    path = @__source if @__source? && !options.parent?
-
-    if options.parent?
-      path = @__parentsPath(if Object.isArray(options.parent) then options.parent else [options.parent]) + path
-
+    path = @basePath(options)
     path += "/#{options.from}" if options.from?
     path
 
@@ -81,7 +99,7 @@ class Joosy.Resource.REST extends Joosy.Resource.Generic
   #
   # @see Joosy.Resource.REST.collectionPath
   #
-  collectionPath: (options={}) ->
+  collectionPath: (options) ->
     @constructor.collectionPath options
 
   #

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

@@ -26,19 +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.
@@ -53,8 +53,8 @@ Joosy.Router =
     @routes = Object.extended()
     @__namespace = ""
     @__asNamespace = ""
-    
-    
+
+
   #
   # Draws the routes similar to Ruby on Rails
   #
@@ -95,30 +95,30 @@ 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)
+  # Match route (adds 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()
+      as = @__asNamespace + options.as.capitalize()
     else
-      as = options["as"]
-    
+      as = options.as
+
     routeName = @__namespace + route
 
     map = {}
-    map[route] = options["to"]
-    
+    map[route] = options.to
+
     Joosy.Module.merge @rawRoutes, map
-    
+
     @__injectReverseUrl(as, routeName)
-  
+
   #
   # Shortcut to match "/"
   #
@@ -127,17 +127,17 @@ Joosy.Router =
   #                              default it is "root"
   #
   root: (options={}) ->
-    as = options["as"] || "root"
-    @match("/", to: options["to"], as: as)
-    
+    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"])
- 
+    @match(404, to: options.to)
+
   #
   # Namespaces a match route
   #
@@ -149,14 +149,16 @@ Joosy.Router =
     if Object.isFunction(options)
       block = options
       options = {}
-      
+
     newScope = $.extend({}, this)
     newScope.rawRoutes = {}
     newScope.__namespace += name
-    newScope.__asNamespace += "#{options["as"]}" if options["as"]
+    if options.as
+      options.as = options.as.capitalize() if newScope.__asNamespace.length > 0
+      newScope.__asNamespace += 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
@@ -277,11 +279,11 @@ 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] as     The name for the route, ex: for "projects"
+  #                        builds "projectsUrl" and "projectsPath" functions
   # @param [String] route  Entire route, joined by namespaces, ex:
   #                        "/projects/":
   #                             "/:id" :
@@ -290,7 +292,7 @@ Joosy.Router =
   #
   __injectReverseUrl: (as, route) ->
     return if as == undefined
-    
+
     fnc = (options) ->
       url = route
       (route.match(/\/:[^\/]+/g) || []).each (str) ->
@@ -299,9 +301,9 @@ Joosy.Router =
 
     Joosy.Helpers.Application["#{as}Path"] = (options) ->
       fnc(options)
-      
+
     Joosy.Helpers.Application["#{as}Url"] = (options) ->
-      url = 'http://' + window.location.host + window.location.pathname
+      url = window.location.protocol + '//' + window.location.host + window.location.pathname
       "#{url}#{fnc(options)}"
 
 Joosy.Module.merge Joosy.Router, Joosy.Modules.Events

data/lib/joosy/version.rb

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

data/lib/rails/generators/joosy/preloader_generator.rb

@@ -23,7 +23,7 @@ HELP
         template "preload.html.#{options[:template_engine]}",
                  "app/views/layouts/#{file_name}.html.#{options[:template_engine]}"
 
-        route "match '#{file_name}' => '#{file_name}#index'"
+        route "get '#{file_name}' => '#{file_name}#index'"
       end
     end
   end

data/lib/rails/generators/joosy/resource_generator.rb

@@ -8,13 +8,17 @@ module Joosy
       def create_files
         super
 
-        template "app/resources/template.js.coffee", "#{app_path}/resources/#{file_name}.js.coffee"
+        if namespace_name.empty?
+          template "app/resources/template.js.coffee", "#{app_path}/resources/#{file_name}.js.coffee"
+        else
+          template "app/resources/template_with_namespace.js.coffee", "#{app_path}/resources/#{namespace_path}/#{file_name}.js.coffee"
+        end
       end
 
       protected
 
       def app_path
-        unless class_path.size == 1
+        if class_path.size < 1
           puts <<HELP
 Usage: rails generate joosy:resource joosy_app_name/resource_name
 Tip: resource_name is better to be singular
@@ -23,6 +27,14 @@ HELP
         end
         class_path[0]
       end
+
+      def namespace_path
+        File.join class_path[1..-1]
+      end
+
+      def namespace_name
+        class_path[1..-1].map(&:camelize).join '.'
+      end
     end
   end
-end
+end

data/lib/rails/generators/joosy/templates/app/resources/template_with_namespace.js.coffee

@@ -0,0 +1,4 @@
+Joosy.namespace '<%= namespace_name %>', ->
+
+  class @<%= file_name.camelize %> extends Joosy.Resource.REST
+    @entity '<%= file_name %>'

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

@@ -10,6 +10,14 @@ describe "Joosy.Resource.REST", ->
     @entity 'fluffy'
     @map 'fluffy_inlines', FluffyInline
 
+  Joosy.namespace 'Animal', ->
+    class @Cat extends Joosy.Resource.REST
+      @entity 'cat'
+
+    class @Dog extends Joosy.Resource.REST
+      @entity 'dog'
+      @source '/cuties'
+
   beforeEach ->
     @server = sinon.fakeServer.create()
 
@@ -21,6 +29,18 @@ describe "Joosy.Resource.REST", ->
     expect(target.url).toMatch url
     target.respond 200, 'Content-Type': 'application/json', data
 
+  it "build base path", ->
+    parent = FluffyParent.build 1
+    grandParent = FluffyParent.build 666
+
+    expect(Animal.Cat.basePath()).toEqual '/animal/cats'
+    expect(Animal.Cat.basePath parent: parent).toEqual '/fluffy_parents/1/animal/cats'
+    expect(Animal.Cat.basePath parent: [grandParent, parent]).toEqual '/fluffy_parents/666/fluffy_parents/1/animal/cats'
+
+    expect(Animal.Dog.basePath()).toEqual '/cuties'
+    expect(Animal.Dog.basePath parent: parent).toEqual '/fluffy_parents/1/cuties'
+    expect(Animal.Dog.basePath parent: [grandParent, parent]).toEqual '/fluffy_parents/666/fluffy_parents/1/cuties'
+
   it "builds member path", ->
     parent = FluffyParent.build 1
     grandParent = FluffyParent.build 666
@@ -41,7 +61,6 @@ describe "Joosy.Resource.REST", ->
     expect(Fluffy.collectionPath parent: parent, from: 'test').toEqual '/fluffy_parents/1/fluffies/test'
     expect(Fluffy.collectionPath parent: parent, from: 'test', params: {foo: 'bar'}).toEqual '/fluffy_parents/1/fluffies/test'
 
-
   describe "finds resource", ->
     rawData = '{"fluffy": {"id": 1, "name": "test1"}}'
 

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

@@ -141,7 +141,7 @@ describe "Joosy.Router", ->
 
     Joosy.Application.setCurrentPage.restore()
     Joosy.Router.restrict false
-    
+
   it "should DRAW simple routes, only using match and root", ->
     Joosy.Router.map
       '/': spies.root
@@ -150,14 +150,14 @@ describe "Joosy.Router", ->
     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
@@ -169,7 +169,7 @@ describe "Joosy.Router", ->
     rawRoutesForMap = Joosy.Router.rawRoutes
 
     Joosy.Router.reset()
-    
+
     Joosy.Router.draw ->
       @root to: spies.root
       @match '/page', to: TestPage
@@ -177,25 +177,25 @@ describe "Joosy.Router", ->
         @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", ->
@@ -203,11 +203,13 @@ describe "Joosy.Router", ->
         @namespace "/:id", ->
           @match "/", to: TestPage, as: "show"
           @match "/edit", to: TestPage, as: "edit"
-          @match "/delete", to: TestPage, as: "delete"
-          
+
+        @namespace '/subnamespace', as: 'subnamespace', ->
+          @match '/', to: TestPage, as: 'index'
+
       @namespace '/tickets', ->
         @match "/", to: TestPage, as: "tasksIndex"
-        
+
       @namespace '/activities', ->
         @root to: TestPage, as: "activities"
 
@@ -215,19 +217,20 @@ describe "Joosy.Router", ->
       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/"
+
+      expect(@projectsSubnamespaceIndexPath()).toEqual '#!/projects/subnamespace/'
     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/"

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: joosy
 version: !ruby/object:Gem::Version
-  version: 1.1.0.alpha.3
-  prerelease: 6
+  version: 1.1.0
 platform: ruby
 authors:
 - Boris Staal
@@ -12,118 +11,104 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-16 00:00:00.000000000 Z
+date: 2013-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sprockets
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: haml_coffee_assets
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-coffeescript
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-sprockets
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: jasmine
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: A gem wrapper to include Joosy via the asset pipeline.
@@ -188,6 +173,7 @@ files:
 - lib/rails/generators/joosy/templates/app/pages/template.js.coffee
 - lib/rails/generators/joosy/templates/app/pages/welcome/index.js.coffee
 - lib/rails/generators/joosy/templates/app/resources/template.js.coffee
+- lib/rails/generators/joosy/templates/app/resources/template_with_namespace.js.coffee
 - lib/rails/generators/joosy/templates/app/routes.js.coffee
 - lib/rails/generators/joosy/templates/app/templates/layouts/application.jst.hamlc
 - lib/rails/generators/joosy/templates/app/templates/pages/welcome/index.jst.hamlc
@@ -240,27 +226,25 @@ files:
 - vendor/assets/javascripts/sugar.js
 homepage: http://github.com/joosy/joosy
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Joosy Framework support for Ruby on Rails
 test_files: []
-has_rdoc: