contentful_rails 0.0.6.1 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 587a6e33dfd511dd81be0bd2831151ab5b5c7388
-  data.tar.gz: 5f304345143c6d1849daad31ec963660342ecb92
+  metadata.gz: ca234cec854ccb57f25cad68cce520664212992a
+  data.tar.gz: af4bf4031e663ce175917da5ad2fadddb98fe662
 SHA512:
-  metadata.gz: 0bc806cb1e137e5e6dc4a88aef2e094203c37ffb605972cbf0b8797141dda2e996d8f60f95dbe9ac63e7dccfe08188b3d15c47c9c245a71e3e368f91f5c87997
-  data.tar.gz: 18edbccf8e71e997103a9a70f0ca8d0cafb9c8754bbb009ac9dadebc3a249cede96c6fd1369db8cf6ed746a1c57fa202e27271b2ef1baa83ed7ec5a8ffa77327
+  metadata.gz: 9041135f6cf91254144e1a2fb78b42afd724cd56daa0f0e2d161490b18b7278ebfec38c0b24fdc7cce57c7c5e7b674db1c14aa66be7fe47b7b2e5a9308ca6867
+  data.tar.gz: c8f8098b982a102e1eaafe35af32020d2fe02a6ad097097efea2b19b5cb196bafac5b593ac86907d006fe1073a3b7e8400a3ca4b674087acf33706170aca37e2

data/app/helpers/contentful_rails/markdown_helper.rb

@@ -1,10 +1,45 @@
 module ContentfulRails
   module MarkdownHelper
-    def parse_markdown(content)
-      @markdown ||= Redcarpet::Markdown.new(
-          Redcarpet::Render::HTML, autolink: true, space_after_headers: true, fenced_code_blocks: true
-      )
-      @markdown.render(content).html_safe
+    # Return HTML which is passed through the Redcloth markdown processor, using a custom renderer
+    # so that we can manipulate images using contentful's URL-based API.
+    # NOTE that this is super-permissive out of the box. Set options to suit when you call the method.
+    # @param renderer_options [Hash] of options from https://github.com/vmg/redcarpet#darling-i-packed-you-a-couple-renderers-for-lunch
+    # @param markdown_options [Hash] of options from https://github.com/vmg/redcarpet#and-its-like-really-simple-to-use
+    def parse_markdown(markdown_string, renderer_options: {}, markdown_options: {}, image_options: {})
+      markdown_opts = {
+        no_intr_emphasis: true,
+        tables: true,
+        fenced_code_blocks: true,
+        autolink: true,
+        disable_indented_code_blocks: true,
+        strikethrough: true,
+        lax_spacing: true,
+        space_after_headers: false,
+        superscript: true,
+        underline: true,
+        highlight: true,
+        footnotes: true
+      }.merge(markdown_options)
+
+      renderer_opts = {
+        filter_html: false, # we want to allow HTML in the markdown blocks
+        no_images: false,
+        no_links: false,
+        no_styles: false,
+        escape_html: false,
+        safe_links_only: false,
+        with_toc_data: true,
+        hard_wrap: true,
+        xhtml: false,
+        prettify: false,
+        link_attributes: {},
+        image_options: image_options
+      }.merge(renderer_options)
+
+      renderer = ContentfulRails::MarkdownRenderer.new(renderer_opts)
+      markdown = Redcarpet::Markdown.new(renderer, markdown_opts)
+
+      markdown.render(markdown_string).html_safe
     end
   end
 end

data/lib/contentful_rails.rb

@@ -1,6 +1,7 @@
 require "contentful_rails/engine"
 require "contentful_rails/development_constraint"
 require "contentful_rails/cached_timestamps"
+require "contentful_rails/markdown_renderer"
 require 'redcarpet'
 
 module ContentfulRails

data/lib/contentful_rails/markdown_renderer.rb

@@ -0,0 +1,30 @@
+require 'redcarpet'
+# A custom renderer for Redcarpet, which adds options for manipulating images through the URL of the image,
+# and building links based on the content of the link.
+#
+# You can subclass this in your application, to add or manipulate specific markup to elements in the markdown.
+class ContentfulRails::MarkdownRenderer < Redcarpet::Render::HTML
+  include ActionView::Helpers::TagHelper
+  def initialize(opts)
+    @options = opts
+    @image_parameters = {
+      w: @options[:image_options][:width], #width in px
+      h: @options[:image_options][:height], #height in px
+      fit: @options[:image_options][:fit], #crop, scale, pad, thumb
+      f: @options[:image_options][:focus], #top, right, bottom, left, top_right, top_left, bottom_right, bottom_left, face
+      fm: @options[:image_options][:format], #jpg, png
+      bg: @options[:image_options][:background_colour], #no idea what the options are, but 'transparent' works for pngs
+      r: @options[:image_options][:corner_radius], #corner radius in px
+      q: @options[:image_options][:quality]
+    }.delete_if {|k,v| v.nil?}
+    super
+  end
+
+  def image(link, title, alt_text)
+    # add the querystring to the image
+    link += "?#{@image_parameters.to_query}"
+    # return a content tag
+    content_tag(:img, nil, src: link.to_s, alt: alt_text, title: title)
+  end
+
+end

data/lib/contentful_rails/version.rb

@@ -1,3 +1,3 @@
 module ContentfulRails
-  VERSION = "0.0.6.1"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: contentful_rails
 version: !ruby/object:Gem::Version
-  version: 0.0.6.1
+  version: 0.0.7
 platform: ruby
 authors:
 - Error Creative Studio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-24 00:00:00.000000000 Z
+date: 2015-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: contentful_model
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.0.6
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 4.1.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 4.1.8
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.2'
 description: A gem to help with hooking Contentful into your Rails application
@@ -68,6 +68,7 @@ files:
 - lib/contentful_rails/cached_timestamps.rb
 - lib/contentful_rails/development_constraint.rb
 - lib/contentful_rails/engine.rb
+- lib/contentful_rails/markdown_renderer.rb
 - lib/contentful_rails/version.rb
 - lib/tasks/contentful_rails_tasks.rake
 - test/contentful_rails_test.rb
@@ -83,12 +84,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []