stationed 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86a07ab2c8293fd8cc8575df86dd92d6754d9082
-  data.tar.gz: 3cae3f13454df7072d2f7cf77d34bcf74435972b
+  metadata.gz: cd0eef67b43417e7fd36f910d756d88eb01be768
+  data.tar.gz: 86a8f6cce7c8084573de3c9228b592bed0b1ef83
 SHA512:
-  metadata.gz: 3efc2cc9a7ce774e617d0cb4c04a58371066d9903686db47d1f9d406304c063b8f518d22ac67f3e2845b4046258498e470f447877ca044101649f7f2627208f9
-  data.tar.gz: ad1a6a9f6cf5a104312316d66c5773911fd4223b7bfae1643c5916bb8c06fde70867c2bfb2e240d64a35c8385250d907041ed519222cbc069d3a6e2db04a4b59
+  metadata.gz: 64faf83906f6206d63eda4c13e8232b8492dfcbcc4cd503bd911d01de0456503737d1ff2bc4fd84e6bb62401adbcb6efe40c0c21527b653a47e91816401440dd
+  data.tar.gz: a87de8d7e9358cf86f7ffb9df76cf244b737edff1eb6d43ebf01bb525928186053d3da024ecc058a962f00973b0d2c55d2d5c5aebbe473d59ea41903cca5b069

data/HISTORY.md

@@ -1,5 +1,13 @@
 # HISTORY
 
+## 0.4.0
+
+* Improve default layout and actually remove Erb layout file
+* Prevent load order issue with i18n-spec matchers
+* Allow passing additional interpolation arguments to record-based page titles
+* Add extra action-default record page title translation key
+* Use regular translate helper rather than directly accessing I18n
+
 ## 0.3.0
 
 * Properly installed stationed executable [ariejan]

data/app/helpers/page_title_helper.rb

@@ -23,14 +23,16 @@ module PageTitleHelper
   # @example Set the page title based on a model name
   #   page_title Post.find(1)
   #   # example translation key: 'Editing %{singular} %{id}'
+  # @example Pass along extra arguments to interpolate
+  #   page_title @post, author: @post.author.name
   # @example Show the page title
   #   <title><%= title %></title>
   #
   # @param [String, #model_name] String or ActiveModel-compliant object
   # @return [String] page title component or formatted page title
-  def page_title(new_title = nil)
+  def page_title(new_title = nil, options = {})
     if new_title
-      title_from_string_or_record_or_class(new_title).tap do |str|
+      title_from_string_or_record_or_class(new_title, options).tap do |str|
         content_for :page_title, str
       end
     elsif content_for? :page_title
@@ -43,14 +45,14 @@ module PageTitleHelper
   private
 
   def standard_title
-    I18n.translate(
+    translate(
       standard_defaults.first,
       default: standard_defaults.drop(1)
     )
   end
 
   def formatted_title
-    I18n.translate(
+    translate(
       formatted_defaults.first,
       title:   content_for(:page_title),
       default: formatted_defaults.drop(1)
@@ -63,14 +65,14 @@ module PageTitleHelper
       singular: klass.model_name.human,
       plural:   klass.model_name.human.pluralize
     )
-    I18n.translate model_defaults.first, options
+    translate model_defaults.first, options
   end
 
-  def title_from_string_or_record_or_class(object)
+  def title_from_string_or_record_or_class(object, options)
     if object.respond_to?(:model_name)
-      title_for_class(object)
+      title_for_class(object, options)
     elsif object.class.respond_to?(:model_name)
-      title_for_class(object.class, id: object.to_param)
+      title_for_class(object.class, options.reverse_merge(id: object.to_param))
     else
       object
     end
@@ -99,6 +101,7 @@ module PageTitleHelper
     [
       :"page_title.#{controller_name}.#{action_name}.model",
       :"page_title.#{controller_name}.model",
+      :"page_title.default.#{action_name}.model",
       :'page_title.default.model',
       :'page_title.default.standard',
       ::Rails.application.class.parent_name

data/lib/stationed/generators/plugins/i18n_spec.rb

@@ -11,7 +11,7 @@ module Stationed
 
         def finish_template
           return super unless options[:i18n_spec]
-          gem 'i18n-spec', group: :test
+          gem 'i18n-spec', group: :test, require: false
           copy_file 'i18n_spec.rb', 'spec/locales/i18n_spec.rb'
           uncomment_lines 'config/environments/development.rb', /raise_on_missing_translations/
           uncomment_lines 'config/environments/test.rb', /raise_on_missing_translations/

data/lib/stationed/generators/plugins/layout.rb

@@ -11,7 +11,7 @@ module Stationed
 
         def finish_template
           return super unless options[:layout]
-          remove_file 'app/views/layouts/application.html.haml'
+          remove_file 'app/views/layouts/application.html.erb'
           copy_file 'application.html.haml', 'app/views/layouts/application.html.haml'
           super
         end

data/lib/stationed/generators/templates/application.html.haml

@@ -7,6 +7,7 @@
     = stylesheet_link_tag 'application'
     = csrf_meta_tags
   %body
-    = render 'flashes'
-    = yield
+    #page
+      = render 'flashes'
+      = yield
     = javascript_include_tag 'application'

data/lib/stationed/generators/templates/i18n_spec.rb

@@ -1,3 +1,6 @@
+require 'spec_helper'
+require 'i18n-spec'
+
 Dir.glob('config/locales/*.yml') do |locale_file|
   describe locale_file do
     it { should be_parseable }

data/lib/stationed/version.rb

@@ -1,3 +1,3 @@
 module Stationed
-  VERSION = '0.3.0'.freeze
+  VERSION = '0.4.0'.freeze
 end

data/spec/dummy/log/test.log

@@ -1578,3 +1578,165 @@
    (0.0ms)  rollback transaction
    (0.0ms)  begin transaction
    (0.0ms)  rollback transaction
+   (0.3ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.2ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.2ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.2ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.2ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.3ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.2ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.2ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.2ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.2ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.2ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction

data/spec/helpers/page_title_helper_spec.rb

@@ -15,13 +15,14 @@ describe PageTitleHelper do
     name   = double human: 'Post'
     model  = double model_name: name
     record = double class: model, to_param: '1'
-    expect(I18n).to receive(:translate).with(
+    expect(helper).to receive(:translate).with(
       :'page_title.controller.action.model',
       singular: 'Post',
       plural: 'Posts',
       id: '1',
       default: [
         :'page_title.controller.model',
+        :'page_title.default.action.model',
         :'page_title.default.model',
         :'page_title.default.standard',
         'Dummy'
@@ -30,15 +31,37 @@ describe PageTitleHelper do
     helper.page_title record
   end
 
+  it 'passes additional options along to helper.translate when setting a record title' do
+    name   = double human: 'Post'
+    model  = double model_name: name
+    record = double class: model, to_param: '1'
+    expect(helper).to receive(:translate).with(
+      :'page_title.controller.action.model',
+      singular: 'Post',
+      plural: 'Posts',
+      id: '1',
+      extra_argument: 'foobar',
+      default: [
+        :'page_title.controller.model',
+        :'page_title.default.action.model',
+        :'page_title.default.model',
+        :'page_title.default.standard',
+        'Dummy'
+      ]
+    ).and_return('bla')
+    helper.page_title record, extra_argument: 'foobar'
+  end
+
   it 'interpolates plural and singular names into the formatted default given a model' do
     name = double human: 'Post'
     model = double model_name: name
-    expect(I18n).to receive(:translate).with(
+    expect(helper).to receive(:translate).with(
       :'page_title.controller.action.model',
       singular: 'Post',
       plural: 'Posts',
       default: [
         :'page_title.controller.model',
+        :'page_title.default.action.model',
         :'page_title.default.model',
         :'page_title.default.standard',
         'Dummy'
@@ -53,7 +76,7 @@ describe PageTitleHelper do
     end
 
     it 'inserts it into the default format' do
-      expect(I18n).to receive(:translate).with(
+      expect(helper).to receive(:translate).with(
         :'page_title.controller.action.formatted',
         default: [
           :'page_title.controller.formatted',
@@ -69,7 +92,7 @@ describe PageTitleHelper do
 
   context 'when no title has been set' do
     it 'returns the default page title' do
-      expect(I18n).to receive(:translate).with(
+      expect(helper).to receive(:translate).with(
         :'page_title.controller.action.standard',
         default: [
           :'page_title.controller.standard',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stationed
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Arjan van der Gaag
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-13 00:00:00.000000000 Z
+date: 2014-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails