ghost_in_the_post 0.0.14 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4854e245fe24316010a61d16bb6d8708be6bb54d
-  data.tar.gz: f57f1f1b55eb911f65a1d5691705bc38b12ee7af
+  metadata.gz: 5501b582bfdb4c2800ebd28be0b3560c2d4f5ca1
+  data.tar.gz: 061c884ae5fc118175284fa4fd2db7704f7288c1
 SHA512:
-  metadata.gz: 7b211875500f8abf390e22245b4d893b83c8bf03d30e5074bd73f32c9cdf8fedf21530a9235c8ce9a765d3e7d94fa4470f1afda9b9635a44fc9b22840892a093
-  data.tar.gz: 39dec3a48fa5eaaba2c385093a6973e795c5a3052d2405eddfda6159229410340008434790d8612d7a286acbe7c74b1cf9aefd61fd97e934b607754fc3583da4
+  metadata.gz: ac27f06ac531d4e71b7ade96b4bf7e6598aa5dfc64cccec3af8d40d4ce112ca934757cab2cc261ca11b74c6b747a63cc399b2bfc23a2663690f30c1889f3d4c5
+  data.tar.gz: 1cb9c7bda38950e0533838743b85d9dec865c33e64e8feaca4b213f7a76138545d7de01757ddd3402ccc07bb2817b81723bba3ffb524ce65f09d80027abe9aaf

data/lib/ghost_in_the_post/js_inline.rb

@@ -5,6 +5,7 @@ module GhostInThePost
   class AssetNotFoundError < StandardError; end
   
   class JsInline
+    SCRIPT_ID = "ghost_in_the_post_script_container"
 
     def initialize(html, included_scripts=[])
       self.html = html
@@ -12,13 +13,17 @@ module GhostInThePost
     end
 
     def inline
-      @dom.at_xpath('html/body').add_child("<script>#{generate_flat_js}</script>")
+      @dom.at_xpath('html/body').add_child("<script id='#{SCRIPT_ID}'>#{generate_flat_js}</script>")
     end
 
     def remove_all_script
       @dom.css('script').map(&:remove)
     end
 
+    def remove_inlined
+      @dom.css("##{SCRIPT_ID}").map(&:remove)
+    end
+
     def html=(html)
       @dom = Nokogiri::HTML.parse(html, nil, Encoding::UTF_8.to_s)
     end

data/lib/ghost_in_the_post/phantom_transform.rb

@@ -24,7 +24,11 @@ module GhostInThePost
           htmlfile.unlink
         end
       end
-      @inliner.remove_all_script if GhostInThePost.remove_js_tags
+      if GhostInThePost.remove_js_tags
+        @inliner.remove_all_script 
+      else
+        @inliner.remove_inlined
+      end
       @inliner.html
     end
 

data/lib/ghost_in_the_post/version.rb

@@ -1,3 +1,3 @@
 module GhostInThePost
-  VERSION = "0.0.14"
+  VERSION = "0.1.0"
 end

data/lib/ghost_in_the_post.rb

@@ -27,14 +27,9 @@ module GhostInThePost
 
   def self.config=(new_config={})
     self.complain_about_unknown_keys(new_config.keys)
-    @@phantomjs_path = new_config[:phantomjs_path]
-    @@includes = Array(new_config[:includes])
-    @@remove_js_tags = new_config[:remove_js_tags].nil? ? true : new_config[:remove_js_tags]
-    @@raise_js_errors = new_config[:raise_js_errors].nil? ? true : new_config[:raise_js_errors]
-    @@raise_asset_errors = new_config[:raise_asset_errors].nil? ? true : new_config[:raise_asset_errors]
-    @@timeout = new_config[:timeout] || DEFAULT_TIMEOUT
-    @@wait_event = new_config[:wait_event] || DEFAULT_WAIT_EVENT
-    @@debug = new_config[:debug].nil? ? false : new_config[:debug]
+    new_config.each do |key, value|
+      self.send("#{key}=", value)
+    end
     raise ArgumentError, "GhostInThePost.config.phantomjs_path is not set" if self.phantomjs_path.nil?
   end
 
@@ -42,6 +37,10 @@ module GhostInThePost
     @@phantomjs_path or raise ArgumentError, "GhostInThePost.config.phantomjs_path is not set"
   end
 
+  def self.includes= to_include
+    @@includes = Array(to_include)
+  end
+
   private
   
   def self.complain_about_unknown_keys(keys)

data/spec/dummy/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    ghost_in_the_post (0.0.13)
+    ghost_in_the_post (0.0.14)
       nokogiri
       rails (~> 4.2.3)
 

data/spec/dummy/log/development.log

@@ -659,3 +659,6 @@ Mailer#normal: processed outbound mail in 20.2ms
   Rendered mailer/normal.html.erb (240.5ms)
 
 Mailer#normal: processed outbound mail in 518.2ms
+  Rendered mailer/timeout.html.erb (224.5ms)
+
+Mailer#timeout: processed outbound mail in 474.3ms

data/spec/lib/ghost_in_the_post/js_inline_spec.rb

@@ -33,6 +33,7 @@ module GhostInThePost
       it "should inline js" do
         subject.inline
         expect(subject.html).to include(js)
+        expect(subject.html).to include("<script id=\"#{JsInline::SCRIPT_ID}\"")
       end
     end
 
@@ -43,6 +44,14 @@ module GhostInThePost
       end
     end
 
+    describe "#remove_inlined" do
+      it "should remove just the inlined js" do
+        subject.remove_inlined
+        expect(subject.html).to include("<script")
+        expect(subject.html).not_to include("<script id=\"#{JsInline::SCRIPT_ID}\"")
+      end
+    end
+
     describe "#html=" do
       it "should parse the html" do
         subject.html #initialize first so that it only receives once

data/spec/lib/ghost_in_the_post/phantom_transform_spec.rb

@@ -74,6 +74,13 @@ module GhostInThePost
         subject.transform
       end
 
+      it "should remove just inlined js if config not set" do
+        GhostInThePost.config = {phantomjs_path: "this/is/path", remove_js_tags: false}
+        allow(IO).to receive(:popen).and_return ""
+        expect(@inliner).to receive(:remove_inlined)
+        subject.transform
+      end
+
       it "should create a temp file for the html" do
         allow(IO).to receive(:popen).and_return ""
         file = Object.new

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ghost_in_the_post
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.1.0
 platform: ruby
 authors:
 - Tim Anema
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-05 00:00:00.000000000 Z
+date: 2016-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails