redmine_plugin_asset_pipeline 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 452b31113f347e2f0993e7172270f0e70dd2e246
-  data.tar.gz: 257c70066e8bd581bb3e4b520b8a6082ea464d5d
+  metadata.gz: 32c6c1262932a660105027633a4db9595fad559d
+  data.tar.gz: 2858b901fdcb9c87e905f11f8fc971ca3a093e7e
 SHA512:
-  metadata.gz: a2aad88a53986b3c8063fec9bc58287c5bd7b61b0f624adf107fc5edf3785e9579ceae40438642a64421c4ad11ae4d8e3e994e6fca1511bcb2243e3600d814e4
-  data.tar.gz: 3386b9f95bd87ee617ac2ec7da5ca8b4632926654fb73104f9f01c53b3279e495ff916e9c89a5f76de7bdeb26432e2300c0e29b51581f4df7cb11632d8c8d64a
+  metadata.gz: 7c4fbcc94210ccf17a0292abeef07d2751f4bcad8b4425811ca857b910baccb401ce9198b785ac2ac081e6437be0f8377cae9eea0bd2b7d92132ddbae5dd4d0a
+  data.tar.gz: bc4d527cf689a5547ae7921457f5204e6d1e5cdae71b14ecf81e42cc38b2aca6221a90686e0d41d4bfa85246a525525ca0a2d4420053df4d3a1db565a52951aa

data/README.md

@@ -37,7 +37,7 @@ This plugin is only compatible with Redmine 2.1.0+. It is distributed as a ruby
 
 Add this line to your redmine's Gemfile.local:
 
-    gem 'redmine_asset_pipeline'
+    gem 'redmine_plugin_asset_pipeline'
 
 And then execute:
 

data/lib/generators/redmine_pipeline/private_assets_initializer/templates/35-patch_assets_mirror.rb

@@ -3,4 +3,10 @@ Rails.configuration.before_configuration do
   unless Redmine::Plugin.included_modules.include? RedminePluginAssetPipeline::PluginPatch
     Redmine::Plugin.send(:include, RedminePluginAssetPipeline::PluginPatch)
   end
+end
+
+RedminePluginAssetPipeline.configure do |config|
+  if Rails.env.development?
+    config.use_ln = true
+  end
 end

data/lib/redmine_plugin_asset_pipeline.rb

@@ -1,6 +1,27 @@
 require 'redmine_plugin_asset_pipeline/version'
 
 module RedminePluginAssetPipeline
+  class Configuration
+    attr_accessor :use_ln
+
+    def initialize
+      @use_ln = false
+    end
+
+    def [](value)
+      self.public_send(value)
+    end
+  end
+
+  def self.configure
+    self.config ||= Configuration.new
+    yield(self.config)
+  end
+
+  def self.config
+    @config
+  end
+
   # Run the classic redmine plugin initializer after rails boot
   class Plugin < ::Rails::Engine
     config.after_initialize do
@@ -23,9 +44,34 @@ module RedminePluginAssetPipeline
       end
     end
 
+    #add all plugin directories in case some js/css/images are included directly or via relative css
+    #it also avoids Sprocket's FileOutsidePaths errors
+    # config.assets.paths += Dir.glob("#{config.root}/plugins/*/assets")
+    #add our directory
+    # config.assets.paths += Dir.glob("#{File.dirname(__FILE__)}/assets")
+    #compression
+    # config.assets.compress = true
+    # config.assets.css_compressor = :yui
+    # config.assets.js_compressor = :yui
+
+    # Register our processor (subclass of the standard one which adds a directive for redmine plugins)
+    initializer 'redmine.sprockets_processor', after: 'sprockets.environment' do
+      require 'redmine_plugin_asset_pipeline/sprockets_processor'
+      env = RedmineApp::Application.assets
+      env.unregister_preprocessor('text/css', Sprockets::DirectiveProcessor)
+      env.unregister_preprocessor('application/javascript', Sprockets::DirectiveProcessor)
+      env.register_preprocessor('text/css', RedminePluginAssetPipeline::SprocketsProcessor)
+      env.register_preprocessor('application/javascript', RedminePluginAssetPipeline::SprocketsProcessor)
+    end
+
     config.to_prepare do
       require_dependency 'redmine_plugin_asset_pipeline/application_helper_patch'
     end
+  end
+
+  private
 
+  def self.config=(value)
+    @config = value
   end
 end

data/lib/redmine_plugin_asset_pipeline/application_helper_patch.rb

@@ -19,10 +19,10 @@ module ApplicationHelper
     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))
+          super(dep.pathname.to_s, { href: asset_path(dep, ext: 'css', body: true, protocol: :request, digest: digest) }.merge!(options))
         }
       else
-        super(source.to_s, { :href => asset_path(source, :ext => 'css', :body => body, :protocol => :request, :digest => digest) }.merge!(options))
+        super(source.to_s, { href: asset_path(source, ext: 'css', body: body, protocol: :request, digest: digest) }.merge!(options))
       end
     end.flatten.uniq.join("\n").html_safe
   end
@@ -43,10 +43,10 @@ module ApplicationHelper
     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))
+          super(dep.pathname.to_s, { src: asset_path(dep, ext: 'js', body: true, digest: digest) }.merge!(options))
         }
       else
-        super(source.to_s, { :src => asset_path(source, :ext => 'js', :body => body, :digest => digest) }.merge!(options))
+        super(source.to_s, { src: asset_path(source, ext: 'js', body: body, digest: digest) }.merge!(options))
       end
     end.flatten.uniq.join("\n").html_safe
   end
@@ -67,7 +67,7 @@ module ApplicationHelper
       @calendar_headers_tags_included = true
       content_for :header_tags do
         start_of_week = Setting.start_of_week
-        start_of_week = l(:general_first_day_of_week, :default => '1') if start_of_week.blank?
+        start_of_week = l(:general_first_day_of_week, default: '1') if start_of_week.blank?
         # Redmine uses 1..7 (monday..sunday) in settings and locales
         # JQuery uses 0..6 (sunday..saturday), 7 needs to be changed to 0
         start_of_week = start_of_week.to_i % 7
@@ -77,7 +77,7 @@ module ApplicationHelper
                 "showOn: 'button', buttonImageOnly: true, buttonImage: '" +
                 path_to_image('images/calendar.png') +
                 "', showButtonPanel: true, showWeek: true, showOtherMonths: true, selectOtherMonths: true};")
-        jquery_locale = l('jquery.locale', :default => current_language.to_s)
+        jquery_locale = l('jquery.locale', default: current_language.to_s)
         unless jquery_locale == 'en'
           tags << javascript_include_tag("i18n/jquery.ui.datepicker-#{jquery_locale}.js")
         end
@@ -105,7 +105,7 @@ module ApplicationHelper
 
   def asset_path(source, options = {})
     source = source.logical_path if source.respond_to?(:logical_path)
-    path = asset_paths.compute_public_path(source, assets_prefix, options.merge(:body => true))
+    path = asset_paths.compute_public_path(source, assets_prefix, options.merge(body: true))
     options[:body] ? "#{path}?body=1" : path
   end
 

data/lib/redmine_plugin_asset_pipeline/plugin_patch.rb

@@ -33,38 +33,40 @@ module RedminePluginAssetPipeline
         end
         return unless File.directory?(source)
 
-        source_files = Dir[source + "/**/*"]
-        source_dirs = source_files.select { |d| File.directory?(d) }
-        source_files -= source_dirs
-
-        unless source_files.empty?
-          base_target_dir = File.join(destination, File.dirname(source_files.first).gsub(source, ''))
-          begin
-            FileUtils.mkdir_p(base_target_dir)
-          rescue Exception => e
-            raise "Could not create directory #{base_target_dir}: " + e.message
+        if RedminePluginAssetPipeline.config.use_ln
+          FileUtils.ln_s(source, destination)
+        else
+          source_files = Dir[source + "/**/*"]
+          source_dirs = source_files.select { |d| File.directory?(d) }
+          source_files -= source_dirs
+          unless source_files.empty?
+            base_target_dir = File.join(destination, File.dirname(source_files.first).gsub(source, ''))
+            begin
+              FileUtils.mkdir_p(base_target_dir)
+            rescue Exception => e
+              raise "Could not create directory #{base_target_dir}: " + e.message
+            end
           end
-        end
-
-        source_dirs.each do |dir|
-          # strip down these paths so we have simple, relative paths we can
-          # add to the destination
-          target_dir = File.join(destination, dir.gsub(source, ''))
-          begin
-            FileUtils.mkdir_p(target_dir)
-          rescue Exception => e
-            raise "Could not create directory #{target_dir}: " + e.message
+          source_dirs.each do |dir|
+            # strip down these paths so we have simple, relative paths we can
+            # add to the destination
+            target_dir = File.join(destination, dir.gsub(source, ''))
+            begin
+              FileUtils.mkdir_p(target_dir)
+            rescue Exception => e
+              raise "Could not create directory #{target_dir}: " + e.message
+            end
           end
-        end
 
-        source_files.each do |file|
-          begin
-            target = File.join(destination, file.gsub(source, ''))
-            unless File.exist?(target) && FileUtils.identical?(file, target)
-              FileUtils.cp(file, target)
+          source_files.each do |file|
+            begin
+              target = File.join(destination, file.gsub(source, ''))
+              unless File.exist?(target) && FileUtils.identical?(file, target)
+                FileUtils.cp(file, target)
+              end
+            rescue Exception => e
+              raise "Could not copy #{file} to #{target}: " + e.message
             end
-          rescue Exception => e
-            raise "Could not copy #{file} to #{target}: " + e.message
           end
         end
       end

data/lib/redmine_plugin_asset_pipeline/sprockets_processor.rb

@@ -0,0 +1,28 @@
+module RedminePluginAssetPipeline
+  class SprocketsProcessor < Sprockets::DirectiveProcessor
+    # This processor subclasses the standard Sprockets::DirectiveProcessor
+    # as advised in Sprockets, to add a new directive called
+    # "require_redmine_plugins". This directive is relative to the
+    # #{Rails.root}/plugins/ directory and accepts wildcards.
+    #
+    # For convenience, it also replaces "ALL" by a star ("*") before
+    # evaluating the globing. Otherwise, "*/" is interpreted as the end of
+    # the comment in CSS files, which is obviously problematic.
+    #
+    #
+    # For the record, here's the example custom require provided in sprockets:
+    #
+    # def process_require_glob_directive
+    #  Dir["#{pathname.dirname}/#{glob}"].sort.each do |filename|
+    #    require(filename)
+    #  end
+    # end
+
+    def process_require_redmine_plugins_directive(type)
+      mask = Rails.root.join(Redmine::Plugin.private_directory,  "*/#{type}/_common_part*").expand_path
+      Dir.glob(mask).sort.each do |entry|
+        context.require_asset(pathname.dirname.join(entry).expand_path)
+      end
+    end
+  end
+end

data/lib/redmine_plugin_asset_pipeline/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redmine_plugin_asset_pipeline
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Tab10id
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-13 00:00:00.000000000 Z
+date: 2014-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -56,6 +56,7 @@ files:
 - lib/redmine_plugin_asset_pipeline.rb
 - lib/redmine_plugin_asset_pipeline/application_helper_patch.rb
 - lib/redmine_plugin_asset_pipeline/plugin_patch.rb
+- lib/redmine_plugin_asset_pipeline/sprockets_processor.rb
 - lib/redmine_plugin_asset_pipeline/version.rb
 - redmine_plugin_asset_pipeline.gemspec
 - test/test_helper.rb