meteor 0.9.33 → 0.9.34
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/ChangeLog +4 -0
- data/Gemfile.lock +1 -1
- data/lib/meteor/core/kernel.rb +8 -8
- data/lib/meteor/element.rb +8 -5
- data/lib/meteor.rb +2 -2
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: e244c53919093f4fa5aaeb5b0fb3c4becac0e0c5feb213308477494b6e048d3c
|
|
4
|
+
data.tar.gz: d7a7294a851bd5b8663102955ac3c0bfc7d4a33feb453c5d15ee0d464d760beb
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: a18ec4e77104c88fc27a0e7a83efaacbaf79cbaf319a50e7637f8341df3eb9ad8aa77b3faf169d637b381be0053ad2bc98d774cc26e32957190ba1dcebcd8b16
|
|
7
|
+
data.tar.gz: 4949cc3d32443fa9faba71a2157f94bc383a5af767e8dc1f063b00733f328d8ebc64c0d872a07f394932f0e5fe7633691c30d98b8093525267187f1d52e840f0
|
data/ChangeLog
CHANGED
data/Gemfile.lock
CHANGED
data/lib/meteor/core/kernel.rb
CHANGED
|
@@ -45,7 +45,7 @@ module Meteor
|
|
|
45
45
|
@@pattern_find_four = Regexp.new(PATTERN_FIND_four)
|
|
46
46
|
@@pattern_find_five = Regexp.new(PATTERN_FIND_five)
|
|
47
47
|
|
|
48
|
-
@@
|
|
48
|
+
@@pattern_non_nest = Regexp.new('\\A[^<>]*\\Z')
|
|
49
49
|
|
|
50
50
|
@@pattern_get_attrs_map = Regexp.new('([^\\s]*)="([^\"]*)"')
|
|
51
51
|
|
|
@@ -1946,7 +1946,7 @@ module Meteor
|
|
|
1946
1946
|
#
|
|
1947
1947
|
def flash
|
|
1948
1948
|
if element_hook
|
|
1949
|
-
if element_hook.origin.
|
|
1949
|
+
if element_hook.origin.non_nest
|
|
1950
1950
|
if element_hook.origin.cx
|
|
1951
1951
|
# @root.hookDocument << '<!-- @' << @root.element.name << ' '
|
|
1952
1952
|
# @root.hookDocument << @root.element.attributes << '-->'
|
|
@@ -2020,13 +2020,13 @@ module Meteor
|
|
|
2020
2020
|
return unless elm.normal
|
|
2021
2021
|
|
|
2022
2022
|
# case of normal element (内容あり要素の場合)
|
|
2023
|
-
|
|
2023
|
+
self.non_nest = elm
|
|
2024
2024
|
|
|
2025
2025
|
pif2 = self.class.new(self)
|
|
2026
2026
|
|
|
2027
2027
|
@elm_ = elm.clone(pif2)
|
|
2028
2028
|
|
|
2029
|
-
pif2.root_element.document = if !elm.
|
|
2029
|
+
pif2.root_element.document = if !elm.non_nest
|
|
2030
2030
|
String.new(elm.mixed_content)
|
|
2031
2031
|
else
|
|
2032
2032
|
String.new(elm.document)
|
|
@@ -2039,13 +2039,13 @@ module Meteor
|
|
|
2039
2039
|
|
|
2040
2040
|
# private :shadow
|
|
2041
2041
|
|
|
2042
|
-
def
|
|
2043
|
-
@res = @@
|
|
2042
|
+
def non_nest=(elm)
|
|
2043
|
+
@res = @@pattern_non_nest.match(elm.mixed_content)
|
|
2044
2044
|
|
|
2045
|
-
elm.
|
|
2045
|
+
elm.non_nest = true if @res
|
|
2046
2046
|
end
|
|
2047
2047
|
|
|
2048
|
-
private :
|
|
2048
|
+
private :non_nest=
|
|
2049
2049
|
|
|
2050
2050
|
def is_match(regex, str)
|
|
2051
2051
|
case regex
|
data/lib/meteor/element.rb
CHANGED
|
@@ -21,8 +21,8 @@ module Meteor
|
|
|
21
21
|
# @return [true,false] content normal flag (内容存在フラグ)
|
|
22
22
|
# @!attribute [rw] cx
|
|
23
23
|
# @return [true,false] comment extension tag flag (コメント拡張タグフラグ)
|
|
24
|
-
# @!attribute [rw]
|
|
25
|
-
# @return [true,false] child
|
|
24
|
+
# @!attribute [rw] non_nest
|
|
25
|
+
# @return [true,false] child non-nest flag (非入れ子フラグ)
|
|
26
26
|
# @!attribute [rw] parser
|
|
27
27
|
# @return [Meteor::Parser] parser(パーサ)
|
|
28
28
|
# @!attribute [rw] type_value
|
|
@@ -37,7 +37,7 @@ module Meteor
|
|
|
37
37
|
# @return [true,false] deletion flag (削除フラグ)
|
|
38
38
|
#
|
|
39
39
|
class Element
|
|
40
|
-
attr_accessor :name, :attributes, :mixed_content, :raw_content, :pattern, :document_sync, :normal, :cx, :
|
|
40
|
+
attr_accessor :name, :attributes, :mixed_content, :raw_content, :pattern, :document_sync, :normal, :cx, :non_nest,
|
|
41
41
|
:parser, :type_value, :usable, :origin, :copy, :removed
|
|
42
42
|
|
|
43
43
|
alias tag name
|
|
@@ -46,6 +46,9 @@ module Meteor
|
|
|
46
46
|
alias empty normal
|
|
47
47
|
alias empty= normal=
|
|
48
48
|
|
|
49
|
+
alias mono non_nest
|
|
50
|
+
alias mono= non_nest=
|
|
51
|
+
|
|
49
52
|
#
|
|
50
53
|
# initializer (イニシャライザ)
|
|
51
54
|
# @overload initialize(name)
|
|
@@ -87,7 +90,7 @@ module Meteor
|
|
|
87
90
|
# @parser=nil
|
|
88
91
|
# @normal = false
|
|
89
92
|
# @cx = false
|
|
90
|
-
# @
|
|
93
|
+
# @non_nest = false
|
|
91
94
|
# @parent = false
|
|
92
95
|
@usable = true
|
|
93
96
|
end
|
|
@@ -118,7 +121,7 @@ module Meteor
|
|
|
118
121
|
@document = String.new(elm.document)
|
|
119
122
|
@normal = elm.normal
|
|
120
123
|
@cx = elm.cx
|
|
121
|
-
@
|
|
124
|
+
@non_nest = elm.non_nest
|
|
122
125
|
@origin = elm
|
|
123
126
|
# @usable = false
|
|
124
127
|
elm.copy = self
|
data/lib/meteor.rb
CHANGED
|
@@ -37,11 +37,11 @@ require 'meteor/ml/xml/parser_impl'
|
|
|
37
37
|
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|
38
38
|
#
|
|
39
39
|
# @author Yasumasa Ashida
|
|
40
|
-
# @version 0.9.
|
|
40
|
+
# @version 0.9.34
|
|
41
41
|
#
|
|
42
42
|
|
|
43
43
|
module Meteor
|
|
44
|
-
VERSION = '0.9.
|
|
44
|
+
VERSION = '0.9.34'
|
|
45
45
|
|
|
46
46
|
# require 'fileutils'
|
|
47
47
|
|