pluggable_js 2.0.4 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2cc20f0627f664082c987b6d5e70bd6571aae063
-  data.tar.gz: 8171d7cf58b584808136c99d206acea4d7baa565
+  metadata.gz: 042a86301eb3629ddde7da5e4601b20bc1bbf8a2
+  data.tar.gz: ce6aee1cd8a3d65d9c89e9f46a98e6e1f0a545d9
 SHA512:
-  metadata.gz: 5cf93f00b0f6ca8cd7a7bde116202ee1a836196eaa2d3ad9263932f3a0824bf2c46c4319b6cd3d9d4ba1d0932392c99918ce8a66ffc957f711f240745fe8d123
-  data.tar.gz: d29e8a146abf41b85889b16a8761ce6043bd15bbc17ef45d388fefdad89a3a6b5b96604a675e4f0e0179b017f6e2c8c138d8db66f4a5903d709aeaad86b020bb
+  metadata.gz: 96c4ee114de5a06a5d576dbb5390c6899bef8b43144cb7cd76c51fd718517cada5e68b9d6a8940a10f9593d63b0f5a34817ff5a7844c715c31f560ea23b2c4c1
+  data.tar.gz: 3c1a316e6125e8754cc6789be4a2c1fe68a46631112f9dacdbecde1c8a18ab9e1815ed24944d3f1841dd58585eeebd6e55c23eed968f2f8ae58d74ec7c3ea9a9

data/CHANGELOG.md

@@ -61,3 +61,9 @@
 ## v2.0.4
 
 * nested resources related bugfix
+
+## v2.1.0
+
+* removed jquery and coffee from core dependency
+* removed unused generator
+* simplified main helper

data/README.md

@@ -1,4 +1,4 @@
-# PluggableJs 
+# PluggableJs
 
 [![Gem Version](https://badge.fury.io/rb/pluggable_js.svg)](http://badge.fury.io/rb/pluggable_js)
 
@@ -6,8 +6,8 @@ This gem provides simple functionality of loading page specific javascript and a
 
 ## Installation
 
-1. Add `gem 'pluggable_js', '~> 2.0.4'` to Gemfile and run `bundle` command to install it
-2. Add `<%= javascript_pluggable_tag %>` helper to application layout file after `<%= javascript_include_tag 'application' %>` line (if you use turbolinks paste it above the closing `</body>` tag)
+1. Add `gem 'pluggable_js', '~> 2.1.0'` to Gemfile and run `bundle` command to install it
+2. Add `<%= javascript_pluggable_tag %>` helper to application layout file above the closing `</body>` tag
 
 ## Usage
 
@@ -67,6 +67,7 @@ If you are passing data, move `pluggable_js` helper into a separate private meth
 
 * [from <= v0.0.6 to v1.0.0](https://github.com/peresleguine/pluggable_js/wiki/Upgrade-from-v0.0.6-or-less-to-v1.0.0)
 * [from v1.0 to v2.0](https://github.com/peresleguine/pluggable_js/wiki/Upgrade-from-v1.0-to-v2.0)
+* [from v2.0 to v2.1](https://github.com/peresleguine/pluggable_js/wiki/Upgrade-from-v2.0-to-v2.1)
 
 ## Sublime Text Snippet
 
@@ -75,7 +76,8 @@ Go to `Sublime Text > Preferences > Browse Packages...` and save under `User` di
 ```xml
 <snippet>
   <content><![CDATA[
-@['${0}#'] = (data) ->
+@['$1#$2'] = (data) ->
+  $0
 ]]></content>
   <tabTrigger>pjs</tabTrigger>
   <scope>source.coffee</scope>

data/features/pluggable_js.feature

@@ -21,5 +21,4 @@ Feature: PluggableJs
   Scenario: New Post
     When I go to new post
     Then I should see 'You wanna piece of me, boy?'
-    And I should see 'Fire it up.'
     And I should not see 'My life for aiur.'

data/lib/pluggable_js/config.rb

@@ -3,8 +3,8 @@ module PluggableJs
     DEFAULT_PAIR_ACTIONS = { 'create' => 'new', 'update' => 'edit' }
 
     class << self
-      def pair_actions=(hash = {})
-        @pair_actions = DEFAULT_PAIR_ACTIONS.merge hash
+      def pair_actions=(actions = {})
+        @pair_actions = DEFAULT_PAIR_ACTIONS.merge(actions)
       end
 
       def pair_actions
@@ -13,4 +13,4 @@ module PluggableJs
     end
 
   end
-end
+end

data/lib/pluggable_js/helpers.rb

@@ -5,26 +5,13 @@ module PluggableJs
       def javascript_pluggable_tag
         controller = params[:controller]
         action = define_pair_action
-        sc_var_name = "__should_call_#{controller.gsub(/\//, '__')}_#{action}"
 
-        ''.tap do |content|
-          content << (javascript_tag "
-            (function() {
-              var function_name = '#{controller}##{action}';
-              var #{sc_var_name} = true;
-              if (typeof(this[function_name]) == 'function' && #{sc_var_name}) {
-                $(function() {
-                  #{sc_var_name} = false;
-                  return window[function_name](#{@pluggable_js_data});
-                });
-              }
-            }).call(window);"
-          )
-
-          if File.exist?(Rails.root + "app/assets/javascripts/pluggable/#{controller}/#{action}.js.coffee")
-            content << (javascript_include_tag "pluggable/#{controller}/#{action}")
-          end
-        end.html_safe
+        javascript_tag(
+          "(function() {
+            var pluggableFunction = window['#{controller}##{action}'];
+            if (typeof(pluggableFunction) === 'function') { pluggableFunction(#{@pluggable_js_data}); }
+          }).call();"
+        )
       end
 
     private
@@ -41,8 +28,8 @@ module PluggableJs
     end
 
     module Controller
-      def pluggable_js(hash)
-        @pluggable_js_data = hash.to_json
+      def pluggable_js(data)
+        @pluggable_js_data = data.to_json
       end
       alias_method :pjs, :pluggable_js
     end

data/lib/pluggable_js/version.rb

@@ -1,3 +1,3 @@
 module PluggableJs
-  VERSION = "2.0.4"
+  VERSION = '2.1.0'
 end

data/pluggable_js.gemspec

@@ -18,12 +18,13 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'coffee-rails'
-  spec.add_dependency 'jquery-rails'
   spec.add_dependency 'rails', '>= 3.1'
 
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'cucumber-rails'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'capybara-webkit'
+  spec.add_development_dependency 'turbolinks'
+  spec.add_development_dependency 'jquery-rails'
+  spec.add_development_dependency 'coffee-rails'
 end

data/test/dummy/app/assets/javascripts/application.js

@@ -11,4 +11,5 @@
 // about supported directives.
 //
 //= require jquery
+//= require turbolinks
 //= require_directory

data/test/dummy/app/views/layouts/application.html.erb

@@ -2,12 +2,12 @@
 <html>
   <head>
     <title>Dummy</title>
-    <%= stylesheet_link_tag    "application", media: "all" %>
-    <%= javascript_include_tag "application" %>
-    <%= javascript_pluggable_tag %>
+    <%= stylesheet_link_tag    "application", media: "all", "data-turbolinks-track" => true %>
+    <%= javascript_include_tag "application", "data-turbolinks-track" => true %>
     <%= csrf_meta_tags %>
   </head>
   <body>
     <%= yield %>
+    <%= javascript_pluggable_tag %>
   </body>
 </html>

data/test/dummy/app/views/pluggable_js/posts/index.html.erb

@@ -1,2 +1,4 @@
 <div class='protoss-quotes'></div>
 <div class='terran-quotes'></div>
+
+<%= link_to 'New post', new_pluggable_js_post_path %>

data/test/dummy/app/views/pluggable_js/posts/new.html.erb

@@ -1,2 +1,4 @@
 <div class='protoss-quotes'></div>
 <div class='terran-quotes'></div>
+
+<%= link_to 'Posts', root_path %>

data/test/dummy/config/application.rb

@@ -6,6 +6,7 @@ require 'sprockets/railtie'
 Bundler.require(*Rails.groups)
 require 'pluggable_js'
 require 'jquery-rails'
+require 'turbolinks'
 
 module Dummy
   class Application < Rails::Application

metadata

@@ -1,37 +1,51 @@
 --- !ruby/object:Gem::Specification
 name: pluggable_js
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.1.0
 platform: ruby
 authors:
 - Andrey Peresleguine
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-04 00:00:00.000000000 Z
+date: 2016-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: coffee-rails
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
-  name: jquery-rails
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: cucumber-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -39,35 +53,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: capybara-webkit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: cucumber-rails
+  name: turbolinks
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: capybara-webkit
+  name: coffee-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -125,9 +139,6 @@ files:
 - features/pluggable_js.feature
 - features/step_definitions/pluggable_js_steps.rb
 - features/support/env.rb
-- lib/generators/pluggable_js/USAGE
-- lib/generators/pluggable_js/pluggable_js_generator.rb
-- lib/generators/pluggable_js/templates/large_piece_of_code.js.coffee
 - lib/pluggable_js.rb
 - lib/pluggable_js/config.rb
 - lib/pluggable_js/helpers.rb
@@ -138,7 +149,6 @@ files:
 - test/dummy/Rakefile
 - test/dummy/app/assets/images/.keep
 - test/dummy/app/assets/javascripts/application.js
-- test/dummy/app/assets/javascripts/pluggable/pluggable_js/posts/new.js.coffee
 - test/dummy/app/assets/javascripts/posts.js.coffee
 - test/dummy/app/assets/stylesheets/application.css
 - test/dummy/app/controllers/application_controller.rb
@@ -196,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Page-specific javascript for Rails.
@@ -208,7 +218,6 @@ test_files:
 - test/dummy/Rakefile
 - test/dummy/app/assets/images/.keep
 - test/dummy/app/assets/javascripts/application.js
-- test/dummy/app/assets/javascripts/pluggable/pluggable_js/posts/new.js.coffee
 - test/dummy/app/assets/javascripts/posts.js.coffee
 - test/dummy/app/assets/stylesheets/application.css
 - test/dummy/app/controllers/application_controller.rb

data/lib/generators/pluggable_js/USAGE

@@ -1,8 +0,0 @@
-Description:
-    Creates coffeescript files based on controller and action parameters.
-
-Example:
-    $ rails generate pluggable_js Posts index new
-
-        create  app/assets/javascripts/pluggable/posts/index.js.coffee
-        create  app/assets/javascripts/pluggable/posts/show.js.coffee

data/lib/generators/pluggable_js/pluggable_js_generator.rb

@@ -1,19 +0,0 @@
-class PluggableJsGenerator < Rails::Generators::Base
-  source_root File.expand_path('../templates', __FILE__)
-  argument :controller, type: :string
-  argument :actions, type: :array, default: [], banner: 'action action'
-
-  def create_pluggable_js_files
-    actions.each do |action|
-      @action = action
-      template 'large_piece_of_code.js.coffee', File.join('app/assets/javascripts/pluggable', controller_name, "#{action}.js.coffee")
-    end
-  end
-
-  private
-
-  def controller_name
-    controller.tableize
-  end
-  
-end

data/lib/generators/pluggable_js/templates/large_piece_of_code.js.coffee

@@ -1,9 +0,0 @@
-# This file is used only for large piece of js code that you
-# don't want to define as a function in controller related js file.
-
-# Add pluggable/* to assets precompile configuration in production.rb (and staging.rb if you have one),
-# e.g.: config.assets.precompile += %w(pluggable/*)
-# Be sure that pluggable folder is out of require_tree statement in application.js
-
-# jQuery ->
-#   # your code goes here

data/test/dummy/app/assets/javascripts/pluggable/pluggable_js/posts/new.js.coffee

@@ -1,5 +0,0 @@
-# This file is used only for a large piece of js code that you
-# don't want to define as a function in controller related js file.
-
-jQuery ->
-  $('.terran-quotes').append('<p>Fire it up.</p>')