middleman-ogp 1.0.0 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7a795f3654c7cc818de89ae7b305a490f35cf79
-  data.tar.gz: bea3e8661b877fcc400d3827f7bc151e7c768883
+  metadata.gz: 96160b6adc9bfb778a9514674c56f7c123eebb84
+  data.tar.gz: 9423c6302a1cc61e14696c8b00ec4afc680ed35b
 SHA512:
-  metadata.gz: cc0818834f813e104131b5227f5aa9e72c125954957b8d89b4aa0690e0259129472ac4b140668053d9e1296b1d19392e6dcb30e9548f9405ca62ba8427f0973d
-  data.tar.gz: c0f4ef61d865266300ac2bd746dc1229b1fe2dd6a0e4dfca73fef78404bfd3fa5be5c093dd046396147210f5383c4246fbdc2e451990a96a80a58eadeac59ada
+  metadata.gz: 317dd8172ab0d69f28f57b6005c92727f50c1970db9a6992033120b95d56d9c488774389da6236589ee35cbb7b6f8d3f231b686eae18bf5cc2ff036c3871dcbc
+  data.tar.gz: 6faa50f42a43ee59a7ce58b06327f7b8e22913d547baf9ef8b330565bc3b5af0c78891db88b6f26f00a576382814d4962bc692552c62cb890c9949d19a06621c

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+1.0.2
+-----
+
+* Adopted Hash#deep_merge from active support 4 to use blocks.
+
 1.0.0
 -----
 

data/Gemfile

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem "middleman-core", :github => "middleman/middleman", :branch => 'v3-stable'
+gem "middleman-core", '~> 3.2'
 
 # Specify your gem's dependencies in middleman-ogp.gemspec
 gemspec

data/lib/middleman-ogp/extension.rb

@@ -25,11 +25,14 @@ module Middleman
       mattr_accessor :namespaces
 
       def self.ogp_tags(opts = {}, &block)
-        options = namespaces.respond_to?(:to_h) ? namespaces.to_h : namespaces || {}
-        options = options.deep_merge(opts || {}) {|k, old_value, new_value|
+        opts ||= {}
+        options = (namespaces.respond_to?(:to_h) ? namespaces.to_h : namespaces || {}).dup
+        opts.stringify_keys!
+        options.stringify_keys!
+        options = options.deep_merge4(opts) {|k, old_value, new_value|
           if old_value.is_a?(Hash)
             if new_value.is_a? Hash
-              old_value.deep_merge new_value
+              old_value.deep_merge4 new_value
             else
               old_value[''] = new_value
               old_value
@@ -55,7 +58,7 @@ module Middleman
         case obj
         when Hash
           obj.map{|k, v|
-            og_tag(k.to_s.empty? ? key.dup : (key.dup << k.to_sym) , v, prefix, &block)
+            og_tag(k.to_s.empty? ? key.dup : (key.dup << k.to_s) , v, prefix, &block)
           }.join("\n")
         when Array
           obj.map{|v|
@@ -69,3 +72,24 @@ module Middleman
     end
   end
 end
+
+
+class Hash
+
+  def deep_merge4(other_hash, &block)
+    dup.deep_merge4!(other_hash, &block)
+  end
+
+  def deep_merge4!(other_hash, &block)
+    other_hash.each_pair do |k,v|
+      tv = self[k]
+      if tv.is_a?(Hash) && v.is_a?(Hash)
+        self[k] = tv.deep_merge4(v, &block)
+      else
+        self[k] = block && tv ? block.call(k, tv, v) : v
+      end
+    end
+    self
+  end
+
+end

data/lib/middleman-ogp/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module OGP
-    VERSION = "1.0.0"
+    VERSION = "1.0.2"
   end
 end

data/spec/helper_spec.rb

@@ -40,7 +40,7 @@ describe "Middleman::OGP::Helper" do
         EOF
       }
     end
-    describe "options is presented" do
+    describe "options are presented" do
       let(:options)    {
         {
           og: {
@@ -65,5 +65,24 @@ describe "Middleman::OGP::Helper" do
         EOF
       }
     end
+    describe "only additional option is presented" do
+      let(:options)    {
+        {
+          og: {
+            type: 'article'
+          }
+        }
+      }
+      it {
+        subject.should eq <<-EOF.unindent
+          <meta property="og:image" content="http://mydomain.tld/mysite.png" />
+          <meta property="og:image:type" content="image/png" />
+          <meta property="og:image:width" content="300" />
+          <meta property="og:image:height" content="400" />
+          <meta property="og:type" content="article" />
+          <meta property="fb:description" content="foo" />
+        EOF
+      }
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-ogp
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.2
 platform: ruby
 authors:
 - Atsushi Nagase