catalyst-rails 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d92e6653287b8f5235dd06658dee2dd571743bc6e08f903747a2a86ba1b64b8
-  data.tar.gz: 12854757d0594c4a409d95b1e920516d5a4d25a06970de08c98907889a2c5d9b
+  metadata.gz: 45f276a4db53b08c80aca358632f1fd2bf9d1fee132fcb9ed2db9a96f8454c7b
+  data.tar.gz: fae2b667b0302d140811d869bef7be5c8f6f9d849ab1b8e7805ebd3003a620dd
 SHA512:
-  metadata.gz: 27c5ce372e4ee0254ea57a15fc25401499d12fbde0001722c413d74986663e0d0271b5e08b6c79aa1cef2ea9e5c9bbc78a83e3fea79ec75f0dce9a65146db8bd
-  data.tar.gz: a3b4801399815e6d3c174ff04dcf96d1a364c73c343a0b5c4d9c2ca682d24f7b0970fecc65433987d4eeb06117681b0498633f134486233346e882f8a5d91cf1
+  metadata.gz: 05ca2857dea876499f66d32f119f28d5f666e4deebd79f58082b57ad8e3926f28fab0a70111992209e0254e7d1df5f8e1dde1573be5b373c049e2685ce58417c
+  data.tar.gz: f74c8becccb4d5788be14ba88334087b341ed3954687e182987891c4790fc55a343f6c7651894a81297b300aad2f558a4d1e6fd796ac86d4deee4118165461d5

data/lib/catalyst/helpers.rb

@@ -6,36 +6,81 @@ require_relative './manifest'
 module Catalyst
   module Helpers
     include ActionView::Helpers::TagHelper
+    include ActionView::Helpers::OutputSafetyHelper
 
-    def catalyst_javascript_vendor_include_tag
-      if Catalyst.development?
-        catalyst_javascript_include_tag('vendor-dll')
+    def catalyst_javascript_include_tag(path)
+      path = path.to_s.sub(/\.js\z/, '') + '.js'
+
+      if catalyst_referenced_files.include?(path)
+        raise ::Catalyst::Manifest::DuplicateAssetReference,
+              "The asset \"#{path}\" has already been referenced."
       end
+
+      catalyst_referenced_files << path
+
+      safe_join([
+        catalyst_javascript_vendor_include_tag,
+        catalyst_javascript_common_include_tag,
+        content_tag(
+          :script,
+          nil,
+          type: 'text/javascript',
+          crossorigin: 'anonymous',
+          src: ::Catalyst::Manifest[path]
+        )
+      ])
     end
 
-    def catalyst_javascript_include_tag(path)
-      path = path.to_s.gsub(/\.js\z/, '')
+    def catalyst_javascript_vendor_include_tag
+      path = 'vendor-dll.js'
+
+      return nil unless ::Catalyst.development?
+      return nil if catalyst_referenced_files.include?(path)
+
+      catalyst_javascript_include_tag(path)
+    end
 
-      content_tag(
-        :script,
-        nil,
-        type: 'text/javascript',
-        crossorigin: 'anonymous',
-        src: ::Catalyst::Manifest["#{path}.js"]
-      )
+    def catalyst_javascript_common_include_tag
+      path = 'common.js'
+
+      return nil if catalyst_referenced_files.include?(path)
+
+      if ::Catalyst.development? || ::Catalyst::Manifest.has?(path)
+        catalyst_javascript_include_tag(path)
+      end
     end
 
     def catalyst_stylesheet_link_tag(path)
-      path = path.to_s.gsub(/\.css\z/, '')
+      return nil if ::Catalyst.development?
+
+      path = path.to_s.sub(/\.css\z/, '') + '.css'
+
+      if catalyst_referenced_files.include?(path)
+        raise ::Catalyst::Manifest::DuplicateAssetReference,
+              "The asset \"#{path}\" has already been referenced."
+      end
+
+      catalyst_referenced_files << path
 
-      unless Catalyst.development?
+      safe_join([
+        catalyst_common_stylesheet_link_tag,
         content_tag(
           :link,
           nil,
-          href: ::Catalyst::Manifest["#{path}.css"],
+          href: ::Catalyst::Manifest[path],
           media: 'screen',
           rel: 'stylesheet'
         )
+      ])
+    end
+
+    def catalyst_common_stylesheet_link_tag
+      path = 'common.css'
+
+      return nil if catalyst_referenced_files.include?(path)
+
+      if ::Catalyst::Manifest.has?(path)
+        catalyst_stylesheet_link_tag(path)
       end
     end
 
@@ -44,11 +89,15 @@ module Catalyst
     end
 
     def catalyst_asset_url(path)
-      if Catalyst.development? || Catalyst.config.assets_host.nil?
+      if ::Catalyst.development? || ::Catalyst.config.assets_host.nil?
         catalyst_asset_path(path)
       else
         "#{Catalyst.config.assets_host_protocol}://#{Catalyst.config.assets_host}#{catalyst_asset_path(path)}"
       end
     end
+
+    def catalyst_referenced_files
+      @catalyst_referenced_files ||= Set.new
+    end
   end
 end

data/lib/catalyst/manifest.rb

@@ -3,15 +3,18 @@
 require 'singleton'
 require 'forwardable'
 
+require_relative './errors'
+
 module Catalyst
   class Manifest
-    AssetMissing = Class.new(StandardError)
+    AssetMissing = Class.new(::Catalyst::CatalystError)
+    DuplicateAssetReference = Class.new(::Catalyst::CatalystError)
 
     include Singleton
 
     class << self
       extend Forwardable
-      def_delegator :instance, :[]
+      def_delegators :instance, :[], :has?
     end
 
     def initialize
@@ -26,6 +29,16 @@ module Catalyst
       end
     end
 
+    def has?(path)
+      path = path.to_s.gsub(/\A\/+/, '')
+
+      if Catalyst.development?
+        false
+      else
+        @manifest.key?(path)
+      end
+    end
+
     def [](path)
       path = path.to_s.gsub(/\A\/+/, '')
 

data/lib/catalyst/version.rb

@@ -2,6 +2,6 @@
 
 module Catalyst
   def self.version
-    Gem::Version.new('0.0.4')
+    Gem::Version.new('0.0.5')
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: catalyst-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Dan Martens
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-29 00:00:00.000000000 Z
+date: 2018-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-configurable