alchemy_cms 5.0.0 → 5.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16f4ae2bce440faa0777082d737d275f21bc1b5dcd13c52143369a4db9e2b5cf
-  data.tar.gz: 305a0964902cae1ff220c3b20e77c8da0f0ffef33e1022baa1283b97d8a8dc72
+  metadata.gz: 6917c640c04335035e6dc96c947904226222acd26dec111b81da71496b40505e
+  data.tar.gz: d5e33e37d5d5cbacbbb6c3729468548155add079b131524880bdd9c8ff8fd35f
 SHA512:
-  metadata.gz: ee11b0843264ecc2feeb7317e2caae8a27d2a2416abbd990b1fef3d8a662ce4781f4b586b68bd920fc25f9c1ac5c09fd2139bf45c4cb29bb2fbcff318e40fac3
-  data.tar.gz: f34a6757641128e2815e2b50baa2a5628020880e2af272ad5f5df01f9b8ec9a4f98d9b8b9e696d845d3c70a27254ba09988066d0892bb0b8c23311ceb7c39069
+  metadata.gz: e73a121ef1c1eee8c0dc065a585509cc55f3eeb457e89f4356ab112a6c8347e1209bb6b37f7f865a1f3589f3f4aae07158a8e842874e735e46ebbb1566a689c7
+  data.tar.gz: d82eb3375db6a20ac410051da9e476b50193b1a72337660a87bc8931d56b674369bb4f1bc9909511b85183f16949a854cdbed6301884db8c59c1016a8b6fa53d

data/.travis.yml

@@ -0,0 +1,48 @@
+language: ruby
+os: linux
+dist: bionic
+services:
+  - mysql
+addons:
+  postgresql: "10"
+cache:
+  bundler: true
+  yarn: true
+  directories:
+    - /home/travis/.webdrivers/
+rvm:
+  - 2.6.6
+  - 2.7.1
+
+before_script:
+  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+  - chmod +x ./cc-test-reporter
+  - ./cc-test-reporter before-build
+  - nvm use 12
+
+script: bundle exec rake
+
+after_script:
+  - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT
+
+jobs:
+  include:
+    - language: node_js
+      node_js: 12
+      install: yarn install
+      script: yarn jest --coverage
+      env: NODE_ENV=test
+      before_script: skip
+      after_script: skip
+
+env:
+  global:
+    CC_TEST_REPORTER_ID=bca4349e32f97919210ac8a450b04904b90683fcdd57d65a22c0f5065482bc22
+  jobs:
+    - DB=mysql RAILS_VERSION=5.2
+    - DB=mysql RAILS_VERSION=6.0
+    - DB=postgresql RAILS_VERSION=5.2
+    - DB=postgresql RAILS_VERSION=6.0
+notifications:
+  slack:
+    secure: QzOFw1Ph69pzwWBFgtIVkOnjbcRxB9HPRQ+RYjK+2tg+fsbiTJ+wYgHcZL49tPYcLAls4kymkFWzWBF3PCAXJMfKgUCqXzdQ2FuJC/JoVRTLll4wDnZFPG33jsm5tVznmycZ3ma4+ZWfJQ+C+elEBOba6v1kG9eGIy6sH2cvXfE=

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 5.0.1 (2020-09-29)
+
+- Better image alt text support [#1940](https://github.com/AlchemyCMS/alchemy_cms/pull/1940) ([tvdeyen](https://github.com/tvdeyen))
+
 ## 5.0.0 (2020-07-17)
 
 - Do not convert JPEG images into JPG [#1904](https://github.com/AlchemyCMS/alchemy_cms/pull/1904) ([tvdeyen](https://github.com/tvdeyen))

data/Gemfile

@@ -10,10 +10,10 @@ if ENV["DB"].nil? || ENV["DB"] == "sqlite"
   gem "sqlite3", "~> 1.4.1"
 end
 gem "mysql2", "~> 0.5.1" if ENV["DB"] == "mysql"
-gem "pg",     "~> 1.0"   if ENV["DB"] == "postgresql"
+gem "pg", "~> 1.0" if ENV["DB"] == "postgresql"
 
 group :development, :test do
-  if ENV["GITHUB_ACTIONS"]
+  if ENV["TRAVIS"]
     gem "sassc", "~> 2.4.0" # https://github.com/sass/sassc-ruby/issues/146
   else
     gem "launchy"

data/README.md

@@ -1,7 +1,7 @@
 # AlchemyCMS
 
 [![Gem Version](https://badge.fury.io/rb/alchemy_cms.svg)](http://badge.fury.io/rb/alchemy_cms)
-[![Build Status](https://github.com/AlchemyCMS/alchemy_cms/workflows/CI/badge.svg?branch=master)](https://github.com/AlchemyCMS/alchemy_cms/actions)
+[![Build Status](https://travis-ci.com/AlchemyCMS/alchemy_cms.svg?branch=master)](https://travis-ci.com/AlchemyCMS/alchemy_cms)
 [![Maintainability](https://api.codeclimate.com/v1/badges/196c56c56568ed24a697/maintainability)](https://codeclimate.com/github/AlchemyCMS/alchemy_cms/maintainability)
 [![Test Coverage](https://api.codeclimate.com/v1/badges/196c56c56568ed24a697/test_coverage)](https://codeclimate.com/github/AlchemyCMS/alchemy_cms/test_coverage)
 [![Depfu](https://badges.depfu.com/badges/ebe56d2dd7b7044a8ae700cc81212a8e/overview.svg)](https://depfu.com/github/AlchemyCMS/alchemy_cms?project_id=4600)

data/app/models/alchemy/essence_picture_view.rb

@@ -55,7 +55,7 @@ module Alchemy
     def img_tag
       @_img_tag ||= image_tag(
         essence.picture_url(options.except(*DEFAULT_OPTIONS.keys)), {
-          alt: essence.alt_tag.presence,
+          alt: alt_text,
           title: essence.title.presence,
           class: caption ? nil : essence.css_class.presence,
           srcset: srcset.join(", ").presence,
@@ -79,5 +79,9 @@ module Alchemy
         width.present? ? "#{url} #{width}w" : "#{url} #{height}h"
       end
     end
+
+    def alt_text
+      essence.alt_tag.presence || html_options.delete(:alt) || essence.picture.name&.humanize
+    end
   end
 end

data/lib/alchemy/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Alchemy
-  VERSION = "5.0.0"
+  VERSION = "5.0.1"
 
   def self.version
     VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.0.1
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -13,7 +13,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-17 00:00:00.000000000 Z
+date: 2020-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -596,7 +596,6 @@ files:
 - ".github/ISSUE_TEMPLATE/Bug_report.md"
 - ".github/ISSUE_TEMPLATE/Feature_request.md"
 - ".github/PULL_REQUEST_TEMPLATE.md"
-- ".github/workflows/ci.yml"
 - ".github/workflows/greetings.yml"
 - ".github/workflows/stale.yml"
 - ".gitignore"
@@ -604,6 +603,7 @@ files:
 - ".localeapp/config.rb"
 - ".prettierrc"
 - ".rubocop.yml"
+- ".travis.yml"
 - ".yardopts"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md

data/.github/workflows/ci.yml

@@ -1,134 +0,0 @@
-name: CI
-
-on: [push, pull_request]
-
-jobs:
-  RSpec:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        rails:
-          - '5.2'
-          - '6.0'
-        ruby:
-          - '2.5.x'
-          - '2.6.x'
-        database:
-          - mysql
-          - postgresql
-    env:
-      DB: ${{ matrix.database }}
-      DB_USER: alchemy_user
-      DB_PASSWORD: password
-      DB_HOST: '127.0.0.1'
-      RAILS_ENV: test
-      RAILS_VERSION: ${{ matrix.rails }}
-    services:
-      postgres:
-        image: postgres:11
-        env:
-          POSTGRES_USER: alchemy_user
-          POSTGRES_PASSWORD: password
-          POSTGRES_DB: alchemy_cms_dummy_test
-        ports: ['5432:5432']
-        options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
-      mysql:
-        image: mysql:latest
-        ports: ['3306:3306']
-        env:
-          MYSQL_USER: alchemy_user
-          MYSQL_PASSWORD: password
-          MYSQL_DATABASE: alchemy_cms_dummy_test
-          MYSQL_ROOT_PASSWORD: password
-        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=5
-    steps:
-      - uses: actions/checkout@v1
-      - name: Set up Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-      - name: Restore apt cache
-        id: apt-cache
-        uses: actions/cache@preview
-        with:
-          path: /home/runner/apt/cache
-          key: ${{ runner.os }}-apt-${{ matrix.database }}
-          restore-keys: |
-            ${{ runner.os }}-apt-
-      - name: Install Postgres headers
-        if: matrix.database == 'postgresql'
-        run: |
-          mkdir -p /home/runner/apt/cache
-          sudo apt update -qq
-          sudo apt install -qq --fix-missing libpq-dev -o dir::cache::archives="/home/runner/apt/cache"
-          sudo chown -R runner /home/runner/apt/cache
-      - name: Install MySQL headers
-        if: matrix.database == 'mysql'
-        run: |
-          mkdir -p /home/runner/apt/cache
-          sudo apt update -qq
-          sudo apt install -qq --fix-missing libmysqlclient-dev -o dir::cache::archives="/home/runner/apt/cache"
-          sudo chown -R runner /home/runner/apt/cache
-      - name: Install bundler
-        run: |
-          gem install bundler
-      - name: Restore Ruby Gems cache
-        id: cache
-        uses: actions/cache@preview
-        with:
-          path: vendor/bundle
-          key: ${{ runner.os }}-bundle-${{ matrix.ruby }}-${{ matrix.rails }}-${{ matrix.database }}-${{ hashFiles('**/Gemfile') }}
-          restore-keys: |
-            ${{ runner.os }}-bundle-
-      - name: Install bundle
-        timeout-minutes: 10
-        run: |
-          bundle install --jobs 4 --retry 3 --path vendor/bundle
-      - name: Restore node modules cache
-        id: yarn-cache
-        uses: actions/cache@preview
-        with:
-          path: spec/dummy/node_modules
-          key: ${{ runner.os }}-yarn-dummy-${{ hashFiles('./package.json') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-dummy-
-      - name: Prepare database
-        run: |
-          bundle exec rake alchemy:spec:prepare
-      - name: Run tests & publish code coverage
-        uses: paambaati/codeclimate-action@v2.5.7
-        env:
-          CC_TEST_REPORTER_ID: bca4349e32f97919210ac8a450b04904b90683fcdd57d65a22c0f5065482bc22
-        with:
-          coverageCommand: bundle exec rspec
-      - uses: actions/upload-artifact@master
-        if: failure()
-        with:
-          name: Screenshots
-          path: spec/dummy/tmp/screenshots
-  Jest:
-    runs-on: ubuntu-latest
-    env:
-      NODE_ENV: test
-    steps:
-      - uses: actions/checkout@v1
-      - name: Restore node modules cache
-        uses: actions/cache@preview
-        with:
-          path: node_modules
-          key: ${{ runner.os }}-yarn-${{ hashFiles('./package.json') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-
-      - name: Install yarn
-        run: yarn install
-      - name: Run jest
-        run: yarn jest
-      - name: Run jest & publish code coverage
-        uses: paambaati/codeclimate-action@v2.5.7
-        env:
-          CC_TEST_REPORTER_ID: bca4349e32f97919210ac8a450b04904b90683fcdd57d65a22c0f5065482bc22
-        with:
-          coverageLocations:
-            ./coverage/lcov.info:lcov
-          coverageCommand: yarn jest --collectCoverage --coverageDirectory=coverage