paloma 3.0.2 → 4.0.0

data/vendor/assets/javascripts/paloma/router.js

@@ -1,64 +1,23 @@
 (function(Paloma){
 
-
-
-  var Router = function(config){
-    this.controllers = {};
-    this.redirects = {};
-
-    this.delimiters = {};
-    this.delimiters.namespace = config['namespace'];
-    this.delimiters.action = config['action'];
+  var Router = function(namespaceDelimiter){
+    this.namespaceDelimiter = namespaceDelimiter;
   };
 
 
   Router.prototype.parse = function(path){
-    var namespaced = path.split(this.delimiters.namespace),
-        namespaces = namespaced.slice(0, namespaced.length - 1),
-        controllerPart = namespaced.pop();
-
-    var actioned = controllerPart.split(this.delimiters.action),
-        controller = actioned[0],
-        action = actioned.length == 1 ? null : actioned.pop();
+    var parts = path.split(this.namespaceDelimiter),
+        controller = parts.pop(),
+        namespaces = parts;
 
     var controllerPath = namespaces.concat([controller]);
 
     return {controllerPath: controllerPath,
             namespaces: namespaces,
-            controller: controller,
-            action: action};
-  };
-
-
-  Router.prototype.resource = function(resource, option){
-    option = option || {};
-    this.controllers[resource] = option['controller'] || resource;
-  };
-
-
-  Router.prototype.redirect = function(path, option){
-    option = option || {};
-    this.redirects[path] = this.parse(option['to'] || path);
+            controller: controller};
   };
 
 
-  Router.prototype.controllerFor = function(resource){
-    return this.controllers[resource] || resource;
-  };
-
-
-  Router.prototype.redirectFor = function(resource, action){
-    var path = resource + this.delimiters.action + action,
-        redirect = this.redirects[path];
-
-    if (!redirect){ return null; }
-
-    return {controller: redirect['controllerPath'].join(this.delimiters.namespace),
-            action: redirect['action']};
-  };
-
-
-
   Paloma.Router = Router;
 
 })(window.Paloma);

metadata

@@ -1,119 +1,136 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: paloma
-version: !ruby/object:Gem::Version
-  version: 3.0.2
+version: !ruby/object:Gem::Version 
+  hash: 63
+  prerelease: 
+  segments: 
+  - 4
+  - 0
+  - 0
+  version: 4.0.0
 platform: ruby
-authors:
+authors: 
 - Karl Paragua
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-31 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2014-02-15 00:00:00 +08:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: jquery-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.2.0
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 3
+        - 2
+        - 0
         version: 3.2.0
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rake
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rspec
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.0'
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rspec-rails
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: capybara
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 0
+        version: "2.0"
   type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: capybara
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: jasmine-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.4.5
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
   type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: jasmine-rails
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 0
+        - 4
+        - 5
         version: 0.4.5
+  type: :development
+  version_requirements: *id007
 description: Page-specific javascript for Rails done right
 email: kb.paragua@gmail.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - Changelog.md
 - Gemfile
@@ -123,7 +140,9 @@ files:
 - app/views/paloma/_hook.html.erb
 - lib/paloma.rb
 - lib/paloma/action_controller_extension.rb
+- lib/paloma/controller.rb
 - lib/paloma/rails/engine.rb
+- lib/paloma/utilities.rb
 - paloma.gemspec
 - test_app/.gitignore
 - test_app/.rspec
@@ -138,11 +157,9 @@ files:
 - test_app/app/assets/stylesheets/foo.css
 - test_app/app/assets/stylesheets/main.css
 - test_app/app/assets/stylesheets/multiple_names.css
-- test_app/app/controllers/admin/bar_controller.rb
+- test_app/app/controllers/admin/foos_controller.rb
 - test_app/app/controllers/application_controller.rb
-- test_app/app/controllers/foo_controller.rb
 - test_app/app/controllers/main_controller.rb
-- test_app/app/controllers/multiple_names_controller.rb
 - test_app/app/helpers/admin/bar_helper.rb
 - test_app/app/helpers/application_helper.rb
 - test_app/app/helpers/foo_helper.rb
@@ -177,11 +194,14 @@ files:
 - test_app/public/favicon.ico
 - test_app/public/robots.txt
 - test_app/script/rails
-- test_app/spec/integration/main_spec.rb
+- test_app/spec/integration/advanced_spec.rb
+- test_app/spec/integration/basic_spec.rb
 - test_app/spec/javascripts/controller_builder_spec.js
 - test_app/spec/javascripts/router_spec.js
 - test_app/spec/javascripts/support/jasmine.yml
 - test_app/spec/spec_helper.rb
+- test_app/spec/units/controller_spec.rb
+- test_app/spec/units/utilities_spec.rb
 - test_app/test/fixtures/.gitkeep
 - test_app/test/functional/.gitkeep
 - test_app/test/integration/.gitkeep
@@ -198,27 +218,39 @@ files:
 - vendor/assets/javascripts/paloma/init.js
 - vendor/assets/javascripts/paloma/paloma.js
 - vendor/assets/javascripts/paloma/router.js
+has_rdoc: true
 homepage: https://github.com/kbparagua/paloma
 licenses: []
-metadata: {}
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 2.1.5
+rubygems_version: 1.5.2
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Provides an easy way to execute page-specific javascript for Rails.
 test_files: []
+

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZmY5ODBlYWI4YWMwNmI2NDFjZjMwNTUwMWQyYWNkMWVjZjc5MGEyNA==
-  data.tar.gz: !binary |-
-    MTM4NDcyOGIxZWFlNzI3NGUwNDBhN2Y5ZTkxNjA4NTVjN2M5MDU5OQ==
-SHA512:
-  metadata.gz: !binary |-
-    YWM4MmIzMDI3ODI3MGIyNzFhYzAzN2Y4ZDliYzAxZGQxMTk3MjY0ZGQ1YmQ2
-    ZDU3YWQ0MzM3MTI3ODM5ZWI0ZGZmYWQ2M2JjNTQ4MWEyZjEwOTMyNDU2NTMx
-    ZDhmZDg4ZTkzZWI2OGQ4ZTY4NjhkM2I3ZGU4ODc5YmI3MTM2MGU=
-  data.tar.gz: !binary |-
-    NDFkN2RjMzk3MWRkZDhiNjI4NmY0MWNjZGQwMmQ1MTk4NThkYjUwNjJkNzNm
-    NDQ5NTUwMDFhZTNkZjg0NzI3ZTM3MGQzMzIzMGNiZmFkODE2MTI3NDNlODAx
-    NTllMDVlODA0YWZhYmM5ZmUzNjA0MzYyYjRlZDMwNTA2MjlkYzc=

data/test_app/app/controllers/admin/bar_controller.rb

@@ -1,7 +0,0 @@
-class Admin::BarController < ApplicationController
-
-  def show
-    render :inline => 'Admin/Bar#show', :layout => 'application'
-  end
-
-end

data/test_app/app/controllers/foo_controller.rb

@@ -1,19 +0,0 @@
-class FooController < ApplicationController
-
-  def index
-    redirect_to main_index_path
-  end
-
-
-  def show
-    js :parameter => 'Parameter From Paloma'
-    render :inline => '<h1>Foo#show</h1>', :layout => 'application'
-  end
-
-
-  def edit
-    js false
-    render :inline => 'Foo#edit', :layout => 'application'
-  end
-
-end

data/test_app/app/controllers/multiple_names_controller.rb

@@ -1,7 +0,0 @@
-class MultipleNamesController < ApplicationController
-
-  def index
-    render :inline => 'MultipleName#index', :layout => 'application'
-  end
-
-end

data/test_app/spec/integration/main_spec.rb

@@ -1,108 +0,0 @@
-require 'spec_helper'
-
-
-feature 'executing Paloma controller', :js => true do
-
-  describe 'after rendering' do
-
-    it 'executes the corresponding Paloma controller action' do
-      visit foo_path(1)
-      called = page.evaluate_script 'window.called'
-
-      expect(called).to include 'MyFoo#show'
-    end
-
-
-    context 'coming from a redirect' do
-      before { visit foo_index_path }
-
-      it 'executes first the Paloma action of the first Rails action' do
-        first = page.evaluate_script 'window.called[0]'
-        expect(first).to eq 'MyFoo#index'
-      end
-
-      it 'executes next the Paloma action of the last Rails action' do
-        last = page.evaluate_script 'window.called.pop()'
-        expect(last).to eq 'Main#index'
-      end
-    end
-
-
-    context 'when js params is passed' do
-      it 'passes the parameters to Paloma controller action' do
-        visit foo_path(1)
-        parameter = page.evaluate_script 'window.parameter'
-
-        expect(parameter).to eq 'Parameter From Paloma'
-      end
-    end
-
-
-    context 'from namespaced controller' do
-      it 'executes the corresponding Paloma controller action' do
-        visit admin_bar_path(1)
-        called = page.evaluate_script 'window.called.pop()'
-
-        expect(called).to eq 'Admin/Bar#show'
-      end
-    end
-
-
-    context 'when js(false) is triggered' do
-      it 'does not append paloma hook' do
-        visit edit_foo_path(1)
-
-        page.should_not have_selector '.js-paloma-hook'
-      end
-    end
-
-
-    context 'when requests from a controller with multiple name' do
-      it 'executes the corresponding Paloma action' do
-        visit multiple_names_path
-
-        called = page.evaluate_script 'window.called.pop()'
-
-        expect(called).to eq 'MultipleNames#index'
-      end
-    end
-
-
-    #
-    # [TODO]
-    # Create proper test for the following:
-    #
-
-    context 'when rendering json' do
-      it 'does not execute Paloma' do
-        visit json_response_main_path 1
-        page.should_not have_selector '.js-paloma-hook'
-      end
-    end
-
-
-    context 'when rendering js' do
-      it 'does not execute Paloma' do
-        visit js_response_main_path 1
-        page.should_not have_selector '.js-paloma-hook'
-      end
-    end
-
-
-    context 'when rendering xml' do
-      it 'does not execute Paloma' do
-        visit xml_response_main_path 1
-        page.should_not have_selector '.js-paloma-hook'
-      end
-    end
-
-
-    context 'when rendering a file' do
-      it 'does not execute Paloma' do
-        visit file_response_main_path 1
-        page.should_not have_selector '.js-paloma-hook'
-      end
-    end
-  end
-
-end