vanity 4.0.2 → 4.0.4

data/gemfiles/rails61.gemfile.lock

@@ -7,100 +7,132 @@ GIT
 PATH
   remote: ..
   specs:
-    vanity (4.0.2)
+    vanity (4.0.4)
       i18n
 
 GEM
   remote: https://rubygems.org/
   specs:
-    RedCloth (4.2.9)
-    RedCloth (4.2.9-java)
-    actioncable (5.2.0)
-      actionpack (= 5.2.0)
+    RedCloth (4.3.2)
+    actioncable (6.1.6.1)
+      actionpack (= 6.1.6.1)
+      activesupport (= 6.1.6.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailer (5.2.0)
-      actionpack (= 5.2.0)
-      actionview (= 5.2.0)
-      activejob (= 5.2.0)
+    actionmailbox (6.1.6.1)
+      actionpack (= 6.1.6.1)
+      activejob (= 6.1.6.1)
+      activerecord (= 6.1.6.1)
+      activestorage (= 6.1.6.1)
+      activesupport (= 6.1.6.1)
+      mail (>= 2.7.1)
+    actionmailer (6.1.6.1)
+      actionpack (= 6.1.6.1)
+      actionview (= 6.1.6.1)
+      activejob (= 6.1.6.1)
+      activesupport (= 6.1.6.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.2.0)
-      actionview (= 5.2.0)
-      activesupport (= 5.2.0)
-      rack (~> 2.0)
+    actionpack (6.1.6.1)
+      actionview (= 6.1.6.1)
+      activesupport (= 6.1.6.1)
+      rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.0)
-      activesupport (= 5.2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actiontext (6.1.6.1)
+      actionpack (= 6.1.6.1)
+      activerecord (= 6.1.6.1)
+      activestorage (= 6.1.6.1)
+      activesupport (= 6.1.6.1)
+      nokogiri (>= 1.8.5)
+    actionview (6.1.6.1)
+      activesupport (= 6.1.6.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.2.0)
-      activesupport (= 5.2.0)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activejob (6.1.6.1)
+      activesupport (= 6.1.6.1)
       globalid (>= 0.3.6)
-    activemodel (5.2.0)
-      activesupport (= 5.2.0)
-    activerecord (5.2.0)
-      activemodel (= 5.2.0)
-      activesupport (= 5.2.0)
-      arel (>= 9.0)
-    activerecord-jdbc-adapter (52.8-java)
-      activerecord (~> 5.2.0)
-    activestorage (5.2.0)
-      actionpack (= 5.2.0)
-      activerecord (= 5.2.0)
-      marcel (~> 0.3.1)
-    activesupport (5.2.0)
+    activemodel (6.1.6.1)
+      activesupport (= 6.1.6.1)
+    activerecord (6.1.6.1)
+      activemodel (= 6.1.6.1)
+      activesupport (= 6.1.6.1)
+    activestorage (6.1.6.1)
+      actionpack (= 6.1.6.1)
+      activejob (= 6.1.6.1)
+      activerecord (= 6.1.6.1)
+      activesupport (= 6.1.6.1)
+      marcel (~> 1.0)
+      mini_mime (>= 1.1.0)
+    activesupport (6.1.6.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    addressable (2.5.2)
-      public_suffix (>= 2.0.2, < 4.0)
-    appraisal (2.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    addressable (2.8.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    appraisal (2.4.1)
       bundler
       rake
       thor (>= 0.14.0)
-    arel (9.0.0)
     ast (2.4.2)
     blankslate (2.1.2.4)
-    bson (4.3.0)
-    bson (4.3.0-java)
-    builder (3.2.3)
-    classifier-reborn (2.2.0)
+    bson (4.15.0)
+    builder (3.2.4)
+    classifier-reborn (2.3.0)
       fast-stemmer (~> 1.0)
-    coderay (1.1.2)
+      matrix (~> 0.4)
+    coderay (1.1.3)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
-    coffee-script-source (1.11.1)
+    coffee-script-source (1.12.2)
     colorator (0.1)
-    concurrent-ruby (1.0.5)
-    concurrent-ruby (1.0.5-java)
-    crack (0.4.3)
-      safe_yaml (~> 1.0.0)
-    crass (1.0.4)
-    erubi (1.7.1)
-    execjs (2.7.0)
-    fakefs (0.18.0)
-    faraday (0.15.2)
-      multipart-post (>= 1.2, < 3)
+    concurrent-ruby (1.1.10)
+    crack (0.4.5)
+      rexml
+    crass (1.0.6)
+    erubi (1.10.0)
+    execjs (2.8.1)
+    fakefs (1.8.0)
+    faraday (1.10.0)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0)
+      faraday-multipart (~> 1.0)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.0)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
+      faraday-retry (~> 1.0)
+      ruby2_keywords (>= 0.0.4)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
+    faraday-httpclient (1.0.1)
+    faraday-multipart (1.0.4)
+      multipart-post (~> 2)
+    faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
+    faraday-retry (1.0.3)
     fast-stemmer (1.0.2)
     ffi (1.15.5)
-    ffi (1.15.5-java)
     garb (0.9.1)
       activesupport (>= 2.2.0)
       crack (>= 0.1.6)
-    globalid (0.4.1)
-      activesupport (>= 4.2.0)
-    hashdiff (0.3.7)
-    i18n (1.0.1)
+    globalid (1.0.0)
+      activesupport (>= 5.0)
+    hashdiff (1.0.1)
+    i18n (1.11.0)
       concurrent-ruby (~> 1.0)
     integration (0.1.0)
-    jdbc-sqlite3 (3.28.0)
     jekyll (2.5.3)
       classifier-reborn (~> 2.0)
       colorator (~> 0.1)
@@ -116,9 +148,9 @@ GEM
       redcarpet (~> 3.1)
       safe_yaml (~> 1.0)
       toml (~> 0.1.0)
-    jekyll-coffeescript (1.1.1)
+    jekyll-coffeescript (1.2.2)
       coffee-script (~> 2.2)
-      coffee-script-source (~> 1.11.1)
+      coffee-script-source (~> 1.12)
     jekyll-gist (1.5.0)
       octokit (~> 4.2)
     jekyll-paginate (1.1.0)
@@ -128,97 +160,88 @@ GEM
       listen (~> 3.0)
     kramdown (1.17.0)
     liquid (2.6.3)
-    listen (3.1.5)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-      ruby_dep (~> 1.2)
-    loofah (2.2.2)
+    listen (3.7.1)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
+    loofah (2.18.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mail (2.7.0)
+    mail (2.7.1)
       mini_mime (>= 0.1.1)
-    marcel (0.3.3)
-      mimemagic (~> 0.3.2)
+    marcel (1.0.2)
+    matrix (0.4.2)
     mercenary (0.3.6)
-    method_source (0.9.0)
-    mimemagic (0.3.10)
-      nokogiri (~> 1)
-      rake
-    mini_mime (1.0.0)
+    method_source (1.0.0)
+    mini_mime (1.1.2)
     mini_portile2 (2.6.1)
-    minitest (5.11.3)
-    mocha (1.13.0)
-    mongo (2.6.1)
-      bson (>= 4.3.0, < 5.0.0)
-    multipart-post (2.0.0)
-    nio4r (2.3.1)
-    nio4r (2.3.1-java)
+    minitest (5.15.0)
+    mocha (1.14.0)
+    mongo (2.17.1)
+      bson (>= 4.8.2, < 5.0.0)
+    multipart-post (2.2.3)
+    nio4r (2.5.8)
     nokogiri (1.12.5)
       mini_portile2 (~> 2.6.1)
       racc (~> 1.4)
-    nokogiri (1.12.5-java)
-      racc (~> 1.4)
-    octokit (4.9.0)
-      sawyer (~> 0.8.0, >= 0.5.3)
-    parallel (1.21.0)
-    parser (3.1.1.0)
+    octokit (4.25.1)
+      faraday (>= 1, < 3)
+      sawyer (~> 0.9)
+    parallel (1.22.1)
+    parser (3.1.2.0)
       ast (~> 2.4.1)
     parslet (1.5.0)
       blankslate (~> 2.0)
-    passenger (6.0.12)
+    passenger (6.0.14)
       rack
       rake (>= 0.8.1)
-    posix-spawn (0.3.13)
-    pry (0.11.3)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    pry (0.11.3-java)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-      spoon (~> 0.0)
-    public_suffix (3.0.2)
+    posix-spawn (0.3.15)
+    pry (0.14.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    public_suffix (4.0.7)
     pygments.rb (0.6.3)
       posix-spawn (~> 0.3.6)
       yajl-ruby (~> 1.2.0)
     racc (1.6.0)
-    racc (1.6.0-java)
-    rack (2.2.3)
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
-    rails (5.2.0)
-      actioncable (= 5.2.0)
-      actionmailer (= 5.2.0)
-      actionpack (= 5.2.0)
-      actionview (= 5.2.0)
-      activejob (= 5.2.0)
-      activemodel (= 5.2.0)
-      activerecord (= 5.2.0)
-      activestorage (= 5.2.0)
-      activesupport (= 5.2.0)
-      bundler (>= 1.3.0)
-      railties (= 5.2.0)
+    rack (2.2.4)
+    rack-test (2.0.2)
+      rack (>= 1.3)
+    rails (6.1.6.1)
+      actioncable (= 6.1.6.1)
+      actionmailbox (= 6.1.6.1)
+      actionmailer (= 6.1.6.1)
+      actionpack (= 6.1.6.1)
+      actiontext (= 6.1.6.1)
+      actionview (= 6.1.6.1)
+      activejob (= 6.1.6.1)
+      activemodel (= 6.1.6.1)
+      activerecord (= 6.1.6.1)
+      activestorage (= 6.1.6.1)
+      activesupport (= 6.1.6.1)
+      bundler (>= 1.15.0)
+      railties (= 6.1.6.1)
       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.2.0)
-      actionpack (= 5.2.0)
-      activesupport (= 5.2.0)
+    rails-html-sanitizer (1.4.3)
+      loofah (~> 2.3)
+    railties (6.1.6.1)
+      actionpack (= 6.1.6.1)
+      activesupport (= 6.1.6.1)
       method_source
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
+      rake (>= 12.2)
+      thor (~> 1.0)
     rainbow (3.1.1)
     rake (13.0.6)
-    rb-fsevent (0.10.3)
-    rb-inotify (0.9.10)
-      ffi (>= 0.5.0, < 2)
-    redcarpet (3.4.0)
-    redis (4.6.0)
+    rb-fsevent (0.11.1)
+    rb-inotify (0.10.1)
+      ffi (~> 1.0)
+    redcarpet (3.5.1)
+    redis (4.7.1)
     redis-namespace (1.8.2)
       redis (>= 3.0.4)
-    regexp_parser (2.2.1)
+    regexp_parser (2.5.0)
     rexml (3.2.5)
     rubocop (1.25.1)
       parallel (~> 1.10)
@@ -231,56 +254,52 @@ GEM
       unicode-display_width (>= 1.4.0, < 3.0)
     rubocop-ast (1.15.2)
       parser (>= 3.0.1.1)
-    rubocop-performance (1.13.2)
+    rubocop-performance (1.13.3)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
-    rubocop-rspec (2.8.0)
+    rubocop-rspec (2.10.0)
       rubocop (~> 1.19)
     ruby-progressbar (1.11.0)
-    ruby_dep (1.5.0)
+    ruby2_keywords (0.0.5)
     rubystats (0.3.0)
-    safe_yaml (1.0.4)
-    sass (3.5.7)
+    safe_yaml (1.0.5)
+    sass (3.7.4)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
-    sawyer (0.8.1)
-      addressable (>= 2.3.5, < 2.6)
-      faraday (~> 0.8, < 1.0)
-    spoon (0.0.6)
-      ffi
-    sprockets (3.7.2)
+    sawyer (0.9.2)
+      addressable (>= 2.3.5)
+      faraday (>= 0.17.3, < 3)
+    sprockets (4.1.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.2.1)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
+    sprockets-rails (3.4.2)
+      actionpack (>= 5.2)
+      activesupport (>= 5.2)
       sprockets (>= 3.0.0)
-    sqlite3 (1.3.10)
-    thor (0.20.0)
-    thread_safe (0.3.6)
-    thread_safe (0.3.6-java)
-    timecop (0.9.1)
+    sqlite3 (1.4.4)
+    thor (1.2.1)
+    timecop (0.9.5)
     toml (0.1.2)
       parslet (~> 1.5.0)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-    unicode-display_width (2.1.0)
-    webmock (3.4.2)
-      addressable (>= 2.3.6)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.2.0)
+    webmock (3.14.0)
+      addressable (>= 2.8.0)
       crack (>= 0.3.2)
-      hashdiff
-    websocket-driver (0.7.0)
-      websocket-extensions (>= 0.1.0)
-    websocket-driver (0.7.0-java)
+      hashdiff (>= 0.4.0, < 2.0.0)
+    webrick (1.7.0)
+    websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.3)
+    websocket-extensions (0.1.5)
     yajl-ruby (1.2.3)
-    yard (0.9.15)
+    yard (0.9.28)
+      webrick (~> 1.7.0)
+    zeitwerk (2.6.0)
 
 PLATFORMS
-  java
   ruby
 
 DEPENDENCIES
@@ -300,19 +319,20 @@ DEPENDENCIES
   passenger
   pry
   rack
-  rails (~> 5.2.0)
+  rails (~> 6.1.0)
   rake
   redis (>= 3.2.1)
   redis-namespace (>= 1.1.0)
-  rubocop
+  rubocop (~> 1.25.1)
+  rubocop-ast (~> 1.15.2)
   rubocop-performance
   rubocop-rspec
   rubystats (>= 0.2.5)
-  sqlite3 (~> 1.3.10)
+  sqlite3 (~> 1.4.0)
   timecop
   vanity!
   webmock
   yard
 
 BUNDLED WITH
-   1.17.3
+   2.3.26

data/lib/vanity/configuration.rb

@@ -213,7 +213,7 @@ module Vanity
       file_path = File.join(config_path, file_name)
 
       if File.exist?(file_path) # rubocop:todo Style/GuardClause
-        config = YAML.safe_load(ERB.new(File.read(file_path)).result, [], [], true)
+        config = SafeYAML.load(ERB.new(File.read(file_path)).result)
         config ||= {}
         params_for_environment = config[environment.to_s]
 

data/lib/vanity/frameworks/rails.rb

@@ -249,8 +249,9 @@ module Vanity
       def vanity_js
         return if Vanity.context.vanity_active_experiments.nil? || Vanity.context.vanity_active_experiments.empty?
 
+        template = File.read(Vanity.template("_vanity.js.erb"))
         javascript_tag do
-          render file: Vanity.template("_vanity.js.erb"), formats: [:js]
+          ERB.new(template).result(binding)
         end
       end
 

data/lib/vanity/safe_yaml.rb

@@ -0,0 +1,21 @@
+require "yaml"
+
+module Vanity
+  module SafeYAML
+    begin
+      YAML.safe_load("---", permitted_classes: [])
+    rescue ArgumentError
+      SUPPORTS_PERMITTED_CLASSES = false
+    else
+      SUPPORTS_PERMITTED_CLASSES = true
+    end
+
+    def self.load(payload)
+      if SUPPORTS_PERMITTED_CLASSES
+        YAML.safe_load(payload, permitted_classes: [], permitted_symbols: [], aliases: true)
+      else
+        YAML.safe_load(payload, [], [], true)
+      end
+    end
+  end
+end

data/lib/vanity/version.rb

@@ -1,5 +1,5 @@
 module Vanity
-  VERSION = "4.0.2"
+  VERSION = "4.0.4"
 
   module Version
     version = VERSION.to_s.split(".").map { |i| i.to_i }

data/lib/vanity.rb

@@ -17,6 +17,7 @@ module Vanity
 end
 
 require "vanity/version"
+require "vanity/safe_yaml"
 # Metrics
 require "vanity/metric/base"
 require "vanity/metric/active_record"

data/test/metric/active_record_test.rb

@@ -203,7 +203,7 @@ if ENV["DB"] == "active_record"
         once = true
       end
       Sky.create!
-      Sky.last.update_attributes height: 4
+      Sky.last.update height: 4
     end
 
     it "with after_save" do
@@ -226,7 +226,7 @@ if ENV["DB"] == "active_record"
       end
       Sky.create!
       (1..5).each do |height|
-        Sky.last.update_attributes! height: height
+        Sky.last.update! height: height
       end
       assert_equal 2, times
     end
@@ -279,7 +279,7 @@ if ENV["DB"] == "active_record"
       (1..5).each do |height|
         Sky.create! height: height
       end
-      Sky.first.update_attributes! height: 4
+      Sky.first.update! height: 4
       assert_equal 3, Vanity::Metric.data(metric(:sky_is_limit)).last.last
     end
 

data/test/test_helper.rb

@@ -263,7 +263,11 @@ if ENV["DB"] == "active_record"
 
   migrate_path = File.expand_path('dummy/db/migrate', __dir__)
   if defined?(ActiveRecord::MigrationContext)
-    ActiveRecord::MigrationContext.new(migrate_path).migrate
+    if ActiveRecord.version.release >= Gem::Version.new('6.0')
+      ActiveRecord::MigrationContext.new(migrate_path, ActiveRecord::SchemaMigration).migrate
+    else
+      ActiveRecord::MigrationContext.new(migrate_path).migrate
+    end
   else
     ActiveRecord::Migrator.migrate(migrate_path)
   end

data/vanity.gemspec

@@ -13,7 +13,6 @@ Gem::Specification.new do |spec|
   spec.post_install_message = "To get started run vanity --help"
 
   spec.files         = `git ls-files`.split("\n")
-  spec.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   spec.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   spec.require_paths = ["lib"]