chartkick-remote 1.1.6 → 1.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b23f76a69dd77e75b2e4a692ecfb52dc48273c63
-  data.tar.gz: d2eed42d77b27092177b8fc6d4da6d38bb3b9d08
+  metadata.gz: 0655801c196c86eb2b4df610851bd01cfe75824a
+  data.tar.gz: 53b374e3dcf082410e144bb944d0cd39dd22cabe
 SHA512:
-  metadata.gz: ba0639eda196a091f434ae52a6603f3e8a78f5a806d43b4a8f01256069685551560b6be29d56ef19c354619a76b4daa5ebc19972c27ed07939b41f4497e729ad
-  data.tar.gz: 004a0af71d3e2bc386dea0caa3e66e0c7e61cbaf6e73b7973acd2e5a41cd7bd35011ba7ff3edec45f099a460cd6a14fa00a124f0e3a81e77a3eda1dc47447a65
+  metadata.gz: bf6ba0aa6def8bbbefbf3422aeb22a9d126b8a4bd6a93c9f1486d3622dfb5cff250baee8d292b890ddb1dd1b74ed8c437bfe740916bd5dfd679a58f3762f5d95
+  data.tar.gz: 43c8828817139754ba395074d24a92c1bd029b654dc2a058700a4d6971b2c50dbf63747fbe0385247949e7d3504b875053822710511f7c7fafdf78d4a0234b12

data/lib/chartkick/remote/helper.rb

@@ -23,14 +23,8 @@ module Chartkick::Remote
       options = options.dup
       options.reverse_merge!(controller.chartkick_options) if controller.respond_to?(:chartkick_options)
 
-      standalone = options.delete(:standalone)
-      remote = options.delete(:remote)
-      skip = false
-
-      if remote
+      if remote = options.delete(:remote)
         @remote_chart_id = (@remote_chart_id || 0) + 1
-        chart_id = controller.params[:_chartkick_remote_chart_id]
-        skip = params[:_chartkick_remote_standalone] && chart_id.to_s != @remote_chart_id.to_s
         controller.chartkick_remote_blocks ||= {}
         controller.chartkick_remote_blocks[@remote_chart_id] = block
         data_source = url_for(params.
@@ -40,17 +34,28 @@ module Chartkick::Remote
         data_source = block.call
       end
 
-      if skip
-        result = '<div>Skipped</div>'.html_safe
-      else
-        result = send(:"#{type}_without_remote", data_source, options)
-      end
+      result = send(:"#{type}_without_remote", data_source, options)
+
+      result = apply_standalone_mode(result) if options.delete(:standalone) && remote
+
+      result
+    end
+
+    def apply_standalone_mode(result)
+      standalone_enabled = params[:_chartkick_remote_standalone].present?
+
+      skip = standalone_enabled && controller.params[:_chartkick_remote_chart_id].to_s != @remote_chart_id.to_s
 
-      if remote && standalone
+      if skip || !standalone_enabled
+        result = '<div>Skipped by Standalone Mode</div>'.html_safe if standalone_enabled
         standalone_link = link_to 'Standalone',
                                   url_for(params.merge(_chartkick_remote_chart_id: @remote_chart_id,
                                                        _chartkick_remote_standalone: 1))
-
+        result += standalone_link.html_safe
+      elsif standalone_enabled && !skip
+        standalone_link = link_to 'Exit Standalone Mode',
+                                  url_for(params.except(:_chartkick_remote_chart_id,
+                                                        :_chartkick_remote_standalone))
         result += standalone_link.html_safe
       end
 

data/lib/chartkick/remote/version.rb

@@ -1,5 +1,5 @@
 module Chartkick
   module Remote
-    VERSION = "1.1.6"
+    VERSION = "1.1.7"
   end
 end

data/spec/controllers/remote_spec.rb

@@ -42,10 +42,22 @@ describe Chartkick::Remote, type: :controller do
         chartkick_remote standalone: true
       end
 
+      it "shows a link to enter standalone mode" do
+        get :index, format: :html
+
+        expect(response.body).to have_tag :a, { text: 'Standalone', href: '/anonymous.html?_chartkick_remote' }
+      end
+
       it "does not show any other charts but the selected chart" do
         get :index, _chartkick_remote_chart_id: 1, _chartkick_remote_standalone: 1, format: :html
 
-        expect(response.body).to have_tag :div, 'Skipped' #, count: 1
+        expect(response.body).to have_tag :a, { text: 'Exit Standalone Mode', href: '/anonymous.html' }
+      end
+
+      it "shows a link to exit standalone mode" do
+        get :index, _chartkick_remote_chart_id: 1, _chartkick_remote_standalone: 1, format: :html
+
+        expect(response.body).to have_tag :a, { text: 'Exit Standalone Mode', href: '/anonymous.html' }
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chartkick-remote
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.1.7
 platform: ruby
 authors:
 - Andrew S. Brown