redmine_plugin_asset_pipeline 0.0.10 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32c6c1262932a660105027633a4db9595fad559d
-  data.tar.gz: 2858b901fdcb9c87e905f11f8fc971ca3a093e7e
+  metadata.gz: f69a414b7ef365a32b7a3a817bc5af4db18a61ca
+  data.tar.gz: c3e4d2fcca90345cdce76bbcbde18b374cfb8b81
 SHA512:
-  metadata.gz: 7c4fbcc94210ccf17a0292abeef07d2751f4bcad8b4425811ca857b910baccb401ce9198b785ac2ac081e6437be0f8377cae9eea0bd2b7d92132ddbae5dd4d0a
-  data.tar.gz: bc4d527cf689a5547ae7921457f5204e6d1e5cdae71b14ecf81e42cc38b2aca6221a90686e0d41d4bfa85246a525525ca0a2d4420053df4d3a1db565a52951aa
+  metadata.gz: 4cb2b4951b8bcfc39666ab1c23ad660d1a63094df00b93b29b6f804ab1399627460923ba90e0b5f6c1846c15762a6de0cc9f33c33d5c4a6e3dc76108be54952d
+  data.tar.gz: 7ad912d8ba8b3613872f649e0b4115967615a0f99aeb840c89215ff1b48da47806017cd305f222a7fd2a9a801787e4b9135e2a9c3e684b6fddda1a3d7c0676b7

data/.gitignore

@@ -3,6 +3,7 @@
 .bundle
 .config
 .yardoc
+.idea/*
 Gemfile.lock
 InstalledFiles
 _yardoc

data/lib/redmine_plugin_asset_pipeline/application_helper_patch.rb

@@ -3,52 +3,80 @@ require_dependency 'application_helper'
 module ApplicationHelper
   def stylesheet_link_tag(*sources)
     options = sources.extract_options!
-    plugin = options.delete(:plugin)
+    plugin  = options.delete(:plugin)
     debug   = options.key?(:debug) ? options.delete(:debug) : debug_assets?
-    body    = options.key?(:body)  ? options.delete(:body)  : false
-    digest  = options.key?(:digest)  ? options.delete(:digest)  : digest_assets?
+    body    = options.key?(:body) ? options.delete(:body) : false
+    digest  = options.key?(:digest) ? options.delete(:digest) : digest_assets?
     sources.map! do |source|
       if plugin
         "#{plugin}/stylesheets/#{source}"
       elsif current_theme && current_theme.stylesheets.include?(source)
         current_theme.stylesheet_path(source)
       else
-        "stylesheets/#{source}"
+        # NOTE: bugfix aka crutch for asset from gem
+        ["stylesheets/#{source}", source].
+            find{|s| asset_for(s, 'css').present?} || "stylesheets/#{source}"
       end
     end
     sources.collect do |source|
-      if debug && asset = asset_for(source, 'css')
-        asset.to_a.map { |dep|
-          super(dep.pathname.to_s, { href: asset_path(dep, ext: 'css', body: true, protocol: :request, digest: digest) }.merge!(options))
-        }
+      asset = asset_for(source, 'css')
+      if debug && asset
+        asset.to_a.map do |dep|
+          single_asset_path = asset_path(dep, ext: 'css',
+                                              body: true,
+                                              protocol: :request,
+                                              digest: digest)
+          # TODO: here we must try to make more pretty solution
+          next if single_asset_path.blank?
+          super(dep.pathname.to_s, { href: single_asset_path }.merge!(options))
+        end.compact
       else
-        super(source.to_s, { href: asset_path(source, ext: 'css', body: body, protocol: :request, digest: digest) }.merge!(options))
+        single_asset_path = asset_path(source, ext: 'css',
+                                               body: body,
+                                               protocol: :request,
+                                               digest: digest)
+        # TODO: here we must try to make more pretty solution
+        next if single_asset_path.blank?
+        super(source.to_s, { href: single_asset_path }.merge!(options))
       end
-    end.flatten.uniq.join("\n").html_safe
+    end.compact.uniq.join("\n").html_safe
   end
 
   def javascript_include_tag(*sources)
     options = sources.last.is_a?(Hash) ? sources.pop : {}
-    plugin = options.delete(:plugin)
+    plugin  = options.delete(:plugin)
     debug   = options.key?(:debug) ? options.delete(:debug) : debug_assets?
-    body    = options.key?(:body)  ? options.delete(:body)  : false
-    digest  = options.key?(:digest)  ? options.delete(:digest)  : digest_assets?
+    body    = options.key?(:body) ? options.delete(:body) : false
+    digest  = options.key?(:digest) ? options.delete(:digest) : digest_assets?
     sources.map! do |source|
       if plugin
         "#{plugin}/javascripts/#{source}"
       else
-        "javascripts/#{source}"
+        # NOTE: bugfix aka crutch for asset from gem
+        ["javascripts/#{source}", source].
+            find{|s| asset_for(s, 'js').present?} || "javascripts/#{source}"
       end
     end
     sources.collect do |source|
-      if debug && asset = asset_for(source, 'js')
-        asset.to_a.map { |dep|
-          super(dep.pathname.to_s, { src: asset_path(dep, ext: 'js', body: true, digest: digest) }.merge!(options))
-        }
+      asset = asset_for(source, 'js')
+      if debug && asset
+        asset.to_a.map do |dep|
+          single_asset_path = asset_path(dep, ext: 'js',
+                                              body: true,
+                                              digest: digest)
+          # TODO: here we must try to make more pretty solution
+          next if single_asset_path.blank?
+          super(dep.pathname.to_s, { src: single_asset_path }.merge!(options))
+        end.compact
       else
-        super(source.to_s, { src: asset_path(source, ext: 'js', body: body, digest: digest) }.merge!(options))
+        single_asset_path = asset_path(source, ext: 'js',
+                                               body: body,
+                                               digest: digest)
+        # TODO: here we must try to make more pretty solution
+        next if single_asset_path.blank?
+        super(source.to_s, { src: single_asset_path }.merge!(options))
       end
-    end.flatten.uniq.join("\n").html_safe
+    end.compact.uniq.join("\n").html_safe
   end
 
   def image_tag(source, options={})

data/lib/redmine_plugin_asset_pipeline/version.rb

@@ -1,3 +1,3 @@
 module RedminePluginAssetPipeline
-  VERSION = '0.0.10'
+  VERSION = '0.0.12'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redmine_plugin_asset_pipeline
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.12
 platform: ruby
 authors:
 - Tab10id
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-10 00:00:00.000000000 Z
+date: 2014-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler