blocks 4.0.0.rc2 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c2bc8606eb38fc14ef7d5cba2af1243900777696d36555948c3723d96242032
-  data.tar.gz: 3d278dc1864520beaa5b33d44680fe0326621128f7fe97d96249080698237e2b
+  metadata.gz: 6514db3994d5dca614d81e9441afedb963f36ac68b2884bc0b55bbc8a32dd490
+  data.tar.gz: d76fe105e80388c986d90ab3ae5cb9887329982c7b240c1aa09d8501ba0826b4
 SHA512:
-  metadata.gz: 0db01d1469f15ac1f833ae155d04ea28232106eff6a108d7640552f3f18116a7aec72f32d54939efe3ba5cdd56bc5d19fa2150cb79ff1b5fcfa89414a2696b51
-  data.tar.gz: 4fa95a20bc9f3ab1372dfa921a8acb4bea749beabb2aff6ae0241ff134a38074d9f24fd0c5dd5ff779a30a1f3ea3371d443af5f6ea6de66949f3163d42da9576
+  metadata.gz: e5f71b99378aa63f869ac83cc9b1838f04e2f8ab4dc113f00171a80d1a8266635b1df5bc1ec7d6cc429a5fdcb398990f035d266896ac8b27f97b36b233d5e409
+  data.tar.gz: 83718a88a327ba0e4650c40f366d847777b083e7765642fd43d6c9f0e0ed2ccf8df1e1b0adc621096256591aabf3a9f734ea4a7e40e1d095e67f9b85abe05e6f

data/.gitignore

@@ -6,4 +6,5 @@ Gemfile.lock
 coverage/
 _site/
 .sass-cache/
-.idea/
+.idea/
+docs/.jekyll-cache

data/.travis.yml

@@ -1,18 +1,6 @@
 language: ruby
 cache: bundler
 
-before_install:
-  - function version { echo "$@" | awk -F. '{ printf("%d%03d%03d%03d\n", $1,$2,$3,$4); }'; };
-    if [ $(version $TRAVIS_RUBY_VERSION) -ge $(version '2.7.0') ]; 
-    then
-      gem install "rubygems-update" --no-document;
-      update_rubygems;
-      gem install bundler -v 1.17.3;
-    else
-      gem install "rubygems-update:<3.0.0" --no-document;
-      update_rubygems;
-      gem install bundler -v 1.17.3;
-    fi
 rvm:
   - 2.0.0
   - 2.1.10
@@ -34,7 +22,7 @@ gemfile:
   - gemfiles/Gemfile.rails-5-1-stable
   - gemfiles/Gemfile.rails-5-2-stable
   - Gemfile
-matrix:
+jobs:
   exclude:
     # Exclude Rails 5 from Ruby < 2.3
     - rvm: 2.0.0
@@ -86,16 +74,20 @@ matrix:
       gemfile: gemfiles/Gemfile.rails-4-1-stable
     - rvm: 2.7.0
       gemfile: gemfiles/Gemfile.rails-4-2-stable
-
-script: 'bundle exec rake'
-
-jobs:
   include:
-    # ./bin/deploy_docs will exit if the current branch is not master
-    - stage: documentation
-      script: './bin/deploy_docs'
+    - name: Documentation
+      script: bundle exec jekyll build
       rvm: 2.6.5
       gemfile: Gemfile
+      if: branch = master AND type = push
+      deploy:
+        local_dir: _site
+        provider: pages
+        skip_cleanup: true
+        github_token: $GITHUB_TOKEN  # Set in the settings page of your repository, as a secure variable
+        keep_history: true
+
+script: 'bundle exec rake'
 
 notifications:
   email:

data/Gemfile

@@ -4,7 +4,7 @@ gemspec
 
 # Requires min Ruby version 2.3
 
-gem "nokogiri", "1.10.7"
+gem "nokogiri", "1.10.8"
 gem "capybara"
 gem "rspec", "~> 3.6.0"
 gem "rspec-its", "~> 1.2.0"

data/gemfiles/Gemfile.rails-5-0-stable

@@ -4,7 +4,7 @@ gemspec path: ".."
 
 # Requires min Ruby version 2.3
 
-gem "nokogiri", "1.10.7"
+gem "nokogiri", "1.10.8"
 gem "capybara"
 gem "rspec", "~> 3.6.0"
 gem "rspec-its", "~> 1.2.0"

data/gemfiles/Gemfile.rails-5-1-stable

@@ -4,7 +4,7 @@ gemspec path: ".."
 
 # Requires min Ruby version 2.3
 
-gem "nokogiri", "1.10.7"
+gem "nokogiri", "1.10.8"
 gem "capybara"
 gem "rspec", "~> 3.6.0"
 gem "rspec-its", "~> 1.2.0"

data/gemfiles/Gemfile.rails-5-2-stable

@@ -4,7 +4,7 @@ gemspec path: ".."
 
 # Requires min Ruby version 2.3
 
-gem "nokogiri", "1.10.7"
+gem "nokogiri", "1.10.8"
 gem "capybara"
 gem "rspec", "~> 3.6.0"
 gem "rspec-its", "~> 1.2.0"

data/lib/blocks/helpers/controller_extensions.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'action_controller'
+require 'active_support/dependencies'
 
 module Blocks
   module ControllerExtensions
@@ -10,4 +10,6 @@ module Blocks
   end
 end
 
-ActionController::Base.send :include, Blocks::ControllerExtensions
+ActiveSupport.on_load(:action_controller) do
+  include Blocks::ControllerExtensions
+end

data/lib/blocks/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Blocks
-  VERSION = "4.0.0.rc2"
+  VERSION = "4.0.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blocks
 version: !ruby/object:Gem::Version
-  version: 4.0.0.rc2
+  version: 4.0.1
 platform: ruby
 authors:
 - Andrew Hunter
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-06-08 00:00:00.000000000 Z
+date: 2023-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -71,8 +71,6 @@ files:
 - Rakefile
 - _config.yml
 - bin/console
-- bin/deploy_docs
-- bin/setup
 - blocks.gemspec
 - docs/.gitignore
 - docs/404.html
@@ -178,7 +176,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -189,12 +187,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Blocks gives you total control over how your blocks of code render.
 test_files: []

data/bin/deploy_docs

@@ -1,50 +0,0 @@
-set -e
-
-DEPLOY_REPO="https://${GITHUB_TOKEN}@github.com/hunterae/blocks.git"
-
-function main {
-	clean
-	get_current_site
-	build_site
-	deploy
-}
-
-function clean {
-	echo "cleaning _site folder"
-	if [ -d "_site" ]; then rm -Rf _site; fi
-}
-
-function get_current_site {
-	echo "getting latest site"
-	git clone --depth 1 $DEPLOY_REPO _site
-}
-
-function build_site {
-	echo "building site"
-	bundle exec jekyll build
-}
-
-function deploy {
-	echo "deploying changes"
-
-	if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
-	    echo "except don't publish site for pull requests"
-	    exit 0
-	fi
-
-	if [ "$TRAVIS_BRANCH" != "master" ]; then
-	    echo "except we should only publish the master branch. stopping here"
-	    exit 0
-	fi
-
-	cd _site
-	git config --global user.name "Travis CI"
-    git config --global user.email 'Deployment Bot'
-	git add -A
-	git status
-	git commit -m "Lastest site built on successful travis build $TRAVIS_BUILD_NUMBER auto-pushed to github"
-	git push --force $DEPLOY_REPO master:gh-pages
-}
-
-
-main

data/bin/setup

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install
-
-# Do any other automated setup that you need to do here