struggle 1.5.6 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6eeeac63a267bd4f07f3d489f63c5915c3620bf
-  data.tar.gz: 2455d1f08ac2b2b5db8a25e093e2abd3c7c9ee59
+  metadata.gz: f2c49188e67e6a0fc4175d8b84e0146d0110e92f
+  data.tar.gz: 9120205f88375a50882ac5378fd76ea21bc8965f
 SHA512:
-  metadata.gz: ab84f0e6e0046191253ad12271b7b6a9249041b6d863eec14156476f44a535e7d2131776fb2cade202a37ad38c2cf0eee44f9ac0a9f81ce1d3371c50017aa817
-  data.tar.gz: 34b4381cd71a4bf9bb23e6e0a9bd1910288793596138d6ec1edb7e01c9fed2a6339174ad2263a6b67036afc25759264f741bff6caf78fbdffda4c328a7c12271
+  metadata.gz: 09f33bea4800221b29fb18fb453e299af1efb0cf4cfbc088de1000cfe8ed761fcf4193eb2f5f245e8477dd94df6fcbd32f620036ccc80b7100fbf0f4f00af3f4
+  data.tar.gz: d16353ea833ed39f5fb0663921c34510c7403545ee9a2e03e606393e1db9c6001db48fee7761a5350e4f391985d6069fa1fe9fc72029cb475b55c5e19444c1b9

data/lib/struggle/concerns/string_extend.rb

@@ -0,0 +1,5 @@
+module StringExtend
+  def html_clear(html)
+    html.gsub(/<script.*?<\/script>/, "").gsub(/<iframe.*?<\/iframe>/, "")
+  end
+end

data/lib/struggle.rb

@@ -13,6 +13,5 @@ require 'struggle/pay_gateway'
 require 'struggle/sms'
 require 'struggle/tmagick'
 require 'struggle/vcode'
-require 'struggle/html_extend'
-ActiveRecord::Base.send :extend, HtmlExtend::Help
-ActiveRecord::Base.send :include, HtmlExtend::Model
+require 'struggle/concerns/string_extend'
+String.send :include, StringExtend

data/struggle.gemspec

@@ -1,9 +1,9 @@
 Gem::Specification.new do |s|
   s.name        = 'struggle'
-  s.version     = '1.5.6'
-  s.date        = '2015-08-03'
+  s.version     = '1.6.0'
+  s.date        = '2015-08-21'
   s.summary     = "struggle!"
-  s.description = "vcode,tfile,pager,func,logistic,pay_gateway,tmagick,html_extend;"
+  s.description = "vcode,tfile,pager,func,logistic,pay_gateway,tmagick,class_extend;"
   s.authors     = ["lean"]
   s.email       = '54850915@qq.com' 
   s.files       = `git ls-files`.split("\n")

metadata

@@ -1,44 +1,44 @@
 --- !ruby/object:Gem::Specification
 name: struggle
 version: !ruby/object:Gem::Version
-  version: 1.5.6
+  version: 1.6.0
 platform: ruby
 authors:
 - lean
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-03 00:00:00.000000000 Z
+date: 2015-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iconv
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rmagick
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: vcode,tfile,pager,func,logistic,pay_gateway,tmagick,html_extend;
+description: vcode,tfile,pager,func,logistic,pay_gateway,tmagick,class_extend;
 email: 54850915@qq.com
 executables: []
 extensions: []
@@ -47,8 +47,8 @@ extra_rdoc_files:
 files:
 - README.md
 - lib/struggle.rb
+- lib/struggle/concerns/string_extend.rb
 - lib/struggle/func.rb
-- lib/struggle/html_extend.rb
 - lib/struggle/logistic.rb
 - lib/struggle/pager.rb
 - lib/struggle/pay_gateway.rb
@@ -67,17 +67,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: struggle!

data/lib/struggle/html_extend.rb

@@ -1,35 +0,0 @@
-module HtmlExtend
-  def self.set_eval_str(evalStr)
-    @evalStr = evalStr
-  end
-
-  def self.get_eval_str
-    @evalStr
-  end
-  module Help
-    def html_clear_extend(attr)
-      HtmlExtend.set_eval_str "self.#{attr}=html_clear(self.#{attr})"
-      before_save :save_extend
-    end
-  end
-  module Model
-    def save_extend
-      eval HtmlExtend.get_eval_str
-    end
-
-    #删除script标签
-    def script_clear(html)
-      html.gsub(/<script.*?<\/script>/, "")
-    end
-
-    #删除iframe标签
-    def iframe_clear(html)
-      html.gsub(/<iframe.*?<\/iframe>/, "")
-    end
-
-    #删除script标签，删除iframe标签
-    def html_clear(html)
-      html.gsub(/<script.*?<\/script>/, "").gsub(/<iframe.*?<\/iframe>/, "")
-    end
-  end
-end