image_optim_rails 0.3.0 → 0.4.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MTM1OWI4NGJjYTY3YjllZWRlZTVmNzM4ZWY0YjhiOWM5OTdmNTNkOQ==
-  data.tar.gz: !binary |-
-    NjA4ZWIyM2VmMTc5MzlmYmQzMTk2MDlkODAyMjFjOGZhYmYwMmVlMw==
+SHA1:
+  metadata.gz: 7ec6959ffaf8e94146e51857bbd6fa8d61c12d43
+  data.tar.gz: b151102a5974a95aecb7eb9d4238a23d3a6cf4d3
 SHA512:
-  metadata.gz: !binary |-
-    NjM5YTE5NWI4MWI4YWEwMTIwN2QzODYyZWE2MmYxNTc1MjY0MzY4ZmFlYzkw
-    NmQwZWI1MDFhNzVhOTQwZDAyYzUzNDg4YjMwNzQ2MTVjMmY4NDdlZDE2Yzll
-    ODFiNmYzNDUxOWVlODNlNzZjNzE4Y2Y5MzQ3N2IwOGNjZTdkYTk=
-  data.tar.gz: !binary |-
-    YmU0ZDYwODkwMjcyOTIzMGRhN2RlNDRjNjBkZmY5NWM3MThmOGNhNjI1ODY1
-    YTEzODczZmIyZjhmMTk5ZjNmZTZiMzkxYTEyZDRiNjQ0ODRmNzAxMWY3Njcy
-    ZGViZWQzMWM4Y2ExZWM2YjFhZGZkZTgwYjM0MGExNTlhYjI3OTI=
+  metadata.gz: a9189dec0dc6125fa5db0345732c35b4e788c13e8ec25839eab4799920cd05e2a2ab0640c7299911435e85f8125d4897884748a3926425ba8d151903264017a3
+  data.tar.gz: 83bb9dc2cde4d1e8a8e5d99decc2f8a1d44673c5c41d4e9a25f11c0fcadd575793c135e1a7d718d7fa7a39ae10ca70474d4c918836f24b0ea09f9306b5871b64

data/.rubocop.yml

@@ -3,6 +3,30 @@ AllCops:
     - '*.gemspec'
     - 'vendor/**/*'
 
+Layout/AccessModifierIndentation:
+  EnforcedStyle: outdent
+
+Layout/CaseIndentation:
+  EnforcedStyle: end
+
+Layout/DotPosition:
+  EnforcedStyle: trailing
+
+Layout/IndentArray:
+  EnforcedStyle: consistent
+
+Layout/IndentAssignment:
+  Enabled: false
+
+Layout/IndentHash:
+  EnforcedStyle: consistent
+
+Layout/SpaceBeforeBlockBraces:
+  EnforcedStyle: no_space
+
+Layout/SpaceInsideHashLiteralBraces:
+  EnforcedStyle: no_space
+
 Lint/EndAlignment:
   EnforcedStyleAlignWith: variable
 
@@ -19,18 +43,9 @@ Metrics/LineLength:
 Metrics/MethodLength:
   Max: 25
 
-Style/AccessModifierIndentation:
-  EnforcedStyle: outdent
-
 Style/Alias:
   EnforcedStyle: prefer_alias_method
 
-Style/CaseIndentation:
-  EnforcedStyle: end
-
-Style/DotPosition:
-  EnforcedStyle: trailing
-
 Style/DoubleNegation:
   Enabled: false
 
@@ -46,35 +61,15 @@ Style/HashSyntax:
 Style/IfUnlessModifier:
   MaxLineLength: 40
 
-Style/IndentArray:
-  EnforcedStyle: consistent
-
-Style/IndentAssignment:
-  Enabled: false
-
-Style/IndentHash:
-  EnforcedStyle: consistent
-
 Style/ParallelAssignment:
   Enabled: false
 
-Style/PercentLiteralDelimiters:
-  PreferredDelimiters:
-    '%w': '[]'
-    '%W': '[]'
-
 Style/Semicolon:
   AllowAsExpressionSeparator: true
 
 Style/SignalException:
   EnforcedStyle: semantic
 
-Style/SpaceBeforeBlockBraces:
-  EnforcedStyle: no_space
-
-Style/SpaceInsideHashLiteralBraces:
-  EnforcedStyle: no_space
-
 Style/TrailingCommaInArguments:
   EnforcedStyleForMultiline: no_comma
 

data/.travis.yml

@@ -23,16 +23,16 @@ matrix:
     - env: RAILS_VERSION='~> 4.0' SPROCKETS_VERSION='>= 4.0.beta'
       rvm: '2.0.0-p648'
     - env: RAILS_VERSION='~> 5.0' SPROCKETS_RAILS_VERSION='~> 2.0'
-      rvm: '2.2.6'
+      rvm: '2.2.7'
     - env: RAILS_VERSION='~> 5.0' SPROCKETS_VERSION='~> 3.0'
-      rvm: '2.2.6'
+      rvm: '2.2.7'
     - env: RAILS_VERSION='~> 5.0' SPROCKETS_VERSION='>= 4.0.beta'
-      rvm: '2.2.6'
+      rvm: '2.2.7'
     - env: RUBOCOP=✓
-      rvm: '2.4.0'
+      rvm: '2.4.1'
       script: bundle exec rubocop
       before_install:
     - env: CHECK_RUBIES=✓
-      rvm: '2.4.0'
+      rvm: '2.4.1'
       script: bundle exec travis_check_rubies
       before_install:

data/CHANGELOG.markdown

@@ -2,6 +2,10 @@
 
 ## unreleased
 
+## v0.4.0 (2017-05-31)
+
+* Use absolute path to Rails root for default options [#3](https://github.com/toy/image_optim_rails/pull/3) [@wjordan](https://github.com/wjordan)
+
 ## v0.3.0 (2017-03-13)
 
 * Add sprockets 4 support [toy/image_optim_rails#2](https://github.com/toy/image_optim_rails/issues/2) [@toy](https://github.com/toy)

data/image_optim_rails.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'image_optim_rails'
-  s.version     = '0.3.0'
+  s.version     = '0.4.0'
   s.summary     = %q{Optimize image assets using image_optim}
   s.homepage    = "http://github.com/toy/#{s.name}"
   s.authors     = ['Ivan Kuchin']
@@ -22,6 +22,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'image_optim_pack', '~> 0.2', '>= 0.2.2'
   s.add_development_dependency 'rspec', '~> 3.0'
   if RUBY_VERSION >= '2.0'
-    s.add_development_dependency 'rubocop', '~> 0.47'
+    s.add_development_dependency 'rubocop', '~> 0.49'
   end
 end

data/lib/image_optim/railtie.rb

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

data/spec/image_optim/railtie_spec.rb

@@ -68,12 +68,13 @@ describe 'ImageOptim::Railtie' do
 
     describe 'options' do
       let(:default_options) do
+        root = File.expand_path('../../..', __FILE__)
         {
           :config_paths => [
-            'config/image_optim.yml',
-            'config/image_optim/xxx.yml',
+            "#{root}/config/image_optim.yml",
+            "#{root}/config/image_optim/xxx.yml",
           ],
-          :cache_dir => 'tmp/cache/image_optim',
+          :cache_dir => "#{root}/tmp/cache/image_optim",
         }
       end
 

metadata

@@ -1,100 +1,114 @@
 --- !ruby/object:Gem::Specification
 name: image_optim_rails
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Ivan Kuchin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-13 00:00:00.000000000 Z
+date: 2017-05-30 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.49'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.49'
 description: 
 email: 
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rubocop.yml
-- .travis.yml
+- ".gitignore"
+- ".rubocop.yml"
+- ".travis.yml"
 - CHANGELOG.markdown
 - Gemfile
 - LICENSE.txt
@@ -115,17 +129,17 @@ 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: []
 rubyforge_project: image_optim_rails
-rubygems_version: 2.6.4
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Optimize image assets using image_optim
@@ -133,4 +147,3 @@ test_files:
 - spec/dummy/app/assets/config/manifest.js
 - spec/image_optim/railtie_spec.rb
 - spec/spec_helper.rb
-has_rdoc: