krant 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba0f34faf0b16e61df910db4c83718b1e25504984d8de226203ab2e50f762956
-  data.tar.gz: 2132ba279ce47cde88e3956b007b758d7a76c17543d18e55ad41c0cc11e7a2ce
+  metadata.gz: e41b01787c4238be635ddb9d868a6a44e583fdc42854955c560c95b73bf70f3c
+  data.tar.gz: 22d24551cb7c92c8b611dd2a018d22cc24e87dc4b9ccf2c71011935f7da40346
 SHA512:
-  metadata.gz: d8e239a5b45e1d973439139b7ff004dc030d41e8997c590fc542a50b548a3872939dba3becb20c1885e828fce9f21270139cd15f3fd94c04e4d4216c6a072f4e
-  data.tar.gz: 2d71a30ef434e5d1868797c1fbe92ff57439cb182996a349ab6f649b4d266bf0af089508662da00739ad59fbb4595073a659f9bd0e7d525956128d254e18bfc1
+  metadata.gz: 5fe9c3e5ec1e74509852becc490d157d00b32382c99335aa43d830623cb1f577765f226c24fea753d7427bd6b9d7ccf58e67405f081901ffc6cf0e2e519f0b80
+  data.tar.gz: deef5f5daf44dbe0e1084dd8d90e8388ec67df0fcdcc340a65aecbba4dabd76f64f8888583caf18e10c44a6cd5488496ff80e939f0e1d4c6ab44031d923b0b6d

data/CHANGELOG.md

@@ -1,14 +1,14 @@
 # CHANGELOG
 
-### Version 1.0.0
+### Version 1.1.0
 
-2019-02-26
+2019-05-20
 
-[Compare changes](https://github.com/codevise/krant/compare/0-1-stable...v1.0.0)
+[Compare changes](https://github.com/codevise/krant/compare/1-0-stable...v1.1.0)
 
-- Upgrade to Rails 5.2
-  ([#1](https://github.com/codevise/krant/pull/1))
+- Add markdown support to broadcast messages
+  ([#2](https://github.com/codevise/krant/pull/2))
 
 See
-[0-1-stable branch](https://github.com/codevise/krant/blob/0-1-stable/CHANGELOG.md)
+[1-0-stable branch](https://github.com/codevise/krant/blob/1-0-stable/CHANGELOG.md)
 for previous changes.

data/README.md

@@ -59,6 +59,7 @@ Krant.broadcast_message_locales = [:en, :fr, :es]
 
 Messages with different translations can now be configured via the
 admin interface and will be displayed once marked as active.
+Broadcast messages have full markdown support.
 
 The color of the broadcast message bar can be configured via SCSS
 
@@ -141,7 +142,7 @@ Define a Rake tasks to persists news items in the database:
 ```ruby
 # Rakefile
 require 'krant/tasks'
-Krant::Trasks.install { MyApp.news }
+Krant::Tasks.install { MyApp.news }
 ```
 
 and run the defined task after each deploy:

data/admin/krant/broadcast_messages.rb

@@ -13,7 +13,8 @@ module Krant
           broadcast_message.translations.each do |t|
             div class: 'krant-broadcast-messages-table-text' do
               span "#{t.locale}:", class: 'krant-broadcast-messages-table-text-locale'
-              span t.text, class: 'krant-broadcast-messages-table-text-translation'
+              span Redcarpet::Markdown.new(Redcarpet::Render::StripDown).render(t.text),
+                   class: 'krant-broadcast-messages-table-text-translation'
             end
           end
         end

data/app/assets/stylesheets/krant/active_admin/broadcast_messages.scss

@@ -27,5 +27,9 @@ $krant-broadcast-message-bar-border-color: #dedede !default;
     border-right: solid 1px $krant-broadcast-message-bar-border-color;
     padding: 10px $horizontal-page-margin;
     text-align: center;
+
+    p {
+      margin: 0;
+    }
   }
 }

data/config/locales/de.yml

@@ -2,7 +2,7 @@ de:
   krant:
     admin:
       broadcast_messages:
-        text_translation_label: "Text (%{locale_name}):"
+        text_translation_label: "Text/Markdown (%{locale_name}):"
       news_menu_item:
         unseen: "Neuigkeiten*"
         no_unseen: "Neuigkeiten"
@@ -17,7 +17,7 @@ de:
         other: "Broadcast Nachrichten"
     attributes:
       "krant/broadcast_message":
-        text: "Text"
+        text: "Inhalt"
         active: "Aktiv"
         created_at: "Erstellt am"
         updated_at: "Geändert am"

data/config/locales/en.yml

@@ -2,7 +2,7 @@ en:
   krant:
     admin:
       broadcast_messages:
-        text_translation_label: "Text (%{locale_name}):"
+        text_translation_label: "Text/Markdown (%{locale_name}):"
       news_menu_item:
         unseen: "What's new*"
         no_unseen: "What's new"
@@ -17,7 +17,7 @@ en:
         other: "Broadcast Messages"
     attributes:
       "krant/broadcast_message":
-        text: "Text"
+        text: "Content"
         active: "Active"
         created_at: "Created at"
         updated_at: "Updated at"

data/krant.gemspec

@@ -35,4 +35,5 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'activeadmin', ['>= 1.0', '< 1.4']
   spec.add_runtime_dependency 'rails', '~> 5.1'
   spec.add_runtime_dependency 'kramdown', '~> 1.5'
+  spec.add_runtime_dependency 'redcarpet', '~> 3.4'
 end

data/lib/krant/engine.rb

@@ -1,5 +1,7 @@
 require 'active_admin'
 require 'kramdown'
+require 'redcarpet'
+require 'redcarpet/render_strip'
 
 module Krant
   # Rails integration

data/lib/krant/version.rb

@@ -1,3 +1,3 @@
 module Krant
-  VERSION = '1.0.0'.freeze
+  VERSION = '1.1.0'.freeze
 end

data/lib/krant/views/header_with_broadcast_messages.rb

@@ -10,7 +10,9 @@ module Krant
         div do
           TranslatedBroadcastMessage.active.each do |broadcast_message|
             div class: 'krant-broadcast-messages-bar' do
-              broadcast_message.text
+              Redcarpet::Markdown.new(Redcarpet::Render::HTML, autolink: true)
+                .render(broadcast_message.text)
+                .html_safe
             end
           end
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: krant
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Tim Fischbach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-26 00:00:00.000000000 Z
+date: 2019-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appraisal
@@ -212,6 +212,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: redcarpet
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
 description: 
 email:
 - tfischbach@codevise.de
@@ -280,7 +294,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 2.7.5
 signing_key: 
 specification_version: 4
 summary: Display app news and broadcast messages in Active Admin.