sir_trevor_rails 0.5.0b1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0440542cac7ceda76800ef5d839ce166aea6a96
-  data.tar.gz: 63bfbecf7f48260f978fd284bf773ec1cc8287c2
+  metadata.gz: 63883a02cdf49d08e2ecfc4b3ecd307396d4b9c8
+  data.tar.gz: 81b858f079c3632f141414bd4ed19b197edd1b05
 SHA512:
-  metadata.gz: 41c835b01d6f5fd0bf4540ba2a3c65d3fcf70c43de7586ab3048fae21025bd05045c70c4afca5a9671dbbfe3a774e8e9f7a97dd9c3b97ff1840d7bf281135a3f
-  data.tar.gz: 7621bdbeae052096553e9af079169a8f600aef8e8733acfdf02e0b3f91618455c8a44b3bcec27a0eb382fbb55fd52b1cfc0d32c9cd6e3f4d3cdf3c19821b9013
+  metadata.gz: d80735fb35626d3be73f46a844007c8b6541118b65f5d5db1b48401475dad94e9840b9564d236493457fb463e0eed2c9e35bb00d4043cd681b33021e9170cec2
+  data.tar.gz: 9e9d4e118c9c541d7afa0f2ce96152de64b1e136fb83561f3cc0f31c460e749515b96237b399c2534dfa04bdbd10dc1a46c5ffd79c613d570142f9f4827908ca

data/.travis.yml

@@ -0,0 +1,8 @@
+language: ruby
+cache: bundler
+rvm:
+  - 2.0.0
+  - 2.1.0
+  - 2.2.2
+
+script: 'bundle exec rake test'

data/app/views/sir_trevor/blocks/_heading_block.html.erb

@@ -1 +1,3 @@
-<h2><%= heading_block.text %></h2>
+<h2 class="st__content-block st__content-block--heading">
+  <%= without_p_wrap(sir_trevor_format(heading_block.text, format: heading_block.format)) %>
+</h2>

data/app/views/sir_trevor/blocks/_list_block.html.erb

@@ -1,3 +1,11 @@
 <div class="st__content-block st__content-block--list">
-	<%= sir_trevor_markdown list_block.text %>
+  <% if list_block.format == :html %>
+    <ul>
+      <% list_block.listItems.each do |item| %>
+        <li><%= sir_trevor_format item[:content], format: list_block.format %></li>
+      <% end %>
+    </ul>
+  <% else %>
+    <%= sir_trevor_markdown list_block.text %>
+  <% end %>
 </div>

data/app/views/sir_trevor/blocks/_quote_block.html.erb

@@ -1,7 +1,13 @@
 <div class="st__content-block st__content-block--quote">
   <div class="quote">
     <div class="quote__content">
-    	<%= sir_trevor_markdown quote_block.text %>
+      <% if quote_block.format == :html %>
+        <blockquote>
+          <%= sir_trevor_format quote_block.text, format: quote_block.format %>
+        </blockquote>
+      <% else %>
+        <%= sir_trevor_markdown quote_block.text %>
+      <% end %>
     </div>
 
     <% if quote_block.cite.present? %>

data/app/views/sir_trevor/blocks/_text_block.html.erb

@@ -1,3 +1,3 @@
 <div class="st__content-block st__content-block--text">
-	<%= sir_trevor_markdown text_block.text %>
+  <%= sir_trevor_format text_block.text, format: text_block.format%>
 </div>

data/app/views/sir_trevor/blocks/_tweet_block.html.erb

@@ -1,9 +1,9 @@
 <div class="st__content-block st__content-block--tweet">
-  <%= link_to image_tag(tweet_block.profile_image_url, class: 'img'), tweet_block.screen_name %>
+  <%= link_to image_tag(tweet_block.profile_image_url, class: 'img'), tweet_block.profile_url %>
   <p>
     <%= tweet_block.render_tweet_body %>
   </p>
-  <cite>From <%= link_to tweet_block.at_name, tweet_block.screen_name %> on Twitter:</cite>
-  <time datetime="<%= tweet_block.created_at %>">(<%= link_to Time.parse(tweet_block.created_at), tweet_block.status_url %>)</time>
+  <cite>From <%= link_to tweet_block.at_name, tweet_block.profile_url %> on Twitter:</cite>
+  <time datetime="<%= tweet_block.created_at %>">(<%= link_to Time.zone.parse(tweet_block.created_at), tweet_block.status_url %>)</time>
 </div>
 

data/lib/generators/sir_trevor_rails/block/block_generator.rb

@@ -11,23 +11,28 @@ module SirTrevorRails
       def create_block
 
         # Copy the JS
-        copy_file "_block.js", "app/assets/javascripts/sir_trevor/blocks/#{name}.js"
-
-        gsub_file "app/assets/javascripts/sir_trevor/blocks/#{name}.js", /SirTrevor\.Blocks\.Example/, "SirTrevor.Blocks.#{name.capitalize}"
-        gsub_file "app/assets/javascripts/sir_trevor/blocks/#{name}.js", /return "Example"/, "return: '#{name.capitalize}'"
-        gsub_file "app/assets/javascripts/sir_trevor/blocks/#{name}.js", /type: 'example'/, "type: '#{name.downcase}'"
+        template "_block.js.erb", "app/assets/javascripts/sir_trevor/blocks/#{file_name}.js"
 
         # Copy the HTML
-        copy_file "_block.html.erb", "app/views/sir_trevor/blocks/_#{name}_block.html.erb"
-        gsub_file "app/views/sir_trevor/blocks/_#{name}_block.html.erb", /\s(-block)/, " #{name}-block"
-        gsub_file "app/views/sir_trevor/blocks/_#{name}_block.html.erb", /\s(_block)/, " #{name}_block"
+        template "_block.html.erb", "app/views/sir_trevor/blocks/_#{file_name}_block.html.erb"
 
         # Copy the BlockDecorator
-        copy_file "_block.rb", "app/sir_trevor_blocks/#{name}_block.rb"
-        gsub_file "app/sir_trevor_blocks/#{name}_block.rb", /ExampleBlock/, " #{name}Block"
+        template "_block.rb.erb", "app/sir_trevor_blocks/#{file_name}_block.rb"
+      end
+
+      private
 
+      def file_name
+        name.underscore
       end
 
+      def block_name
+        file_name.camelize
+      end
+
+      def css_class
+        file_name.dasherize
+      end
     end
   end
-end
+end

data/lib/generators/sir_trevor_rails/block/templates/_block.html.erb

@@ -1,3 +1,3 @@
-<div class="content-block example-block">
-  <%= example_block %>
-</div>
+<div class="content-block <%= css_class %>-block">
+  <%%= <%= file_name %>_block %>
+</div>

data/lib/generators/sir_trevor_rails/block/templates/{_block.js → _block.js.erb}

@@ -4,20 +4,18 @@
   Author: C J Bell @ madebymany
 */
 
-SirTrevor.Blocks.Example = (function(){
-
+SirTrevor.Blocks.<%= block_name %> = (function(){
   return SirTrevor.Block.extend({
-
     // String; Names the block
     // Note – please use underscores when naming
     // Eg example_block should be ExampleBlock
-    type: 'example',
+    type: '<%= file_name %>',
 
     // Function; the title displayed in the toolbar
     // Can return a translated string (if required)
     title: function() {
       // return i18n.t('blocks:example:title');
-      return "Example";
+      return "<%= block_name %>";
     },
 
     // Boolean; show this blockType of the toolbar
@@ -200,4 +198,4 @@ SirTrevor.Blocks.Example = (function(){
     }
   });
 
-})();
+})();

data/lib/generators/sir_trevor_rails/block/templates/_block.rb.erb

@@ -0,0 +1,2 @@
+class <%= block_name %>Block < SirTrevorRails::Block
+end

data/lib/sir_trevor_rails/block.rb

@@ -2,26 +2,37 @@ require 'ostruct'
 
 module SirTrevorRails
   class Block < OpenStruct
+    DEFAULT_FORMAT = :markdown
 
     def self.from_hash(hash, parent)
-      hash = hash.deep_dup
+      hash = hash.deep_dup.with_indifferent_access
       self.type_klass(hash).new(hash, parent)
     end
 
+    def format
+      send(:[], :format).present? ? send(:[], :format).to_sym : DEFAULT_FORMAT
+    end
+
     def initialize(hash, parent)
-      @as_json = hash
+      @raw_data = hash
       @parent  = parent
       @type    = hash[:type].to_sym
-
       super(hash[:data])
     end
 
-    attr_reader :parent, :type, :as_json
+    attr_reader :parent, :type
 
     def to_partial_path
       "sir_trevor/blocks/" << self.class.name.demodulize.underscore
     end
 
+    def as_json(*attrs)
+      {
+        type: @type.to_s,
+        data: marshal_dump
+      }
+    end
+
     private
 
     # Infers the block class.
@@ -58,6 +69,5 @@ module SirTrevorRails
         self
       end
     end
-
   end
 end

data/lib/sir_trevor_rails/block_array.rb

@@ -1,11 +1,23 @@
 module SirTrevorRails
   class BlockArray < Array
 
-    def self.from_json(str, parent = nil)
-      blocks = MultiJson.load(str, symbolize_keys: true)
-      blocks = blocks[:data] if blocks.is_a?(Hash)
-      blocks.map! { |block_obj| SirTrevorRails::Block.from_hash(block_obj, parent) }
-      new blocks
+    def self.from_json(blocks, parent = nil)
+      if blocks.is_a?(String)
+        blocks = MultiJson.load(blocks, symbolize_keys: true)
+      end
+
+      if blocks.is_a?(Hash)
+        blocks = blocks[:data] || blocks['data'] or
+          raise IndexError, "No block data found"
+      end
+
+      new blocks.map { |obj|
+        SirTrevorRails::Block.from_hash(obj.deep_symbolize_keys, parent)
+      }
+    end
+
+    def to_s
+      {data: as_json}.to_json
     end
 
     def has_block_of_type?(type)

data/lib/sir_trevor_rails/blocks/tweet_block.rb

@@ -25,11 +25,13 @@ module SirTrevorRails
         "@" << screen_name
       end
 
-      def profile_image_url(size="bigger")
-        "//twitter.com/api/users/profile_image/" << self.user[:screen_name] <<
-          "?size=" << size
+      def profile_image_url
+        # TODO: add support for different size images: https://dev.twitter.com/overview/general/user-profile-images-and-banners
+
+        # Split the URL to omit the protocol and let the browser define the context (note: assumes asset is available over both HTTP and HTTPS) 
+        "//" << self.user[:profile_image_url].split("://")[1]
       end
 
     end
   end
-end
+end

data/lib/sir_trevor_rails/helpers/view_helper.rb

@@ -2,15 +2,34 @@ module SirTrevorRails
   module Helpers
     module ViewHelper
       extend ActiveSupport::Concern
+      included do
+        include ActionView::Helpers::SanitizeHelper
+      end
+
+      def sir_trevor_format(text, format: :markdown)
+        if format.to_s.to_sym == :html
+          sir_trevor_html(text)
+        else
+          sir_trevor_markdown(text)
+        end
+      end
+
+      def sir_trevor_html(text)
+        sanitize(text, tags: %w(b i a br p))
+      end
 
       def sir_trevor_markdown(text)
-        Redcarpet::Render::HTML.new(hard_wrap: true, filter_html: true,
+        rndr = CustomMarkdownFormatter.new(hard_wrap: true, filter_html: true,
                                     autolink: true, no_intraemphasis: true,
                                     fenced_code: true)
 
-        markdown = Redcarpet::Markdown.new(CustomMarkdownFormatter)
+        markdown = Redcarpet::Markdown.new(rndr)
         markdown.render(text).html_safe
       end
+
+      def without_p_wrap(html)
+        Regexp.new('^<p>(.*)<\/p>$').match(html)[1].html_safe rescue html
+      end
     end
   end
 end

data/lib/sir_trevor_rails/version.rb

@@ -1,3 +1,3 @@
 module SirTrevorRails
-  VERSION = "0.5.0b1"
+  VERSION = "0.5.0"
 end

data/lib/sir_trevor_rails/view_resolver.rb

@@ -5,9 +5,9 @@ module SirTrevorRails
       super("app/views")
     end
 
-    def find_templates(name, prefix, partial, details)
-      super(name, prefix.gsub(/^(.)+(sir_trevor)/, '\2'), partial, details)
+    def find_templates(name, prefix, *args)
+      super(name, prefix.gsub(/^(.)+(sir_trevor)/, '\2'), *args)
     end
 
   end
-end
+end

data/sir_trevor_rails.gemspec

@@ -31,9 +31,11 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "pry-rails"
   spec.add_development_dependency "combustion"
   spec.add_development_dependency "sqlite3"
+  spec.add_development_dependency "capybara"
+  spec.add_development_dependency "launchy"
 
-  spec.add_dependency "rails"
+  spec.add_dependency "rails", ">= 3", "< 5"
   spec.add_dependency "redcarpet", ">= 2.0.1", "< 4"
   spec.add_dependency "twitter-text", "~> 1.4"
-
+  spec.add_dependency 'multi_json', '~> 1.0'
 end

data/spec/fixtures/blocks/custom.json

@@ -0,0 +1,7 @@
+{
+  "type": "custom",
+  "data": {
+    "text": "Body",
+    "title": "Name"
+  }
+}

data/spec/fixtures/blocks/heading_html.json

@@ -0,0 +1,7 @@
+{
+  "type": "heading",
+  "data": {
+    "text": "Heading <i>1</i>",
+    "format": "html"
+  }
+}

data/spec/fixtures/blocks/heading_markdown.json

@@ -0,0 +1,6 @@
+{
+  "type": "heading",
+  "data": {
+    "text": "Heading _1_"
+  }
+}

data/spec/fixtures/blocks/image.json

@@ -0,0 +1,26 @@
+{
+  "type":"image",
+  "data":{
+    "id":1,
+    "updated_at":"2015-01-01T01:00:00+01:00",
+    "created_at":"2015-01-01T01:00:00+01:00",
+    "file":{
+      "url":"http://placeimg.com/1000/600/any",
+      "thumb":{
+        "url":"http://placeimg.com/100/100/any"
+      },
+      "large":{
+        "url":"http://placeimg.com/800/400/any"
+      },
+      "xlarge":{
+        "url":"http://placeimg.com/1000/600/any"
+      },
+      "medium":{
+        "url":"http://placeimg.com/600/300/any"
+      },
+      "mobile":{
+        "url":"http://placeimg.com/800/400/any"
+      }
+    }
+  }
+}

data/spec/fixtures/blocks/list_html.json

@@ -0,0 +1,10 @@
+{
+  "type": "list",
+  "data": {
+    "listItems": [
+      { "content": "List Item 1" },
+      { "content": "<b>List Item 2</b>" }
+    ],
+    "format": "html"
+  }
+}

data/spec/fixtures/blocks/list_markdown.json

@@ -0,0 +1,6 @@
+{
+  "type": "list",
+  "data": {
+    "text": " - List Item 1\n - **List Item 2**\n"
+  }
+}

data/spec/fixtures/blocks/quote_html.json

@@ -0,0 +1,8 @@
+{
+  "type": "quote",
+  "data": {
+    "text": "This is quoted text",
+    "cite": "Author",
+    "format": "html"
+  }
+}

data/spec/fixtures/blocks/quote_markdown.json

@@ -0,0 +1,7 @@
+{
+  "type": "quote",
+  "data": {
+    "text": "> This is quoted text",
+    "cite": "Author"
+  }
+}

data/spec/fixtures/blocks/text_html.json

@@ -0,0 +1,7 @@
+{
+  "type": "text",
+  "data": {
+    "text": "One <i>two</i> <b>three</b> <a href='http://example.com'>four</a>",
+    "format": "html"
+  }
+}

data/spec/fixtures/blocks/text_markdown.json

@@ -0,0 +1,6 @@
+{
+  "type": "text",
+  "data": {
+    "text": "One _two_ **three** [four](http://example.com)"
+  }
+}

data/spec/fixtures/blocks/tweet.json

@@ -0,0 +1,21 @@
+{
+  "type":"tweet",
+  "data":{
+    "user":{
+      "profile_image_url":"http://pbs.twimg.com/profile_images/613336689893896192/5nQjxG2o_normal.jpg",
+      "profile_image_url_https":"https://pbs.twimg.com/profile_images/613336689893896192/5nQjxG2o_normal.jpg",
+      "screen_name":"SachseInTheCity",
+      "name":"Nelson Sachse"
+    },
+    "id":"615846875078504448",
+    "text":"There's no pain without some gain !\n\nlet's run \\o/",
+    "created_at":"Tue Jun 30 11:38:31 +0000 2015",
+    "entities":{
+      "hashtags":[],
+      "symbols":[],
+      "user_mentions":[],
+      "urls":[]
+    },
+    "status_url":"https://twitter.com/SachseInTheCity/status/615846875078504448"
+  }
+}

data/spec/integration/editing_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+class EditingSpec < ActionDispatch::IntegrationTest
+  describe 'Edit form' do
+    let(:post) { Post.create(body: blocks_json(:text_html)) }
+
+    it 'serializes BlockArray to correct json' do
+      visit edit_post_path(post)
+      expect { find_field('Body').value == {data: post.body.as_json}.to_json }
+    end
+
+    it 'serializes empty BlockArray to empty array json' do
+      post = Post.create()
+
+      visit edit_post_path(post)
+      expect { find_field('Body').value == "{\"data\":[]}" }
+    end
+  end
+end

data/spec/integration/rendering_spec.rb

@@ -0,0 +1,121 @@
+require 'spec_helper'
+
+class RenderingSpec < ActionDispatch::IntegrationTest
+  describe 'SirTrevorContent rendering' do
+    it 'renders all blocks as separate divs' do
+      post = Post.create(body: blocks_json(:list_html, :text_html))
+      visit post_path(post)
+
+      expect { all('.st__content-block').length == 2 }
+    end
+  end
+
+  describe 'Text block' do
+    it 'renders markdown format' do
+      create_and_visit(blocks_json(:text_markdown))
+
+      expect { find_block(:text).text == "One two three four" }
+      expect { find_block(:text).find('em').text == "two" }
+      expect { find_block(:text).find('strong').text == "three" }
+      expect { find_block(:text).find('a').text == "four" }
+    end
+
+    it 'renders html format' do
+      create_and_visit(blocks_json(:text_html))
+
+      expect { find_block(:text).text == "One two three four" }
+      expect { find_block(:text).find('i').text == "two" }
+      expect { find_block(:text).find('b').text == "three" }
+      expect { find_block(:text).find('a').text == "four" }
+    end
+  end
+
+  describe 'List block' do
+    it 'renders markdown format' do
+      create_and_visit(blocks_json(:list_markdown))
+
+      expect { find_block(:list).text == "List Item 1 List Item 2" }
+      expect { find_block(:list).all('li').first.text == "List Item 1" }
+      expect { find_block(:list).all('li').last.text == "List Item 2" }
+      expect { find_block(:list).first('strong').text == "List Item 2" }
+    end
+
+    it 'renders html format' do
+      create_and_visit(blocks_json(:list_html))
+
+      expect { find_block(:list).text == "List Item 1 List Item 2" }
+      expect { find_block(:list).all('li').first.text == "List Item 1" }
+      expect { find_block(:list).all('li').last.text == "List Item 2" }
+      expect { find_block(:list).first('b').text == "List Item 2" }
+    end
+  end
+
+  describe 'Image block' do
+    it 'renders correctly' do
+      create_and_visit(blocks_json(:image))
+      expect { find_block(:image).find("img")[:src] == "http://placeimg.com/1000/600/any" }
+    end
+  end
+
+  describe 'Heading block' do
+    it 'renders markdown format' do
+      create_and_visit(blocks_json(:heading_markdown))
+
+      expect { find_block(:heading).text == "Heading 1" }
+      expect { find_block(:heading).find('em').text == "1" }
+    end
+
+    it 'renders html format' do
+      create_and_visit(blocks_json(:heading_html))
+
+      expect { find_block(:heading).text == "Heading 1" }
+      expect { find_block(:heading).find('i').text == "1" }
+    end
+  end
+
+  describe 'Quote block' do
+    it 'renders markdown format' do
+      create_and_visit(blocks_json(:quote_markdown))
+
+      expect { find_block(:quote).find('blockquote').text == "This is quoted text" }
+      expect { find_block(:quote).find('cite').text == "– Author" }
+    end
+
+    it 'renders html format' do
+      create_and_visit(blocks_json(:quote_html))
+
+      expect { find_block(:quote).find('blockquote').text == "This is quoted text" }
+      expect { find_block(:quote).find('cite').text == "– Author" }
+    end
+  end
+
+  describe 'Tweet block' do
+    it 'renders correctly' do
+      create_and_visit(blocks_json(:tweet))
+      expect { find_block(:tweet).all('a')[0][:href] == "//twitter.com/SachseInTheCity" }
+      expect { find_block(:tweet).find('img')[:src] == "//pbs.twimg.com/profile_images/613336689893896192/5nQjxG2o_normal.jpg" }
+
+      expect { find_block(:tweet).find('p').text == "There's no pain without some gain ! let's run \\o/" }
+
+      expect { find_block(:tweet).find('cite').text == "From @SachseInTheCity on Twitter:" }
+
+      expect { find_block(:tweet).all('a')[1][:href] == "//twitter.com/SachseInTheCity" }
+      expect { find_block(:tweet).all('a')[1].text == "@SachseInTheCity" }
+
+      expect { find_block(:tweet).find('time')[:datetime] == "Tue Jun 30 11:38:31 +0000 2015" }
+      expect { find_block(:tweet).find('time').text == "(#{Time.zone.parse("Tue Jun 30 11:38:31 +0000 2015")})" }
+
+      expect { find_block(:tweet).all('a')[2][:href] == "https://twitter.com/SachseInTheCity/status/615846875078504448" }
+      expect { find_block(:tweet).all('a')[2].text == Time.zone.parse("Tue Jun 30 11:38:31 +0000 2015").to_s }
+    end
+  end
+
+  def create_and_visit(json)
+    post = Post.create(body: json)
+    visit post_path(post)
+  end
+
+  def find_block(type)
+    first(".st__content-block--#{type}")
+  end
+end

data/spec/internal/app/controllers/posts_controller.rb

@@ -0,0 +1,33 @@
+class PostsController < ActionController::Base
+  def new
+    @post = Post.new
+  end
+
+  def edit
+    @post = Post.find(params[:id])
+  end
+
+  def create
+    @post = Post.new(post_attributes)
+
+    if @post.save
+      redirect_to post_show_path(@post)
+    else
+      render :new
+    end
+  end
+
+  def update
+    @post = Post.find(params[:id])
+
+    if @post.update_attributes(post_attributes)
+      redirect_to post_show_path(@post)
+    else
+      render :edit
+    end
+  end
+
+  def show
+    @post = Post.find(params[:id])
+  end
+end

data/spec/internal/app/models/post.rb

@@ -1,2 +1,4 @@
 class Post < ActiveRecord::Base
+  include SirTrevorRails::HasSirTrevorContent
+  sir_trevor_content :body
 end

data/spec/internal/app/views/posts/_form.html.erb

@@ -0,0 +1,3 @@
+<%= form.label :body %>
+<%= form.text_area :body %>
+<%= form.submit :save %>

data/spec/internal/app/views/posts/edit.html.erb

@@ -0,0 +1,3 @@
+<%= form_for @post do |form| %>
+  <%= render form %>
+<% end %>

data/spec/internal/app/views/posts/new.html.erb

@@ -0,0 +1,3 @@
+<%= form_for @post do |form| %>
+  <%= render form %>
+<% end %>

data/spec/internal/app/views/posts/show.html.erb

@@ -0,0 +1 @@
+<%= render @post.body %>

data/spec/internal/config/routes.rb

@@ -1,3 +1,3 @@
 Rails.application.routes.draw do
-  #
+  resources :posts
 end

data/spec/spec_helper.rb

@@ -1,12 +1,18 @@
 require 'sir_trevor_rails'
 require 'combustion'
+
+Combustion.initialize! :active_record, :action_view do
+  config.active_support.test_order = :random
+end
+
+
+require 'capybara/rails'
 require 'minitest/autorun'
 require 'minitest/spec'
 require 'minitest/pride'
 require 'wrong/adapters/minitest'
 require 'pry'
 
-Combustion.initialize! :active_record, :action_view
 
 Wrong.config.alias_assert :expect, override: true
 
@@ -14,3 +20,38 @@ MiniTest::Spec.class_eval do
   include Wrong::Assert
   include Wrong::Helpers
 end
+
+module SirTrevorRails::Fixtures
+  def blocks_json(*names)
+    "[" + names.map { |name| block_json(name) }.join(',') + "]"
+  end
+
+  def block_json(name)
+    filename = File.join('fixtures', 'blocks', name.to_s + '.json')
+    path = File.expand_path(filename, File.dirname(__FILE__))
+
+    File.read(path)
+  end
+
+  def block_hash(name)
+    MultiJson.load(block_json(name))
+  end
+
+  def blocks_hash(*names)
+    MultiJson.load(blocks_json(*names))
+  end
+end
+
+class ActiveSupport::TestCase
+  extend MiniTest::Spec::DSL
+  include Wrong::Assert
+  include Wrong::Helpers
+
+  include SirTrevorRails::Fixtures
+  include SirTrevorRails # bad, but we don't have to use full class names
+end
+
+class ActionDispatch::IntegrationTest
+  # Make the Capybara DSL available in all integration tests
+  include Capybara::DSL
+end

data/spec/unit/block_array_spec.rb

@@ -1,11 +1,9 @@
 require 'spec_helper'
 
-module SirTrevorRails
+class BlockArraySpec < ActiveSupport::TestCase
   describe BlockArray do
     describe 'intialization' do
       subject { BlockArray }
-      let(:text_block) { {type: 'text', data: {text: 'Lorem ipsum'}} }
-      let(:heading_block) { {type: 'heading', data: {text: 'Heading 1'}} }
 
       it 'can be initialized with an empty JSON array' do
         array = subject.from_json('[]')
@@ -13,25 +11,37 @@ module SirTrevorRails
       end
 
       it 'can be initialized with multiple block hashes' do
-        json = [text_block, heading_block].to_json
-        array = subject.from_json(json)
+        array = subject.from_json(blocks_json(:text_html, :heading_html))
 
         expect { array.is_a? BlockArray }
         expect { array.size == 2 }
       end
+
+      it 'can be initialized with a hash' do
+        ar = subject.from_json({data: blocks_hash(:text_html, :image)})
+
+        expect { ar.is_a? BlockArray }
+        expect { ar.first.type == :text }
+        expect { ar.last.type == :image }
+      end
+
+      it 'can be initialized with an array' do
+        ar = subject.from_json(blocks_hash(:text_html, :image))
+
+        expect { ar.is_a? BlockArray }
+        expect { ar.first.type == :text }
+        expect { ar.last.type == :image }
+      end
     end
 
     describe 'instance methods' do
-      let(:text_block) { {type: 'text', data: {text: 'First text block'}} }
-      let(:other_text_block) { {type: 'text', data: {text: 'Other text block'}} }
-      let(:image_block) { {type: 'image', data: {file: {url: 'http://example.com'}}} }
-      let(:heading_block) { {type: 'heading', data: {text: 'Heading 1'}} }
-      let(:json) { [image_block, text_block, heading_block, other_text_block].to_json }
+      let(:json) { blocks_json :image, :text_html, :heading_html, :text_markdown }
 
       subject { BlockArray.from_json(json) }
 
       describe 'has_block_of_type?' do
         it 'can be called with nonexistent block type' do
+          # no assert needed, if anything was wrong it would raise an exception
           subject.has_block_of_type? :nonexistent
         end
 
@@ -47,7 +57,7 @@ module SirTrevorRails
       describe 'first_block_of_type' do
         it 'returns first block of given type in the array' do
           block = subject.first_block_of_type(:text)
-          assert { block.text == 'First text block' }
+          assert { block.text.starts_with? "One <i>two</i>" }
         end
 
         it 'returns nil if called with block type not in the array' do

data/spec/unit/block_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-module SirTrevorRails
+class BlockSpec < ActiveSupport::TestCase
   describe Block do
     describe '.block_class' do
       subject { Block }
@@ -46,11 +46,17 @@ module SirTrevorRails
     end
 
     describe 'JSON representation' do
-      let(:source_hash) { { type: 'test', data: {} } }
-      let(:block) { Block.from_hash(source_hash, nil) }
+      let(:empty_source_hash) { { type: 'test', data: {} } }
+      let(:empty_block) { Block.from_hash(empty_source_hash, nil) }
+      let(:data_source_hash) { { type: 'test', data: { one: 2, three: 4 } } }
+      let(:data_block) { Block.from_hash(data_source_hash, nil) }
 
       it 'returns source hash when #as_json is called' do
-        expect { block.as_json == source_hash }
+        expect { empty_block.as_json == empty_source_hash }
+      end
+
+      it 'serializes block data' do
+        expect { data_block.as_json == data_source_hash }
       end
     end
 

data/spec/unit/custom_block_spec.rb

@@ -4,16 +4,18 @@ require 'spec_helper'
 # `spec/internal/app/models/custom_block.rb`, just like it would in real 
 # Rails app.
 
-describe CustomBlock do
-  describe "SirTrevorRails::Block" do
-    let(:custom_block_hash) { {type: 'custom', data: {text: 'Body', title: 'name'}} }
+class CustomBlockTest < ActiveSupport::TestCase
+  describe CustomBlock do
+    describe "SirTrevorRails::Block" do
+      let(:custom_block_hash) { {type: 'custom', data: {text: 'Body', title: 'name'}} }
 
-    it 'initialises class defined in the file' do
-      block = SirTrevorRails::Block.from_hash(custom_block_hash, nil)
+      it 'initialises class defined in the file' do
+        block = SirTrevorRails::Block.from_hash(block_hash(:custom), nil)
 
-      assert { block.is_a? CustomBlock }
-      assert { block.respond_to? :upcase_title }
-      assert { block.upcase_title == "NAME" }
+        assert { block.is_a? CustomBlock }
+        assert { block.respond_to? :upcase_title }
+        assert { block.upcase_title == "NAME" }
+      end
     end
   end
 end

data/spec/unit/has_sir_trevor_content_spec.rb

@@ -1,15 +1,9 @@
 require 'spec_helper'
 
-module SirTrevorRails
+class HasSirTrevorContentSpec < ActiveSupport::TestCase
   describe 'HasSirTrevorContent' do
     describe 'initialized for body field' do
-      before do
-        Post.send(:include, HasSirTrevorContent)
-        Post.send(:sir_trevor_content, :body)
-      end
-
       let(:post) { Post.new }
-      let(:text_block) { {type: 'text', data: {text: 'Lorem ipsum'}} }
 
       it 'returns BlockArray for initialised field' do
         assert { post.body.is_a? BlockArray }
@@ -28,7 +22,7 @@ module SirTrevorRails
       end
 
       it 'returns blocks if field is SirTrevor JSON' do
-        post.body = [text_block].to_json
+        post.body = blocks_json(:text_html)
 
         assert { post.body.size == 1 }
         assert { post.body.first.is_a? Block }

data/spec/unit/helpers_spec.rb

@@ -0,0 +1,44 @@
+require 'spec_helper'
+
+module SirTrevorRails
+  describe Helpers do
+    let(:subject) { Class.new.send(:include, Helpers::ViewHelper).new }
+
+    describe 'sir_trevor_format' do
+      it 'is callable' do
+        expect { subject.respond_to? :sir_trevor_format }
+      end
+
+      it 'calls sir_trevor_markdown if format is not provided' do
+        subject.stub :sir_trevor_markdown, 'markdown-called' do
+          expect { subject.sir_trevor_format('test') == 'markdown-called' }
+        end
+      end
+
+      it 'calls sir_trevor_markdown if format == markdown' do
+        subject.stub :sir_trevor_markdown, 'markdown-called' do
+          expect { subject.sir_trevor_format('test', format: :markdown) == 'markdown-called' }
+        end
+      end
+
+      it 'calls sir_trevor_html if format == html' do
+        subject.stub :sir_trevor_html, 'html-called' do
+          expect { subject.sir_trevor_format('test', format: :html) == 'html-called' }
+        end
+      end
+    end
+
+    describe 'sir_trevor_html' do
+      it 'removes not allowed html tags' do
+        html = '<strong><i>Hello<br><a href="http://example.com/">World</a>!</i></strong>'
+        escaped_html = "<i>Hello<br><a href=\"http://example.com/\">World</a>!</i>"
+        expect { subject.sir_trevor_html(html) != html }
+        expect { subject.sir_trevor_html(html) == escaped_html }
+      end
+      it 'retains formatting html tags' do
+        html = '<b><i>Hello<br><a href="http://example.com/">World</a>!</i></b>'
+        expect { subject.sir_trevor_html(html) == html }
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sir_trevor_rails
 version: !ruby/object:Gem::Version
-  version: 0.5.0b1
+  version: 0.5.0
 platform: ruby
 authors:
 - Andrew Sprinz
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-25 00:00:00.000000000 Z
+date: 2016-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -112,19 +112,53 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: launchy
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
@@ -159,6 +193,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 description: 
 email:
 - andrew@madebymany.co.uk
@@ -170,6 +218,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - CHANGELOG
 - Gemfile
 - LICENSE.txt
@@ -188,8 +237,8 @@ files:
 - config/initializers/validators.rb
 - lib/generators/sir_trevor_rails/block/block_generator.rb
 - lib/generators/sir_trevor_rails/block/templates/_block.html.erb
-- lib/generators/sir_trevor_rails/block/templates/_block.js
-- lib/generators/sir_trevor_rails/block/templates/_block.rb
+- lib/generators/sir_trevor_rails/block/templates/_block.js.erb
+- lib/generators/sir_trevor_rails/block/templates/_block.rb.erb
 - lib/generators/sir_trevor_rails/views/views_generator.rb
 - lib/sir_trevor_rails.rb
 - lib/sir_trevor_rails/block.rb
@@ -202,8 +251,26 @@ files:
 - lib/sir_trevor_rails/version.rb
 - lib/sir_trevor_rails/view_resolver.rb
 - sir_trevor_rails.gemspec
+- spec/fixtures/blocks/custom.json
+- spec/fixtures/blocks/heading_html.json
+- spec/fixtures/blocks/heading_markdown.json
+- spec/fixtures/blocks/image.json
+- spec/fixtures/blocks/list_html.json
+- spec/fixtures/blocks/list_markdown.json
+- spec/fixtures/blocks/quote_html.json
+- spec/fixtures/blocks/quote_markdown.json
+- spec/fixtures/blocks/text_html.json
+- spec/fixtures/blocks/text_markdown.json
+- spec/fixtures/blocks/tweet.json
+- spec/integration/editing_spec.rb
+- spec/integration/rendering_spec.rb
+- spec/internal/app/controllers/posts_controller.rb
 - spec/internal/app/models/custom_block.rb
 - spec/internal/app/models/post.rb
+- spec/internal/app/views/posts/_form.html.erb
+- spec/internal/app/views/posts/edit.html.erb
+- spec/internal/app/views/posts/new.html.erb
+- spec/internal/app/views/posts/show.html.erb
 - spec/internal/config/database.yml
 - spec/internal/config/routes.rb
 - spec/internal/db/schema.rb
@@ -214,6 +281,7 @@ files:
 - spec/unit/block_spec.rb
 - spec/unit/custom_block_spec.rb
 - spec/unit/has_sir_trevor_content_spec.rb
+- spec/unit/helpers_spec.rb
 homepage: https://github.com/madebymany/sir-trevor-rails
 licenses:
 - MIT
@@ -229,18 +297,36 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: A ruby wrapper for sir trevor content
 test_files:
+- spec/fixtures/blocks/custom.json
+- spec/fixtures/blocks/heading_html.json
+- spec/fixtures/blocks/heading_markdown.json
+- spec/fixtures/blocks/image.json
+- spec/fixtures/blocks/list_html.json
+- spec/fixtures/blocks/list_markdown.json
+- spec/fixtures/blocks/quote_html.json
+- spec/fixtures/blocks/quote_markdown.json
+- spec/fixtures/blocks/text_html.json
+- spec/fixtures/blocks/text_markdown.json
+- spec/fixtures/blocks/tweet.json
+- spec/integration/editing_spec.rb
+- spec/integration/rendering_spec.rb
+- spec/internal/app/controllers/posts_controller.rb
 - spec/internal/app/models/custom_block.rb
 - spec/internal/app/models/post.rb
+- spec/internal/app/views/posts/_form.html.erb
+- spec/internal/app/views/posts/edit.html.erb
+- spec/internal/app/views/posts/new.html.erb
+- spec/internal/app/views/posts/show.html.erb
 - spec/internal/config/database.yml
 - spec/internal/config/routes.rb
 - spec/internal/db/schema.rb
@@ -251,4 +337,4 @@ test_files:
 - spec/unit/block_spec.rb
 - spec/unit/custom_block_spec.rb
 - spec/unit/has_sir_trevor_content_spec.rb
-has_rdoc: 
+- spec/unit/helpers_spec.rb

data/lib/generators/sir_trevor_rails/block/templates/_block.rb

@@ -1,2 +0,0 @@
-class ExampleBlock < SirTrevorRails::Block
-end