From 17db45d8ad387ff609fda15f69a7f502e0669ed8 Mon Sep 17 00:00:00 2001 From: Alexandru Emil Lupu Date: Fri, 12 May 2023 13:18:35 +0300 Subject: [PATCH] Allow all versions of decidim >= 0.26.0 (#16) --- .github/workflows/ci_lint.yml | 2 +- .ruby-version | 2 +- Gemfile.lock | 180 +++++++++--------- README.md | 9 +- .../decidim/slider/homepage/main_cell.rb | 16 +- lib/decidim/slider/version.rb | 4 +- 6 files changed, 108 insertions(+), 105 deletions(-) diff --git a/.github/workflows/ci_lint.yml b/.github/workflows/ci_lint.yml index 416f520..b61d35f 100644 --- a/.github/workflows/ci_lint.yml +++ b/.github/workflows/ci_lint.yml @@ -7,7 +7,7 @@ on: pull_request: env: - RUBY_VERSION: 2.7.6 + RUBY_VERSION: 2.7.5 jobs: lint-report: diff --git a/.ruby-version b/.ruby-version index 5b013b9..a603bb5 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.7.6 \ No newline at end of file +2.7.5 diff --git a/Gemfile.lock b/Gemfile.lock index 70456c3..34a9674 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,8 +1,8 @@ PATH remote: . specs: - decidim-slider (0.0.1) - decidim-core (= 0.26.5) + decidim-slider (0.0.2) + decidim-core (~> 0.26.0) GEM remote: https://rubygems.org/ @@ -70,7 +70,7 @@ GEM addressable (2.8.4) public_suffix (>= 2.0.2, < 6.0) ast (2.4.2) - axe-core-api (4.6.0) + axe-core-api (4.7.0) dumb_delegator virtus axe-core-rspec (4.1.0) @@ -97,7 +97,7 @@ GEM browser (2.7.1) builder (3.2.4) byebug (11.1.3) - capybara (3.38.0) + capybara (3.39.0) addressable matrix mini_mime (>= 0.1.3) @@ -126,7 +126,7 @@ GEM actionpack (>= 5.0) cells (>= 4.1.6, < 5.0.0) charlock_holmes (0.7.7) - chef-utils (18.1.0) + chef-utils (18.2.7) concurrent-ruby childprocess (3.0.0) codecov (0.6.0) @@ -153,53 +153,53 @@ GEM db-query-matchers (0.10.0) activesupport (>= 4.0, < 7) rspec (~> 3.0) - decidim (0.26.5) - decidim-accountability (= 0.26.5) - decidim-admin (= 0.26.5) - decidim-api (= 0.26.5) - decidim-assemblies (= 0.26.5) - decidim-blogs (= 0.26.5) - decidim-budgets (= 0.26.5) - decidim-comments (= 0.26.5) - decidim-core (= 0.26.5) - decidim-debates (= 0.26.5) - decidim-forms (= 0.26.5) - decidim-generators (= 0.26.5) - decidim-meetings (= 0.26.5) - decidim-pages (= 0.26.5) - decidim-participatory_processes (= 0.26.5) - decidim-proposals (= 0.26.5) - decidim-sortitions (= 0.26.5) - decidim-surveys (= 0.26.5) - decidim-system (= 0.26.5) - decidim-templates (= 0.26.5) - decidim-verifications (= 0.26.5) - decidim-accountability (0.26.5) - decidim-comments (= 0.26.5) - decidim-core (= 0.26.5) - decidim-admin (0.26.5) + decidim (0.26.7) + decidim-accountability (= 0.26.7) + decidim-admin (= 0.26.7) + decidim-api (= 0.26.7) + decidim-assemblies (= 0.26.7) + decidim-blogs (= 0.26.7) + decidim-budgets (= 0.26.7) + decidim-comments (= 0.26.7) + decidim-core (= 0.26.7) + decidim-debates (= 0.26.7) + decidim-forms (= 0.26.7) + decidim-generators (= 0.26.7) + decidim-meetings (= 0.26.7) + decidim-pages (= 0.26.7) + decidim-participatory_processes (= 0.26.7) + decidim-proposals (= 0.26.7) + decidim-sortitions (= 0.26.7) + decidim-surveys (= 0.26.7) + decidim-system (= 0.26.7) + decidim-templates (= 0.26.7) + decidim-verifications (= 0.26.7) + decidim-accountability (0.26.7) + decidim-comments (= 0.26.7) + decidim-core (= 0.26.7) + decidim-admin (0.26.7) active_link_to (~> 1.0) - decidim-core (= 0.26.5) + decidim-core (= 0.26.7) devise (~> 4.7) devise-i18n (~> 1.2) devise_invitable (~> 2.0) - decidim-api (0.26.5) + decidim-api (0.26.7) graphql (~> 1.12, < 1.13) rack-cors (~> 1.0) redcarpet (~> 3.5, >= 3.5.1) - decidim-assemblies (0.26.5) - decidim-core (= 0.26.5) - decidim-blogs (0.26.5) - decidim-admin (= 0.26.5) - decidim-comments (= 0.26.5) - decidim-core (= 0.26.5) - decidim-budgets (0.26.5) - decidim-comments (= 0.26.5) - decidim-core (= 0.26.5) - decidim-comments (0.26.5) - decidim-core (= 0.26.5) + decidim-assemblies (0.26.7) + decidim-core (= 0.26.7) + decidim-blogs (0.26.7) + decidim-admin (= 0.26.7) + decidim-comments (= 0.26.7) + decidim-core (= 0.26.7) + decidim-budgets (0.26.7) + decidim-comments (= 0.26.7) + decidim-core (= 0.26.7) + decidim-comments (0.26.7) + decidim-core (= 0.26.7) redcarpet (~> 3.5, >= 3.5.1) - decidim-core (0.26.5) + decidim-core (0.26.7) active_link_to (~> 1.0) acts_as_list (~> 0.9) batch-loader (~> 1.2) @@ -209,7 +209,7 @@ GEM cells-rails (~> 0.1.3) charlock_holmes (~> 0.7) date_validator (~> 0.9.0) - decidim-api (= 0.26.5) + decidim-api (= 0.26.7) devise (~> 4.7) devise-i18n (~> 1.2) diffy (~> 3.3) @@ -251,15 +251,15 @@ GEM valid_email2 (~> 2.1) webpacker (= 6.0.0.rc.5) wisper (~> 2.0) - decidim-debates (0.26.5) - decidim-comments (= 0.26.5) - decidim-core (= 0.26.5) - decidim-dev (0.26.5) + decidim-debates (0.26.7) + decidim-comments (= 0.26.7) + decidim-core (= 0.26.7) + decidim-dev (0.26.7) axe-core-rspec (~> 4.1.0) byebug (~> 11.0) capybara (~> 3.24) db-query-matchers (~> 0.10.0) - decidim (= 0.26.5) + decidim (= 0.26.7) erb_lint (~> 0.0.35) factory_bot_rails (~> 4.8) i18n-tasks (~> 0.9.18) @@ -282,45 +282,45 @@ GEM w3c_rspec_validators (~> 0.3.0) webmock (~> 3.6) wisper-rspec (~> 1.0) - decidim-forms (0.26.5) - decidim-core (= 0.26.5) + decidim-forms (0.26.7) + decidim-core (= 0.26.7) wicked_pdf (~> 2.1) wkhtmltopdf-binary (~> 0.12) - decidim-generators (0.26.5) - decidim-core (= 0.26.5) - decidim-meetings (0.26.5) - decidim-core (= 0.26.5) - decidim-forms (= 0.26.5) + decidim-generators (0.26.7) + decidim-core (= 0.26.7) + decidim-meetings (0.26.7) + decidim-core (= 0.26.7) + decidim-forms (= 0.26.7) icalendar (~> 2.5) - decidim-pages (0.26.5) - decidim-core (= 0.26.5) - decidim-participatory_processes (0.26.5) - decidim-core (= 0.26.5) - decidim-proposals (0.26.5) - decidim-comments (= 0.26.5) - decidim-core (= 0.26.5) + decidim-pages (0.26.7) + decidim-core (= 0.26.7) + decidim-participatory_processes (0.26.7) + decidim-core (= 0.26.7) + decidim-proposals (0.26.7) + decidim-comments (= 0.26.7) + decidim-core (= 0.26.7) doc2text (~> 0.4.4) redcarpet (~> 3.5, >= 3.5.1) - decidim-sortitions (0.26.5) - decidim-admin (= 0.26.5) - decidim-comments (= 0.26.5) - decidim-core (= 0.26.5) - decidim-proposals (= 0.26.5) - decidim-surveys (0.26.5) - decidim-core (= 0.26.5) - decidim-forms (= 0.26.5) - decidim-templates (= 0.26.5) - decidim-system (0.26.5) + decidim-sortitions (0.26.7) + decidim-admin (= 0.26.7) + decidim-comments (= 0.26.7) + decidim-core (= 0.26.7) + decidim-proposals (= 0.26.7) + decidim-surveys (0.26.7) + decidim-core (= 0.26.7) + decidim-forms (= 0.26.7) + decidim-templates (= 0.26.7) + decidim-system (0.26.7) active_link_to (~> 1.0) - decidim-core (= 0.26.5) + decidim-core (= 0.26.7) devise (~> 4.7) devise-i18n (~> 1.2) devise_invitable (~> 2.0) - decidim-templates (0.26.5) - decidim-core (= 0.26.5) - decidim-forms (= 0.26.5) - decidim-verifications (0.26.5) - decidim-core (= 0.26.5) + decidim-templates (0.26.7) + decidim-core (= 0.26.7) + decidim-forms (= 0.26.7) + decidim-verifications (0.26.7) + decidim-core (= 0.26.7) declarative-builder (0.1.0) declarative-option (< 0.2.0) declarative-option (0.1.0) @@ -334,7 +334,7 @@ GEM warden (~> 1.2.3) devise-i18n (1.11.0) devise (>= 4.9.0) - devise_invitable (2.0.7) + devise_invitable (2.0.8) actionmailer (>= 5.0) devise (>= 4.6) diff-lcs (1.5.0) @@ -398,7 +398,7 @@ GEM highline (2.1.0) html_tokenizer (0.0.7) htmlentities (4.3.4) - i18n (1.12.0) + i18n (1.13.0) concurrent-ruby (~> 1.0) i18n-tasks (0.9.37) activesupport (>= 4.0.2) @@ -489,7 +489,7 @@ GEM net-smtp (0.3.3) net-protocol nio4r (2.5.9) - nokogiri (1.14.3-x86_64-linux) + nokogiri (1.14.4-x86_64-linux) racc (~> 1.4) oauth (1.1.0) oauth-tty (~> 1.0, >= 1.0.1) @@ -550,7 +550,7 @@ GEM puma (5.6.5) nio4r (~> 2.0) racc (1.6.2) - rack (2.2.6.4) + rack (2.2.7) rack-attack (6.6.1) rack (>= 1.0, < 3) rack-cors (1.1.1) @@ -712,7 +712,7 @@ GEM temple (0.10.0) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) - thor (1.2.1) + thor (1.2.2) thread_safe (0.3.6) tilt (2.1.0) timeout (0.3.2) @@ -764,7 +764,7 @@ GEM wkhtmltopdf-binary (0.12.6.6) xpath (3.2.0) nokogiri (~> 1.8) - zeitwerk (2.6.7) + zeitwerk (2.6.8) PLATFORMS x86_64-linux @@ -773,8 +773,8 @@ DEPENDENCIES bootsnap (~> 1.7) byebug (~> 11.0) codecov - decidim (= 0.26.5) - decidim-dev (= 0.26.5) + decidim (~> 0.26.0) + decidim-dev (~> 0.26.0) decidim-slider! faker (~> 2.14) letter_opener_web (~> 1.3) @@ -786,7 +786,7 @@ DEPENDENCIES web-console RUBY VERSION - ruby 2.7.6p219 + ruby 2.7.5p203 BUNDLED WITH - 2.4.6 + 2.3.5 diff --git a/README.md b/README.md index 3202009..8e2f364 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,14 @@ # Decidim::Slider -A Slider component for Decidim's homepage. +A Slider for Decidim's homepage. + +[![Crowdin](https://badges.crowdin.net/decidim-slider/localized.svg)](https://crowdin.com/project/decidim-slider) + ## Usage -Slider will be available as a Component for a Participatory -Space. +Slider will be available as a Content block in the homepage section. It will be displayed as a carousel with the images and links provided in the admin panel. + ## Installation diff --git a/app/cells/decidim/slider/homepage/main_cell.rb b/app/cells/decidim/slider/homepage/main_cell.rb index 8338851..1b4edc0 100644 --- a/app/cells/decidim/slider/homepage/main_cell.rb +++ b/app/cells/decidim/slider/homepage/main_cell.rb @@ -44,14 +44,14 @@ def has_slides? def slides @slides ||= Decidim::ContentBlock.published.for_scope(:slider_tabs, organization: current_organization).order(:weight) end - # - # def cache_hash - # hash = [I18n.locale] - # slides.each do |slide| - # hash.push(slide.cache_key_with_version) - # end - # hash.join(Decidim.cache_key_separator) - # end + + def cache_hash + hash = [I18n.locale] + slides.each do |slide| + hash.push(slide.cache_key_with_version) + end + hash.join(Decidim.cache_key_separator) + end end end end diff --git a/lib/decidim/slider/version.rb b/lib/decidim/slider/version.rb index d8489b2..5c01dda 100644 --- a/lib/decidim/slider/version.rb +++ b/lib/decidim/slider/version.rb @@ -4,11 +4,11 @@ module Decidim # This holds the decidim-meetings version. module Slider def self.version - "0.0.1" + "0.0.2" end def self.decidim_version - "0.26.5" + "~> 0.26.0" end end end