cmor_testimonials 0.0.8.pre → 0.0.9.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47e03fe0e148a6d92430c17764f771cfd3d6d99b77818570d52b7738b9782b1d
-  data.tar.gz: 46ccb4604316104565146d9dc8f48b7077e5c1242256c7124d0fa3bb4b7846c8
+  metadata.gz: 673d3c98117a279b7e256e92d00802174e2ba4a094cefaf7b260e62e344711e6
+  data.tar.gz: 718f7433d4a4a36d34c65b8e6a03e82b266e592f12c2fe49800c227d599a81ff
 SHA512:
-  metadata.gz: ba5df50c762711c4a0843b6932df7d33cddf463dd2eea84ed4239fd8e00b3af90a16c8ead75fef426c0ee3d07348804773ea62ed1fe9ce8d9781e98cbf6dc76f
-  data.tar.gz: a05f728bd7702604cfc8c1d7db97b37fa68b65498e052b4a3ceb001f4f59e185816412f5cdc39ace266b5cfbe4e963f0585ed8a9d5337a459ca58df60acd5037
+  metadata.gz: 47ccafd07ae19e4e8d5a7925637061a7d0de322c09e91ea755511e9610ed73a57bad1d8d275e5b11e30a2698923f1af5f539be20d53f706d4d751eda97f0608e
+  data.tar.gz: 32e0e61cb536bb2ba895c8fc8ce7df1ddf63ddb70332be4290fcb0c0aecdf7f3c99b6c63dd21f7fcb432797da75683026107eb0eec65328bdd345fef398305a5

data/app/assets/stylesheets/cmor/testimonials/application/carousel.css

@@ -4,12 +4,12 @@
 }
 
 
-.carousel-control-prev-icon:before {
+.carousel-control-prev:before {
   content:"\2039";
   font-size: 250%;
 }
 
-.carousel-control-next-icon:before {
+.carousel-control-next:before {
   content:"\203A";
   font-size: 250%;
 }

data/app/models/cmor/testimonials/category.rb

@@ -1,7 +1,14 @@
 module Cmor
   module Testimonials
     class Category < ActiveRecord::Base
-      has_many :testimonials, -> { order(position: :asc) }, dependent: :destroy
+      has_many :testimonials, -> { order(position: :asc) }, dependent: :destroy do
+        def published 
+          merge(Testimonial.published)
+        end
+      end
+
+      scope :with, ->(type) { joins(type) }
+      scope :with_published_testimonials, -> { with(:testimonials).merge(Testimonial.published) }
 
       validates :locale, presence: true, inclusion: { in: I18n.available_locales.map(&:to_s) }
       validates :identifier, presence: true, uniqueness: { scope: [ :locale ] }

data/app/view_helpers/cmor/testimonials/application_view_helper.rb

@@ -1,7 +1,7 @@
 module Cmor
   module Testimonials
     class ApplicationViewHelper < Rao::ViewHelper::Base
-      def render_category(identifier, options = {})
+      def render_category(category_or_identifier, options = {})
         default_variant_options = Cmor::Testimonials::Configuration.image_variant_options[:category]
         options.reverse_merge!(
           autostart:       true,
@@ -15,18 +15,16 @@ module Cmor
           variant_options: default_variant_options,
           font_awesome:    false
         )
-        category = Cmor::Testimonials::Category.where(identifier: identifier).first
+        category = if category_or_identifier.is_a?(Cmor::Testimonials::Category)
+          category_or_identifier
+        else
+          Cmor::Testimonials::Category.where(identifier: category_or_identifier).first
+        end
 
-        if category.present?
+        if category.present? && category.testimonials.published.any?
           render category: category, options: options
         end
       end
-
-      private
-
-      def render(locals = {})
-        c.render partial: "/#{self.class.name.underscore}/#{caller_locations(1,1)[0].label}", locals: locals
-      end
     end
   end
 end

data/app/views/cmor/testimonials/application_view_helper/_render_category.html.haml

@@ -2,11 +2,11 @@
   - if options[:indicators]
     / Carousel indicators
     %ol.carousel-indicators
-      - category.testimonials.count.times do |i|
+      - category.testimonials.published.count.times do |i|
         %li{ class: (i == 0) ? "active" : "", "data-slide-to" => i, "data-target" => "##{dom_id(category)}"}
   / Wrapper for carousel items
   .carousel-inner
-    - category.testimonials.each_with_index do |testimonial, i|
+    - category.testimonials.published.each_with_index do |testimonial, i|
       .item.carousel-item.text-center{ class: ((i == 0) ? 'active' : '') }
         .img-box
           %img.img-thumbnail.rounded-circle{:alt => "", :src => main_app.url_for(testimonial.image.variant(options[:variant_options])) }/
@@ -14,15 +14,11 @@
         %p.overview
           = "<b>#{testimonial.fullname}</b>, #{testimonial.role} - #{testimonial.company}".html_safe
   - if options[:controls]
-    %a.carousel-control-prev{"data-slide" => "prev", :href => "##{dom_id(category)}", :role => "button"}
-      - if options[:font_awesome]
-        %i.fa.fa-angle-left
-      - else
-        %span.carousel-control-prev-icon{"aria-hidden" => "true"}
+    - if options[:font_awesome]
+      %i.fa.fa-angle-left
+      %i.fa.fa-angle-right
+    - else
+      %a.carousel-control-prev{"data-slide" => "prev", :href => "##{dom_id(category)}", :role => "button"}
         %span.sr-only= t('.previous')
-    %a.carousel-control-next{"data-slide" => "next", :href => "##{dom_id(category)}", :role => "button"}
-      - if options[:font_awesome]
-        %i.fa.fa-angle-right
-      - else
-        %span.carousel-control-next-icon{"aria-hidden" => "true"}
+      %a.carousel-control-next{"data-slide" => "next", :href => "##{dom_id(category)}", :role => "button"}
         %span.sr-only= t('.next')

data/config/locales/de.yml

@@ -33,7 +33,7 @@ de:
   cmor:
     testimonials:
       application_view_helper:
-        render:
+        render_category:
           next: Vor
           previous: Zurück
   routes:

data/config/locales/en.yml

@@ -33,7 +33,7 @@ en:
   cmor:
     testimonials:
       application_view_helper:
-        render:
+        render_category:
           next: Next
           previous: Previous
   routes:

data/spec/view_helpers/cmor/testimonials/application_view_helper_spec.rb

@@ -1,15 +1,37 @@
 require 'rails_helper'
 
 RSpec.describe Cmor::Testimonials::ApplicationViewHelper, type: :view_helper do
-  let(:testimonials) { create_list(:cmor_testimonials_testimonial, 3) }
-  let(:category) { create(:cmor_testimonials_category, testimonials: testimonials) }
-  let(:args) { [category.identifier, {}] }
   before(:each) do
     register_view_helper Markup::Rails::ApplicationViewHelper, as: :markup_helper
   end
-
   
-  describe 'render_category' do
-    it { expect(html).to have_css('div.cmor-testimonials-category') }
+  context 'testimonials present' do
+    let(:testimonials) { create_list(:cmor_testimonials_testimonial, 3) }
+    let(:category) { create(:cmor_testimonials_category, testimonials: testimonials) }
+    let(:args) { [category.identifier, {}] }
+
+    describe 'render_category' do
+      it { expect(html).to have_css('div.cmor-testimonials-category') }
+    end
+  end
+
+  context 'testimonials absent' do
+    let(:testimonials) {[]}
+    let(:category) { create(:cmor_testimonials_category, testimonials: testimonials) }
+    let(:args) { [category.identifier, {}] }
+
+    describe 'render_category' do
+      it { expect(rendered).to eq(nil) }
+    end
+  end
+
+  context 'when using a category as first argument' do
+    let(:testimonials) { create_list(:cmor_testimonials_testimonial, 3) }
+    let(:category) { create(:cmor_testimonials_category, testimonials: testimonials) }
+    let(:args) { [category, {}] }
+
+    describe 'render_category' do
+      it { expect(html).to have_css('div.cmor-testimonials-category') }
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cmor_testimonials
 version: !ruby/object:Gem::Version
-  version: 0.0.8.pre
+  version: 0.0.9.pre
 platform: ruby
 authors:
 - Eugen Müller
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-25 00:00:00.000000000 Z
+date: 2019-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -31,28 +31,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.8.pre
+        version: 0.0.9.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.8.pre
+        version: 0.0.9.pre
 - !ruby/object:Gem::Dependency
   name: cmor_core_frontend
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.8.pre
+        version: 0.0.9.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.8.pre
+        version: 0.0.9.pre
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement