layout_values 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1709097eb4268187789cd6d4175ebe42072d93f
-  data.tar.gz: 33f252563fe63db9d755de5c010aaae7614bdc31
+  metadata.gz: edbfe809cb1d8a53d7773d46f2ee28e8646eabb0
+  data.tar.gz: 8e9e20b070cf93cf875906f8ccc59faaeda25297
 SHA512:
-  metadata.gz: 676b86b89035620ea5db44486b1dd319b86660cb3c15b7f1c1c1a948ad7f20376ac6e9ea0b850e7a39f5d47f8434b78758553dc8b8ce1faeb02e32f9df886dd7
-  data.tar.gz: 6a921cd10b80a8548071d37e871bbc0bc6746c2329721e13fec582d9151d1d48b4cddba389b474ce7b0111279592d98e7f5d975202b530132e3a620456587662
+  metadata.gz: 0fd4c8d44130bd12178059795bba2992b3ade282684e492fde11274faeee3ba87c6b874b24b39e5ca43c7210b95724cb3be32ef0daa604940144ebb14dff2268
+  data.tar.gz: 4f7b5d9d8c6b005ee3ac27176180d02a9957e02b6fc3642fd94215e6686d34363113c990d7ff010504b1c836fba256ec06306fa9b9537f605a8fbd3564c9ccce

data/app/helpers/layout_values_helper.rb

@@ -1,5 +1,7 @@
-module LayoutValuesHelper
+# for #present?
+require "active_support/core_ext/string"
 
+module LayoutValuesHelper
   %i(title meta_description meta_keywords).each do |method|
     define_method method do |value = nil|
       if value.present?
@@ -11,25 +13,30 @@ module LayoutValuesHelper
     end
   end
 
-
   private
-  def layout_value(key)
-    # Read
-    if content_for?(key)
-      value = content_for(key)
-    else
-      value = t("#{controller.controller_name}.#{controller.action_name}.#{key}", default: "")
-    end
+
+  def layout_value(key, options = {})
+    options = {
+      default_value_key: "#{controller.controller_name}.#{controller.action_name}.#{key}",
+      decorator_key: "layout.#{key}.format",
+      default_decorator_key: "layout.#{key}.default",
+    }.merge(options)
+
+    # Read the value
+    value = if content_for?(key)
+              content_for(key)
+            else
+              t(options[:default_value_key], default: "")
+            end
 
     # Decorate
-    if value.present?
-      value = t("layout.#{key}.format", key.to_sym => value, default: value)
-    else
-      value = t("layout.#{key}.default", default: value)
-    end
+    value = if value.present?
+              t(options[:decorator_key], key.to_sym => value, default: value)
+            else
+              t(options[:default_decorator_key], default: value)
+            end
 
     # Translation helpers tend to add HTML
     strip_tags value
   end
-
 end

data/lib/layout_values/version.rb

@@ -1,3 +1,3 @@
 module LayoutValues
-  VERSION = "0.0.2"
+  VERSION = "0.1.0"
 end

data/spec/layout_values_helper_spec.rb

@@ -0,0 +1,121 @@
+require_relative "../app/helpers/layout_values_helper"
+require "spec_helper"
+
+describe LayoutValuesHelper do
+  class MockView
+    include LayoutValuesHelper
+
+    def content_for?(*)
+      false
+    end
+
+    def content_for(*)
+      nil
+    end
+
+    def t(*)
+      ""
+    end
+
+    def strip_tags(v)
+      v
+    end
+  end
+
+  let(:view) { MockView.new }
+  let(:controller) {
+    double(:controller, controller_name: "pages", action_name: "index")
+  }
+  before { allow(view).to receive(:controller) { controller } }
+
+  methods = %i(title meta_description meta_keywords)
+  methods.each do |method|
+    describe "##{method}" do
+      describe "with an argument" do
+        it "sets the content_for" do
+          allow(view).to receive(:content_for)
+          view.send(method, "bar")
+          expect(view).to have_received(:content_for).with(method, "bar")
+        end
+
+        it "returns the value it sets" do
+          expect(view.send(method, "bar")).to eq("bar")
+        end
+      end
+
+      describe "with no arguments" do
+        describe "without a content_for" do
+          before do
+            allow(view).to receive(:content_for?).with(method) { false }
+          end
+
+          it "defaults to ''" do
+            expect(view.send(method)).to eq("")
+          end
+
+          it "returns the controller locale value" do
+            allow(view).to receive(:t).with("pages.index.#{method}",
+                                            default: "") {
+              "translated"
+            }
+            allow(view).to receive(:t).with("layout.#{method}.format",
+                                            method => "translated",
+                                            default: "translated") {
+              "formatted translated"
+            }
+
+            expect(view.send(method)).to eq("formatted translated")
+          end
+
+          it "returns the default controller locale value" do
+            allow(view).to receive(:t).with("pages.index.#{method}",
+                                            default: "") { "" }
+            allow(view).to receive(:t).with("layout.#{method}.default",
+                                            default: "") { "default" }
+
+            expect(view.send(method)).to eq("default")
+          end
+        end
+
+        context "with a content_for" do
+          before do
+            allow(view).to receive(:content_for?).with(method) { true }
+            allow(view).to receive(:content_for).with(method) { "foo" }
+          end
+
+          it "returns the content formatted" do
+            allow(view).to receive(:t).with("layout.#{method}.format",
+                                            method => "foo",
+                                            default: "foo") { "foo - my site" }
+
+            expect(view.send(method)).to eq("foo - my site")
+          end
+
+          it "strips tags" do
+            allow(view).to receive(:t).with("layout.#{method}.format",
+                                            method => "foo",
+                                            default: "foo") { "foo - my site" }
+            allow(view).to receive(:strip_tags) { "stripped" }
+
+            expect(view.send(method)).to eq("stripped")
+          end
+        end
+
+        context "with an empty content_for" do
+          before do
+            allow(view).to receive(:content_for?).with(method) { true }
+            allow(view).to receive(:content_for).with(method) { "" }
+          end
+
+          it "returns the locales default" do
+            allow(view).to receive(:t).with("layout.#{method}.default",
+                                            default: "") { "default" }
+
+            expect(view.send(method)).to eq("default")
+          end
+        end
+      end
+    end
+  end
+end
+

data/spec/spec_helper.rb

@@ -0,0 +1,5 @@
+RSpec.configure do |config|
+  config.color = true
+  config.tty = true
+  config.formatter = :documentation
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: layout_values
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Sunny Ripert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-04 00:00:00.000000000 Z
+date: 2015-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 4.0.3
+        version: 4.1.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 4.0.3
+        version: 4.1.11
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -45,14 +45,16 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- MIT-LICENSE
+- README.md
+- Rakefile
 - app/helpers/layout_values_helper.rb
+- lib/layout_values.rb
 - lib/layout_values/engine.rb
 - lib/layout_values/version.rb
-- lib/layout_values.rb
-- MIT-LICENSE
-- Rakefile
-- README.md
-homepage: http://github.com/sunny
+- spec/layout_values_helper_spec.rb
+- spec/spec_helper.rb
+homepage: https://github.com/sunny/layout_values
 licenses: []
 metadata: {}
 post_install_message: 
@@ -71,8 +73,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Add helpers to indicate page titles and meta description.
-test_files: []
+test_files:
+- spec/layout_values_helper_spec.rb
+- spec/spec_helper.rb