middleman-title 0.0.3 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 905b57b97b08acd97e7305dca9bb78ce393d3cfb
-  data.tar.gz: 7792436582d0ecabeb0e0e340de188e28804db5b
+  metadata.gz: eb52042c35467ac74d487bd3b00deaac99f22127
+  data.tar.gz: 5561cfd621050ed045af7511c59f945c42d979b7
 SHA512:
-  metadata.gz: 5ba9d6c37b5d0e2fcd187861b799cf244fa42858ec00a9b1a9a13f4797a92a709ea245da95ddd7db6d3472437cc87eebf8cbb36e84003b5629d318e65a7bdb19
-  data.tar.gz: d2058bf70334d73aa65fda7fa3721b31feb1a7a450ad3bec4a604215c02fb8472bcf67a905345f6141eef053c00d93192930cc4c3bdc99dfa0f1f3d1295b5312
+  metadata.gz: df37d610c126e6f2765a9d7f3207b288b18067f2f33ce7f9141a185be675bc9ca2e133e3490bf31781424f77ff38e7558d927e668a18e005c65f8afd0c64e58b
+  data.tar.gz: 8ba5950d3fb5ef5dc5aee0c178b413ccdd10aaa9ad6bde2238fe91d9be147e51fdfc3a58279bdb88a492db3ad17deda3af29071de7e2e051d316b37a093a8079

data/.travis.yml

@@ -1,5 +1,7 @@
 language: ruby
 cache: bundler
+before_install:
+- gem update bundler
 rvm:
 - 2.3.0
 - 2.2.0

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.0.0 (2017-04-01)
+* Add compatibility with Middleman v4 (#2)
+* Upgrade plugin to use the Middleman extension API (#2)
+* Allow overriding individual page titles (#3)
+
 ## 0.0.3
 * Fix Rspec stub name for title_options
 * Adjust Middleman dependency to 3.2 or higher

data/README.md

@@ -93,6 +93,14 @@ This would output:
 John Doe — Staff — Your Website Name
 ```
 
+## Override Page Title
+
+If at any point you want to completely override the page title, you can use `page_title` in the Frontmatter.
+
+```YAML
+page_title: The title of a page to be used as-is in <title> without site name
+```
+
 ## Contributing
 
 1. Fork it ( https://github.com/jcypret/middleman-title/fork )

data/lib/middleman-title.rb

@@ -2,5 +2,5 @@ require 'middleman-core'
 
 ::Middleman::Extensions.register(:title) do
   require 'middleman-title/extension'
-  ::Middleman::Title
-end
+  ::Middleman::TitleExtension
+end

data/lib/middleman-title/extension.rb

@@ -1,35 +1,21 @@
+require 'middleman-core'
 require 'middleman-title/helpers'
 
 module Middleman
-  module Title
+  class TitleExtension < Middleman::Extension
+    option :site, false, 'Name of your website'
+    option :separator, ' &mdash; ', 'Title section separator'
+    option :reverse, false, 'Reverse the order of title sections'
 
-    class Options < Struct.new(:site, :separator, :reverse)
-      def initialize(h)
-        super(*h.values_at(:site, :separator, :reverse))
-      end
-    end
-
-    class << self
-
-      def options
-        @@options
-      end
-
-      def registered(app, options_hash = {}, &block)
-        options = Options.new(options_hash)
-        yield options if block_given?
-
-        # default options
-        options.separator ||= ' &mdash; '
-        options.site      = false if options.site.nil?
-        options.reverse   = false if options.reverse.nil?
-
-        @@options = options
-        app.helpers Helpers
-      end
-      alias :included :registered
+    self.defined_helpers = [ Middleman::Title::Helpers ]
 
+    def initialize(app, options_hash={}, &block)
+      super
+      ::Middleman::TitleExtension.class_variable_set(:@@options, options)
     end
 
+    def self.options
+      @@options
+    end
   end
 end

data/lib/middleman-title/helpers.rb

@@ -3,6 +3,9 @@ module Middleman
     module Helpers
 
       def page_title
+        current_page_title = current_page.data.page_title
+        return current_page_title unless current_page_title.nil?
+
         title = []
         title = add_page_name_to_title(title)
         title = add_website_name_to_title(title)
@@ -11,7 +14,7 @@ module Middleman
 
       private
         def title_options
-          ::Middleman::Title.options
+          ::Middleman::TitleExtension.options
         end
 
         def website_name

data/lib/middleman-title/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module Title
-    VERSION = '0.0.3'
+    VERSION = '1.0.0'
   end
 end

data/middleman-title.gemspec

@@ -18,5 +18,5 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'middleman-core', '>= 3.2'
+  spec.add_dependency 'middleman-core', '>= 4.0'
 end

data/spec/extension_spec.rb

@@ -12,6 +12,7 @@ describe Middleman::Title::Helpers do
       h.stub_chain(:current_page, :data, :title).and_return(nil)
       h.stub_chain(:current_page, :data, :title_site).and_return(nil)
       h.stub_chain(:current_page, :data, :title_reverse).and_return(nil)
+      h.stub_chain(:current_page, :data, :page_title).and_return(nil)
     end
 
     context 'website name is set' do
@@ -93,5 +94,13 @@ describe Middleman::Title::Helpers do
 
     end
 
+    context 'page_title is set' do
+      before(:each) { h.stub_chain(:current_page, :data, :page_title).and_return('This takes precedence') }
+
+      it 'returns page_title specified for the current page' do
+        expect(h.page_title).to eq 'This takes precedence'
+      end
+    end
+
   end
 end

data/spec/spec_helper.rb

@@ -1,5 +1,5 @@
-require "codeclimate-test-reporter"
-CodeClimate::TestReporter.start
+require 'simplecov'
+SimpleCov.start
 
 require 'bundler/setup'
 Bundler.setup
@@ -8,4 +8,4 @@ require 'middleman-title/extension'
 
 RSpec.configure do |config|
   # some (optional) config here
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: middleman-title
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 1.0.0
 platform: ruby
 authors:
 - Justin Cypret
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-11 00:00:00.000000000 Z
+date: 2017-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.0'
 description: A Middleman extension for setting the page title
 email:
 - jcypret@gmail.com
@@ -67,11 +67,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: A Middleman extension for setting the page title
 test_files:
 - spec/extension_spec.rb
 - spec/spec_helper.rb
-has_rdoc: