mongoid_markdown_extension 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98721c11aa15c68da195f8aa13d89a9f3cc2d204
-  data.tar.gz: c2d7b530f4b39fef19e734d881bdcfd20579fc42
+  metadata.gz: 0205fc66b7a8adf5cac5d95156cdae75feb5ae39
+  data.tar.gz: 9909e3b390ef53daa70be54acbef2bedb5388b03
 SHA512:
-  metadata.gz: 3406c9a2a958ae0394739e30bdcedd5ea4a369a3ee75819f0c4de6881ed5adfea88bc507107f10e8397b9d893b7263a95710bd95368c0f0fd3f5fe92079717c3
-  data.tar.gz: a22a1a4522e9ce2e022153a8868cf9e78d07891bf3ea87b192e1381588e0c3658e331df1bc2b32f63dc495045918b9413d6fc24aa535709bf235650927cd391f
+  metadata.gz: 15a411be7ebb7b02c9e98b05933f83f79b81dbc7599b79ab2b3a80d114ac8cd025b95e911caefdde351b29eafafbf42fcd7e2bc48ef9a51311f62db7c32b30f3
+  data.tar.gz: f612112f8f502ee35031b745a14ba55ae05ac7428706ea5abd35344d840b959b45399e61875c6479a402d2f295af6792de33f22d9c2a66a9e9bebf76648d68e7

data/lib/mongoid_markdown_extension.rb

@@ -1,3 +1,5 @@
+require 'mongoid'
+
 require 'mongoid_markdown_extension/inline_renderer'
 require 'mongoid_markdown_extension/markdown'
 require 'mongoid_markdown_extension/version'

data/lib/mongoid_markdown_extension/markdown.rb

@@ -3,6 +3,40 @@ require 'redcarpet/render_strip'
 
 module MongoidMarkdownExtension
   class Markdown < String
+    class << self
+      attr_writer :configuration
+    end
+
+    def self.configuration
+      @configuration ||= Configuration.new
+    end
+
+    def self.reset
+      @configuration = Configuration.new
+    end
+
+    def self.configure
+      yield(configuration)
+    end
+
+    def self.demongoize(value)
+      Markdown.new(value)
+    end
+
+    def self.mongoize(value)
+      case value
+      when Markdown then value.mongoize
+      else value
+      end
+    end
+
+    def self.evolve(value)
+      case value
+      when Markdown then value.mongoize
+      else value
+      end
+    end
+
     def initialize(str)
       super str.to_s
       @str = str.to_s
@@ -28,13 +62,14 @@ module MongoidMarkdownExtension
       @str
     end
 
-    private # =============================================================
+    private
 
     def markdown_renderer
-      Redcarpet::Markdown.new(
-        self.class.configuration.render_class.new(self.class.configuration.render_options),
-        self.class.configuration.extensions
-      )
+      render_class = MongoidMarkdownExtension::Markdown.configuration.render_class
+      render_options = MongoidMarkdownExtension::Markdown.configuration.render_options
+      extensions = MongoidMarkdownExtension::Markdown.configuration.extensions
+
+      Redcarpet::Markdown.new(render_class.new(render_options), extensions)
     end
 
     # TODO: how to combine custom render class with the InlineRenderer?
@@ -43,45 +78,10 @@ module MongoidMarkdownExtension
     end
 
     def markdown_stripdown_renderer
-      Redcarpet::Markdown.new(Redcarpet::Render::StripDown, space_after_headers: true)
-    end
-
-    # ---------------------------------------------------------------------
-
-    class << self
-      attr_accessor :configuration
-
-      def configure
-        @configuration ||= Configuration.new
-        yield @configuration
-      end
-
-      def configuration
-        @configuration ||= Configuration.new
-      end
-
-      def demongoize(value)
-        Markdown.new(value)
-      end
-
-      def mongoize(value)
-        case value
-        when Markdown then value.mongoize
-        else value
-        end
-      end
-
-      def evolve(value)
-        case value
-        when Markdown then value.mongoize
-        else value
-        end
-      end
+      Redcarpet::Markdown.new(Redcarpet::Render::StripDown)
     end
   end
 
-  # ---------------------------------------------------------------------
-
   class Configuration
     attr_accessor :extensions
     attr_accessor :render_class

data/lib/mongoid_markdown_extension/version.rb

@@ -1,3 +1,3 @@
 module MongoidMarkdownExtension
-  VERSION = '0.1.6'.freeze
+  VERSION = '0.1.7'.freeze
 end

data/mongoid_markdown_extension.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'redcarpet', '>= 3.1.2'
+  spec.add_dependency 'redcarpet', '~> 3.4'
   spec.add_dependency 'mongoid', '>= 4.0'
 
   spec.add_development_dependency 'bundler', '~> 1.6'

data/test/mongoid_markdown_extension/markdown_test.rb

@@ -1,7 +1,5 @@
 require 'test_helper'
 
-# ---------------------------------------------------------------------
-
 class MongoidMarkdownExtensionTest
   include Mongoid::Document
   field :body, type: MongoidMarkdownExtension::Markdown
@@ -29,13 +27,18 @@ module MongoidMarkdownExtension
     let(:string) { 'some text with _italic_' }
     subject { MongoidMarkdownExtension::Markdown.new(string) }
 
+    after(:each) do
+      MongoidMarkdownExtension::Markdown.reset
+    end
+
     describe 'configuration' do
       describe 'setup block' do
         it 'yields self' do
           MongoidMarkdownExtension::Markdown.configure do |config|
-            config.must_be_kind_of Configuration
+            config.must_be_kind_of MongoidMarkdownExtension::Configuration
           end
         end
+
         it 'returns default values' do
           MongoidMarkdownExtension::Markdown.configuration.extensions.must_equal(
             autolink: true,
@@ -51,8 +54,6 @@ module MongoidMarkdownExtension
       end
     end
 
-    # ---------------------------------------------------------------------
-
     describe '#to_s' do
       it 'returns the original value' do
         subject.to_s.must_equal string
@@ -63,6 +64,7 @@ module MongoidMarkdownExtension
       it 'survives nil' do
         MongoidMarkdownExtension::Markdown.new(nil).to_html.must_equal ''
       end
+
       it 'converts the string to html' do
         subject.to_html.must_equal Redcarpet::Markdown.new(Redcarpet::Render::HTML).render(string)
       end
@@ -74,9 +76,11 @@ module MongoidMarkdownExtension
       it 'survives nil' do
         MongoidMarkdownExtension::Markdown.new(nil).to_inline_html.must_equal ''
       end
+
       it 'converts the string to html' do
         subject.to_inline_html.wont_include '<p>'
       end
+
       it 'replaces <p> with <br />' do
         subject.to_inline_html.must_equal 'some text with <em>italic</em><br /><br />foo'
       end
@@ -86,6 +90,7 @@ module MongoidMarkdownExtension
       it 'survives nil' do
         MongoidMarkdownExtension::Markdown.new(nil).to_stripped_s.must_equal ''
       end
+
       it 'converts the markdown to stripped string' do
         subject.to_stripped_s.wont_include '_'
       end
@@ -97,14 +102,13 @@ module MongoidMarkdownExtension
       end
     end
 
-    # ---------------------------------------------------------------------
-
     describe '.mongoize' do
       describe 'when passed a string' do
         it 'returns it back' do
           MongoidMarkdownExtension::Markdown.mongoize(string).must_equal string
         end
       end
+
       describe 'when passed markdown object' do
         it 'returns its string' do
           MongoidMarkdownExtension::Markdown.mongoize(subject).must_be_kind_of String

data/test/test_helper.rb

@@ -1,10 +1,11 @@
 require 'bundler/setup'
-require 'mongoid'
-require 'mongoid_markdown_extension'
+
 require 'minitest'
 require 'minitest/autorun'
 require 'minitest/spec'
 
+require 'mongoid_markdown_extension'
+
 if ENV['CI']
   require 'coveralls'
   Coveralls.wear!

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_markdown_extension
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Tomas Celizna
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-24 00:00:00.000000000 Z
+date: 2018-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.2
+        version: '3.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.2
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Custom field type for Mongoid that handles Markdown conversion via Redcarpet