sync

jonhue · Jan 19, 2018 · c422893 · c422893
1 parent 964838c
commit c422893
Show file tree

Hide file tree

Showing 14 changed files with 51 additions and 46 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,12 @@
 
 ### master
 
-* nothing yet
+* features
+    * automatically load controller action specific stylesheets
+* enhancements
+    * allow options to be passed to the `amp/doctype` component
+* bugfixes
+    * fix `amp/canonical-link` component for apps without SplitView
 
 ### 1.1.0 - 2018/01/17
 

diff --git a/DEPRECATIONS.md b/DEPRECATIONS.md
@@ -1,5 +1,9 @@
 # Deprecations
 
+### master
+
+* remove `inherit_stylesheets` configuration option
+
 ### 1.0.0 - 2018/01/14
 
 * deprecated previously available view helper methods
diff --git a/README.md b/README.md
@@ -202,11 +202,10 @@ You can configure amp-html by passing a block to `configure`. This can be done i
 
 ```ruby
 AmpHtml.configure do |config|
-    config.inherit_stylesheets = false
+    config.split_view = false
 end
 ```
 
-* `inherit_stylesheets` Use your regular stylesheets bundled with `app/assets/stylesheets/application.css` in your AMP views. Takes a boolean. Defaults to `false`.
 * `split_view` Enable SplitView to allow for AMP enabled and AMP disabled versions of your views. Takes a boolean. Defaults to `false`.
 * `split_view_default` The default view version if no `amp` param is present in the request. Must be either `'amp'` or `'html'`. Defaults to `'amp'`.
 

diff --git a/app/helpers/amp_html/base_helper.rb b/app/helpers/amp_html/base_helper.rb
@@ -10,15 +10,20 @@ def amp?
             end
         end
 
-        # Fix for accessing AMP assets in different environments
-        def get_asset name
-            if Rails.application.assets
-                asset = Rails.application.assets[name]
-                return asset.to_s if asset
-            end
-            asset = Rails.application.assets_manifest.assets[name]
-            return nil unless asset
-            return File.binread(File.join(Rails.application.assets_manifest.dir, asset))
+        def amp_packaged_css
+            global = Rails.application.assets.find_asset('amp/application.css').to_s
+            package = Rails.application.assets.find_asset("amp/packages/#{params[:controller]}/#{action_name}.css").to_s
+            # if Rails.env.development?
+            #     ::Sass::Engine.new(global + package, {
+            #         syntax: :scss,
+            #         cache: false,
+            #         read_cache: false,
+            #         style: :compressed
+            #     }).render
+            # else
+            #     global + package
+            # end
+            global + package
         end
 
         def amp= value = true

diff --git a/app/views/mozaic/amp/_doctype.html.erb b/app/views/mozaic/amp/_doctype.html.erb
@@ -1,4 +1,4 @@
 <!doctype html>
-<html ⚡>
+<%= content_tag 'html', options do %>
     <%= block %>
-</html>
+<% end %>
diff --git a/app/views/mozaic/amp/_head.html.erb b/app/views/mozaic/amp/_head.html.erb
@@ -7,7 +7,6 @@
 
 <style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
 <style amp-custom>
-    <%= get_asset 'application.css' if AmpHtml.configuration.inherit_stylesheets %>
-    <%= get_asset 'amp/application.css' %>
+    <%= amp_packaged_css %>
     <%= area :css %>
 </style>
diff --git a/lib/amp-html/configuration.rb b/lib/amp-html/configuration.rb
@@ -11,12 +11,10 @@ def self.configure
 
     class Configuration
 
-        attr_accessor :inherit_stylesheets
         attr_accessor :split_view
         attr_accessor :split_view_default
 
         def initialize
-            @inherit_stylesheets = false
             @split_view = false
             @split_view_default = 'amp'
         end

diff --git a/lib/amp-html/railtie.rb b/lib/amp-html/railtie.rb
@@ -9,7 +9,7 @@ class Railtie < ::Rails::Railtie
 
                 ### Base
 
-                config.define_component 'amp/doctype'
+                config.define_component 'amp/doctype', '⚡': ''
                 config.define_component 'amp/amp-link', rel: 'amphtml' do |options|
                     return false unless AmpHtml.configuration.split_view
                     href = options[:href].split('?').first
@@ -20,12 +20,13 @@ class Railtie < ::Rails::Railtie
                     end
                 end
                 config.define_component 'amp/canonical-link', rel: 'canonical' do |options|
-                    return false unless AmpHtml.configuration.split_view
-                    href = options[:href].split('?').first
-                    if AmpHtml.configuration.split_view_default == 'amp'
-                        options[:href] ||= "#{href}?#{{ amp: false }.to_query}"
-                    else
-                        options[:href] ||= href
+                    if AmpHtml.configuration.split_view
+                        href = options[:href].split('?').first
+                        if AmpHtml.configuration.split_view_default == 'amp'
+                            options[:href] ||= "#{href}?#{{ amp: false }.to_query}"
+                        else
+                            options[:href] ||= href
+                        end
                     end
                 end
                 config.define_component 'amp/head'
@@ -101,6 +102,12 @@ class Railtie < ::Rails::Railtie
 
         initializer 'amp-html.assets' do
             Rails.application.config.assets.precompile += ['amp/application.css']
+            Dir.glob Rails.root.join('app', 'assets', 'stylesheets', 'amp', 'packages', '**', '*') do |path|
+                next if File.directory? path
+                path = path.split('stylesheets').last
+                path.slice! 0
+                Rails.application.config.assets.precompile += [path]
+            end
         end
 
         initializer 'amp-html.action_controller' do

diff --git a/lib/generators/amp_html_generator.rb b/lib/generators/amp_html_generator.rb
@@ -14,7 +14,8 @@ def create_layout
             end
 
             def create_assets
-                template 'application.css', 'app/assets/stylesheets/amp/application.css'
+                template 'application.sass', 'app/assets/stylesheets/amp/application.sass'
+                template '.keep-file', 'app/assets/stylesheets/amp/packages/.keep'
             end
 
             def create_initializer

diff --git a/lib/generators/templates/.keep-file b/lib/generators/templates/.keep-file
diff --git a/lib/generators/templates/application.css b/lib/generators/templates/application.css
diff --git a/lib/generators/templates/application.sass b/lib/generators/templates/application.sass
@@ -0,0 +1,6 @@
+// This is a manifest file that'll be compiled into amp/application.css, which will include all the files
+// listed below.
+//
+// This manifest is only used for application wide styles. Add view specific files to the /packages subfolder.
+//
+// Don't use `require_tree .` in this file, as that would include all view specific files in this manifest.
diff --git a/lib/generators/templates/initializer.rb b/lib/generators/templates/initializer.rb
@@ -1,9 +1,5 @@
 AmpHtml.configure do |config|
 
-    # Use your regular stylesheets bundled with `app/assets/stylesheets/application.css` in your AMP views. Takes a boolean.
-	# config.inherit_stylesheets = false
-
-
     ### SplitView
 
 	# Enable SplitView to allow for AMP enabled and AMP disabled versions of your views. Takes a boolean.

diff --git a/lib/generators/templates/layout.html.erb b/lib/generators/templates/layout.html.erb
@@ -2,7 +2,7 @@
     <head>
         <%%= component 'amp/head' %>
         <title>Hello AMP world</title>
-        <%% if AmpHtml.configuration.split_view %><%%= component 'amp/canonical-link', href: request.original_url %><%% end %>
+        <%%= component 'amp/canonical-link', href: request.original_url %>
         <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
         <%%= csrf_meta_tags %>
     </head>