middleman-title 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8890ac07e237420852ff05324a82f3b437eb00f4
-  data.tar.gz: ca350f34ed2c92bfaaaf26118b9c9d79d438fd18
+  metadata.gz: 1fb2a922916b5111439d744037d6d6b1e1777569
+  data.tar.gz: e891cad4a69d680472768b16e2e2aa49fffde704
 SHA512:
-  metadata.gz: cafb5818c7b23d812ae006102612d9a2822f587924b65c2505d908d3dda7b7ba7189be29917850c69a262ad94a9d246f337404de0d2dda9e5f9b5ed02ff368f9
-  data.tar.gz: d09d8e9543b8a1b56fe0f353bf8c4c518f026f21ea2b7d1d4297c76ee52440dd885a505ed56c9ad841de3432d529137eaead0e5879aec0046216920624ec2a46
+  metadata.gz: a7a7675a4d9ff10dac71cd054f731877fdb1ad38deb353b2f3408b65e589c9a8e379c60b8f857ac5e72529c97c3430aa946fe8777c19daee07eb9115855d3ac5
+  data.tar.gz: bce2a8617200ac8352028c5ae89cb8c0e6ed337b4bca9a4767cbf77e93afa158cb2965be62f5f4edccd6ded48bb57635a0a156f3cf13f896cfc17e6500aa43ea

data/.travis.yml

@@ -2,5 +2,7 @@ rvm:
 - 1.9.3
 - 2.0.0
 - 2.1.0
-
-script: 'bundle exec rspec'
+script: 'bundle exec rspec'
+addons:
+  code_climate:
+    repo_token: 96d351848c244b986b3888fd13d12b6e916dcfbc83474c8a7a2c03d1c7827ecf

data/CHANGELOG.md

@@ -0,0 +1,6 @@
+## 0.0.2
+* Fix conflict with options set for middleman-deploy
+* Allow options to be passed in as hash or block
+
+## 0.0.1
+* Initial release

data/Gemfile

@@ -1,3 +1,9 @@
 source 'https://rubygems.org'
 
-gemspec
+gemspec
+
+gem 'bundler', '~> 1.6'
+gem 'rake', '~> 10.3'
+gem 'rspec', '~> 2.14'
+
+gem 'codeclimate-test-reporter', require: nil

data/README.md

@@ -1,6 +1,6 @@
-
 # Middleman Title
 [![Build Status](https://travis-ci.org/jcypret/middleman-title.svg?branch=master)](https://travis-ci.org/jcypret/middleman-title)
+[![Code Climate](https://codeclimate.com/github/jcypret/middleman-title.png)](https://codeclimate.com/github/jcypret/middleman-title)
 
 This Middleman extension allows you to easily set page titles for your website.
 
@@ -75,7 +75,7 @@ This would output:
 
 ## Contributing
 
-1. Fork it ( https://github.com/[my-github-username]/middleman-title/fork )
+1. Fork it ( https://github.com/jcypret/middleman-title/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/lib/middleman-title/extension.rb

@@ -2,17 +2,34 @@ require 'middleman-title/helpers'
 
 module Middleman
   module Title
-    class << self
 
-      def registered(app, options_hash = {}, &block)
-        app.helpers Helpers
-        @@options = options_hash
+    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
+
     end
+
   end
 end

data/lib/middleman-title/helpers.rb

@@ -10,23 +10,23 @@ module Middleman
       end
 
       private
-        def options
-          Title.options
+        def title_options
+          ::Middleman::Title.options
         end
 
         def website_name
-          current_page.data.title_site || options[:site]
+          current_page.data.title_site || title_options.site
         end
 
         def title_separator
-          options[:separator] || ' — '
+          title_options.separator
         end
 
         def title_reverse
-          if current_page.data.title_reverse == false
-            false
+          if current_page.data.title_reverse.nil? == false
+            current_page.data.title_reverse
           else
-            current_page.data.title_reverse || options[:reverse]
+            title_options.reverse
           end
         end
 
@@ -41,7 +41,7 @@ module Middleman
         end
 
         def add_website_name_to_title(title)
-          if current_page.data.title_site == false || website_name.nil?
+          if current_page.data.title_site == false || website_name == false
             title
           elsif website_name_first?
             title.unshift(website_name)
@@ -58,10 +58,6 @@ module Middleman
           title_reverse
         end
 
-        def hide_website_name?
-          current_page.data.title_site == false
-        end
-
     end
   end
-end
+end

data/lib/middleman-title/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module Title
-    VERSION = '0.0.1'
+    VERSION = '0.0.2'
   end
-end
+end

data/middleman-title.gemspec

@@ -19,8 +19,4 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'middleman-core', '~> 3.2'
-
-  spec.add_development_dependency 'bundler', '~> 1.6'
-  spec.add_development_dependency 'rake', '~> 10.3', '>= 10.3.1'
-  spec.add_development_dependency 'rspec', '~> 2.14', '>= 2.14.1'
 end

data/spec/extension_spec.rb

@@ -5,13 +5,17 @@ describe Middleman::Title::Helpers do
 
   describe '#page_title' do
     before(:each) do
+      h.stub_chain(:options, :site).and_return(false)
+      h.stub_chain(:options, :separator).and_return(' — ')
+      h.stub_chain(:options, :reverse).and_return(false)
+
       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)
     end
 
     context 'website name is set' do
-      before(:each) { h.stub(:options) { { site: 'Website Name' } } }
+      before(:each) { h.stub_chain(:options, :site).and_return('Website Name') }
 
       context 'page name is set' do
         before(:each) { h.stub_chain(:current_page, :data, :title).and_return('How to Say Hello to the World') }
@@ -31,19 +35,20 @@ describe Middleman::Title::Helpers do
         end
 
         it 'puts website name first when activate reverse is true' do
-          h.stub(:options) { { site: 'Website Name', reverse: true } }
+          h.stub_chain(:options, :reverse).and_return(true)
           expect(h.page_title).to eq 'Website Name — How to Say Hello to the World'
         end
 
         it 'puts website name last when activate reverse is true but frontmatter is false' do
-          h.stub(:options) { { site: 'Website Name', reverse: true } }
+          h.stub_chain(:options, :reverse).and_return(true)
           h.stub_chain(:current_page, :data, :title_reverse).and_return(false)
           expect(h.page_title).to eq 'How to Say Hello to the World — Website Name'
         end
 
         context 'separator is set' do
           it 'to a vertical bar' do
-            h.stub(:options) { { site: 'Website Name', separator: ' | ' } }
+            h.stub_chain(:options, :site).and_return('Website Name')
+            h.stub_chain(:options, :separator).and_return(' | ')
             expect(h.page_title).to eq 'How to Say Hello to the World | Website Name'
           end
         end
@@ -71,7 +76,6 @@ describe Middleman::Title::Helpers do
     end
 
     context 'website name is not set' do
-      before(:each) { h.stub(:options) { {} } }
 
       context 'page name is set' do
         before(:each) { h.stub_chain(:current_page, :data, :title).and_return('How to Say Hello to the World') }
@@ -90,4 +94,4 @@ describe Middleman::Title::Helpers do
     end
 
   end
-end
+end

data/spec/spec_helper.rb

@@ -1,3 +1,6 @@
+require "codeclimate-test-reporter"
+CodeClimate::TestReporter.start
+
 require 'bundler/setup'
 Bundler.setup
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: middleman-title
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Justin Cypret
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-20 00:00:00.000000000 Z
+date: 2014-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
@@ -24,60 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.6'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 10.3.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 10.3.1
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.14'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.14.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.14'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.14.1
 description: A Middleman extension for setting the page title
 email:
 - jcypret@gmail.com
@@ -88,8 +34,8 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
-- Gemfile.lock
 - LICENSE.md
 - README.md
 - Rakefile

data/Gemfile.lock

@@ -1,76 +0,0 @@
-PATH
-  remote: .
-  specs:
-    middleman-title (0.0.1)
-      middleman-core (~> 3.2)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activesupport (4.0.5)
-      i18n (~> 0.6, >= 0.6.9)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
-      thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
-    diff-lcs (1.2.5)
-    erubis (2.7.0)
-    ffi (1.9.3)
-    hooks (0.4.0)
-      uber (~> 0.0.4)
-    i18n (0.6.9)
-    listen (1.3.1)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9)
-      rb-kqueue (>= 0.2)
-    middleman-core (3.3.2)
-      activesupport (~> 4.0.1)
-      bundler (~> 1.1)
-      erubis
-      hooks (~> 0.3)
-      i18n (~> 0.6.9)
-      listen (~> 1.1)
-      padrino-helpers (~> 0.12.1)
-      rack (>= 1.4.5, < 2.0)
-      rack-test (~> 0.6.2)
-      thor (>= 0.15.2, < 2.0)
-      tilt (~> 1.4.1, < 2.0)
-    minitest (4.7.5)
-    multi_json (1.10.0)
-    padrino-helpers (0.12.2)
-      i18n (~> 0.6, >= 0.6.7)
-      padrino-support (= 0.12.2)
-      tilt (~> 1.4.1)
-    padrino-support (0.12.2)
-      activesupport (>= 3.1)
-    rack (1.5.2)
-    rack-test (0.6.2)
-      rack (>= 1.0)
-    rake (10.3.1)
-    rb-fsevent (0.9.4)
-    rb-inotify (0.9.4)
-      ffi (>= 0.5.0)
-    rb-kqueue (0.2.2)
-      ffi (>= 0.5.0)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.8)
-    rspec-expectations (2.14.5)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.6)
-    thor (0.19.1)
-    thread_safe (0.3.3)
-    tilt (1.4.1)
-    tzinfo (0.3.39)
-    uber (0.0.6)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.6)
-  middleman-title!
-  rake (~> 10.3, >= 10.3.1)
-  rspec (~> 2.14, >= 2.14.1)