jskit_rails 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8be4087240bb5bcfabd77ccd006bbdde23ae5f4e
-  data.tar.gz: 9c9217a2ae99809335411531b3f2186b36bfccdb
+  metadata.gz: bcd9fbda4dcb8214247e55f4b44a5cc97e9b5d83
+  data.tar.gz: 645875d832923ce32348206255e18f544df2f486
 SHA512:
-  metadata.gz: 7f8df0a2ddbde6b3b458a5412589143d4491681901ffed69c453fb716450fa59f870a59234f2d49ec2f282ab5827263135eb712dccd991913452c702e60a28da
-  data.tar.gz: 9ca356034d993e0ff3a4a058e5aeb369507f4cbf9304100bcb1d62e24ae0b160043ff54bff0b5c9d641c9802354dc4355795d0b53b982eb38e237c2e7a1340aa
+  metadata.gz: 0f0ce3d5b2cf5f534c142a53db851957cd1f7025853106e4266e854d026cb89f993df5097c13b6512601dc901e56cc1d7d697e83ec30c6dbcfac8b7285892d17
+  data.tar.gz: 00f8b09e5ec97a0ebe0f40406be07e20a33969cd4dfd81366586b9aa8eca0d3a0f7d5c1267b2f90c7b0976920b7eceeb010f28d5a55100a4d99ddd6445f29243

data/app/decorators/controllers/jskit_rails/application_controller_decorator.rb

@@ -23,7 +23,7 @@ ApplicationController.class_eval do
       [
         JskitRails.configuration.app_namespace,
         "Dispatcher",
-        event_trigger(event_name(controller_name, action_name), JSKit.action_payload)
+        %Q(trigger("#{[event_namespace, "controller", controller_name, action_name].compact.join(":")}"#{JSKit.action_payload});)
       ].join(".")
     end
 
@@ -31,7 +31,7 @@ ApplicationController.class_eval do
       [
         JskitRails.configuration.app_namespace,
         "Dispatcher",
-        event_trigger(event_name(controller_name, "all"), JSKit.controller_payload)
+        %Q(trigger("#{[event_namespace, "controller", controller_name, "all"].compact.join(":")}"#{JSKit.controller_payload});)
       ].join(".")
     end
 
@@ -40,18 +40,10 @@ ApplicationController.class_eval do
       [
         JskitRails.configuration.app_namespace,
         "Dispatcher",
-        event_trigger(event_name("application", "all"), JSKit.app_payload)
+        %Q(trigger("#{[event_namespace, "controller", "application", "all"].compact.join(":")}"#{JSKit.app_payload});)
       ].join(".")
     end
 
-    def event_name(controller, action)
-      [event_namespace, "controller", controller, action].compact.join(":")
-    end
-
-    def event_trigger(event, payload)
-      %Q(trigger("#{event}"#{JSKit.controller_payload});)
-    end
-
     def payload_js(payload)
       payload.empty? ? "" : ", #{payload.map(&:to_json).join(', ')}"
     end
@@ -63,8 +55,6 @@ ApplicationController.class_eval do
       :payload_js,
       :application_event,
       :action_event,
-      :event_name,
-      :event_trigger,
       :controller_event)
   end
 

data/spec/controllers/application_controller_spec.rb

@@ -28,19 +28,6 @@ describe ApplicationController, type: :controller do
     end
   end
 
-  describe "#event_name" do
-    it "returns the event name" do
-      expect(ApplicationController::JSKit.send(:event_name, "test_controller", "test_action")).to eq("controller:test_controller:test_action")
-    end
-
-    context "with namespace" do
-      it "returns the controller event name prefixed with the namespace" do
-        allow(ApplicationController::JSKit).to receive(:event_namespace) { "test" }
-        expect(ApplicationController::JSKit.send(:event_name, "test_controller", "test_action")).to eq("test:controller:test_controller:test_action")
-      end
-    end
-  end
-
   describe "#jskit" do
     it "returns a script tag with the global event and the controller event" do
       subject = ApplicationController.new
@@ -49,6 +36,7 @@ describe ApplicationController, type: :controller do
       application_event = ApplicationController::JSKit.send(:application_event)
       controller_event = ApplicationController::JSKit.send(:controller_event)
       action_event = ApplicationController::JSKit.send(:action_event)
+
       expect(subject.jskit).to eq(subject.view_context.javascript_tag([application_event, controller_event, action_event].join("\n")))
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jskit_rails
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Dayton Nolan