keystone 0.0.30 → 0.0.31

data/Rakefile

@@ -11,7 +11,6 @@ $:.unshift "lib"
 #   sh "gem install kanamei-keystone-#{Keystone::VERSION}.gem"
 # end
 
-desc "create gem file"
 task :build do
   begin
     require 'jeweler'

data/VERSION

@@ -1 +1 @@
-0.0.30
+0.0.31

data/lib/keystone.rb

@@ -16,7 +16,7 @@ autoload :Moji          , 'vendor/moji'
 
 module Keystone
 
-  VERSION = '0.0.30'
+  VERSION = '0.0.31'
 
   autoload :StringUtil , 'keystone/string_util'
   autoload :Batch      , 'keystone/batch'

data/lib/keystone/base.rb

@@ -41,6 +41,7 @@ module Keystone
         messages = message.split("\n")
         if messages.size > 1
           messages.each_with_index do |st,i|
+            next if st == ""
             if i == 0
               puts "[#{Time.now.strftime("%Y/%m/%d %H:%M:%S")}][#{$$}][#{log_type.to_s}] #{st}"
             else
@@ -48,10 +49,12 @@ module Keystone
             end
           end
         else
-          if is_base_info
-            puts "[#{Time.now.strftime("%Y/%m/%d %H:%M:%S")}][#{$$}][#{log_type.to_s}] #{message}"
-          else
-            puts "[#{log_type.to_s}] #{message}"
+          if message != ""
+            if is_base_info
+              puts "[#{Time.now.strftime("%Y/%m/%d %H:%M:%S")}][#{$$}][#{log_type.to_s}] #{message}"
+            else
+              puts "[#{log_type.to_s}] #{message}"
+            end
           end
         end
       end
@@ -94,4 +97,4 @@ module Keystone
       end
     end
   end
-end
+end

data/lib/keystone/string_util.rb

@@ -39,7 +39,7 @@ module Keystone
         return "@#{user}"
       end
       return dom.split('.').reverse.join(".") + "@" + user
-    end    
+    end
     
     MULTIBYTE_SPACE = [0x3000].pack("U")
     PRESERVED_QUERY_WORDS_RE = /(AND|OR|ANDNOT)/
@@ -72,7 +72,48 @@ module Keystone
           Moji.zen_to_han(str,Moji::ZEN_ALNUM | Moji::ZEN_SYMBOL).downcase,Moji::HAN_KATA | Moji::HAN_JSYMBOL)
       )
     end    
-    
+
+    #
+    # tagで指定したhtmlタグを削除する
+    #
+    # erace_all = true でタグのcontentsも丸ごと削除
+    #
+    def self.remove_html_tag(html,tag,erace_all = false)
+      poss = []
+      last_hit = 0
+      next_check_start = 0
+      str = html.clone
+      strori = str.clone
+      loop do
+        pos,size=nil,nil
+        if pos = str =~ /(<#{tag}.*?>)/
+          size = $1.size
+        else
+          break
+        end
+        last_hit = next_check_start + pos
+        next_check_start = last_hit + size
+        poss << last_hit
+        str = str[pos+size..-1]
+      end
+
+      poss.reverse!
+      str = strori
+
+      poss.each do |pos|
+        str1 = str[0..pos-1]
+        str2 = str[pos..-1]
+        str1 = '' if pos == 0
+        if erace_all
+          str2.sub!(/<#{tag}.*?>(.*?)<\/#{tag}>/mi){''}
+        else
+          str2.sub!(/<#{tag}.*?>(.*?)<\/#{tag}>/mi){$1}
+        end
+        str = str1 + str2
+      end
+      return str
+    end
+
     #
     #
     # 指定された文字列より[A-z0-9-_.]以外を取り除く

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: keystone
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 30
-  version: 0.0.30
+  prerelease: 
+  version: 0.0.31
 platform: ruby
 authors: 
 - paco
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-04 00:00:00 +09:00
+date: 2011-02-07 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
@@ -27,7 +23,6 @@ extensions: []
 extra_rdoc_files: 
 - README
 files: 
-- .gitignore
 - README
 - Rakefile
 - VERSION
@@ -203,8 +198,8 @@ homepage: http://github.com/kanamei/keystone
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -212,21 +207,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: oreore library

data/.gitignore

@@ -1,3 +0,0 @@
-*.log
-.DS_Store
-*.gem