image_optim_rails 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 0a27fab3ec29968a0f1461aa69f5d1f3238d2a05
-  data.tar.gz: 14e3da57b4023c649e9ed3a4874ab5621174c545
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NzY1ZDA5MDRkZGQxN2ExYmRlOGE4MzUxZWZlNjZiNmRiY2QxMDlkYg==
+  data.tar.gz: !binary |-
+    YjFiYzEwZDY1ZWNhMzExM2E3OGZhZDg0MGRjODVhOWRiOTE5M2E2Yg==
 SHA512:
-  metadata.gz: ff3b6c95266bbb357df1faab872a7427af1eea240f5d29eeedfd99b8f9b0fbcea8efd01049643c266b6a7822b3c6898ca8c1c8cb97007bd463cee098e4b6b6fe
-  data.tar.gz: 5a0cc79969ee1ea39c78246e6a9b7f66b6846985749f6e7ffb39a275ed8fc8cd1f14469abee011dd841221e04c33b9b824b4067ddd7d184ef1fe0d5a5d80670e
+  metadata.gz: !binary |-
+    OTY4ZDFkZWNkYmMxZWQzYTRmNWE4YjlkMTliYzk3ZmVmOGJkNGZlM2Q2NTlj
+    ZTJmZjJjMDc1ZjkwYTk2MmFkZGU1MWQ5YmNjOWYzMmE2MWQ0MjgxODZmOGI4
+    ZWMzNDE5MDNjNDI4MDYyOGYyY2NkMTIzMjM2MDRhOWViYzNlYWU=
+  data.tar.gz: !binary |-
+    YjYzNDVmMjMxYzM5N2NmOWYwYzFiY2MxNzk0NWY4NTYyMGU4MWE0YjdhNjcw
+    ZmM0YTdiODE1OTNhZDVmZTM2MWEwMGFiMWFkYWY0YzQxYWNmZTI3MTY2NWEz
+    NTU1MWJkNTE1NWYyYjlmZDM0MzA0ZDI5ZjUxZmFjMDlhMGRiZDM=

data/CHANGELOG.markdown

@@ -0,0 +1,11 @@
+# ChangeLog
+
+## unreleased
+
+## v0.2.0 (2016-10-03)
+
+* Use railsy config paths `config/image_optim.yml` and `config/image_optim/#{RAILS_ENV}.yml` and cache to `tmp/cache/image_optim` by default [@toy](https://github.com/toy)
+
+## v0.1.0 (2016-08-14)
+
+* Extracted from [image_optim gem](https://github.com/toy/image_optim) [toy/image_optim#127](https://github.com/toy/image_optim/issues/127) [@toy](https://github.com/toy)

data/README.markdown

@@ -15,13 +15,13 @@ Options and instructions for getting binaries can be found in [image_optim readm
 Add to your `Gemfile`:
 
 ```ruby
-gem 'image_optim'
+gem 'image_optim_rails'
 ```
 
 With [`image_optim_pack`](https://github.com/toy/image_optim_pack):
 
 ```ruby
-gem 'image_optim'
+gem 'image_optim_rails'
 gem 'image_optim_pack'
 ```
 
@@ -34,11 +34,18 @@ You can provide options for image_optim used for preprocessor through config:
 ```ruby
 config.assets.image_optim.nice = 20
 config.assets.image_optim.svgo = false
+config.assets.image_optim.gifsicle.careful = true
 ```
 
-Check available options in [options section of image_optim](https://github.com/toy/image_optim#options).
+Or through config files `config/image_optim.yml` and `config/image_optim/#{RAILS_ENV}.yml`.
 
-Image optimization can be time consuming, so depending on your deployment process you may prefer to optimize original asset files.
+Caching is enabled by default in directory `tmp/cache/image_optim`.
+
+Check all available options in [options section of image_optim](https://github.com/toy/image_optim#options).
+
+## ChangeLog
+
+In separate file [CHANGELOG.markdown](CHANGELOG.markdown).
 
 ## Copyright
 

data/image_optim_rails.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'image_optim_rails'
-  s.version     = '0.1.0'
+  s.version     = '0.2.0'
   s.summary     = %q{Optimize image assets using image_optim}
   s.homepage    = "http://github.com/toy/#{s.name}"
   s.authors     = ['Ivan Kuchin']

data/lib/image_optim/railtie.rb

@@ -18,6 +18,7 @@ class ImageOptim
             hash[key] = ActiveSupport::OrderedOptions.new
           end
         end
+      app.config.assets.image_optim.merge!(default_options)
     end
 
     initializer 'image_optim.initializer' do |app|
@@ -41,12 +42,22 @@ class ImageOptim
 
     def options(app)
       if app.config.assets.image_optim == true
-        {}
+        default_options
       else
-        app.config.assets.image_optim || {}
+        app.config.assets.image_optim || default_options
       end
     end
 
+    def default_options
+      {
+        :config_paths => [
+          'config/image_optim.yml',
+          "config/image_optim/#{Rails.env}.yml",
+        ],
+        :cache_dir => 'tmp/cache/image_optim',
+      }
+    end
+
     def optimize_image_data(data)
       @image_optim.optimize_image_data(data) || data
     end

data/spec/image_optim/railtie_spec.rb

@@ -63,20 +63,35 @@ describe 'ImageOptim::Railtie' do
     end
 
     describe 'options' do
-      it 'initializes with empty hash by default' do
-        expect(ImageOptim).to receive(:new).with({})
+      let(:default_options) do
+        {
+          :config_paths => [
+            'config/image_optim.yml',
+            'config/image_optim/xxx.yml',
+          ],
+          :cache_dir => 'tmp/cache/image_optim',
+        }
+      end
+
+      before do
+        allow(Rails).to receive(:env).
+          and_return(ActiveSupport::StringInquirer.new('xxx'))
+      end
+
+      it 'initializes with defaults' do
+        expect(ImageOptim).to receive(:new).with(default_options)
         init_rails_app
       end
 
-      it 'initializes with empty hash if config.assets.image_optim is true' do
-        expect(ImageOptim).to receive(:new).with({})
+      it 'initializes with defaults if config.assets.image_optim is true' do
+        expect(ImageOptim).to receive(:new).with(default_options)
         init_rails_app do |config|
           config.assets.image_optim = true
         end
       end
 
-      it 'initializes with empty hash if config.assets.image_optim is nil' do
-        expect(ImageOptim).to receive(:new).with({})
+      it 'initializes with defaults if config.assets.image_optim is nil' do
+        expect(ImageOptim).to receive(:new).with(default_options)
         init_rails_app do |config|
           config.assets.image_optim = nil
         end
@@ -92,7 +107,7 @@ describe 'ImageOptim::Railtie' do
 
       it 'is possible to set individual options' do
         hash = {:config_paths => 'config/image_optim.yml'}
-        expect(ImageOptim).to receive(:new).with(hash)
+        expect(ImageOptim).to receive(:new).with(default_options.merge(hash))
         init_rails_app do |config|
           config.assets.image_optim.config_paths = 'config/image_optim.yml'
         end
@@ -100,7 +115,7 @@ describe 'ImageOptim::Railtie' do
 
       it 'is possible to set individual worker options' do
         hash = {:advpng => {:level => 3}}
-        expect(ImageOptim).to receive(:new).with(hash)
+        expect(ImageOptim).to receive(:new).with(default_options.merge(hash))
         init_rails_app do |config|
           expect(config.assets.image_optim.advpng).to eq({})
           config.assets.image_optim.advpng.level = 3
@@ -108,7 +123,7 @@ describe 'ImageOptim::Railtie' do
       end
 
       it 'is not possible to set unknown worker options' do
-        expect(ImageOptim).to receive(:new).with({})
+        expect(ImageOptim).to receive(:new).with(default_options)
         init_rails_app do |config|
           expect(config.assets.image_optim.unknown).to eq(nil)
           expect do

data/spec/spec_helper.rb

@@ -46,12 +46,11 @@ def mepp(image_a, image_b)
     2>&1
   ].join(' ')
   output = ImageOptim::Cmd.capture(command)
-  if [0, 1].include?($CHILD_STATUS.exitstatus)
-    num_r = '\d+(?:\.\d+(?:[eE][-+]?\d+)?)?'
-    output[/\((#{num_r}), #{num_r}\)/, 1].to_f
-  else
+  unless [0, 1].include?($CHILD_STATUS.exitstatus)
     fail "compare #{image_a} with #{image_b} failed with `#{output}`"
   end
+  num_r = '\d+(?:\.\d+(?:[eE][-+]?\d+)?)?'
+  output[/\((#{num_r}), #{num_r}\)/, 1].to_f
 end
 
 RSpec::Matchers.define :be_smaller_than do |expected|

metadata

@@ -1,114 +1,101 @@
 --- !ruby/object:Gem::Specification
 name: image_optim_rails
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Ivan Kuchin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-14 00:00:00.000000000 Z
+date: 2016-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: image_optim
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.24.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.24.0
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sprockets
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: image_optim_pack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.2'
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.2.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.2'
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.2.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.37'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.37'
 description: 
 email: 
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rubocop.yml"
-- ".travis.yml"
+- .gitignore
+- .rubocop.yml
+- .travis.yml
+- CHANGELOG.markdown
 - Gemfile
 - LICENSE.txt
 - README.markdown
@@ -127,12 +114,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -144,3 +131,4 @@ summary: Optimize image assets using image_optim
 test_files:
 - spec/image_optim/railtie_spec.rb
 - spec/spec_helper.rb
+has_rdoc: