middleman-ogp 1.0.4 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f7a5f4b243909d06f5f4f61011e561be8c440ad
-  data.tar.gz: f8bb1f3431ea81b651eb58ed7fa58069520ca22a
+  metadata.gz: 06a47dbe1d43eadc2986af4ed48387c2549c313c
+  data.tar.gz: 9e43b8b331044d136958eb88a96f9c64f4eff3f2
 SHA512:
-  metadata.gz: ffae72c9b95445b0660f70ab2160c22584e450ab05fb2fc1651210f7e8c25f87dfe1fee352c489947055da2e3d04e17c636e5f1b60fec94508972988da38f637
-  data.tar.gz: dbeac35022a41b1dda2dd9f35ac396c85f358a95aa2dd00b163cdba268612e88a6c49c8a7cb2f6fa0b3d9b7a87c7029abfaf7456c8177a0a762dff6b867f51ce
+  metadata.gz: 5ab7e36a2608652c10d909c049b3a2015e35996475ad229c989599b36c1f408e08674e7e0eb9ba8aee7e6f77993bac82d5a77d6d924424de237a4246912ab915
+  data.tar.gz: 5728656b532f26049f2aa794098cc1af38e6df939a02d5f1b36c756067bac1026587dea1eab438c1ff66a430ecdf49d186ce575bd4a926b507e03a30b12215cd

data/.gitignore

@@ -5,7 +5,7 @@ pkg
 .sass-cache
 .sassc
 .tmp
-Gemfile.lock
+Gemfile*.lock
 docs
 .rbenv-*
 .*.swp
@@ -16,3 +16,4 @@ tmp
 Makefile
 .mm-pid-*
 *.gem
+.ruby-version

data/.travis.yml

@@ -1,14 +1,18 @@
 rvm:
-  - 1.9.3
   - 2.0.0
   - 2.1.0
+  - 2.2.2
+  - 2.3.1
   - jruby-19mode
+env:
+  - MM_VERSION=3 TEST=true
+  - MM_VERSION=4 TEST=true
 
 # Bug in jRuby w/ Rouge: https://github.com/jruby/jruby/issues/1392
 matrix:
   allow_failures:
     - rvm: jruby-19mode
 
-script: "bundle exec rake test"
+before_install: "ln -s \"Gemfile.mm${MM_VERSION}\" Gemfile"
 
-env: TEST=true
+script: "bundle exec rake test"

data/{Gemfile → Gemfile.mm3}

@@ -10,12 +10,14 @@ gem "rake",     "~> 10.1.0", :require => false
 gem "yard",     "~> 0.8.0", :require => false
 
 # Test tools
-gem "cucumber", "~> 1.3.1"
+gem "cucumber", "~> 2.4.0"
 gem "fivemat"
-gem "aruba",    "~> 0.5.1"
+gem "aruba",    "~> 0.14.0"
 gem "rspec"
 
 gem "slim"
 
 # Code Quality
 gem "cane", :platforms => [:mri_19, :mri_20], :require => false
+
+

data/Gemfile.mm4

@@ -0,0 +1,23 @@
+source "https://rubygems.org"
+
+gem "middleman-core", '~> 4.0'
+gem "middleman-cli", '~> 4.0'
+gem "middleman-blog", '~> 4.0'
+
+# Specify your gem's dependencies in middleman-ogp.gemspec
+gemspec
+
+gem "rake",     "~> 10.1.0", :require => false
+gem "yard",     "~> 0.8.0", :require => false
+
+# Test tools
+gem "cucumber", "~> 2.4.0"
+gem "fivemat"
+gem "aruba",    "~> 0.14.0"
+gem "rspec"
+gem 'capybara', '~> 2.7', '>= 2.7.1'
+
+gem "slim"
+
+# Code Quality
+gem "cane", :platforms => [:mri_19, :mri_20], :require => false

data/fixtures/test-app/source/layout.slim

@@ -1,7 +1,7 @@
 html
   head
     meta charset="utf-8"
-    title= data.page.title
+    title= current_page.data.title
     - ogp_tags do|name, value|
       meta property=name content=value
 

data/fixtures/test-blog/source/layout.slim

@@ -1,10 +1,10 @@
 html
   head
     meta charset="utf-8"
-    title= data.page.title
+    title= current_page.data.title
     - ogp_tags do|name, value|
       meta property=name content=value
 
   body
     .container
-      = yield
+      = yield

data/lib/middleman-ogp/extension.rb

@@ -1,3 +1,7 @@
+require 'padrino-helpers'
+require 'active_support'
+require 'middleman-core/extensions'
+
 module Middleman
   module OGP
     class OGPExtension < Extension
@@ -59,7 +63,7 @@ module Middleman
     end
 
     module Helper
-      include Padrino::Helpers::TagHelpers
+      include ::Padrino::Helpers::TagHelpers
       mattr_accessor :namespaces
       mattr_accessor :blog
       mattr_accessor :auto
@@ -106,15 +110,24 @@ module Middleman
             og_tag(key, v, prefix, &block)
           }.join("\n")
         else
-          block.call [prefix].concat(key).join(':'), obj.to_s
+          if obj.respond_to?(:value)
+            value = obj.value
+            if value.is_a?(Middleman::Util::EnhancedHash)
+              value.map{|k,v|
+                og_tag(k.to_s.empty? ? key.dup : (key.dup << k.to_s) , v, prefix, &block)
+              }.join("\n")
+            else
+              raise 'Unknown value'
+            end
+          else
+            block.call [prefix].concat(key).join(':'), obj.to_s
+          end
         end
       end
-
     end
   end
 end
 
-
 class Hash
 
   def deep_merge4(other_hash, &block)

data/lib/middleman-ogp/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module OGP
-    VERSION = "1.0.4"
+    VERSION = "1.1.0"
   end
 end

data/middleman-ogp.gemspec

@@ -15,5 +15,5 @@ Gem::Specification.new do |s|
   s.files = `git ls-files -z`.split("\0")
   s.test_files = `git ls-files -z -- {fixtures,features,spec}/*`.split("\0")
   s.require_paths = ["lib"]
-  s.add_runtime_dependency("middleman-core", ["~> 3.2"])
+  s.add_runtime_dependency("middleman-core", [">= 3.2"])
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: middleman-ogp
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.1.0
 platform: ruby
 authors:
 - Atsushi Nagase
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-11 00:00:00.000000000 Z
+date: 2016-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.2'
 description: OpenGraph Protocol Helper for Middleman
@@ -35,7 +35,8 @@ files:
 - .travis.yml
 - CHANGELOG.md
 - CONTRIBUTING.md
-- Gemfile
+- Gemfile.mm3
+- Gemfile.mm4
 - LICENSE.md
 - README.md
 - Rakefile
@@ -81,7 +82,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: OpenGraph Protocol Helper for Middleman