ogatstyle 3.4.0 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e7ef1303609484a196d4110e1382f086d20bf1e3a1799f7efd06e873221d571
-  data.tar.gz: 0ae5abaf8a27a8ee2d791b5a4a9429d5d3d2d6a75fda503b455168800c55c418
+  metadata.gz: 667c92d3b67dd434cc2d8484bdd0176d9d94c30888218aedf8ec137fb1569995
+  data.tar.gz: e2a810ea1cded5effce64f46722fb6b039b3e51a43c6687369be8f9883fb1943
 SHA512:
-  metadata.gz: 5e7a133c3597765ed1c641420827c40ef5ea9fe6edb0bdcb5f9936bc7a0ffd8c278663a405fe579b7c33ceb6422cb048b2ebbf5a9d78b6192789de9a9368e4ef
-  data.tar.gz: 487a9fe041d8203eb674d169705be002d209cd50d46bc71726f62451a8f194f7aaf0ec249616601ffbd57d7d7f123a892ae2d9d4aa25bde74e49918de3f22e4d
+  metadata.gz: d9ac13e0c3a98c415943a14c22165902814c986a83a135a91dc3fbe60724885e4e76909d7c998ef004c45d2642bb40e8bf2b00c1b1d93b70964c8d637adf74a5
+  data.tar.gz: c0ab921fd4376645f34bc71df899d26cc520b1fdb76584b4f931bd0b9f2c438401691f295184cb25937355bcdcf34adf8222bea82afbdba1912a8c906a5897fc

data/.rubocop.yml

@@ -1,6 +1,11 @@
+inherit_from:
+  - .rubocop_todo.yml
+  - .rubocop_metrics_todo.yml
+
 inherit_gem:
   rubocop-ogat:
     - config/default.yml
+
 AllCops:
   TargetRubyVersion: 2.3
 

data/.rubocop_metrics_todo.yml

@@ -0,0 +1,54 @@
+Metrics/AbcSize:
+  Exclude:
+    - db/**/*
+    - spec/**/*
+    - config/routes.rb
+
+Metrics/BlockLength:
+  Exclude:
+    - db/**/*
+    - spec/**/*
+    - config/routes.rb
+
+Metrics/BlockNesting:
+  Exclude:
+    - db/**/*
+    - spec/**/*
+    - config/routes.rb
+
+Metrics/ClassLength:
+  Exclude:
+    - db/**/*
+    - spec/**/*
+    - config/routes.rb
+
+Metrics/CyclomaticComplexity:
+  Exclude:
+    - db/**/*
+    - spec/**/*
+    - config/routes.rb
+
+Metrics/MethodLength:
+  Exclude:
+    - db/**/*
+    - spec/**/*
+    - config/routes.rb
+
+Metrics/ModuleLength:
+  Exclude:
+    - db/**/*
+    - spec/**/*
+    - config/routes.rb
+
+Metrics/ParameterLists:
+  Exclude:
+    - db/**/*
+    - spec/**/*
+    - config/routes.rb
+
+Metrics/PerceivedComplexity:
+  Exclude:
+    - db/**/*
+    - spec/**/*
+    - config/routes.rb
+

data/.rubocop_todo.yml

@@ -0,0 +1,18 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config --exclude-limit 1000 --no-offense-counts --no-auto-gen-timestamp`
+# using RuboCop version 0.66.0.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Configuration parameters: Include, Whitelist.
+# Include: **/*.gemfile, **/Gemfile, **/gems.rb
+Bundler/GemComment:
+  Exclude:
+    - 'Gemfile'
+
+Style/ConstantVisibility:
+  Exclude:
+    - 'lib/ogatstyle/fileicon/mapping.rb'
+    - 'lib/ogatstyle/version.rb'

data/.travis.yml

@@ -2,15 +2,15 @@ sudo: false
 language: ruby
 cache: bundler
 rvm:
-  - 2.3.6
-  - 2.4.3
-  - 2.5.0
+  - 2.4.6
+  - 2.5.5
+  - 2.6.3
   - ruby-head
 matrix:
   allow_failures:
     - rvm: ruby-head
   fast_finish: true
-before_install: gem install bundler -v 1.16.1
+before_install: gem install bundler -v '~> 1.17.3'
 script:
   - bundle exec rubocop
   - bundle exec rake
@@ -21,7 +21,7 @@ deploy:
     secure: sFLffEqNmjfv0atXzQNifV3N6ChQrqwmV8fuu3YFFMUzkfyQEkcjdc6AkhlHtA9NkqQrXpjOtQb5CpcGVYHgB49JaRKYiAkObzv2omvq8BaxC+IMaszYEBVLuACIGmxX2nouP88QfNye1RjM059jnHCFrEih5Opj3G0j4ux89ukfEuskC8hME+tIumO9p6iqQOnRH3JuOQese1N/oPSBdW5M1/vL39j2juzBTidFVRwQSVekHA1pWO8JzcIBzjsBnRxDdp9D4SLOwmMYhBqaeIhx+rTblcv1wfp4/oyQAUrDg9777KGiLHJREEuosjdTeaYeWWqmgh6v7OFzXV21v54cCnqjoJoeC9DXLiSuw2eaQZO9+ce3o0f3K7/bRCO4NpRVmbEcitBZxoD7fqqdlE4JhEfpNCIw+TnHNXDIpoT0CsNHfuPtYh6p6Sbjs/9hOfbCR3tskTgMi3USJyqUHCySky/1DzW4DddnQaIRKWuqaOF7FWZroQ2BqPI2oSBwr5v0n/FpBkzoxRvLqcPqPtia/P5g+dFYhlV02WUBSecS1oRahqK+MlHzGytqAOyiwp+aFZ/blxhJYgYDxLgsidnTp1vwun2shgkyUtPWLh/VX3HFrR7RUkbXKn7VObgqr7PSgCke4TGJwMY8RZiQH5hPszfKDsiuW854eZUZR3I=
   gem: ogatstyle
   on:
-    rvm: 2.4.3
+    rvm: 2.4.6
     tags: true
     repo: Outwood/ogatstyle
 addons:

data/README.md

@@ -30,7 +30,7 @@ Or install it yourself as:
 @import "ogatstyle";
 ```
 
-### Full-width web app varient
+### Full-width web app variant
 
 ```scss
 @import "ogatstyle_app";

data/app/assets/stylesheets/ogatstyle/_type.scss

@@ -1,6 +1,5 @@
 p.lead {
   font-family: $ogat-font-family;
-  font-style: italic;
   font-weight: lighter;
 }
 

data/app/assets/stylesheets/ogatstyle/apps/_bootstrap_variables.scss

@@ -12,3 +12,5 @@ $navbar-inverse-brand-hover-bg:     $ogat-purple-alt;
 
 $headings-font-family: $ogat-font-family;
 $headings-font-weight: bold !default;
+
+$link-color:            mix($ogat-purple, white, 80%);

data/app/assets/stylesheets/ogatstyle/sites/_bootstrap_variables.scss

@@ -3,3 +3,5 @@ $brand-primary: $ogat-purple;
 $headings-font-family: $ogat-font-family;
 // Gill Sans does not appear to support weight 500
 $headings-font-weight: bold !default;
+
+$link-color:            mix($ogat-purple, white, 80%);

data/lib/ogatstyle/fileicon/mapping.rb

@@ -3,67 +3,67 @@
 module Ogatstyle
   module Fileicon
     MAPPING = {
-      'bmp'  => 'image',
-      'gif'  => 'image',
+      'bmp' => 'image',
+      'gif' => 'image',
       'jpeg' => 'image',
-      'jpg'  => 'image',
-      'png'  => 'image',
-      'svg'  => 'image',
+      'jpg' => 'image',
+      'png' => 'image',
+      'svg' => 'image',
       'tiff' => 'image',
 
-      '7z'   => 'archive',
-      'bz2'  => 'archive',
-      'gz'   => 'archive',
-      'rar'  => 'archive',
-      'sit'  => 'archive',
+      '7z' => 'archive',
+      'bz2' => 'archive',
+      'gz' => 'archive',
+      'rar' => 'archive',
+      'sit' => 'archive',
       'sitx' => 'archive',
-      'tar'  => 'archive',
-      'tgz'  => 'archive',
-      'zip'  => 'archive',
+      'tar' => 'archive',
+      'tgz' => 'archive',
+      'zip' => 'archive',
       'zipx' => 'archive',
 
       'css' => 'css',
 
-      'htm'  => 'html',
+      'htm' => 'html',
       'html' => 'html',
 
-      'xls'  => 'excel',
+      'xls' => 'excel',
       'xlsx' => 'excel',
 
-      'ppt'  => 'powerpoint',
+      'ppt' => 'powerpoint',
       'pptx' => 'powerpoint',
 
-      'doc'  => 'word',
+      'doc' => 'word',
       'docx' => 'word',
 
       'pdd' => 'photoshop',
       'psb' => 'photoshop',
       'psd' => 'photoshop',
 
-      'ai'  => 'illustrator',
+      'ai' => 'illustrator',
       'pdf' => 'pdf',
       'swf' => 'flash',
       'txt' => 'text',
 
-      'aac'  => 'music',
-      'aif'  => 'music',
+      'aac' => 'music',
+      'aif' => 'music',
       'aiff' => 'music',
       'flac' => 'music',
-      'm4a'  => 'music',
-      'm4p'  => 'music',
-      'mp3'  => 'music',
-      'ogg'  => 'music',
-      'vob'  => 'music',
-      'wav'  => 'music',
-      'wma'  => 'music',
+      'm4a' => 'music',
+      'm4p' => 'music',
+      'mp3' => 'music',
+      'ogg' => 'music',
+      'vob' => 'music',
+      'wav' => 'music',
+      'wma' => 'music',
 
-      'avi'  => 'movie',
+      'avi' => 'movie',
       'divx' => 'movie',
-      'm4v'  => 'movie',
-      'mkv'  => 'movie',
-      'mov'  => 'movie',
+      'm4v' => 'movie',
+      'mkv' => 'movie',
+      'mov' => 'movie',
       'mpeg' => 'movie',
-      'mpg'  => 'movie'
+      'mpg' => 'movie'
     }.freeze
   end
 end

data/lib/ogatstyle/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Ogatstyle
-  VERSION = '3.4.0'
+  VERSION = '3.5.0'
 end

data/ogatstyle.gemspec

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'ogatstyle/version'
 
@@ -26,12 +26,12 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'activesupport', '>= 4.0', '< 6.0'
   spec.add_development_dependency 'bundler', '~> 1.16'
-  spec.add_development_dependency 'rake', '~> 12.3'
+  spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.2'
-  spec.add_development_dependency 'rubocop-ogat', '~> 1.1.0'
+  spec.add_development_dependency 'rubocop-ogat', '~> 1.39.0'
   spec.add_dependency 'bootstrap-sass', '~> 3.3'
   spec.add_dependency 'font-awesome-sass', '>= 4.2', '< 6.0'
   spec.add_dependency 'rails', '>= 4.1'
-  spec.add_dependency 'sass-rails', '>= 3.2'
+  spec.add_dependency 'sassc-rails', '~> 2.1'
   spec.add_dependency 'sprockets-rails', '>= 3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ogatstyle
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 3.5.0
 platform: ruby
 authors:
 - Elliot Bowes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-28 00:00:00.000000000 Z
+date: 2019-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -51,14 +51,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -79,14 +79,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.39.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.39.0
 - !ruby/object:Gem::Dependency
   name: bootstrap-sass
   requirement: !ruby/object:Gem::Requirement
@@ -136,19 +136,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4.1'
 - !ruby/object:Gem::Dependency
-  name: sass-rails
+  name: sassc-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: sprockets-rails
   requirement: !ruby/object:Gem::Requirement
@@ -178,6 +178,8 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
+- ".rubocop_metrics_todo.yml"
+- ".rubocop_todo.yml"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
@@ -249,8 +251,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: OGAT Style Gem