asip-meteor 0.9.0 → 0.9.0.1

data/ChangeLog

@@ -1,4 +1,4 @@
-== 0.0.1 / 2008-09-03
+== 0.9.0.1 / 2008-10-03 Yasumasa Ashida <ys.ashida@gmail.com>
 
 * initial release
 

data/lib/meteor.rb

@@ -836,54 +836,54 @@ module Meteor
       # 
       # @param [TrueClass][FalseClass] hook フックフラグ
       #
-      def hook=(hook)
-        @root.hook = hook
-      end
+      #def hook=(hook)
+      #  @root.hook = hook
+      #end
 
       #
       # フックフラグを取得する
       # 
       # @return [TrueClass][FalseClass] フックフラグ
       #
-      def hook
-        @root.hook
-      end
+      #def hook
+      #  @root.hook
+      #end
 
       #
       # 単一要素フックフラグをセットする
       # 
       # @pamam [TrueClass][FalseClass] hook 単一要素フックフラグ
       #
-      def monoHook=(hook)
-        @root.monoHook = hook
-      end
+      #def monoHook=(hook)
+      #  @root.monoHook = hook
+      #end
 
       #
       # 単一要素フックフラグを取得する
       # 
       # @return [TrueClass][FalseClass] 単一要素フックフラグ
       #
-      def monoHook
-        @root.monoHook
-      end
+      #def monoHook
+      #  @root.monoHook
+      #end
 
       #
       # フックドキュメントをセットする
       # 
       # @param [String] hookDocument フックドキュメント
       #
-      def hookDocument=(hookDocument)
-        @root.hookDocument = hookDocument
-      end
+      #def hookDocument=(hookDocument)
+      #  @root.hookDocument = hookDocument
+      #end
 
       #
       # フックドキュメントを取得する
       # 
       # @return [String] フックドキュメント
       #
-      def hookDocument
-        @root.hookDocument
-      end
+      #def hookDocument
+      #  @root.hookDocument
+      #end
 
       #
       # 文字エンコーディングをセットする
@@ -1946,15 +1946,14 @@ module Meteor
 
       def editAttributes_(elm,attrName,attrValue)
 
-        attrValue = escape(attrValue)
-
-        @pattern = Meteor::Core::Util::PatternCache.get('' << attrName << SET_ATTR_1)
+        #attrValue = escape(attrValue)
 
         #属性検索
-        @res = @pattern.match(elm.attributes)
+        #@res = @pattern.match(elm.attributes)
 
         #検索対象属性の存在判定
-        if @res then
+        #if @res then
+        if elm.attributes.include?(' ' << attrName << ATTR_EQ) then
           
           @_attrValue = attrValue
           #replace2Regex(@_attrValue)
@@ -1964,16 +1963,23 @@ module Meteor
             replace2Regex(@_attrValue)
           end
           #属性の置換
+          @pattern = Meteor::Core::Util::PatternCache.get('' << attrName << SET_ATTR_1)
           elm.attributes.sub!(@pattern,'' << attrName << ATTR_EQ << @_attrValue << DOUBLE_QUATATION)
         else
           #属性文字列の最後に新規の属性を追加する
+          @_attrValue = attrValue
+          #replace2Regex(@_attrValue)
+          if elm.parser.rootElement.hook || elm.parser.rootElement.monoHook then
+            replace2Regex(@_attrValue)
+          end
+          
           if EMPTY != elm.attributes && EMPTY != elm.attributes.strip then
             elm.attributes = '' << SPACE << elm.attributes.strip
           else
             elm.attributes = ''
           end
 
-          elm.attributes << SPACE << attrName << ATTR_EQ << attrValue << DOUBLE_QUATATION
+          elm.attributes << SPACE << attrName << ATTR_EQ << @_attrValue << DOUBLE_QUATATION
         end
         
       end
@@ -2037,9 +2043,8 @@ module Meteor
           elm.arguments.map.each{ |name,attr|
             
             if attr.changed then
-              @_attrValue = attr.value
-              replace2Regex(@_attrValue)
-          
+              @_attrValue = escape(attr.value)
+              #replace2Regex(@_attrValue)  
               @pattern_cc = '' << name << SET_ATTR_1
               #@pattern_cc = "#{attrName}=\"[^\"]*\""
               @pattern = Meteor::Core::Util::PatternCache.get(@pattern_cc)
@@ -3036,9 +3041,9 @@ module Meteor
         #
         def initialize_1(ps)
           @root.document = String.new(ps.document)
-          @root.hookDocument = String.new(ps.hookDocument)
-          @root.hook = ps.hook
-          @root.monoHook = ps.monoHook
+          @root.hookDocument = String.new(ps.rootElement.hookDocument)
+          @root.hook = ps.rootElement.hook
+          @root.monoHook = ps.rootElement.monoHook
           @root.contentType = String.new(ps.contentType);
         end
         private :initialize_1
@@ -3635,26 +3640,26 @@ module Meteor
         #@@pattern_readonly = Regexp.new(READONLY)
         #@@pattern_select = Regexp.new(SELECT)
         #@@pattern_multiple = Regexp.new(MULTIPLE)
-
-        SELECTED_M = "\\sselected=\"[^\"]*\"\\s|\\sselected=\"[^\"]*\"$|\\sSELECTED=\"[^\"]*\"\\s|\\sSELECTED=\"[^\"]*\"$"
-        SELECTED_M1 = "\\sselected=\"([^\"]*)\"\\s|\\sselected=\"([^\"]*)\"$|\\sSELECTED=\"([^\"]*)\"\\s|\\sSELECTED=\"([^\"]*)\"$"
-        SELECTED_R = "selected=\"[^\"]*\"|SELECTED=\"[^\"]*\""
+        
+        SELECTED_M = "\\sselected=\"[^\"]*\"\\s|\\sselected=\"[^\"]*\"$"
+        SELECTED_M1 = "\\sselected=\"([^\"]*)\"\\s|\\sselected=\"([^\"]*)\"$"
+        SELECTED_R = "selected=\"[^\"]*\""
         SELECTED_U = "selected=\"selected\""
-        CHECKED_M = "\\schecked=\"[^\"]*\"\\s|\\schecked=\"[^\"]*\"$|\\sCHECKED=\"[^\"]*\"\\s|\\sCHECKED=\"[^\"]*\"$"
-        CHECKED_M1 = "\\schecked=\"([^\"]*)\"\\s|\\schecked=\"([^\"]*)\"$|\\sCHECKED=\"([^\"]*)\"\\s|\\sCHECKED=\"([^\"]*)\"$"
-        CHECKED_R = "checked=\"[^\"]*\"|CHECKED=\"[^\"]*\""
+        CHECKED_M = "\\schecked=\"[^\"]*\"\\s|\\schecked=\"[^\"]*\"$"
+        CHECKED_M1 = "\\schecked=\"([^\"]*)\"\\s|\\schecked=\"([^\"]*)\"$"
+        CHECKED_R = "checked=\"[^\"]*\""
         CHECKED_U = "checked=\"checked\""
-        DISABLED_M = "\\sdisabled=\"[^\"]*\"\\s|\\sdisabled=\"[^\"]*\"$|\\sDISABLED=\"[^\"]*\"\\s|\\sDISABLED=\"[^\"]*\"$"
-        DISABLED_M1 = "\\sdisabled=\"([^\"]*)\"\\s|\\sdisabled=\"([^\"]*)\"$|\\sDISABLED=\"([^\"]*)\"\\s|\\sDISABLED=\"([^\"]*)\"$"
-        DISABLED_R = "disabled=\"[^\"]*\"|DISABLED=\"[^\"]*\""
+        DISABLED_M = "\\sdisabled=\"[^\"]*\"\\s|\\sdisabled=\"[^\"]*\"$"
+        DISABLED_M1 = "\\sdisabled=\"([^\"]*)\"\\s|\\sdisabled=\"([^\"]*)\"$"
+        DISABLED_R = "disabled=\"[^\"]*\""
         DISABLED_U = "disabled=\"disabled\""
-        READONLY_M = "\\sreadonly=\"[^\"]*\"\\s|\\sreadonly=\"[^\"]*\"$|\\sREADONLY=\"[^\"]*\"\\s|\\sREADONLY=\"[^\"]*\"$"
-        READONLY_M1 = "\\sreadonly=\"([^\"]*)\"\\s|\\sreadonly=\"([^\"]*)\"$|\\sREADONLY=\"([^\"]*)\"\\s|\\sREADONLY=\"([^\"]*)\"$"
-        READONLY_R = "readonly=\"[^\"]*\"|READONLY=\"[^\"]*\""
+        READONLY_M = "\\sreadonly=\"[^\"]*\"\\s|\\sreadonly=\"[^\"]*\"$"
+        READONLY_M1 = "\\sreadonly=\"([^\"]*)\"\\s|\\sreadonly=\"([^\"]*)\"$"
+        READONLY_R = "readonly=\"[^\"]*\""
         READONLY_U = "readonly=\"readonly\""
-        MULTIPLE_M = "\\smultiple=\"[^\"]*\"\\s|\\smultiple=\"[^\"]*\"$|\\sMULTIPLE=\"[^\"]*\"\\s|\\sMULTIPLE=\"[^\"]*\"$"
-        MULTIPLE_M1 = "\\smultiple=\"([^\"]*)\"\\s|\\smultiple=\"([^\"]*)\"$|\\sMULTIPLE=\"([^\"]*)\"\\s|\\sMULTIPLE=\"([^\"]*)\"$"
-        MULTIPLE_R = "multiple=\"[^\"]*\"|MULTIPLE=\"[^\"]*\""
+        MULTIPLE_M = "\\smultiple=\"[^\"]*\"\\s|\\smultiple=\"[^\"]*\"$"
+        MULTIPLE_M1 = "\\smultiple=\"([^\"]*)\"\\s|\\smultiple=\"([^\"]*)\"$"
+        MULTIPLE_R = "multiple=\"[^\"]*\""
         MULTIPLE_U = "multiple=\"multiple\""
 
         HTTP_EQUIV = 'http-equiv'
@@ -3730,9 +3735,9 @@ module Meteor
         #
         def initialize_1(ps)
           @root.document = String.new(ps.document)
-          @root.hookDocument = String.new(ps.hookDocument)
-          @root.hook = ps.hook
-          @root.monoHook = ps.monoHook
+          @root.hookDocument = String.new(ps.rootElement.hookDocument)
+          @root.hook = ps.rootElement.hook
+          @root.monoHook = ps.rootElement.monoHook
           @root.contentType = String.new(ps.contentType);
         end
         private :initialize_1
@@ -4098,9 +4103,9 @@ module Meteor
         #
         def initialize_1(ps)
           @root.document = String.new(ps.document)
-          @root.hookDocument = String.new(ps.hookDocument)
-          @root.hook = ps.hook
-          @root.monoHook = ps.monoHook
+          @root.hookDocument = String.new(ps.rootElement.hookDocument)
+          @root.hook = ps.rootElement.hook
+          @root.monoHook = ps.rootElement.monoHook
           @root.contentType = String.new(ps.contentType);
         end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: asip-meteor
 version: !ruby/object:Gem::Version 
-  version: 0.9.0
+  version: 0.9.0.1
 platform: ruby
 authors: 
 - asip
@@ -9,7 +9,7 @@ autorequire: meteor
 bindir: bin
 cert_chain: []
 
-date: 2008-10-02 00:00:00 -07:00
+date: 2008-10-03 00:00:00 -07:00
 default_executable: 
 dependencies: []