content_for_once 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39029b89781a30278e60acc026418ce56947f1a8
-  data.tar.gz: b54d71e3215b3807f664c946bfdba633b77b1a7c
+  metadata.gz: e9130a0a1f3cb7ff1305896303709cd277fc3749
+  data.tar.gz: 33b9f68c48c0af457b8f3f0f04ff4e8384ac9d66
 SHA512:
-  metadata.gz: f8521ac5487cb55ecffbc701140117e7486203228a56b6152ae49d18a5f2ff4bb7c0575cc3b69cb4148c59ace0510f4892cd6589bd3fe923b11ae45443fd0d0f
-  data.tar.gz: a1c0995b8819dac8b06056321104d95f40d7f39b49e8db68e812647bd7fdd3db4334f522f872e9277ef1b9b3dfe2b3a966d6d24df74359b98756fde79885b219
+  metadata.gz: a2f68741094e1a959b681f017832e9a5d51d26bbce9f55037df5f4ffb5b640d20f1d8be42242702b5833e16f98782ae89848716966619f6a0dae651f2508dc7d
+  data.tar.gz: db37d66b52b6e3e4763c0fce2e1095f7d8d856898f744ac475cdb88f054527a4e411f772d7130485cc778a9f62b10ff9363293ed90451002c25450206e9fef61

data/content_for_once.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "actionview", "~> 4.2.6"
   spec.add_dependency "activesupport", "~> 4.2.6"
+  spec.add_dependency "nokogiri"
 
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/content_for_once/helpers.rb

@@ -4,14 +4,16 @@ module ContentForOnce
       @contents ||= Hash.new {|h, k| h[k] = '' }
       name = name.to_sym
 
-      @contents[name].concat(capture(&block))
-      @contents[name] = @contents[name].scan(/<\w+(?:\s+[^>]+)?\/?>*<\/\w+>|<\w+(?:\s+[^>]+)?\/?>/).uniq.join
+      @contents[name].concat(capture(&block)) if capture(&block).present?
+      @contents[name] = Nokogiri::HTML.fragment(@contents[name]).children.
+        map(&:to_s).select(&:present?).map {|e| e.gsub(/>\n/, '>') }.uniq.join("\n")
 
       @contents.each do |name, content|
         # ref: https://github.com/rails/rails/blob/master/actionview/lib/action_view/helpers/capture_helper.rb#L149
         _content = @view_flow.get(name).presence || ''
         _content.concat(content.html_safe)
-        _content = _content.scan(/<\w+(?:\s+[^>]+)?\/?>*<\/\w+>|<\w+(?:\s+[^>]+)?\/?>/).uniq.join
+        _content = Nokogiri::HTML.fragment(_content.encode("UTF-8")).children.
+          map(&:to_s).select(&:present?).map {|e| e.gsub(/>\n/, '>') }.uniq.join("\n")
         @view_flow.set(name, _content)
       end
     end

data/lib/content_for_once/version.rb

@@ -1,3 +1,3 @@
 module ContentForOnce
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: content_for_once
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Ryusuke Sekiguchi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-02 00:00:00.000000000 Z
+date: 2016-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionview
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 4.2.6
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -121,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Embed the HTML tags just only once