flutie 2.0.0 → 2.1.0

data/Rakefile

@@ -5,7 +5,7 @@ require 'appraisal'
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)
 
-task :default do |t|
+task :default do |_task|
   if ENV['BUNDLE_GEMFILE'] =~ /gemfiles/
     exec 'rake spec'
   else
@@ -13,6 +13,6 @@ task :default do |t|
   end
 end
 
-task :appraise => ['appraisal:install'] do |t|
+task appraise: ['appraisal:install'] do |_task|
   exec 'rake appraisal'
 end

data/flutie.gemspec

@@ -1,22 +1,45 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "flutie/version"
+$LOAD_PATH << File.expand_path('lib', __dir__)
+require 'flutie/version'
 
 Gem::Specification.new do |s|
-  s.name        = 'flutie'
-  s.version     = Flutie::VERSION.dup
-  s.authors     = ['Matt Jankowski', 'Chad Pytel', 'Kevin Burg', 'Chad Mazzola', 'Phil LaPier', 'Dan Croak', 'Fred Yates', 'OZAWA Sakuro', 'Mike Burns', 'Greg Sterndale', 'Joe Ferris', 'J. Edward Dewyea', 'Emilien Taque', 'Aaron Suggs', 'Nick Quaranto']
-  s.email       = ['support@thoughtbot.com']
-  s.homepage    = 'http://github.com/thoughtbot/flutie'
-  s.summary     = 'Flutie provides extra Rails view helpers'
+  s.name = 'flutie'
+  s.version = Flutie::VERSION.dup
+  s.licenses = ['MIT']
+  s.authors = <<-AUTHORS.split("\n")
+    Aaron Suggs
+    Caleb Thompson
+    Chad Mazzola
+    Chad Pytel
+    Dan Croak
+    Edwin Morris
+    Emilien Taque
+    Fred Yates
+    Gabe Berke-Williams
+    Galen Frechette
+    Greg Sterndale
+    J. Edward Dewyea
+    Joe Ferris
+    Kevin Burg
+    Matt Jankowski
+    Matthew Burket
+    Mike Burns
+    Nick Quaranto
+    OZAWA Sakuro
+    Phil LaPier
+    Tom Crinson
+  AUTHORS
+
+  s.email = ['support@thoughtbot.com']
+  s.homepage = 'http://github.com/thoughtbot/flutie'
+  s.summary = 'Flutie provides extra Rails view helpers'
   s.description = 'Flutie is a starting point for personal discovery'
 
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.files = `git ls-files -z`
+            .split("\x0")
+            .reject { |f| f =~ %r{^(spec|gemfiles|bin)/} }
   s.require_paths = ['lib']
 
-  s.add_development_dependency('appraisal')
-  s.add_development_dependency('sqlite3')
-  s.add_development_dependency('rspec-rails')
+  s.add_development_dependency('appraisal', '~> 2.2')
+  s.add_development_dependency('rspec-rails', '~> 3.7')
+  s.add_development_dependency('sqlite3', '~> 1.3')
 end

data/lib/flutie.rb

@@ -1,5 +1,6 @@
 require 'flutie/version'
 
+# :nodoc:
 module Flutie
   require 'flutie/railtie' if defined?(Rails)
 end

data/lib/flutie/body_class.rb

@@ -0,0 +1,43 @@
+# :nodoc:
+module Flutie
+  # :nodoc:
+  class BodyClass
+    DEFAULT_EXTRA_CLASS_SYMBOL = :extra_body_classes
+    attr_reader :options, :controller
+
+    def initialize(options, controller)
+      @options = options
+      @controller = controller
+    end
+
+    def basic_body_class
+      [controller_part, action_part].join(' ')
+    end
+
+    def extra_body_classes_symbol
+      options[:extra_body_classes_symbol] || DEFAULT_EXTRA_CLASS_SYMBOL
+    end
+
+    private
+
+    def controller_part
+      qualified_controller_name
+    end
+
+    def action_part
+      [qualified_controller_name, action_name].join('-')
+    end
+
+    def qualified_controller_name
+      controller_path.tr('/', '-')
+    end
+
+    def action_name
+      controller.action_name
+    end
+
+    def controller_path
+      controller.controller_path
+    end
+  end
+end

data/lib/flutie/body_class_helper.rb

@@ -1,13 +1,13 @@
+# :nodoc:
 module BodyClassHelper
   def body_class(options = {})
-    extra_body_classes_symbol = options[:extra_body_classes_symbol] || :extra_body_classes
-    qualified_controller_name = controller.controller_path.gsub('/','-')
-    basic_body_class = "#{qualified_controller_name} #{qualified_controller_name}-#{controller.action_name}"
+    body_class = Flutie::BodyClass.new(options, controller)
 
-    if content_for?(extra_body_classes_symbol)
-      [basic_body_class, content_for(extra_body_classes_symbol)].join(' ')
-    else
-      basic_body_class
-    end
+    [
+      body_class.basic_body_class,
+      content_for(body_class.extra_body_classes_symbol)
+    ]
+      .compact
+      .join(' ')
   end
 end

data/lib/flutie/page_title.rb

@@ -0,0 +1,32 @@
+# :nodoc:
+module Flutie
+  # :nodoc:
+  class PageTitle
+    DEFAULT_PAGE_TITLE_SYMBOL = :page_title
+    DEFAULT_SEPARATOR = ' : '.freeze
+
+    attr_reader :options
+
+    def initialize(options)
+      @options = options
+    end
+
+    def app_name
+      options[:app_name] || rails_app_name
+    end
+
+    def page_title_symbol
+      options[:page_title_symbol] || DEFAULT_PAGE_TITLE_SYMBOL
+    end
+
+    def separator
+      options[:separator] || DEFAULT_SEPARATOR
+    end
+
+    private
+
+    def rails_app_name
+      Rails.application.class.to_s.split('::').first
+    end
+  end
+end

data/lib/flutie/page_title_helper.rb

@@ -1,13 +1,13 @@
+# :nodoc:
 module PageTitleHelper
   def page_title(options = {})
-    app_name = options[:app_name] || Rails.application.class.to_s.split('::').first
-    page_title_symbol = options[:page_title_symbol] || :page_title
-    separator = options[:separator] || ' : '
+    page_title = Flutie::PageTitle.new(options)
 
-    if content_for?(page_title_symbol)
-      [app_name, content_for(page_title_symbol)].join(separator)
-    else
-      app_name
-    end
+    Flutie::PageTitlePresenter.new(
+      page_title.app_name,
+      content_for(page_title.page_title_symbol),
+      page_title.separator,
+      options[:reverse]
+    ).to_s
   end
 end

data/lib/flutie/page_title_presenter.rb

@@ -0,0 +1,32 @@
+# :nodoc:
+module Flutie
+  # :nodoc:
+  class PageTitlePresenter
+    attr_reader :app_name, :content, :separator, :reversed
+
+    def initialize(app_name, content, separator, reversed = false)
+      @app_name = app_name
+      @content = content
+      @separator = separator
+      @reversed = reversed
+    end
+
+    def to_s
+      ordered_parts.compact.join(separator)
+    end
+
+    def ordered_parts
+      if reversed_order?
+        [content, app_name]
+      else
+        [app_name, content]
+      end
+    end
+
+    private
+
+    def reversed_order?
+      @reversed
+    end
+  end
+end

data/lib/flutie/railtie.rb

@@ -1,15 +1,19 @@
+require 'flutie/body_class'
 require 'flutie/body_class_helper'
+require 'flutie/page_title'
+require 'flutie/page_title_presenter'
 require 'flutie/page_title_helper'
 
+# :nodoc:
 module Flutie
-
+  # :nodoc:
   class Railtie < Rails::Railtie
-    initializer 'page_title.helper' do |app|
+    initializer 'page_title.helper' do |_app|
       ActionView::Base.send :include, PageTitleHelper
     end
-    initializer 'body_class.helper' do |app|
+
+    initializer 'body_class.helper' do |_app|
       ActionView::Base.send :include, BodyClassHelper
     end
   end
-
 end

data/lib/flutie/version.rb

@@ -1,3 +1,3 @@
 module Flutie
-  VERSION = '2.0.0'.freeze
+  VERSION = '2.1.0'.freeze
 end

metadata

@@ -1,78 +1,77 @@
 --- !ruby/object:Gem::Specification
 name: flutie
 version: !ruby/object:Gem::Version
-  version: 2.0.0
-  prerelease: 
+  version: 2.1.0
 platform: ruby
 authors:
-- Matt Jankowski
-- Chad Pytel
-- Kevin Burg
-- Chad Mazzola
-- Phil LaPier
-- Dan Croak
-- Fred Yates
-- OZAWA Sakuro
-- Mike Burns
-- Greg Sterndale
-- Joe Ferris
-- J. Edward Dewyea
-- Emilien Taque
-- Aaron Suggs
-- Nick Quaranto
+- "    Aaron Suggs"
+- "    Caleb Thompson"
+- "    Chad Mazzola"
+- "    Chad Pytel"
+- "    Dan Croak"
+- "    Edwin Morris"
+- "    Emilien Taque"
+- "    Fred Yates"
+- "    Gabe Berke-Williams"
+- "    Galen Frechette"
+- "    Greg Sterndale"
+- "    J. Edward Dewyea"
+- "    Joe Ferris"
+- "    Kevin Burg"
+- "    Matt Jankowski"
+- "    Matthew Burket"
+- "    Mike Burns"
+- "    Nick Quaranto"
+- "    OZAWA Sakuro"
+- "    Phil LaPier"
+- "    Tom Crinson"
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-12 00:00:00.000000000 Z
+date: 2018-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.7'
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
 description: Flutie is a starting point for personal discovery
 email:
 - support@thoughtbot.com
@@ -80,9 +79,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".rubocop.yml"
+- ".travis.yml"
 - Appraisals
+- CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
 - Gemfile.lock
@@ -90,104 +92,36 @@ files:
 - README.md
 - Rakefile
 - flutie.gemspec
-- gemfiles/rails_3.0.20.gemfile
-- gemfiles/rails_3.1.11.gemfile
-- gemfiles/rails_3.2.12.gemfile
 - lib/flutie.rb
+- lib/flutie/body_class.rb
 - lib/flutie/body_class_helper.rb
+- lib/flutie/page_title.rb
 - lib/flutie/page_title_helper.rb
+- lib/flutie/page_title_presenter.rb
 - lib/flutie/railtie.rb
 - lib/flutie/version.rb
-- spec/dummy/Rakefile
-- spec/dummy/app/controllers/application_controller.rb
-- spec/dummy/app/helpers/application_helper.rb
-- spec/dummy/app/views/layouts/application.html.erb
-- spec/dummy/config.ru
-- spec/dummy/config/application.rb
-- spec/dummy/config/boot.rb
-- spec/dummy/config/database.yml
-- spec/dummy/config/environment.rb
-- spec/dummy/config/environments/development.rb
-- spec/dummy/config/environments/production.rb
-- spec/dummy/config/environments/test.rb
-- spec/dummy/config/initializers/backtrace_silencers.rb
-- spec/dummy/config/initializers/inflections.rb
-- spec/dummy/config/initializers/mime_types.rb
-- spec/dummy/config/initializers/secret_token.rb
-- spec/dummy/config/initializers/session_store.rb
-- spec/dummy/config/locales/en.yml
-- spec/dummy/config/routes.rb
-- spec/dummy/public/404.html
-- spec/dummy/public/422.html
-- spec/dummy/public/500.html
-- spec/dummy/public/favicon.ico
-- spec/dummy/public/javascripts/application.js
-- spec/dummy/public/javascripts/controls.js
-- spec/dummy/public/javascripts/dragdrop.js
-- spec/dummy/public/javascripts/effects.js
-- spec/dummy/public/javascripts/prototype.js
-- spec/dummy/public/javascripts/rails.js
-- spec/dummy/public/stylesheets/.gitkeep
-- spec/dummy/script/rails
-- spec/helpers/body_class_helper_spec.rb
-- spec/helpers/page_title_helper_spec.rb
-- spec/spec_helper.rb
 homepage: http://github.com/thoughtbot/flutie
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.7.7
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Flutie provides extra Rails view helpers
-test_files:
-- spec/dummy/Rakefile
-- spec/dummy/app/controllers/application_controller.rb
-- spec/dummy/app/helpers/application_helper.rb
-- spec/dummy/app/views/layouts/application.html.erb
-- spec/dummy/config.ru
-- spec/dummy/config/application.rb
-- spec/dummy/config/boot.rb
-- spec/dummy/config/database.yml
-- spec/dummy/config/environment.rb
-- spec/dummy/config/environments/development.rb
-- spec/dummy/config/environments/production.rb
-- spec/dummy/config/environments/test.rb
-- spec/dummy/config/initializers/backtrace_silencers.rb
-- spec/dummy/config/initializers/inflections.rb
-- spec/dummy/config/initializers/mime_types.rb
-- spec/dummy/config/initializers/secret_token.rb
-- spec/dummy/config/initializers/session_store.rb
-- spec/dummy/config/locales/en.yml
-- spec/dummy/config/routes.rb
-- spec/dummy/public/404.html
-- spec/dummy/public/422.html
-- spec/dummy/public/500.html
-- spec/dummy/public/favicon.ico
-- spec/dummy/public/javascripts/application.js
-- spec/dummy/public/javascripts/controls.js
-- spec/dummy/public/javascripts/dragdrop.js
-- spec/dummy/public/javascripts/effects.js
-- spec/dummy/public/javascripts/prototype.js
-- spec/dummy/public/javascripts/rails.js
-- spec/dummy/public/stylesheets/.gitkeep
-- spec/dummy/script/rails
-- spec/helpers/body_class_helper_spec.rb
-- spec/helpers/page_title_helper_spec.rb
-- spec/spec_helper.rb
+test_files: []