asip-meteor 0.9.0.5 → 0.9.0.6

data/README

@@ -27,4 +27,4 @@ by asip <ys.ashida@gmail.com>
 
 Author::    asip <ys.ashida@gmail.com>
 Copyright:: Copyright (c) 2008 asip
-License::   GPL V2
+License::   LGPL V2.1

data/lib/meteor.rb

@@ -4,21 +4,21 @@
 # Copyright (C) 2008 Yasumasa Ashida.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU Lesser General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License
+# You should have received a copy of the GNU Lesser General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #
 # @author Yasumasa Ashida
-# @version 0.9.0.5
+# @version 0.9.0.6
 #
 if RUBY_VERSION < '1.9.0' then
   require 'kconv'
@@ -27,7 +27,7 @@ end
 
 module Meteor
 
-  VERSION = "0.9.0.5"
+  VERSION = "0.9.0.6"
   
   #
   # 要素クラス
@@ -1227,195 +1227,7 @@ module Meteor
         @pattern_2 = Meteor::Core::Util::PatternCache.get(@pattern_cc_2)
         @pattern_1b = Meteor::Core::Util::PatternCache.get(@pattern_cc_1b);
         
-        if RUBY_VERSION >= '1.9.0' then
-          
-          @position = 0
-          
-          while (@res = @pattern.match(@root.document,@position)) || @cnt > 0
-            
-            if @res then
-              
-              if @cnt > 0 then
-                
-                @position2 = @res.end(0)
-                
-                @res = @pattern_2.match(@root.document,@position)
-                
-                if @res then
-                  
-                  @position = @res.end(0)
-                  
-                  if @position > @position2 then
-                    
-                    if @cnt == 0 then
-                      @sbuf << @pattern_cc_1_1
-                    else
-                      @sbuf << @pattern_cc_1_2
-                    end
-                    
-                    @cnt += 1
-                    
-                    @position = @position2
-                  else
-                    
-                    @cnt -= 1
-                    
-                    if @cnt != 0 then
-                      @sbuf << @pattern_cc_2_1
-                    else
-                      @sbuf << @pattern_cc_2_2
-                    end
-                    
-                    if @cnt == 0 then
-                      break
-                    end
-                  end
-                else
-                  
-                  if @cnt == 0 then
-                    @sbuf << @pattern_cc_1_1
-                  else
-                    @sbuf << @pattern_cc_1_2
-                  end
-                  
-                  @cnt += 1
-                  
-                  @position = @position2
-                end
-              else
-                
-                @position = @res.end(0)
-                
-                if @cnt == 0 then
-                  @sbuf << @pattern_cc_1_1
-                else
-                  @sbuf << @pattern_cc_1_2
-                end
-                
-                @cnt += 1
-              end
-            else
-              
-              @res = @pattern_2.match(@root.document,@position)
-              
-              if @res then
-                @cnt -= 1
-                
-                if @cnt != 0 then
-                  @sbuf << @pattern_cc_2_1
-                else
-                  @sbuf << @pattern_cc_2_2
-                end
-                
-                @position = @res.end(0)
-              end
-              
-              if !@res then
-                break
-              end
-              
-              if @cnt == 0 then
-                break
-              end
-            end
-            
-            @pattern = @pattern_1b
-          end
-        else
-          
-          @rx_document = @root.document
-          
-          while (@res = @pattern.match(@rx_document)) || @cnt > 0
-            
-            if @res then
-              
-              if @cnt > 0 then
-                
-                @rx_document2 = @res.post_match
-                
-                @res = @pattern_2.match(@rx_document)
-                
-                if @res then
-                  
-                  @rx_document = @res.post_match
-                  
-                  if @rx_document2.length > @rx_document.length then
-                    
-                    if @cnt == 0 then
-                      @sbuf << @pattern_cc_1_1
-                    else
-                      @sbuf << @pattern_cc_1_2
-                    end
-                    
-                    @cnt += 1
-                    
-                    @rx_document = @rx_document2
-                  else
-                    
-                    @cnt -= 1
-                    
-                    if @cnt != 0 then
-                      @sbuf << @pattern_cc_2_1
-                    else
-                      @sbuf << @pattern_cc_2_2
-                    end
-                    
-                    if @cnt == 0 then
-                      break
-                    end
-                  end
-                else
-                  
-                  if @cnt == 0 then
-                    @sbuf << @pattern_cc_1_1
-                  else
-                    @sbuf << @pattern_cc_1_2
-                  end
-                  
-                  @cnt += 1
-                  
-                  @rx_document = @rx_document2
-                end
-              else
-                
-                @rx_document = @res.post_match
-                
-                if @cnt == 0 then
-                  @sbuf << @pattern_cc_1_1
-                else
-                  @sbuf << @pattern_cc_1_2
-                end
-                
-                @cnt += 1
-              end
-            else
-              
-              @res = @pattern_2.match(@rx_document)
-              
-              if @res then
-                @cnt -= 1
-                
-                if @cnt != 0 then
-                  @sbuf << @pattern_cc_2_1
-                else
-                  @sbuf << @pattern_cc_2_2
-                end
-                
-                @rx_document = @res.post_match
-              end
-              
-              if !@res then
-                break
-              end
-              
-              if @cnt == 0 then
-                break
-              end
-            end
-            
-            @pattern = @pattern_1b
-          end
-        end
+        create_element_pattern
         
         @pattern_cc = @sbuf
         
@@ -1634,270 +1446,276 @@ module Meteor
         @pattern_2 = Meteor::Core::Util::PatternCache.get(@pattern_cc_2)
         @pattern_1b = Meteor::Core::Util::PatternCache.get(@pattern_cc_1b);
         
+        create_element_pattern
+        
+        @pattern_cc = @sbuf
+        
+        if @sbuf.length == 0 || @cnt != 0 then
+          #  raise NoSuchElementException.new(elmName,attrName1,attrValue1,attrName2,attrValue2);
+          return nil
+        end
+        
+        @pattern = Meteor::Core::Util::PatternCache.get(@pattern_cc)
+        @res = @pattern.match(@root.document)
+        
+        @res
+      end
+      private :elementWithContent_5_2
+      
+      def elementWithoutContent_5(elmName)
+        elementWithoutContent_5_1(elmName,TAG_SEARCH_NC_2_3_2_2);
+      end
+      private :elementWithoutContent_5
+
+      def elementWithoutContent_5_1(elmName,closer)
+
+        #要素
+        @elm_ = Element.new(elmName)
+        #属性
+        @elm_.attributes = @res[1]
+        #全体
+        @elm_.document = @res[0]
+        #空要素検索用パターン
+        @pattern_cc = '' << TAG_OPEN << @_elmName << TAG_SEARCH_NC_2_1_2 << @_attrName1 << ATTR_EQ
+        @pattern_cc << @_attrValue1 << TAG_SEARCH_NC_2_6 << @_attrName2 << ATTR_EQ
+        @pattern_cc << @_attrValue2 << TAG_SEARCH_NC_2_7 << @_attrName2 << ATTR_EQ
+        @pattern_cc << @_attrValue2 << TAG_SEARCH_NC_2_6 << @_attrName1 << ATTR_EQ
+        @pattern_cc << @_attrValue1 << closer
+        @elm_.pattern = @pattern_cc
+        
+        @elm_.parser = self
+      end
+      private :elementWithoutContent_5_1
+
+      #
+      # 属性1・属性2(属性名="属性値")で検索し、要素を取得する
+      #
+      # @param [String] attrName1 属性名1
+      # @param [String] attrValue1 属性値1
+      # @param [String] attrName2 属性名2
+      # @param [String]attrValue2 属性値2
+      # @return [Meteor::Element] 要素
+      #
+      def element_4(attrName1,attrValue1,attrName2,attrValue2)
+
+        @_attrName1 = escapeRegex(attrName1)
+        @_attrName2 = escapeRegex(attrName2)
+        @_attrValue1 = escapeRegex(attrValue1)
+        @_attrValue2 = escapeRegex(attrValue2)
+
+        @pattern_cc = '' << TAG_SEARCH_3_1_2_2 << @_attrName1 << ATTR_EQ
+        @pattern_cc << @_attrValue1 << TAG_SEARCH_2_6 << @_attrName2 << ATTR_EQ
+        @pattern_cc << @_attrValue2 << TAG_SEARCH_2_7 << @_attrName2 << ATTR_EQ
+        @pattern_cc << @_attrValue2 << TAG_SEARCH_2_6 << @_attrName1 << ATTR_EQ
+        @pattern_cc << @_attrValue1 << TAG_SEARCH_2_4_2_3
+
+        @pattern = PatternCache.get(@pattern_cc)
+
+        @res = @pattern.match(@root.document)
+
+        if @res then
+          @elm_ = element_5(@res[1], attrName1, attrValue1,attrName2, attrValue2);
+        else
+          @elm_ = nil
+        end
+
+        @elm_
+      end
+      private :element_4
+
+      def create_element_pattern    
+
         if RUBY_VERSION >= '1.9.0' then
-          
+
           @position = 0
-          
+
           while (@res = @pattern.match(@root.document,@position)) || @cnt > 0
-            
+
             if @res then
-              
+
               if @cnt > 0 then
-                
+
                 @position2 = @res.end(0)
-                
+
                 @res = @pattern_2.match(@root.document,@position)
-                
+
                 if @res then
-                  
+
                   @position = @res.end(0)
-                  
+
                   if @position > @position2 then
-                    
+
                     if @cnt == 0 then
                       @sbuf << @pattern_cc_1_1
                     else
                       @sbuf << @pattern_cc_1_2
                     end
-                    
+
                     @cnt << 1
-                    
+
                     @position = @position2
                   else
-                    
+
                     @cnt -= 1
-                    
+
                     if @cnt != 0 then
                       @sbuf << @pattern_cc_2_1
                     else
                       @sbuf << @pattern_cc_2_2
                     end
-                    
+
                     if @cnt == 0 then
                       break
                     end
                   end
                 else
-                  
+
                   if @cnt == 0 then
                     @sbuf << @pattern_cc_1_1
                   else
                     @sbuf << @pattern_cc_1_2
                   end
-                  
+
                   @cnt += 1
-                  
+
                   @position = @position2
                 end
               else
                 @position = @res.end(0)
-                
+
                 if @cnt == 0 then
                   @sbuf << @pattern_cc_1_1
                 else
                   @sbuf << @pattern_cc_1_2
                 end
-                
+
                 @cnt += 1
               end
             else
-              
+
               @res = @pattern_2.match(@root.document,@position)
-              
+
               if @res then
-                
+
                 @cnt -= 1
-                
+
                 if @cnt != 0 then
                   @sbuf << @pattern_cc_2_1
                 else
                   @sbuf << @pattern_cc_2_2
                 end
-                
+
                 @position = @res.end(0)
               end
-              
+
               if @cnt == 0 then
                 break
               end
-              
+
               if !@res then
                 break
               end
             end
-            
+
             @pattern = @pattern_1b
           end
         else
-          
+
           @rx_document = @root.document
-          
+
           while (@res = @pattern.match(@rx_document)) || @cnt > 0
-            
+
             if @res then
-              
+
               if @cnt > 0 then
-                
+
                 @rx_document2 = @res.post_match
-                
+
                 @res = @pattern_2.match(@rx_document)
-                
+
                 if @res then
-                  
+
                   @rx_document = @res.post_match
-                  
+
                   if @rx_document2.length > @rx_document.length then
-                    
+
                     if @cnt == 0 then
                       @sbuf << @pattern_cc_1_1
                     else
                       @sbuf << @pattern_cc_1_2
                     end
-                    
+
                     @cnt += 1
-                    
+
                     @rx_document = @rx_document2
                   else
-                    
+
                     @cnt -= 1
-                    
+
                     if @cnt != 0 then
                       @sbuf << @pattern_cc_2_1
                     else
                       @sbuf << @pattern_cc_2_2
                     end
-                    
+
                     if @cnt == 0 then
                       break
                     end
                   end
                 else
-                  
+
                   if @cnt == 0 then
                     @sbuf << @pattern_cc_1_1
                   else
                     @sbuf << @pattern_cc_1_2
                   end
-                  
+
                   @cnt += 1
-                  
+
                   @rx_document = @rx_document2
                 end
               else
                 @rx_document = @res.post_match
-                
+
                 if @cnt == 0 then
                   @sbuf << @pattern_cc_1_1
                 else
                   @sbuf << @pattern_cc_1_2
                 end
-                
+
                 @cnt += 1
               end
             else
-              
+
               @res = @pattern_2.match(@rx_document)
-              
+
               if @res then
-                
+
                 @cnt -= 1
-                
+
                 if @cnt != 0 then
                   @sbuf << @pattern_cc_2_1
                 else
                   @sbuf << @pattern_cc_2_2
                 end
-                
+
                 @rx_document = @res.post_match
               end
-              
+
               if @cnt == 0 then
                 break
               end
-              
+
               if !@res then
                 break
               end
             end
-            
+
             @pattern = @pattern_1b
           end
         end
-        
-        @pattern_cc = @sbuf
-        
-        if @sbuf.length == 0 || @cnt != 0 then
-          #  raise NoSuchElementException.new(elmName,attrName1,attrValue1,attrName2,attrValue2);
-          return nil
-        end
-        
-        @pattern = Meteor::Core::Util::PatternCache.get(@pattern_cc)
-        @res = @pattern.match(@root.document)
-        
-        @res
-      end
-      private :elementWithContent_5_2
-      
-      def elementWithoutContent_5(elmName)
-        elementWithoutContent_5_1(elmName,TAG_SEARCH_NC_2_3_2_2);
-      end
-      private :elementWithoutContent_5
-
-      def elementWithoutContent_5_1(elmName,closer)
-
-        #要素
-        @elm_ = Element.new(elmName)
-        #属性
-        @elm_.attributes = @res[1]
-        #全体
-        @elm_.document = @res[0]
-        #空要素検索用パターン
-        @pattern_cc = '' << TAG_OPEN << @_elmName << TAG_SEARCH_NC_2_1_2 << @_attrName1 << ATTR_EQ
-        @pattern_cc << @_attrValue1 << TAG_SEARCH_NC_2_6 << @_attrName2 << ATTR_EQ
-        @pattern_cc << @_attrValue2 << TAG_SEARCH_NC_2_7 << @_attrName2 << ATTR_EQ
-        @pattern_cc << @_attrValue2 << TAG_SEARCH_NC_2_6 << @_attrName1 << ATTR_EQ
-        @pattern_cc << @_attrValue1 << closer
-        @elm_.pattern = @pattern_cc
-        
-        @elm_.parser = self
-      end
-      private :elementWithoutContent_5_1
-
-      #
-      # 属性1・属性2(属性名="属性値")で検索し、要素を取得する
-      #
-      # @param [String] attrName1 属性名1
-      # @param [String] attrValue1 属性値1
-      # @param [String] attrName2 属性名2
-      # @param [String]attrValue2 属性値2
-      # @return [Meteor::Element] 要素
-      #
-      def element_4(attrName1,attrValue1,attrName2,attrValue2)
-
-        @_attrName1 = escapeRegex(attrName1)
-        @_attrName2 = escapeRegex(attrName2)
-        @_attrValue1 = escapeRegex(attrValue1)
-        @_attrValue2 = escapeRegex(attrValue2)
-
-        @pattern_cc = '' << TAG_SEARCH_3_1_2_2 << @_attrName1 << ATTR_EQ
-        @pattern_cc << @_attrValue1 << TAG_SEARCH_2_6 << @_attrName2 << ATTR_EQ
-        @pattern_cc << @_attrValue2 << TAG_SEARCH_2_7 << @_attrName2 << ATTR_EQ
-        @pattern_cc << @_attrValue2 << TAG_SEARCH_2_6 << @_attrName1 << ATTR_EQ
-        @pattern_cc << @_attrValue1 << TAG_SEARCH_2_4_2_3
-
-        @pattern = PatternCache.get(@pattern_cc)
-
-        @res = @pattern.match(@root.document)
-
-        if @res then
-          @elm_ = element_5(@res[1], attrName1, attrValue1,attrName2, attrValue2);
-        else
-          @elm_ = nil
-        end
-
-        @elm_
       end
-      private :element_4
+      private :create_element_pattern
 
       #
       # 要素の属性をセットする or 属性の値を取得する
@@ -1947,6 +1765,7 @@ module Meteor
             @e_cache.store(elm.object_id, elm)
           end
         end
+        elm
       end
       private :setAttribute_3
 
@@ -2070,6 +1889,7 @@ module Meteor
         if @root.hook || @root.monoHook then
           setAttribute_3(@root.mutableElement, attrName, attrValue)
         end
+        @root.mutableElement
       end
       private :setAttribute_2
       
@@ -2184,6 +2004,7 @@ module Meteor
             @e_cache.store(elm.object_id,elm)
           end
         end
+        elm
       end
       private :setAttribute_2_m
  
@@ -2234,7 +2055,8 @@ module Meteor
         if !elm.parent then
           @e_cache.store(elm.object_id,elm)
         end
-        
+
+        elm
       end
       private :setContent_3
 
@@ -2271,6 +2093,8 @@ module Meteor
         if @root.monoHook then
           setContent_3(@root.mutableElement, content, entityRef)
         end
+
+        elm
       end
       private :setContent_2_b
       
@@ -2320,6 +2144,8 @@ module Meteor
             @e_cache.store(elm.object_id,elm)
           end
         end
+
+        elm
       end
       private :removeAttribute_2
 
@@ -2340,6 +2166,8 @@ module Meteor
         if @root.hook || @root.monoHook then
           removeAttribute_2(@root.mutableElement, attrName)
         end
+
+        @root.mutableElement
       end
       private :removeAttribute_1
       

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: asip-meteor
 version: !ruby/object:Gem::Version 
-  version: 0.9.0.5
+  version: 0.9.0.6
 platform: ruby
 authors: 
 - asip
@@ -9,7 +9,7 @@ autorequire: meteor
 bindir: bin
 cert_chain: []
 
-date: 2008-11-15 00:00:00 -08:00
+date: 2009-03-17 00:00:00 -07:00
 default_executable: 
 dependencies: []