ghost_in_the_post 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe35d98b561a58b1bdde7d2d0b737ed63596af75
-  data.tar.gz: 8d413849005f47c94d89b730aed26ff88ab68577
+  metadata.gz: 9882b7c81a059e680ca7aaae7e0b8bd2bf23863f
+  data.tar.gz: 7e7384c6fb80fee05d43839605778697b9063889
 SHA512:
-  metadata.gz: 873e278bb471b1fe87495da70f9cbd7a9fa6a4f7c4d84aa770ea8458c90376a4386640f5cedfa0c9ce004738473536c57c553811771970d6d32e39c28edf47e7
-  data.tar.gz: eab19b013fb94fae08245ea262f128d004eb8f834f42414544aad051b44c8d242ad6d621eef70ff803f49bece7cdfc5d38d08e0b8860c2af8d2a6c50f5bdbabd
+  metadata.gz: 6b01c14bc2d83a7c82dffdcff158b0d2e6b6199bc02dead5343c40521898dd71a9058be94df6f5b5aad1ccc00827b5a576c0adc160b03c0c45a8e721dacf051c
+  data.tar.gz: ec44cfc2541d9c8cc631cc3622827c394a22a6ac2433ce7df430389cd2ebfb26fb748d897e7b50b011c1d1ab9ee7b83c82543f81d8456a27d6cd7099c8586730

data/lib/ghost_in_the_post.rb

@@ -30,9 +30,10 @@ module GhostInThePost
     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?
+    raise ArgumentError, "phantomjs not found at path `#{@@phantomjs_path}` provided to GhostInThePost" unless File.exist?(phantomjs_path)
   end
 
+
   def self.phantomjs_path
     @@phantomjs_path or raise ArgumentError, "GhostInThePost.config.phantomjs_path is not set"
   end

data/lib/ghost_in_the_post/js_inline.rb

@@ -47,7 +47,10 @@ module GhostInThePost
         if GhostInThePost.raise_asset_errors and asset.nil?
           raise AssetNotFoundError.new("cannot find asset #{normalize_asset_name(script)}")
         end
-        asset.to_s unless asset.nil?
+        unless asset.nil?
+          GhostInThePost::JSLoaders::CacheLoader.store(script, asset.to_s)
+          asset.to_s
+        end
       end.compact.join("\n")
     end
 

data/lib/ghost_in_the_post/js_loaders/asset_pipeline_loader.rb

@@ -16,11 +16,20 @@ module GhostInThePost
           ::Rails.application.respond_to?(:assets) &&
           ::Rails.application.assets
       end
+ 
+      DIGEST_PATTERN = /
+        -                # Digest comes after a dash
+        (?:
+         [a-z0-9]{32} |  # Old style is 32 character hash
+         [a-z0-9]{64}    # New style is 64 characters
+        )
+        \.               # Dot for the file extension
+      /x.freeze
 
       def file_name(url)
         URI(url).path
           .sub("#{::Rails.configuration.assets.prefix}/", '')
-          .sub(/-(\h{32}|\h{64})\.js$/, '.js')
+          .gsub(DIGEST_PATTERN, '.')
       end
     end
   end

data/lib/ghost_in_the_post/phantom_transform.rb

@@ -4,7 +4,6 @@ module GhostInThePost
 
   class PhantomTransform
     PHANTOMJS_SCRIPT = File.expand_path('../phantom/staticize.js', __FILE__)
-    TAG = "[GHOSTINTHEPOST-STATICIZE]"
     ERROR_TAG = "[GHOSTINTHEPOST-STATICIZE-ERROR]"
 
     def initialize(html, timeout=nil, wait_event=nil, included_scripts=nil)
@@ -18,7 +17,6 @@ module GhostInThePost
       begin
         htmlfile = html_file(@inliner.html)
         @inliner.html = checkError(IO.popen(command(htmlfile)){|io| io.read})
-        p "#{TAG} #{@inliner.html}" if GhostInThePost.debug
       ensure
         if GhostInThePost.debug and @has_error
           p "Generated html can be found at #{htmlfile.path}"

data/lib/ghost_in_the_post/version.rb

@@ -1,3 +1,3 @@
 module GhostInThePost
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/spec/lib/ghost_in_the_post/js_inline_spec.rb

@@ -10,6 +10,10 @@ module GhostInThePost
     let(:included_scripts){["application.js"]}
     subject {JsInline.new(html, included_scripts)}
 
+    before :each do 
+      allow(File).to receive(:exist?){true}
+    end
+
     describe "#initialize" do
       it "should assign html" do
         expect(Nokogiri::HTML).to receive(:parse)
@@ -27,7 +31,7 @@ module GhostInThePost
 
     describe "#inline" do
       before :each do
-        allow(subject).to receive(:find_asset_in_pipeline).with("application.js").and_return(js)
+        allow(subject).to receive(:find_js).with("application.js").and_return(js)
       end
 
       it "should inline js" do
@@ -35,6 +39,11 @@ module GhostInThePost
         expect(subject.html).to include(js)
         expect(subject.html).to include("<script id=\"#{JsInline::SCRIPT_ID}\"")
       end
+
+      it "should cache the script" do
+        expect(GhostInThePost::JSLoaders::CacheLoader).to receive(:store).with("application.js", js)
+        subject.inline
+      end
     end
 
     describe "#remove_all_script" do

data/spec/lib/ghost_in_the_post/js_loaders/asset_pipeline_loader_spec.rb

@@ -0,0 +1,35 @@
+require 'spec_helper'
+
+describe GhostInThePost::JSLoaders::AssetPipelineLoader do
+  before do
+    assets = double(prefix: '/assets')
+    config = double(assets: assets)
+    allow(Rails).to receive(:configuration).and_return(config)
+  end
+
+  describe "#file_name" do
+    subject do
+      GhostInThePost::JSLoaders::AssetPipelineLoader.file_name(asset)
+    end
+
+    context "when asset file path contains prefix" do
+      let(:asset) { '/assets/application.css' }
+      it { is_expected.to eq('application.css') }
+    end
+
+    context "when asset file path contains 32 chars fingerprint" do
+      let(:asset) { 'application-6776f581a4329e299531e1d52aa59832.css' }
+      it { is_expected.to eq('application.css') }
+    end
+
+    context "when asset file path contains 64 chars fingerprint" do
+      let(:asset) { 'application-02275ccb3fd0c11615bbfb11c99ea123ca2287e75045fe7b72cefafb880dad2b.css' }
+      it { is_expected.to eq('application.css') }
+    end
+
+    context "when asset file page contains numbers, but not a fingerprint" do
+      let(:asset) { 'test/20130708152545-foo-bar.css' }
+      it { is_expected.to eq("test/20130708152545-foo-bar.css") }
+    end
+  end
+end

data/spec/lib/ghost_in_the_post/js_loaders/network_loader_spec.rb

@@ -0,0 +1,53 @@
+require 'spec_helper'
+
+describe GhostInThePost::JSLoaders::NetworkLoader do
+  describe '#uri_for_url' do
+    subject { described_class.uri_for_url(url) }
+    let(:asset_host) { nil }
+
+    before do
+      action_controller = double(asset_host: asset_host)
+      config = double(action_controller: action_controller)
+      allow(Rails).to receive(:configuration).and_return(config)
+    end
+
+    context 'with a valid URL' do
+      let(:url) { 'http://example.com/test.css' }
+      it { is_expected.to eq(URI(url)) }
+    end
+
+    context 'with a protocol relative URL' do
+      let(:url) { '//example.com/test.css' }
+      it { is_expected.to eq(URI("http://#{url}")) }
+    end
+
+    context 'with a file path' do
+      let(:url) { '/assets/foo.css' }
+
+      context 'and a domain as asset host' do
+        let(:asset_host) { 'example.com' }
+        it { is_expected.to eq(URI("http://example.com#{url}")) }
+      end
+
+      context 'and a URL as asset host' do
+        let(:asset_host) { 'https://example.com' }
+        it { is_expected.to eq(URI("https://example.com/assets/foo.css")) }
+      end
+
+      context 'and a protocol relative URL as asset host' do
+        let(:asset_host) { '//example.com' }
+        it { is_expected.to eq(URI("http://example.com/assets/foo.css")) }
+      end
+
+      context 'and a proc as asset host' do
+        let(:asset_host) { ->{ 'example.com' } }
+        it { is_expected.to eq(URI("http://example.com/assets/foo.css")) }
+      end
+
+      context 'without an asset host' do
+        let(:asset_host) { nil }
+        it { is_expected.not_to be }
+      end
+    end
+  end
+end

data/spec/lib/ghost_in_the_post/phantom_transform_spec.rb

@@ -9,6 +9,7 @@ module GhostInThePost
     subject {PhantomTransform.new(html, nil, nil,included_scripts)}
 
     before :each do
+      allow(File).to receive(:exist?).with("this/is/path"){true}
       GhostInThePost.config = {phantomjs_path: "this/is/path"}
       allow_message_expectations_on_nil
     end

data/spec/lib/ghost_in_the_post_spec.rb

@@ -5,6 +5,9 @@ describe GhostInThePost do
   before :each do
     #reload so that variables are set to initials values
     quiet_load 'ghost_in_the_post.rb'
+    allow(File).to receive(:exist?){|path|
+      path == "test_path"
+    }
   end
   
   describe "#create=" do
@@ -22,6 +25,11 @@ describe GhostInThePost do
         GhostInThePost.config = {} 
       end.to raise_error(ArgumentError)
     end
+    it "should raise ArgumentError if path was set for phantom but it is not at that path" do
+      expect do
+        GhostInThePost.config = {phantomjs_path: "nope"} 
+      end.to raise_error(ArgumentError)
+    end
     it "should set includes" do
       GhostInThePost.config = {phantomjs_path: "test_path", includes: ["test"]}
       expect(GhostInThePost.includes).to eq(["test"])

metadata

@@ -1,86 +1,87 @@
 --- !ruby/object:Gem::Specification
 name: ghost_in_the_post
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Tim Anema
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
 date: 2016-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 4.2.3
-  name: rails
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 4.2.3
 - !ruby/object:Gem::Dependency
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: nokogiri
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
-  name: bundler
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-  name: rspec
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: rspec-rails
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Using phantomjs to pre-run javascript in emails. This is best if you have content that uses mustache templates that you would like to reuse in your emails.
+description: Using phantomjs to pre-run javascript in emails. This is best if you
+  have content that uses mustache templates that you would like to reuse in your emails.
 email:
 - timanema@gmail.com
 executables: []
@@ -138,6 +139,8 @@ files:
 - spec/lib/ghost_in_the_post/automatic_spec.rb
 - spec/lib/ghost_in_the_post/ghost_on_command_spec.rb
 - spec/lib/ghost_in_the_post/js_inline_spec.rb
+- spec/lib/ghost_in_the_post/js_loaders/asset_pipeline_loader_spec.rb
+- spec/lib/ghost_in_the_post/js_loaders/network_loader_spec.rb
 - spec/lib/ghost_in_the_post/mail_ghost_spec.rb
 - spec/lib/ghost_in_the_post/mailer_spec.rb
 - spec/lib/ghost_in_the_post/phantom_transform_spec.rb
@@ -149,7 +152,7 @@ homepage: https://github.com/tanema/ghost_in_the_post
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -164,16 +167,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.4.8
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.2.2
+signing_key: 
 specification_version: 4
 summary: Using phantomjs to pre-run javascript in emails
 test_files:
-- spec/spec_helper.rb
-- spec/dummy/config.ru
-- spec/dummy/Gemfile
-- spec/dummy/Gemfile.lock
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/javascripts/test.js
 - spec/dummy/app/mailers/mailer.rb
@@ -188,8 +187,6 @@ test_files:
 - spec/dummy/config/application.rb
 - spec/dummy/config/boot.rb
 - spec/dummy/config/environment.rb
-- spec/dummy/config/routes.rb
-- spec/dummy/config/secrets.yml
 - spec/dummy/config/environments/development.rb
 - spec/dummy/config/initializers/assets.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
@@ -200,12 +197,20 @@ test_files:
 - spec/dummy/config/initializers/mime_types.rb
 - spec/dummy/config/initializers/session_store.rb
 - spec/dummy/config/initializers/wrap_parameters.rb
-- spec/lib/ghost_in_the_post_spec.rb
+- spec/dummy/config/routes.rb
+- spec/dummy/config/secrets.yml
+- spec/dummy/config.ru
+- spec/dummy/Gemfile
+- spec/dummy/Gemfile.lock
 - spec/lib/ghost_in_the_post/automatic_spec.rb
 - spec/lib/ghost_in_the_post/ghost_on_command_spec.rb
 - spec/lib/ghost_in_the_post/js_inline_spec.rb
+- spec/lib/ghost_in_the_post/js_loaders/asset_pipeline_loader_spec.rb
+- spec/lib/ghost_in_the_post/js_loaders/network_loader_spec.rb
 - spec/lib/ghost_in_the_post/mail_ghost_spec.rb
 - spec/lib/ghost_in_the_post/mailer_spec.rb
 - spec/lib/ghost_in_the_post/phantom_transform_spec.rb
+- spec/lib/ghost_in_the_post_spec.rb
+- spec/spec_helper.rb
 - spec/support/mailer_support.rb
 - spec/support/quiet_load.rb