mbrao 1.5.0 → 1.6.0

data/lib/mbrao/rendering_engines/html_pipeline.rb

@@ -26,7 +26,7 @@ module Mbrao
       # @param context [Hash] A context for rendering.
       def render(content, options = {}, context = {})
         options = sanitize_options(options)
-        context = context.ensure_hash(:symbols)
+        context = context.ensure_hash(accesses: :symbols)
 
         begin
           create_pipeline(options, context).call(get_body(content, options))[:output].to_s
@@ -48,7 +48,7 @@ module Mbrao
       #
       # @return [Array] The default pipeline.
       def default_pipeline=(value)
-        @default_pipeline = value.ensure_array(nil, false, false) { |v| v.ensure_array(nil, true, true, true) { |p| p.ensure_string.to_sym } }
+        @default_pipeline = value.ensure_array { |v| v.ensure_array(no_duplicates: true, compact: true, flatten: true) { |p| p.ensure_string.to_sym } }
       end
 
       # Gets the default options.
@@ -67,33 +67,22 @@ module Mbrao
 
       private
 
-      # Sanitizes options.
-      #
-      # @param options [Hash] The options to sanitize.
-      # @return [Hash] The sanitized options.
+      # :nodoc:
       def sanitize_options(options)
-        options = options.ensure_hash(:symbols)
+        options = options.ensure_hash(accesses: :symbols)
         options = filter_filters(options)
-        options[:pipeline_options] = default_options.merge(options[:pipeline_options].ensure_hash(:symbols))
+        options[:pipeline_options] = default_options.merge(options[:pipeline_options].ensure_hash(accesses: :symbols))
 
         options
       end
 
-      # Get body of a content.
-      #
-      # @param content [Content|String] The content to sanitize.
-      # @param options [Hash] A list of options for renderer.
-      # @return [Array] The body to parse.
+      # :nodoc:
       def get_body(content, options)
         content = ::Mbrao::Content.create(nil, content.ensure_string) unless content.is_a?(::Mbrao::Content)
         content.get_body(options.fetch(:locales, ::Mbrao::Parser.locale).ensure_string)
       end
 
-      # Creates the pipeline for rendering.
-      #
-      # @param options [Hash] A list of options for renderer.
-      # @param context [Hash] A context for rendering.
-      # @return [HTML::Pipeline] The pipeline
+      # :nodoc:
       def create_pipeline(options, context)
         ::HTML::Pipeline.new(
           options[:pipeline].map { |f| ::Lazier.find_class(f, "::HTML::Pipeline::%CLASS%Filter", true) },
@@ -101,10 +90,7 @@ module Mbrao
         )
       end
 
-      # Filters pipeline filters basing on the options provided.
-      #
-      # @param options [Hash] The original options.
-      # @return [Hash] The options with the new set of filters.
+      # :nodoc:
       def filter_filters(options)
         options[:pipeline] = get_pipeline(options)
 
@@ -115,10 +101,7 @@ module Mbrao
         options
       end
 
-      # Gets the pipeline for the current options.
-      #
-      # @param options [Hash] The options to parse.
-      # @return [Array] The pipeline to process.
+      # :nodoc:
       def get_pipeline(options)
         options.fetch(:pipeline, default_pipeline.map(&:first)).map(&:to_sym)
       end

data/lib/mbrao/version.rb

@@ -14,7 +14,7 @@ module Mbrao
     MAJOR = 1
 
     # The minor version.
-    MINOR = 5
+    MINOR = 6
 
     # The patch version.
     PATCH = 0

data/mbrao.gemspec

@@ -4,12 +4,12 @@
 # Licensed under the MIT license, which can be found at http://www.opensource.org/licenses/mit-license.php.
 #
 
-require File.expand_path('../lib/mbrao/version', __FILE__)
+require File.expand_path("../lib/mbrao/version", __FILE__)
 
 Gem::Specification.new do |gem|
   gem.name = "mbrao"
   gem.version = Mbrao::Version::STRING
-  gem.homepage = "http://github.com/ShogunPanda/mbrao"
+  gem.homepage = "http://sw.cowtech.it/mbrao"
   gem.summary = "A content parser and renderer with embedded metadata support."
   gem.description = "A content parser and renderer with embedded metadata support."
   gem.rubyforge_project = "mbrao"
@@ -23,12 +23,12 @@ Gem::Specification.new do |gem|
   gem.test_files = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.required_ruby_version = ">= 1.9.3"
+  gem.required_ruby_version = ">= 2.3.0"
 
-  gem.add_dependency("lazier", "~> 3.5.5")
-  gem.add_dependency("html-pipeline", "~> 1.8.0")
-  gem.add_dependency("slim", "~> 2.0.2")
-  gem.add_dependency("kramdown", "~> 1.3.3")
-  gem.add_dependency("rinku", "~> 1.7.3")
-  gem.add_dependency("gemoji", "~> 1.5.0")
+  gem.add_dependency("lazier", "~> 4.2")
+  gem.add_dependency("html-pipeline", "~> 2.3")
+  gem.add_dependency("slim", "~> 3.0")
+  gem.add_dependency("kramdown", "~> 1.10")
+  gem.add_dependency("rinku", "~> 1.7")
+  gem.add_dependency("gemoji", "~> 2.1")
 end

data/spec/mbrao/content_spec.rb

@@ -283,10 +283,10 @@ describe Mbrao::Content do
   describe "#enabled_for_locales?" do
     it "correctly check availability for certain locales" do
       subject.locales = [:en, :it]
-      expect(subject.enabled_for_locales?).to be_true
-      expect(subject.enabled_for_locales?(:en)).to be_true
-      expect(subject.enabled_for_locales?(:it, :es)).to be_true
-      expect(subject.enabled_for_locales?(:es, :de)).to be_false
+      expect(subject.enabled_for_locales?).to be_truthy
+      expect(subject.enabled_for_locales?(:en)).to be_truthy
+      expect(subject.enabled_for_locales?(:it, :es)).to be_truthy
+      expect(subject.enabled_for_locales?(:es, :de)).to be_falsey
     end
   end
 

data/spec/mbrao/integrations/rails_spec.rb

@@ -5,8 +5,8 @@
 #
 
 require "spec_helper"
-require "action_view"
 require "mbrao/integrations/rails"
+require "action_view"
 
 describe ActionView::Template::Handlers::MbraoTemplate do
   class Rails
@@ -77,12 +77,12 @@ describe ActionView::Template::Handlers::MbraoTemplate do
       renderer = DummyRenderer.new
       allow(renderer).to receive(:controller).and_return(controller)
 
-      expect(controller.respond_to?(:mbrao_content)).to be_false
+      expect(controller.respond_to?(:mbrao_content)).to be_falsey
       expect(::Mbrao::Parser).to receive(:parse).and_call_original
       expect(controller.class).to receive(:helper_method).with(:mbrao_content)
       ActionView::Template::Handlers::MbraoTemplate.instance.render(renderer, "CONTENT")
 
-      expect(controller.respond_to?(:mbrao_content)).to be_true
+      expect(controller.respond_to?(:mbrao_content)).to be_truthy
       expect(controller.mbrao_content.body).to eq("CONTENT")
     end
 
@@ -101,7 +101,7 @@ describe ActionView::Template::Handlers::MbraoTemplate do
 
   describe "#supports_streaming?" do
     it "should be true" do
-      expect(ActionView::Template::Handlers::MbraoTemplate.instance.supports_streaming?).to be_true
+      expect(ActionView::Template::Handlers::MbraoTemplate.instance.supports_streaming?).to be_truthy
     end
   end
 end

data/spec/mbrao/parser_spec.rb

@@ -20,7 +20,7 @@ describe Mbrao::Parser do
   end
 
   it "should correctly setup datetime JSON serialization" do
-    expect(ActiveSupport.use_standard_json_time_format).to be_true
+    expect(ActiveSupport.use_standard_json_time_format).to be_truthy
   end
 
   shared_examples_for("attribute_with_default") do |attribute, default, sanitizer|
@@ -102,25 +102,25 @@ describe Mbrao::Parser do
 
   describe ".email?" do
     it "should check for valid emails" do
-      expect(Mbrao::Parser.email?("valid@email.com")).to be_true
-      expect(Mbrao::Parser.email?("valid@localhost")).to be_false
-      expect(Mbrao::Parser.email?("this.is.9@email.com")).to be_true
-      expect(Mbrao::Parser.email?("INVALID")).to be_false
-      expect(Mbrao::Parser.email?(nil)).to be_false
-      expect(Mbrao::Parser.email?([])).to be_false
-      expect(Mbrao::Parser.email?("this.is.9@email.com.uk")).to be_true
+      expect(Mbrao::Parser.email?("valid@email.com")).to be_truthy
+      expect(Mbrao::Parser.email?("valid@localhost")).to be_falsey
+      expect(Mbrao::Parser.email?("this.is.9@email.com")).to be_truthy
+      expect(Mbrao::Parser.email?("INVALID")).to be_falsey
+      expect(Mbrao::Parser.email?(nil)).to be_falsey
+      expect(Mbrao::Parser.email?([])).to be_falsey
+      expect(Mbrao::Parser.email?("this.is.9@email.com.uk")).to be_truthy
     end
   end
 
   describe ".url?" do
     it "should check for valid URLs" do
-      expect(Mbrao::Parser.url?("http://google.it")).to be_true
-      expect(Mbrao::Parser.url?("ftp://ftp.google.com")).to be_true
-      expect(Mbrao::Parser.url?("http://google.it/?q=FOO+BAR")).to be_true
-      expect(Mbrao::Parser.url?("INVALID")).to be_false
-      expect(Mbrao::Parser.url?([])).to be_false
-      expect(Mbrao::Parser.url?(nil)).to be_false
-      expect(Mbrao::Parser.url?({})).to be_false
+      expect(Mbrao::Parser.url?("http://google.it")).to be_truthy
+      expect(Mbrao::Parser.url?("ftp://ftp.google.com")).to be_truthy
+      expect(Mbrao::Parser.url?("http://google.it/?q=FOO+BAR")).to be_truthy
+      expect(Mbrao::Parser.url?("INVALID")).to be_falsey
+      expect(Mbrao::Parser.url?([])).to be_falsey
+      expect(Mbrao::Parser.url?(nil)).to be_falsey
+      expect(Mbrao::Parser.url?({})).to be_falsey
     end
   end
 

data/spec/spec_helper.rb

@@ -4,12 +4,26 @@
 # Licensed under the MIT license, which can be found at http://www.opensource.org/licenses/mit-license.php.
 #
 
-require "rubygems"
 require "bundler/setup"
-require "mbrao"
 
-RSpec.configure do |config|
-  config.expect_with :rspec do |c|
-    c.syntax = :expect
+if ENV["COVERAGE"]
+  require "simplecov"
+  require "coveralls"
+
+  Coveralls.wear! if ENV["CI"]
+
+  SimpleCov.start do
+    root = Pathname.new(File.dirname(__FILE__)) + ".."
+
+    add_filter do |src_file|
+      path = Pathname.new(src_file.filename).relative_path_from(root).to_s
+      path !~ /^lib/
+    end
   end
 end
+
+require "i18n"
+::I18n.enforce_available_locales = false
+require File.dirname(__FILE__) + "/../lib/mbrao"
+
+Lazier::I18n.default_locale = :en

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mbrao
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Shogun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-12 00:00:00.000000000 Z
+date: 2016-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lazier
@@ -16,84 +16,84 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.5
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.5
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: html-pipeline
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: slim
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: kramdown
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.3
+        version: '1.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.3
+        version: '1.10'
 - !ruby/object:Gem::Dependency
   name: rinku
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.3
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.3
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: gemoji
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: '2.1'
 description: A content parser and renderer with embedded metadata support.
 email:
 - shogun@cowtech.it
@@ -177,7 +177,6 @@ files:
 - lib/mbrao/rendering_engines/html_pipeline/kramdown_filter.rb
 - lib/mbrao/version.rb
 - mbrao.gemspec
-- spec/coverage_helper.rb
 - spec/mbrao/author_spec.rb
 - spec/mbrao/content_spec.rb
 - spec/mbrao/integrations/rails_spec.rb
@@ -188,7 +187,7 @@ files:
 - spec/mbrao/rendering_engines/html_pipeline/kramdown_filter_spec.rb
 - spec/mbrao/rendering_engines/html_pipeline_spec.rb
 - spec/spec_helper.rb
-homepage: http://github.com/ShogunPanda/mbrao
+homepage: http://sw.cowtech.it/mbrao
 licenses:
 - MIT
 metadata: {}
@@ -200,7 +199,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -208,12 +207,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: mbrao
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A content parser and renderer with embedded metadata support.
 test_files:
-- spec/coverage_helper.rb
 - spec/mbrao/author_spec.rb
 - spec/mbrao/content_spec.rb
 - spec/mbrao/integrations/rails_spec.rb

data/spec/coverage_helper.rb

@@ -1,20 +0,0 @@
-# encoding: utf-8
-#
-# This file is part of the mbrao gem. Copyright (C) 2013 and above Shogun <shogun@cowtech.it>.
-# Licensed under the MIT license, which can be found at http://www.opensource.org/licenses/mit-license.php.
-#
-
-require "pathname"
-require "simplecov"
-require "coveralls"
-
-Coveralls.wear! if ENV["CI"] || ENV["JENKINS_URL"]
-
-SimpleCov.start do
-  root = Pathname.new(File.dirname(__FILE__)) + ".."
-
-  add_filter do |src_file|
-    path = Pathname.new(src_file.filename).relative_path_from(root).to_s
-    path !~ /^(lib)/
-  end
-end