serviceworker-rails 0.5.4 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d17cdce006f3937428ea792d26d0230da7f160f2
-  data.tar.gz: a732500aceef5f0ebf4e9c735cd035f0d05777e2
+  metadata.gz: 6e58a2ae3f4679e8cd32a024d0114d5a924a174a
+  data.tar.gz: 474f2390c03df7be5efb55d7f173b40dd863c259
 SHA512:
-  metadata.gz: 884781e3a6c78d0fd5dfae678b8dc1fbcb8fed0e08d5328f085da530ea1b3458b4dc704f8ff37a52fc738410cdad37d3a7a390c2aacae14dcf9497a981e5aa97
-  data.tar.gz: 90815d77139a1fc02a9d517475802de3e52b219878d9660e2656367e7505df43a4cebb07caaa4f7c294946c205549ab7d58f2f559867cc64c7ab52203766876f
+  metadata.gz: b212fcdba3d949901fb95462fda9472e9c27d241542c7303949d87eff1183e0c492c77596d01ddb70e41bb86f30e4eecd717a2403bb4edfea6da52724eb78d95
+  data.tar.gz: 331f5ea58dbd378e481397ff48219a80e113aff428c904a93044f6b68cf613fa7f00c9530776397a87b8fde6bfffbba78431c9ea5ba701b8cb32face5a1b2b0d

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+### 0.5.5 - 2017-05-01
+
+* bug fixes
+  * Ensure middleware can handle assets when a separate asset host, e.g. a CDN,
+    is configured
+
 ### 0.5.4 - 2017-02-02
 
 * bug fixes

data/README.md

@@ -2,7 +2,6 @@
 
 [![Build Status](https://travis-ci.org/rossta/serviceworker-rails.svg?branch=master)](https://travis-ci.org/rossta/serviceworker-rails)
 [![Code Climate](https://codeclimate.com/github/rossta/serviceworker-rails/badges/gpa.svg)](https://codeclimate.com/github/rossta/serviceworker-rails)
-[![Coverage Status](https://coveralls.io/repos/github/rossta/serviceworker-rails/badge.svg?branch=master)](https://coveralls.io/github/rossta/serviceworker-rails?branch=master)
 
 Turn your Rails app into a Progressive Web App. Use [Service Worker](https://developer.mozilla.org/en-US/docs/Web/API/Service_Worker_API) with the Rails asset pipeline.
 
@@ -100,9 +99,11 @@ Create a JavaScript file called `app/assets/javascripts/serviceworker.js.erb`:
 // app/assets/javascripts/serviceworker.js.erb
 console.log('[Service Worker] Hello world!');
 
+var CACHE_NAME = 'v1-cached-assets'
+
 function onInstall(event) {
   event.waitUntil(
-    caches.open('cached-assets-v1').then(function prefill(cache) {
+    caches.open(CACHE_NAME).then(function prefill(cache) {
       return cache.addAll([
         '<%= asset_path "application.js" %>',
         '<%= asset_path "application.css" %>',
@@ -239,7 +240,7 @@ function onFetch(event) {
   // See https://jakearchibald.com/2014/offline-cookbook/#on-network-response for more examples
 }
 
-self.addEventListener('install', onInstall);
+self.addEventListener('fetch', onFetch);
 ```
 
 ## Configuration

data/gemfiles/rails_3.gemfile

@@ -6,11 +6,10 @@ gem "rails", "~> 3.2"
 gem "test-unit", "~> 3.0"
 
 group :development, :test do
-  gem "rubocop", "0.39.0"
+  gem "guard", :require => false
+  gem "guard-minitest", :require => false
   gem "pry"
   gem "pry-byebug", :platforms => [:mri]
-  gem "guard"
-  gem "guard-minitest"
 end
 
 gemspec :path => "../"

data/gemfiles/rails_4.gemfile

@@ -5,11 +5,10 @@ source "https://rubygems.org"
 gem "rails", "~> 4.2"
 
 group :development, :test do
-  gem "rubocop", "0.39.0"
+  gem "guard", :require => false
+  gem "guard-minitest", :require => false
   gem "pry"
   gem "pry-byebug", :platforms => [:mri]
-  gem "guard"
-  gem "guard-minitest"
 end
 
 gemspec :path => "../"

data/gemfiles/rails_5.gemfile

@@ -5,11 +5,10 @@ source "https://rubygems.org"
 gem "rails", "~> 5.0"
 
 group :development, :test do
-  gem "rubocop", "0.39.0"
+  gem "guard", :require => false
+  gem "guard-minitest", :require => false
   gem "pry"
   gem "pry-byebug", :platforms => [:mri]
-  gem "guard"
-  gem "guard-minitest"
 end
 
 gemspec :path => "../"

data/lib/generators/serviceworker/install_generator.rb

@@ -31,9 +31,14 @@ module Serviceworker
       end
 
       def update_application_layout
+        layout = detect_layout
         snippet = %(<link rel="manifest" href="/manifest.json" />)
         snippet << %(\n<meta name="apple-mobile-web-app-capable" content="yes">)
-        insert_into_file detect_layout, snippet, before: "</head>\n"
+        unless layout
+          conditional_warn "Could not locate application layout. To insert manifest tags manually, use:\n\n#{snippet}\n"
+          return
+        end
+        insert_into_file layout, snippet, before: "</head>\n"
       end
 
       def add_offline_html
@@ -55,7 +60,7 @@ module Serviceworker
       end
 
       def detect_layout
-        layouts = %w[.html.erb .html.haml .html.slim].map do |ext|
+        layouts = %w[.html.erb .html.haml .html.slim .erb .haml .slim].map do |ext|
           layouts_dir("application#{ext}")
         end
         layouts.find { |layout| File.exist?(layout) }
@@ -80,6 +85,14 @@ module Serviceworker
       def join(*paths)
         File.expand_path(File.join(*paths), destination_root)
       end
+
+      def conditional_warn(warning)
+        silenced? or warn warning
+      end
+
+      def silenced?
+        ENV["RAILS_ENV"] == "test"
+      end
     end
   end
 end

data/lib/generators/serviceworker/templates/offline.html

@@ -55,7 +55,7 @@
 </head>
 
 <body>
-  <!-- This file lives in public/404.html -->
+  <!-- This file lives in public/offline.html -->
   <div class="dialog">
     <div>
       <h1>It looks like you've lost your Internet connection</h1>

data/lib/serviceworker/rails/handler.rb

@@ -29,7 +29,25 @@ module ServiceWorker
       end
 
       def asset_path(path)
-        ::ActionController::Base.helpers.asset_path(path)
+        if controller_helpers.respond_to?(:compute_asset_path)
+          controller_helpers.compute_asset_path(path)
+        else
+          logical_asset_path(path)
+        end
+      end
+
+      def controller_helpers
+        ::ActionController::Base.helpers
+      end
+
+      def logical_asset_path(path)
+        asset_path = controller_helpers.asset_path(path)
+        uri = URI.parse(asset_path)
+        uri.host = nil
+        uri.scheme = nil
+        uri.to_s
+      rescue URI::InvalidURIError
+        asset_path
       end
     end
   end

data/lib/serviceworker/rails/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module ServiceWorker
   module Rails
-    VERSION = "0.5.4".freeze
+    VERSION = "0.5.5".freeze
   end
 end

data/serviceworker-rails.gemspec

@@ -29,5 +29,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rubocop", "0.46.0"
   spec.add_development_dependency "rails"
   spec.add_development_dependency "appraisal", "~> 2.1.0"
-  spec.add_development_dependency "coveralls"
+  spec.add_development_dependency "simplecov"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serviceworker-rails
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors:
 - Ross Kaffenberger
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-02 00:00:00.000000000 Z
+date: 2017-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -137,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.1.0
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -229,7 +229,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: ServiceWorker for Rails 3+