utility 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb3bedad0a8943eb656d1c0c9b378c514d2fe997
-  data.tar.gz: 3ec4e6d00cd5a2ecdf19af67a3434ac00922e27d
+  metadata.gz: c405ee382d7806115552f2126152760ac81caf31
+  data.tar.gz: 108299419e98711c7cc8e833bf31d3b69f2f8ecf
 SHA512:
-  metadata.gz: d7f1001ec78df2f04ce55315a6827b87847dc3604ed467bc17d365df840c5907c2cb3d2f09ea1c013cee6995df64a6a58fab174af2953b47f33a93732be09501
-  data.tar.gz: b93c9d8e9e9645cce81df799967ae1a7d028ab034447dd9ee713a8556ab0c5a6cb199eac002d55f9f34eba4384e50268e132adcbcebd24439f8d87da5dc1489d
+  metadata.gz: 7c8254c38159d0d53a71ca236249018c88bd31b36cd9bdb85076c37708edc696020d5830398a239f25130026f0b95dfb3f36ca2844ad1668fc2d0ac1ab401183
+  data.tar.gz: 3b9fa1484b6b3f3c257be312313e0e440690931ecf087f376efa933527216c259f0cdc35a2212c9cf50b860a0dfbd4bdd84f2deff8e30939a66309ac75249775

data/README.md

@@ -40,37 +40,61 @@ Utility.sha384 "ruby"  #=> "635365ef93ebf2c7a4e40b0b497da727ab8c2914eb9f052e6be4
 Utility.sha512 "ruby"  #=> "423408d7723a3d80baefa804bd50b61a89667efec1713386a7b8efe28e5d13968307a908778cad210d7aa2dfe7db9a2aa86895f9fc1eeefcc99814310b207a6b"
 ```
 
-#### hmc ####
+#### hmac ####
 ```ruby
 Utility.hmac "sha1", "key", "the data"    #=> "ac5b94c09a6033e3aca1a02116ebf48722b155e0"
 Utility.hmac "sha256", "key", "the data"  #=> "00644ab9e7ce1b772c5fcd9b460b1a4fa78de4a55c162590ac506f2f76d62a40"
 ```
 
-#### params parse ####
+#### url/html ####
 ```ruby
-# full url
+# params parse
 Utility.parse_query "http://example.com/?param1=value1&param2=value2&param3=value3"
 #=> {"param1"=>["value1"], "param2"=>["value2"], "param3"=>["value3"]}
-
-# only query params
 Utility.parse_query "param1=value1&param2=value2&param3=value3"
 #=> {"param1"=>["value1"], "param2"=>["value2"], "param3"=>["value3"]}
+
+# url escape
+Utility.url_escape "http://example.com/search?q=#ruby&from=深圳"
+#=> "http://example.com/search?q=%23ruby&from=%E6%B7%B1%E5%9C%B3"
+Utility.url_escape "http://example.com/search?q=#ruby&from=深圳", :all
+#=> "http%3A%2F%2Fexample.com%2Fsearch%3Fq%3D%23ruby%26from%3D%E6%B7%B1%E5%9C%B3"
+Utility.url_escape "深圳香港一水之隔"
+#=> "%E6%B7%B1%E5%9C%B3%E9%A6%99%E6%B8%AF%E4%B8%80%E6%B0%B4%E4%B9%8B%E9%9A%94"
+
+# url unescape
+Utility.url_unescape "http://example.com/search?q=%23ruby&from=%E6%B7%B1%E5%9C%B3"
+#=> "http://example.com/search?q=#ruby&from=深圳"
+Utility.url_unescape "http%3A%2F%2Fexample.com%2Fsearch%3Fq%3D%23ruby%26from%3D%E6%B7%B1%E5%9C%B3"
+#=> "http://example.com/search?q=#ruby&from=深圳"
+Utility.url_unescape "%E6%B7%B1%E5%9C%B3%E9%A6%99%E6%B8%AF%E4%B8%80%E6%B0%B4%E4%B9%8B%E9%9A%94"
+#=> "深圳香港一水之隔"
+
+# html escape/unescape
+Utility.html_escape "<p>some text</p>"                     #=> "&lt;p&gt;some&nbsp;text&lt;/p&gt;"
+Utility.html_unescape "&lt;p&gt;some&nbsp;text&lt;/p&gt;"  #=> "<p>some text</p>"
+Utility.html_unescape "&copy;2017"                         #=> "©2017"
+
+# html text
+Utility.html_text("<p>This <span>is</span> <p>plain</p> text</p>")
+#=> "This is plain text"
 ```
+
 #### computer info ####
 ```ruby
-# get hostname
+# hostname
 Utility.get_hostname  #=> "Charles"
 
-# get ip address
+# ip address
 Utility.get_ip        #=> "192.168.12.26"
 
-#get mac address
+# mac address
 Utility.get_mac       #=> "c8:60:00:10:ec:ee"
 
-#get os
+# os
 Utility.get_os        #=> "linux"
 
-#get os arch
+# os arch
 Utility.get_arch      #=> 64
 ```
 

data/lib/utility/url.rb

@@ -1,5 +1,6 @@
 require 'cgi'
 require 'uri'
+require 'nokogiri'
 
 module Utility::URL
   def parse_query(url)
@@ -9,4 +10,28 @@ module Utility::URL
       CGI.parse url
     end
   end
+
+  def url_escape(url, all = :no)
+    if url =~ URI::regexp && all != :all
+      URI.escape url
+    else
+      CGI::escape url
+    end
+  end
+
+  def url_unescape(url)
+    URI.unescape url
+  end
+
+  def html_escape(html)
+    CGI::escapeHTML(html).gsub(" ", " ")
+  end
+
+  def html_unescape(html)
+    Nokogiri::HTML.parse(html).text
+  end
+
+  def html_text(html)
+    Nokogiri::HTML(html).text
+  end
 end

data/lib/utility/version.rb

@@ -1,3 +1,3 @@
 module Utility
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

data/utility.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "macaddr", "~> 1.0"
+  spec.add_dependency "nokogiri", "~> 1.8"
   spec.add_development_dependency "bundler", "~> 1.14"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: utility
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Cenxky
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-02 00:00:00.000000000 Z
+date: 2017-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: macaddr
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement