sos-core 0.1.3 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85ae9bdcf11f275345ab0febe9babc2fc6e1ee4d
-  data.tar.gz: 14b9535b4163e422ca2d8cc925edfcb4aac61733
+  metadata.gz: d24d9de1e66d3babc6b47ae1a25f7b54aeb48301
+  data.tar.gz: 8088d4d5254b2488abf5d3f0389bd02bb40c5ebe
 SHA512:
-  metadata.gz: 6452ef5ed1118a368e190bf6910d92585e5360b42e9d641a017ef2391f122d5c07d53c327b15f4b4d70d38f4e2ebedd589336daefeb17caa2e2128ac5565df17
-  data.tar.gz: ccda52c496fff348755b52cb6c0ab659b6783ce43e6697907535b4a9a8b499ecb394f6de2e1f2432de80fcf1e6ac68034ce8908ab765143bb58fc216f48a2962
+  metadata.gz: a420feec4eb02fe24c44231b70bae0bae77767c307c8499e246022dedc9615a276f7dd845a6a74a47a6b4612de59b54a5a405f5694ca357bda106ee216e16a09
+  data.tar.gz: 8a643d43183318cc9da7f6b93d674d12459f77b4fff9ad72a2851c45013a663f3ddfd4783897109467c127fdf2c4136a8287b317985f2ae5edbf7e576762e4f2

data/lib/{board_of_directors/boss.rb → boss.rb}

@@ -1,3 +1,5 @@
+require_relative 'company.rb'
+
 module SOSHelper
 
 	# Boss Assign the tasks
@@ -19,6 +21,7 @@ module SOSHelper
 				results = pm.done
 				summarize @base, results.dup
 			end
+			# p @base.to_xml
 
 			@base
 		end
@@ -42,7 +45,8 @@ module SOSHelper
 		end
 
 		def recognize_employee
-			Object.const_get(capitalize @employee).new
+			employee = capitalize @employee
+			eval( employee + ".new")
 		end
 
 		def capitalize(employee)

data/lib/{sos_helper/capability.rb → capability.rb}

@@ -1,23 +1,44 @@
+require 'nokogiri'
+require_relative 'employees/sos/contents.rb'
+
 module SOSHelper
+	class Capability
+		def initialize(args={})
+			@root = args[:root].dup
+		end
+
+		def contents
+			contents = @root.xpath("//sos:Contents")
+			Contents.new(contents)
+		end
+
+		def filterCapabilities
+			
+		end
+
+		def extension
+			
+		end
+
+	end
+
 	class GetCapability
 
+		attr_reader :capabilities
 		def initialize(args={})
 			@request = args[:request]
 			@url = args[:url]
 			@query = {}
-			@allowedValue = {}
 			@capabilities = nil
 		end
 
 		def send(query={})
 			query[:service] = query[:service] || "SOS"
 			query[:request] = query[:request] || "GetCapabilities"
-			@capabilities = request.get(query) { |str| next Nokogiri::XML(str) }
-		end
-
-		def checkAllowedValues(capabilities=nil)
-
-			@allowedValue = check Relics
+			query[:version] = query[:version] || "2.0.0"
+			@capabilities = request.get(query) do |str| xml = Nokogiri::XML(str) 
+													Capability.new(root: xml)
+											   end
 		end
 
 		private

data/lib/company.rb

@@ -0,0 +1,4 @@
+require_relative 'employees/man.rb'
+require_relative 'employees/fes.rb'
+require_relative 'employees/gml.rb'
+require_relative 'employees/sos.rb'

data/lib/employees/fes.rb

@@ -1,4 +1,3 @@
-require_relative 'man.rb'
 Dir[ File.dirname(__FILE__) + "/fes/expression/*.rb"].each {|file| require file }
 Dir[ File.dirname(__FILE__) + "/fes/comparisonOps/*.rb"].each {|file| require file }
 Dir[ File.dirname(__FILE__) + "/fes/extensionOps/*.rb"].each {|file| require file }

data/lib/employees/gml.rb

@@ -1,2 +1 @@
-require_relative 'man.rb'
 Dir[ File.dirname(__FILE__) + "/gml/*.rb"].each {|file| require file }

data/lib/employees/gml/gmlTime.rb

@@ -0,0 +1,26 @@
+require 'time'
+
+
+class Time
+	def toTimeZone(time=nil)
+		return time.utc.iso8601 unless time.nil?
+		self.utc.iso8601
+	end
+end
+
+class GMLTime < Time
+	def initialize(time)
+		@time = toDateTime time
+		super *(@time.to_a[0..5].reverse)
+	end
+
+	def toTimeZone(time=nil)
+		return time.utc.iso8601 unless time.nil?
+		@time.utc.iso8601
+	end
+
+	def toDateTime(time=nil)
+		return Time.parse(time).localtime unless time.nil?
+		Time.parse(@time).localtime
+	end
+end

data/lib/employees/gml/timePeriod.rb

@@ -11,7 +11,7 @@ class TimePeriod < Complicated
 	end
 
 	def custom(value)
-		begin_time, end_time = splitPosition(value)
+		begin_time, end_time = value.split " "
 		position("begin", begin_time) + position("end", end_time)
 	end
 
@@ -19,10 +19,6 @@ class TimePeriod < Complicated
 		"<gml:#{where}Position>#{time}</gml:#{where}Position>"
 	end
 
-	def splitPosition(value)
-		value.split " "
-	end
-
 	def tag_name
 		class_name
 	end

data/lib/employees/mankind/people.rb

@@ -1,6 +1,5 @@
 class People
-	def initialize(tasks=nil)
-		@tasks = tasks.to_a
+	def initialize()
 		@attributes = ""
 	end
 
@@ -16,7 +15,7 @@ class People
 	end
 
 	def inspect
-		tag
+		self.to_s
 	end
 
 	def inject(task)
@@ -44,6 +43,7 @@ class People
 	end
 
 	def attributes(attrs)
+		p attrs
 		attrs.each { |k, v| @attributes += " #{namespace}" + k.to_s + "=\"" + v.to_a[0] + "\"" }
 	end
 

data/lib/employees/sos.rb

@@ -1,2 +1 @@
-require_relative 'man.rb'
 Dir[ File.dirname(__FILE__) + "/sos/*.rb"].each {|file| require file }

data/lib/employees/sos/contents.rb

@@ -0,0 +1,41 @@
+require_relative '../swes/offering.rb'
+
+
+class Contents
+	def initialize(contents)
+		@contents = contents
+	end
+	
+	def offerings
+		offerings = @contents.xpath("//swes:offering")
+		@offering = @offering || get(offerings) || []
+	end
+
+	def get(offerings)
+		offerings.map { |offering| SWES::Offering.new(offering) }
+	end
+
+	def procedureDescriptionFormat
+		
+	end
+
+	def observableProperty
+		
+	end
+
+	def relatedFeature
+		
+	end
+
+	def responseFormat
+		
+	end
+
+	def featureOfInterestType
+		
+	end
+
+	def observationType
+		
+	end
+end

data/lib/employees/sos/offering.rb

@@ -1,3 +1,5 @@
+require_relative '../mankind/simple.rb'
+
 class Offering < Simple
 	
 end

data/lib/employees/sos/time.rb

@@ -0,0 +1,58 @@
+require_relative '../gml/gmlTime.rb'
+
+class SOSTime
+	def initialize(time)
+		@time = checkTimeType time
+	end
+
+	def timeInstant(time)
+		time.xpath(".//gml:TimeInstant")
+	end
+
+	def timePeriod(time)
+		time.xpath(".//gml:TimePeriod")
+	end
+
+	def range(beginTime=beginPosition, endTime=endPosition)
+		beginTime.toTimeZone + " " + endTime.toTimeZone
+	end
+
+	def timePosition
+		@instant ||= gmlTime find("gml:timePosition")
+	end
+
+	def beginPosition
+		@begin ||= gmlTime find("gml:beginPosition")
+	end
+
+	def endPosition
+		
+		@end ||= gmlTime find("gml:endPosition")
+	end
+
+	def gmlTime(time)
+		GMLTime.new time unless time.empty?
+	end
+
+	def find(tag)
+		@time.xpath(".//" + tag).text
+	end
+
+	def checkTimeType(time)
+		type = timeInstant time
+		type = timePeriod time if type.empty?
+	end
+
+	def inspect
+		time = timePosition.nil? ? "@begin: #{beginPosition}, @end: #{endPosition}" : "@intant: #{@instant}"
+		"PhenomenonTime: #{time}"
+	end
+end
+
+class PhenomenonTime < SOSTime
+	
+end
+
+class ResultTime < SOSTime
+	
+end

data/lib/employees/swes/offering.rb

@@ -0,0 +1,79 @@
+require_relative '../mankind/Complicated.rb'
+require_relative '../sos/time.rb'
+
+module SWES
+	class Offering < Complicated
+		attr_accessor :keys
+		def initialize(offering)
+			@offering = offering
+			@keys = [ :identifier,
+					  :procedure,
+					  :procedureDescriptionFormats,
+					  :observableProperty,
+					  :phenomenonTime,
+					  :resultTime,
+					  :responseFormat ]
+		end
+
+		def identifier
+			@identifier ||= find("swes:identifier")
+		end
+
+		def procedure
+			@procedure ||= find("swes:procedure")
+		end
+
+		def procedureDescriptionFormats
+			@procedureDescriptionFormats ||= 
+				findAll("swes:procedureDescriptionFormat")
+		end
+
+		def observableProperty
+			@observableProperty ||= 
+				findAll("swes:observableProperty")
+		end
+
+		def observedArea
+			@observedArea
+		end
+
+		def responseFormat
+			@responseFormat ||= 
+				findAll "sos:responseFormat"
+		end
+
+		def phenomenonTime
+			PhenomenonTime.new find("sos:phenomenonTime", false)
+		end
+
+		def resultTime
+			ResultTime.new find("sos:resultTime", false)
+		end
+
+		def find(tag, text=true)
+			return @offering.xpath(".//" + tag).text if text
+			@offering.xpath(".//" + tag)
+		end
+
+		def findAll(tag)
+			@offering.xpath(".//" + tag).map { |tag| tag.text }
+		end
+
+		def inspect
+			id = identifier.ascii_only? ? identifier : "UTF-16"
+			"Offering: @id='#{id}'"
+		end
+
+		def self.name
+			self.new().class.to_s
+		end
+
+		def tag_name
+			self.class.to_s.split("::")[1]
+		end
+
+		def namespace
+			"swes:"
+		end
+	end
+end

data/lib/{board_of_directors/factory/factory.rb → factory.rb}

@@ -1,3 +1,4 @@
+require_relative 'boss.rb'
 require_relative 'hashMerge.rb'
 require 'set'
 

data/lib/{sos_helper/observation.rb → observation.rb}

@@ -1,8 +1,23 @@
+require 'json'
+
 module SOSHelper
 
 	class Observation
-		def initialize(args)
-			
+		def initialize(str)
+			@xml = Nokogiri::XML(str)
+		end
+
+		def parse
+			datalist = @xml.xpath("//sos:observationData")
+			@output = datalist.map { |data| [data.xpath(".//gml:timePosition").text, data.xpath(".//om:result").text] }
+		end
+
+		def to_json
+			{ data: output }.to_json
+		end
+
+		def output
+			@output ||= []
 		end
 	end
 
@@ -15,6 +30,7 @@ module SOSHelper
 			@request = args[:request]
 			@xml = ObservationRequest.dup
 			@request_body = nil
+			@tp = []
 			@body = ""
 		end
 
@@ -35,7 +51,7 @@ module SOSHelper
 			raise ArgumentError, 'Filters need to be hash' unless custom.is_a? Hash
 			return condition.to_s if custom == {}
 			condition.merge! custom
-
+			p condition
 			self
 		end
 
@@ -47,19 +63,29 @@ module SOSHelper
 			@condition ||= Factory.new()
 		end
 
-		def offering(text)
-			filter({offering: text})
+		def offering=(list)
+			filter({offering: list})
+		end
+
+		def procedure=(list)
+			filter({procedure: list})
 		end
 
-		def procedure(text)
-			filter({procedure: text})
+		def observedProperty=(list)
+			filter({observedProperty: list})
 		end
 
-		def observedProperty(text)
-			filter({observedProperty: text})
+		def randomID
+			tp = "tp_" + rand(100000000).to_s
+			(unique? tp) ? tp : randomID
 		end
 
-		def temporalFilter(id, range)
+		def unique?(tp)
+			not @tp.include? tp
+		end
+
+		def temporalFilter=(id=randomID, range)
+			@tp << randomID
 			filter({ temporalFilter: {
 						during: {
 				 			valueReference: "phenomenonTime",
@@ -68,10 +94,6 @@ module SOSHelper
 		  			})
 		end
 
-		def responseFormat(text)
-			filter({responseFormat: text})
-		end
-
 	end
 
 end

data/lib/sos-core.rb

@@ -1,35 +1,37 @@
-require_relative 'sos-helper.rb'
+require_relative 'xmlRequest.rb'
+require_relative 'sosHelper.rb'
 
-class SOS
+# Usage:
+# 	s = SOS.new("Url")
+# 	s.getCapabilities  => return All capabilities
+# 	s.getObservations(condition)
+#       => set the filter to get observations
+# 	s.offering =>  return all offerings from @capability
+
+# 	url = "http://cgis.csrsr.ncu.edu.tw:8080/swcb-sos-new/service"
+#   s  = SOS.new("YourService")
 
+class SOS
+	attr_reader :capabilities
 	def initialize(url, args={})
 		# request to http://cgis.csrsr.ncu.edu.tw:8080/swcb-sos-new/service
 		@request = XmlRequest.new(url)
-		@capabilities = getCapabilities
+		@capabilities = nil
 		@observations, @gc, @go = nil
-	end
 
-	def allowedValue
-		@allowedValue ||= checkAllowedValues
 	end
-	
+
 	def getCapabilities(query={})
 		@gc = SOSHelper::GetCapability.new(request: @request)
-		@capabilities = @gc.send
-	end
-
-	def checkAllowedValues
-		@gc.checkAllowedValues
+		@gc.send
+		@capabilities = @gc.capabilities
 	end
 
-	def getObservations(condition={})
+	def getObservations
 		@go = SOSHelper::GetObservation.new(request: @request)
-		filter condition unless condition == {}
-		@go
 	end
 	
-	def offering
-		@offerings = @offerings || @capabilities.xpath("//sos:Contents//swes:offering").map { |node| Offering.new(node) } unless @capabilities.nil?
+	def offerings
+		@offerings ||= @capabilities.contents.offerings
 	end
-	
 end

data/lib/sosHelper.rb

@@ -0,0 +1,26 @@
+require 'nokogiri'
+require 'set'
+require_relative 'boss'
+require_relative 'factory'
+require_relative 'capability'
+require_relative 'observation'
+
+module SOSHelper
+	Urls = ["http://cgis.csrsr.ncu.edu.tw:8080/swcb-sos-new/service",
+			  "http://cgis.csrsr.ncu.edu.tw:8080/epa-sos/service",
+			  "http://cgis.csrsr.ncu.edu.tw:8080/epa-aqx-sos/service"].freeze
+
+	Relics = ["offering","observedProperty",
+	     "featureOfInterest",
+		 "procedure", "spatialFilter", 
+		 "temporalFilter", "responseFormat"].freeze
+
+	fpath = File.dirname(__FILE__) + "/request/getObservation.xml"
+	ObservationRequest = File.open( fpath ) { |f| Nokogiri::XML(f)  }.freeze
+	
+end
+
+# o = SOSHelper::GetObservation.new
+# o.filter({:offering => "鳳義坑"}).filter({:observedProperty => "urn:ogc:def:phenomenon:OGC:1.0.30:rainfall_1day"})
+# c = o.filter({:temporalFilter => :during })
+# p c

data/lib/tags.rb

@@ -0,0 +1,17 @@
+module SOSHelper
+	Ruler = {offering: "sos:offering", 
+		     procedure: "sos:procedure",
+			 observedProperty: "sos:observedProperty",
+			 featureOfInterest: "sos:featureOfInterest",
+			 spatialFilter: "sos:spatialFilter",
+			 temporalFilter: "sos:temporalFilter",
+			 responseFormat: "sos:responseFormat",
+			 after: "fes:After",
+			 during: "fes:During",
+			 tequals: "fes:TEquals",
+			 valueReference: "fes:ValueReference",
+			 timePeriod: "gml:TimePeriod",
+			 beginPosition: "gml:beginPosition",
+			 endPosition: "gml:endPosition" }
+
+end 

data/lib/xmlRequest.rb

@@ -0,0 +1,64 @@
+require "uri"
+require "net/http"
+require "json"
+
+# To send get or post request with custom payload.
+# 
+# Usage:
+# => hello = XmlRequest.new( uri )
+# => hello.get({service: "SOS", request: "GetCapabilities"})
+#
+class XmlRequest
+
+	attr_accessor :uri, :packet, :post
+
+	def initialize(url)
+		@uri = url
+		@packet = Net::HTTP.new(uri.host, uri.port)
+		@query = nil
+	end
+
+	def post(body=nil, &block)
+		@post = Net::HTTP::Post.new(uri.path)
+		@post["Content-type"] = "application/xml"
+		@post.body = body
+		File.new("./response/send_post", "w").write body
+		@res = send @post
+		@result = yield @res.body if block_given?
+	end
+
+	def get(query={}, &block)
+		fullPath = path_combine query
+		@get = Net::HTTP::Get.new(fullPath)
+		@res = send @get
+		File.new("./response/tmp_GetCapability", "w").write @res.body
+		@result = yield @res.body if block_given?
+	end
+
+	private
+
+	def uri
+		URI(@uri)
+	end
+
+	def path_combine(query={})
+		params = URI.encode_www_form(query)
+		[uri.path, params].join('?')
+	end
+
+	def send(action)
+		@packet.request( action )
+	end
+
+end
+
+# xml = '<?xml version="1.0" encoding="UTF-8"?>
+# <GetObservation service="SOS" version="2.0.0" xmlns="http://www.opengis.net/sos/2.0"  xmlns:wsa="http://www.w3.org/2005/08/addressing" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:swe="http://www.opengis.net/swe/2.0" xmlns:swes="http://www.opengis.net/swes/2.0" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:gml="http://www.opengis.net/gml/32" xmlns:ogc="http://www.opengis.net/ogc" xmlns:om="http://www.opengis.net/om/1.0" xsi:schemaLocation="http://www.w3.org/2003/05/soap-envelope http://www.w3.org/2003/05/soap-envelope/soap-envelope.xsd http://www.opengis.net/sos/2.0 http://schemas.opengis.net/sos/2.0/sos.xsd">
+# 	<procedure>urn:ogc:object:feature:Sensor:SWCB:sensor鳳義坑</procedure>
+# 	<offering>鳳義坑</offering>
+# 	<observedProperty>urn:ogc:def:phenomenon:OGC:1.0.30:rainfall_1day</observedProperty>
+
+# 	<responseFormat>application/json</responseFormat>
+# </GetObservation>'
+
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sos-core
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.6
 platform: ruby
 authors:
 - Zil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-17 00:00:00.000000000 Z
+date: 2016-04-26 00:00:00.000000000 Z
 dependencies: []
 description: A helper for Sensor Observation Service
 email: k471352@gmail.com
@@ -16,9 +16,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/board_of_directors/boss.rb
-- lib/board_of_directors/factory/factory.rb
-- lib/board_of_directors/factory/hashMerge.rb
+- lib/boss.rb
+- lib/capability.rb
+- lib/company.rb
 - lib/employees/fes.rb
 - lib/employees/fes/comparisonOps/propertyIsBetween.rb
 - lib/employees/fes/comparisonOps/propertyIsEqualTo.rb
@@ -66,6 +66,7 @@ files:
 - lib/employees/gml/end.rb
 - lib/employees/gml/envelope.rb
 - lib/employees/gml/exterior.rb
+- lib/employees/gml/gmlTime.rb
 - lib/employees/gml/linearRing.rb
 - lib/employees/gml/lowerCorner.rb
 - lib/employees/gml/polygon.rb
@@ -79,16 +80,20 @@ files:
 - lib/employees/mankind/people.rb
 - lib/employees/mankind/simple.rb
 - lib/employees/sos.rb
+- lib/employees/sos/contents.rb
 - lib/employees/sos/offering.rb
 - lib/employees/sos/temporalFilter.rb
+- lib/employees/sos/time.rb
+- lib/employees/swes/offering.rb
+- lib/factory.rb
+- lib/hashMerge.rb
+- lib/node.rb
+- lib/observation.rb
+- lib/request/getObservation.xml
 - lib/sos-core.rb
-- lib/sos-helper.rb
-- lib/sos_helper/capability.rb
-- lib/sos_helper/getObservation.xml
-- lib/sos_helper/node.rb
-- lib/sos_helper/observation.rb
-- lib/sos_helper/offering.rb
-- lib/sos_helper/xmlRequest.rb
+- lib/sosHelper.rb
+- lib/tags.rb
+- lib/xmlRequest.rb
 homepage: https://github.com/MOSapeizer/SOS
 licenses:
 - MIT

data/lib/sos-helper.rb

@@ -1,21 +0,0 @@
-require 'set'
-require 'nokogiri'
-Dir[ File.dirname(__FILE__) + "/employees/*.rb"].each {|file| require file }
-require_relative 'board_of_directors/factory/factory.rb'
-require_relative 'board_of_directors/boss.rb'
-Dir[ File.dirname(__FILE__) + "/sos_helper/*.rb"].each {|file| require file }
-
-module SOSHelper
-	Dir[ File.dirname(__FILE__) + "/sos_helper/*.rb"]
-	Urls = ["http://cgis.csrsr.ncu.edu.tw:8080/swcb-sos-new/service",
-			  "http://cgis.csrsr.ncu.edu.tw:8080/epa-sos/service",
-			  "http://cgis.csrsr.ncu.edu.tw:8080/epa-aqx-sos/service"].freeze
-
-	Relics = ["offering","observedProperty",
-	     "featureOfInterest",
-		 "procedure", "spatialFilter", 
-		 "temporalFilter", "responseFormat"].freeze
-
-	ObservationRequest = File.open(File.dirname(__FILE__) + '/sos_helper/getObservation.xml') { |f| Nokogiri::XML(f)  }.freeze
-
-end

data/lib/sos_helper/offering.rb

@@ -1,49 +0,0 @@
-require_relative 'node'
-
-module SOSHelper
-	class Offering
-		ATRRIBUTES = [ :identifier, :procedure, :observableProperty, :observedArea, :resultTime, :phenomenonTime, :node ]
-		ATRRIBUTES.each { |t| attr_reader t }
-
-		def initialize(xml_offer)
-			@node = Node.new xml_offer
-			@id, @procedure = getText(:id), getText(:procedure)
-			@observableProperty = getList(:observableProperty)
-			@observedArea = getHash(:observedArea, [:lowerCorner, :upperCorner])
-			@phenomenonTime = getHash(:phenomenonTime, [:begin, :end])
-			@resultTime = getHash(:resultTime, [:begin, :end])
-
-		end
-
-		def getText(name)
-			@node[name].text
-		end
-
-		def getList(name)
-			@node[name].children.map { |node| node.text }
-		end
-
-		def getHash(name, scope=[])
-			hash = {}
-			scope.each { |s| hash.store(s, @node[name][s].text )} unless scope.empty?
-			hash
-		end
-
-		def to_json
-			{ "identifier": @id, 
-			  "procedure": @procedure,
-			  "observableProperty": @observableProperty,
-			  "observedArea": @observedArea,
-			  "phenomenonTime": @phenomenonTime,
-			  "resultTime": @resultTime }
-		end
-
-		def to_s
-			to_json.to_s
-		end
-
-	end
-
-end
-# p a.node.inspect
-# p a.to_json

data/lib/sos_helper/xmlRequest.rb

@@ -1,54 +0,0 @@
-require "uri"
-require "net/http"
-require "json"
-
-# To send get or post request with custom payload.
-# 
-# Usage:
-# => hello = XmlRequest.new( uri )
-# => hello.get({service: "SOS", request: "GetCapabilities"})
-#
-class XmlRequest
-
-	attr_accessor :uri, :packet, :post
-
-	def initialize(url)
-		@uri = url
-		@packet = Net::HTTP.new(uri.host, uri.port)
-		@query = nil
-	end
-
-	def post(body=nil, &block)
-		@post = Net::HTTP::Post.new(uri.path)
-		@post["Content-type"] = "application/xml"
-		@post.body = body
-		# File.new("./request/request-tmp", "w").write body.dup
-		p body, "packet sending, it may take times to get response..."
-		@res = send @post
-		@result = yield @res.body if block_given?
-	end
-
-	def get(query={}, &block)
-		fullPath = path_combine query
-		@get = Net::HTTP::Get.new(fullPath)
-		@res = send @get
-		@result = yield @res.body if block_given?
-	end
-
-	private
-
-	def uri
-		URI(@uri)
-	end
-
-	def path_combine(query={})
-		params = URI.encode_www_form(query)
-		[uri.path, params].join('?')
-	end
-
-	def send(action)
-		@packet.request( action )
-	end
-
-end
-