rails-webp 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71dc74349b769d210dfac65270ca98c18370085679b7dc65571a4561cf502b3a
-  data.tar.gz: ade953a26071ceab38f52137acb6188d2805d9641629fc7831f778666dff270f
+  metadata.gz: 203dee14382dff0553e80615b22cbeef3c90da0ccc2814fc2f39ead713df21c6
+  data.tar.gz: db6672407cd1d0ed86648502bef383dc933430bd300bb3902310f2df0bf8db21
 SHA512:
-  metadata.gz: 6e141952f99a18c8063373a4fc0480620856d857873ce7eb6c7e19b6cdfa6c707344cee1bed6e2c40404e9515febf5f62634dbfdc05d3db9965d0b505bf013ba
-  data.tar.gz: 960db331883e44ca712d049faabfdceaf35863018e5252fa5fe47c1d053f5ee62c254fb3efdc27b15578adc8ab9f43aebcb506ba17b9a933ae4dfe28918c0adb
+  metadata.gz: 6d6dfb860d0d70c74bcbe2e87caa545390d5915bf1afa8be0b1f98cd13caed4c9496a2493c4311d383dfe107a553d81e33a3d86ecea94fdac2ebf4787b8adb75
+  data.tar.gz: f007930e336d12726fdd78866603e24f17f7af6afb3c104c971e0b8f59f14d93bc3221ab0ef8011727b2cef939257b2721f2e608c2520dbef3b659e4dfa8f654

data/.gitignore

@@ -9,3 +9,5 @@
 
 # rspec failure tracking
 .rspec_status
+
+.DS_Store

data/Gemfile.lock

@@ -1,15 +1,99 @@
 PATH
   remote: .
   specs:
-    rails-webp (0.1)
+    rails-webp (0.1.2)
       mini_magick
+      rails
 
 GEM
   remote: https://rubygems.org/
   specs:
-    byebug (11.0.1)
+    actioncable (5.0.7.2)
+      actionpack (= 5.0.7.2)
+      nio4r (>= 1.2, < 3.0)
+      websocket-driver (~> 0.6.1)
+    actionmailer (5.0.7.2)
+      actionpack (= 5.0.7.2)
+      actionview (= 5.0.7.2)
+      activejob (= 5.0.7.2)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.0.7.2)
+      actionview (= 5.0.7.2)
+      activesupport (= 5.0.7.2)
+      rack (~> 2.0)
+      rack-test (~> 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (5.0.7.2)
+      activesupport (= 5.0.7.2)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (5.0.7.2)
+      activesupport (= 5.0.7.2)
+      globalid (>= 0.3.6)
+    activemodel (5.0.7.2)
+      activesupport (= 5.0.7.2)
+    activerecord (5.0.7.2)
+      activemodel (= 5.0.7.2)
+      activesupport (= 5.0.7.2)
+      arel (~> 7.0)
+    activesupport (5.0.7.2)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    arel (7.1.4)
+    builder (3.2.3)
+    concurrent-ruby (1.1.5)
+    crass (1.0.4)
     diff-lcs (1.3)
+    erubis (2.7.0)
+    globalid (0.4.2)
+      activesupport (>= 4.2.0)
+    i18n (1.1.1)
+      concurrent-ruby (~> 1.0)
+    loofah (2.2.3)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
+    method_source (0.8.2)
     mini_magick (4.9.3)
+    mini_mime (1.0.1)
+    mini_portile2 (2.4.0)
+    minitest (5.11.3)
+    nio4r (2.3.1)
+    nokogiri (1.10.1)
+      mini_portile2 (~> 2.4.0)
+    rack (2.0.6)
+    rack-test (0.6.3)
+      rack (>= 1.0)
+    rails (5.0.7.2)
+      actioncable (= 5.0.7.2)
+      actionmailer (= 5.0.7.2)
+      actionpack (= 5.0.7.2)
+      actionview (= 5.0.7.2)
+      activejob (= 5.0.7.2)
+      activemodel (= 5.0.7.2)
+      activerecord (= 5.0.7.2)
+      activesupport (= 5.0.7.2)
+      bundler (>= 1.3.0)
+      railties (= 5.0.7.2)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.0.4)
+      loofah (~> 2.2, >= 2.2.2)
+    railties (5.0.7.2)
+      actionpack (= 5.0.7.2)
+      activesupport (= 5.0.7.2)
+      method_source
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
     rake (10.5.0)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
@@ -24,13 +108,26 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-support (3.8.0)
+    sprockets (3.7.2)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.1)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    thor (0.19.4)
+    thread_safe (0.3.6)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+    websocket-driver (0.6.5)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bundler (~> 2.0)
-  byebug
   rails-webp!
   rake (~> 10.0)
   rspec (~> 3.0)

data/lib/rails-webp.rb

@@ -0,0 +1 @@
+require 'rails/webp'

data/lib/rails/webp.rb

@@ -9,12 +9,16 @@ module Rails
     class Error < StandardError; end
 
     class << self
-      attr_writer :encode_options, :force
+      attr_writer :encode_options, :exclude_dir_regex, :force
 
       def encode_options
         @encode_options ||= { quality: 80, lossless: true, method: 6, alpha_filtering: 2, alpha_compression: 0, alpha_quality: 100 }
       end
 
+      def exclude_dir_regex
+        @exclude_dir_regex ||= nil
+      end
+
       # Source assets that are unchanged will not be processed by default.
       # Set this to true if you wish to process webp images anyway.
       def force

data/lib/rails/webp/converter.rb

@@ -8,21 +8,6 @@ module Rails
       class << self
         attr_reader :context
 
-        def process(input_path, data, context)
-          @context = context
-          app = Rails.application
-          prefix = app.config.assets.prefix
-          digest = data_digest(data)
-          webp_file = webp_file_name(data, digest)
-          output_path = Pathname.new(File.join(app.root, 'public', prefix, webp_file))
-          if WebP.force || !webp_file_exists?(digest, output_path)
-            FileUtils.mkdir_p(output_path.dirname) unless Dir.exists?(output_path.dirname)
-            convert_to_webp(input_path, output_path)
-            logger.info "Writing #{output_path}"
-          end
-          data
-        end
-
         def convert_to_webp(input_path, output_path)
           # Ex: convert wizard.png -quality 50 -define webp:lossless=true wizard.webp
           MiniMagick::Tool::Convert.new do |convert|
@@ -36,12 +21,34 @@ module Rails
           end
         end
 
+        def process(input_path, data, context, app = Rails.application)
+          return data if excluded_dir?(input_path)
+          @context = context
+          prefix = app.config.assets.prefix
+          digest = data_digest(data)
+          webp_file = webp_file_name(data, digest)
+          output_path = Pathname.new(File.join(app.root, 'public', prefix, webp_file))
+          if WebP.force || !webp_file_exists?(digest, output_path)
+            FileUtils.mkdir_p(output_path.dirname) unless Dir.exists?(output_path.dirname)
+            # TODO: check app.assets.gzip and act accordingly
+            convert_to_webp(input_path, output_path)
+            logger&.info "Writing #{output_path}"
+          end
+          data
+        end
+
         private
 
         def data_digest(data)
           "-#{context.environment.digest_class.new.update(data).to_s}"
         end
 
+        def excluded_dir?(path)
+          regex = WebP.exclude_dir_regex
+          return false unless regex
+          !!path.match(regex)
+        end
+
         def webp_file_name(data, digest)
           file_name = context.logical_path # Original File name w/o extension
           file_ext  = context.pathname.extname # Original File extension

data/lib/rails/webp/version.rb

@@ -1,5 +1,5 @@
 module Rails
   module WebP
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-webp
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Jake Peterson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-22 00:00:00.000000000 Z
+date: 2019-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -98,11 +98,13 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- lib/rails-webp.rb
 - lib/rails/webp.rb
 - lib/rails/webp/converter.rb
 - lib/rails/webp/post_processor.rb
 - lib/rails/webp/railtie.rb
 - lib/rails/webp/version.rb
+- rails-webp-0.1.1.gem
 - rails-webp-0.1.gem
 - rails-webp.gemspec
 homepage: https://github.com/jakenberg