cmor_links 0.0.6.pre → 0.0.7.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 666439cb65ed0dab89eb41f567bbe68e86f574a79d8e9294c2590f0066eb1166
-  data.tar.gz: f2fa8d644874bfbb5ad8e2e7c603383681d83dd9079896cd543c34ba841517fa
+  metadata.gz: 6e2b0b374a79f8a8331a22bd287c320c8c7f53d89fa8b0a8a0d152b60f31e21a
+  data.tar.gz: 66f8dff8954ed3d419a4a4c76e49602e2439a8116acf81e1e4c012bd4f196da7
 SHA512:
-  metadata.gz: bfbce162e53f2c2626cf0f452345b80d0605e9882bcc652cf65005bf9ddb2b30d9c0a7812de1a75593eea320e0af5c57e6e477cf4a3f311ff41a36b97683e222
-  data.tar.gz: 9a0288c8e36285a4b4969cc2a0ffe2e23709012b14ce5adcf4f896642953d22567b21e4b28a8077c60e8b6ebbd40dde7c36eb4d2ee79937b74066e899775208d
+  metadata.gz: 58dcd54abcf09135bc1e6b1978c9d2be7cc0dc0c0ab6e3baf3cb62d988deea8c98b406476094ad8a286fa973203b190828d4cef3992b43c44d612db1e76e77dc
+  data.tar.gz: 231e82443434ed37655076d099274eeb9ea291254ddeb3895ee21c33bc435c179b3d36856b4dc744e4523472fe862b11efed10c894b20856e1c9dde9b00af0fa

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

@@ -2,6 +2,8 @@ require_dependency 'redcloth'
 
 module Cmor::Links
   class Category < ActiveRecord::Base
+    include Markup::Rails::ActiveRecord
+
     # associations
     has_many :links, -> { order(:position) },
              dependent: :destroy
@@ -12,8 +14,7 @@ module Cmor::Links
     acts_as_nested_set
     default_scope { order(lft: :asc) }
 
-    # callbacks
-    after_initialize :set_defaults
+    acts_as_markup :short_description, :long_description, Cmor::Core::Configuration.default_markup_options
 
     # friendly id
     extend FriendlyId
@@ -24,8 +25,6 @@ module Cmor::Links
     validates :locale, absence: true, if: proc { |c| !c.parent.nil? }
     validates :name, presence: true,
                      uniqueness: { scope: [:parent_id] }
-    validates :markup_language, presence: true,
-                                inclusion: Configuration.markup_languages.map(&:to_s)
 
     def human
       name
@@ -43,48 +42,8 @@ module Cmor::Links
       where(arel_table['link_footer_column'].not_eq(nil)).for_actual_locale
     end
 
-    def long_description(options = {})
-      options.reverse_merge!(as: :plain)
-      case options[:as]
-      when :html
-        markup(self[:long_description])
-      else
-        self[:long_description]
-      end
-    end
-
-    def short_description(options = {})
-      options.reverse_merge!(as: :plain)
-      case options[:as]
-      when :html
-        markup(self[:short_description])
-      else
-        self[:short_description]
-      end
-    end
-
     def links_count
       links.count
     end
-
-    private
-
-    def markup(text)
-      case markup_language.to_sym
-      when :textile
-        return unless text
-        RedCloth.new(text).to_html
-      when :none
-        text
-      else
-        fail "Unsupported markup language #{markup_language}"
-      end
-    end
-
-    def set_defaults
-      if self.new_record?
-        self.markup_language ||= Configuration.default_markup_language.to_s
-      end
-    end
   end
 end

data/app/models/cmor/links/link.rb

@@ -1,50 +1,17 @@
 require_dependency 'redcloth'
 
 class Cmor::Links::Link < ActiveRecord::Base
+    include Markup::Rails::ActiveRecord
+
   # acts as list
   acts_as_list scope: :category
 
   # associations
   belongs_to :category, optional: true
 
-
-  # callbacks
-  after_initialize :set_defaults
-
-  # constants
-  MARKUP_LANGUAGES = %w(markdown textile rdoc)
+  acts_as_markup :description, Cmor::Core::Configuration.default_markup_options
 
   # validations
   validates :name, presence: true
   validates :url,  presence: true
-  validates :markup_language, presence: true,
-                              inclusion: MARKUP_LANGUAGES
-
-  def description(options = {})
-    options.reverse_merge!(as: :plain)
-    case options[:as]
-    when :html
-      markup(self[:description])
-    else
-      self[:description]
-    end
-  end
-
-  private
-
-  def markup(text)
-    case markup_language.to_sym
-    when :textile
-      return unless text
-      RedCloth.new(text).to_html
-    when :none
-      text
-    else
-      fail "Unsupported markup language #{markup_language}"
-    end
-  end
-
-  def set_defaults
-    self.markup_language ||= 'textile' if self.new_record?
-  end
 end

data/app/views/cmor/links/categories/_category.html.erb

@@ -11,7 +11,7 @@
     <%= render partial: 'cmor/links/categories/category_in_index', collection: Cmor::Links::CategoryDecorator.decorate_collection(category.descendants), as: :category %>
   </div>
 
-  <div class="download_category-downloads item_list">
+  <div class="links_category-links item_list">
     <h2><%= Cmor::Links::Category.human_attribute_name(:cmor_links_links) %></h2>
     <% if category.links.count == 0 %>
       <p><%= t('cmor.links.category.messages.no_links_available') %></p>

data/config/locales/de.yml

@@ -19,7 +19,6 @@ de:
         links_count: Links
         locale: Sprache
         long_description: Langbeschreibung
-        markup_language: Markup Sprache
         name: Name
         parent: Übergeordnete Kategorie
         parent_id: Übergeordnete Kategorie
@@ -34,11 +33,15 @@ de:
         created_at: Erstellt am
         description: Beschreibung
         link_actions: ''
-        markup_language: Markup Sprache
         name: Name
         position: Position
         updated_at: Aktualisiert am
         url: URL
+  cmor:
+    links:
+      category:
+        messages:
+          no_links_available: Keine Links vorhanden.
   routes:
     cmor_links_engine: links
     categories: kategorien

data/config/locales/en.yml

@@ -19,7 +19,6 @@ en:
         links_count: links
         locale: language
         long_description: long description
-        markup_language: markup language
         name: name
         parent: parent category
         parent_id: parent category
@@ -34,11 +33,15 @@ en:
         created_at: created at
         description: description
         link_action: ''
-        markup_language: markup language
         name: name
         position: position
         updated_at: updated at
         url: url
+  cmor:
+    links:
+      category:
+        messages:
+          no_links_available: There are no links here.
   routes:
     cmor_links_engine: links
     categories: categories

data/db/migrate/001_create_cmor_links_categories.rb

@@ -5,7 +5,6 @@ class CreateCmorLinksCategories < ActiveRecord::Migration[4.2]
       t.string :name
       t.text :short_description
       t.text :long_description
-      t.string :markup_language
       t.integer :link_footer_column
 
       # awesome nested set

data/db/migrate/002_create_cmor_links_links.rb

@@ -4,7 +4,6 @@ class CreateCmorLinksLinks < ActiveRecord::Migration[4.2]
       t.string :name
       t.string :url
       t.text :description
-      t.string :markup_language
 
       # associations
       t.references :category

data/lib/cmor/links/configuration.rb

@@ -20,14 +20,6 @@ module Cmor
       mattr_accessor :base_controller do
         'ApplicationController'
       end
-
-      mattr_accessor :default_markup_language do
-        'textile'
-      end
-
-      mattr_accessor :markup_languages do
-        ['textile']
-      end
     end
   end
 end

data/lib/cmor_links.rb

@@ -1,9 +1,10 @@
-require 'cmor_core'
+require 'cmor_core_frontend'
 require 'acts_as_list'
 require 'awesome_nested_set'
 require 'awesome_nested_set-tools'
 require 'friendly_id'
 require 'draper'
+require 'markup-rails'
 require 'rao-view_helper'
 require 'redcloth'
 

data/lib/generators/cmor/links/install/templates/initializer.rb

@@ -16,14 +16,4 @@ Cmor::Links.configure do |config|
   # Default: config.base_controller = '<%= base_controller_class_name %>'
   #
   config.base_controller = '<%= base_controller_class_name %>'
-
-  # Accepted markup languages
-  #
-  # default: config.markup_languages = %w[ textile ]
-  config.markup_languages = %w( textile )
-
-  # Default markup language
-  #
-  # default: config.default_markup_language = 'textile'
-  config.default_markup_language = 'textile'
 end

data/spec/factories/cmor_links_categories.rb

@@ -2,7 +2,6 @@ FactoryBot.define do
   factory :cmor_links_category, class: Cmor::Links::Category do
     locale { I18n.locale }
     sequence(:name) { |i| "Link category #{i}" }
-    markup_language { 'textile' }
 
     factory(:cmor_links_category_with_parent) do
       locale { nil }

data/spec/factories/cmor_links_links.rb

@@ -2,6 +2,5 @@ FactoryBot.define do
   factory :cmor_links_link, class: Cmor::Links::Link do
     sequence(:name) { |i| "Link #{i}" }
     sequence(:url)  { |i| "http://www.example.com/#{i}" }
-    markup_language { 'textile' }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cmor_links
 version: !ruby/object:Gem::Version
-  version: 0.0.6.pre
+  version: 0.0.7.pre
 platform: ruby
 authors:
 - Roberto Vasquez Angel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-01 00:00:00.000000000 Z
+date: 2019-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,14 +30,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.6.pre
+        version: 0.0.7.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.6.pre
+        version: 0.0.7.pre
+- !ruby/object:Gem::Dependency
+  name: cmor_core_frontend
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.0.7.pre
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.0.7.pre
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -290,6 +304,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: markup-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: awesome_nested_set
   requirement: !ruby/object:Gem::Requirement