geo_api 0.0.13 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dabec2af76e68f5dc969bc7edf82e9a1edd9f303
-  data.tar.gz: d402d1ae5bd493c33e325683659f0ec088cf18e6
+  metadata.gz: 4f55ed5220b1ed6a8386182489524d2321644003
+  data.tar.gz: 3ad607c47d03b4e4601a20c6b6add414cc11fafb
 SHA512:
-  metadata.gz: 48856628437017b00b0153ec290cfe2e5bb2a3446658afcb72970f51bc95729390a16fbae2407e72da0b7f0fe58bfb18c74823ff4c1a231288feb1295edd8a06
-  data.tar.gz: e2ff76e5e705494a1555f535bb15f53e4be7a7fdd1339d13af4bdd7e5dade64a7507751a4a26c15a39a2ad2440a70c08ec0851a03f7a841bd3c407a42d4ae08b
+  metadata.gz: 5ad3562bda56c8172cef6ad223a0b2c1cb7f651b7b949558e030570dd03bc7e3fe82c62d19bfd8bb4c0fa0efb52ed37e17fb9e34998f1fe4cc5bb2112131445b
+  data.tar.gz: 86a3f9ca3f6e1b6764e270955f27e969b4679c760357adb90cc506dac4e99d7c545fbe0887fdbc0cb2c50b2a226ab98052c24319351b4eebc187a08ef9329608

data/geo_api.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.version       = GeoApi::VERSION
   spec.authors       = ["liuzelei"]
   spec.email         = ["liuzelei@gmail.com"]
-  spec.description   = '%q{基础地理位置服务}'
-  spec.summary       = '%q{提供字符串解析,经纬度解析映射等}'
+  spec.description   = '基础地理位置服务'
+  spec.summary       = '提供字符串解析,经纬度解析映射等'
   spec.homepage      = ""
   spec.license       = "MIT"
 

data/lib/geo_api/models/{location_log.rb → log.rb}

@@ -1,7 +1,7 @@
 require 'mongoid'
 module GeoApi
   module Models
-    class LocationLog
+    class Log
       include Mongoid::Document
 
       field :url, type: String

data/lib/geo_api/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module GeoApi
-  VERSION = "0.0.13"
+  VERSION = "0.1.0"
 end

data/lib/geo_api.rb

@@ -1,9 +1,10 @@
 # encoding: utf-8
 require "geo_api/version"
-require 'geo_api/location_service'
 require 'geo_api/configuration'
-require 'geo_api/models/location_log'
+require 'geo_api/models/log'
 require 'logger'
+require 'net/http'
+require 'json'
 
 module GeoApi
   class << self
@@ -18,5 +19,77 @@ module GeoApi
     def logger
       @logger ||= Logger.new(STDOUT)
     end
+
+    def get_location_from_string(location)
+      unless location.blank?
+        formated_address = location.split(/,|-|;|>|:|\+|\^/)
+        databack = Hash.new
+        databack["province"] = formated_address[0] if formated_address.length > 0
+        databack["city"] = formated_address[1] if formated_address.length > 1
+        databack["region"] = formated_address[2] if formated_address.length > 2
+        databack["detail"] = formated_address[3] if formated_address.length > 3
+        databack["latitude"] = ""
+        databack["longitude"] = ""
+
+        if ["重庆市", "上海市", "北京市", "天津市"].include?(databack["province"])
+          databack["region"] = databack["city"]
+          databack["city"] = databack["province"]
+        end
+
+        return databack
+      else
+        return nil
+      end
+    end
+
+    def get_location_from_coordinate(latitude, longitude, coordtype = 5)
+      params = { location: "%s,%s" % [latitude, longitude], coordtype: coordtype, key: GeoApi.config.key }
+      result = send_request(params)
+      if result && result["status"] == 0 && result["result"]
+        databack = Hash.new
+        databack["address"] = result["result"]["address"]
+        databack["province"] = result["result"]["address_component"]["province"]
+        databack["city"] = result["result"]["address_component"]["city"]
+        databack["region"] = result["result"]["address_component"]["district"]
+        databack["detail"] = result["result"]["address_component"]["street"] + result["result"]["address_component"]["street_number"]
+        databack["latitude"] = result["result"]["location"]["lat"].to_s
+        databack["longitude"] = result["result"]["location"]["lng"].to_s
+
+        return databack
+      else
+        return nil
+      end
+    end
+
+    def get_coordinate_from_string(location, city = nil)
+      params = { address: location, region: city, key: GeoApi.config.key }
+      result = send_request(params)
+
+      if result["status"] == 0
+        return result["result"]
+      else
+        return nil
+      end
+    end
+
+    private
+    def send_request(params)
+      uri = URI(GeoApi.config.server)
+      params[:output] = 'json'
+      uri.query = URI.encode_www_form(params)
+      res = Net::HTTP.get_response(uri)
+      log = GeoApi::Models::Log.new
+      log.url = uri
+      begin
+        log.request = JSON.parse(params.to_json)
+      rescue
+        log.raw_request = params
+      end
+      log.response = JSON.parse(res.body) if res.is_a?(Net::HTTPSuccess)# && !res.body.blank?
+      log.save
+      result = JSON.parse(res.body) if res.is_a?(Net::HTTPSuccess)# && !res.body.blank?
+
+      return result
+    end
   end
 end

data/spec/location_spec.rb

@@ -3,20 +3,20 @@ require 'spec_helper'
 
 describe "test location" do
   it "should get location by string" do
-    location = GeoApi::LocationService.instance.get_location_from_string("上海市-灵岩路-79弄1号")
+    location = GeoApi.get_location_from_string("上海市-灵岩路-79弄1号")
     expect(location["province"]).to eq("上海市")
     expect(location["city"]).to eq("上海市")
     #expect(location["region"]).to eq("浦东新区")
 
-    location = GeoApi::LocationService.instance.get_location_from_string("")
+    location = GeoApi.get_location_from_string("")
     expect(location).to eq(nil)
 
-    location = GeoApi::LocationService.instance.get_location_from_string("青海省,西宁市,城北区")
+    location = GeoApi.get_location_from_string("青海省,西宁市,城北区")
     expect(location["province"]).to eq("青海省")
     expect(location["city"]).to eq("西宁市")
     expect(location["region"]).to eq("城北区")
 
-    # location = GeoApi::LocationService.instance.get_location_from_string("城北区")
+    # location = GeoApi.get_location_from_string("城北区")
     # expect(location["province"]).not_to eq("城北区")
   end
 end
@@ -27,7 +27,7 @@ describe "test location form coordinate" do
     latitude = "39.9834"
     longitude = "116.3229"
 
-    location = GeoApi::LocationService.instance.get_location_from_coordinate(latitude, longitude, 5)
+    location = GeoApi.get_location_from_coordinate(latitude, longitude, 5)
     expect(location["province"]).to eq("北京市")
     expect(location["city"]).to eq("北京市")
     expect(location["region"]).to eq("海淀区")
@@ -35,28 +35,28 @@ describe "test location form coordinate" do
     latitude = "36.66"
     longitude = "101.76"
 
-    location = GeoApi::LocationService.instance.get_location_from_coordinate(latitude, longitude, 5)
+    location = GeoApi.get_location_from_coordinate(latitude, longitude, 5)
     expect(location["province"]).to eq("青海省")
     expect(location["city"]).to eq("西宁市")
     expect(location["region"]).to eq("城北区")
   end
 
   it "should get coordinate from  string" do
-    result = GeoApi::LocationService.instance.get_coordinate_from_string("思南路115弄")
-    
+    result = GeoApi.get_coordinate_from_string("思南路115弄")
+    p result
     expect(result["location"]).not_to be_empty
 
-    result = GeoApi::LocationService.instance.get_coordinate_from_string("思南路115弄","上海市")
+    result = GeoApi.get_coordinate_from_string("思南路115弄", "上海市")
    
     expect(result["location"]).not_to be_empty
 
-    result = GeoApi::LocationService.instance.get_coordinate_from_string("")
+    result = GeoApi.get_coordinate_from_string("")
     
     expect(result).to eq(nil)
 
 
     # 500.times do
-    #   result = GeoApi::LocationService.instance.get_coordinate_from_string("思南路115弄")
+    #   result = GeoApi.get_coordinate_from_string("思南路115弄")
     #   if result.nil?
     #     GeoApi.logger.debug("====失败!")
     #   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geo_api
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.1.0
 platform: ruby
 authors:
 - liuzelei
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-17 00:00:00.000000000 Z
+date: 2015-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,7 +108,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: "%q{基础地理位置服务}"
+description: "基础地理位置服务"
 email:
 - liuzelei@gmail.com
 executables: []
@@ -128,8 +128,7 @@ files:
 - lib/generators/geo_api/templates/initializer.rb
 - lib/geo_api.rb
 - lib/geo_api/configuration.rb
-- lib/geo_api/location_service.rb
-- lib/geo_api/models/location_log.rb
+- lib/geo_api/models/log.rb
 - lib/geo_api/version.rb
 - spec/location_spec.rb
 - spec/spec_helper.rb
@@ -156,7 +155,7 @@ rubyforge_project:
 rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
-summary: "%q{提供字符串解析,经纬度解析映射等}"
+summary: "提供字符串解析,经纬度解析映射等"
 test_files:
 - spec/location_spec.rb
 - spec/spec_helper.rb

data/lib/geo_api/location_service.rb

@@ -1,88 +0,0 @@
-# encoding: utf-8
-require 'singleton'
-require 'net/http'
-require 'json'
-
-module GeoApi
-  class LocationService
-    include Singleton
-
-    def get_location_from_string(location)
-      #params = { address: location }
-      #result = send_request(params)
-
-      unless location.blank?
-        
-        formated_address = location.split(/,|-|;|>|:|\+|\^/)
-        databack = Hash.new
-        databack["province"] = formated_address[0] if formated_address.length > 0
-        databack["city"] = formated_address[1] if formated_address.length > 1
-        databack["region"] = formated_address[2] if formated_address.length > 2
-        databack["detail"] = formated_address[3] if formated_address.length > 3
-        databack["latitude"] = ""
-        databack["longitude"] = ""
-
-        if ["重庆市", "上海市", "北京市", "天津市"].include?(databack["province"])
-          databack["region"] = databack["city"]
-          databack["city"] = databack["province"]
-        end
-
-        return databack
-      else
-        return nil
-      end
-    end
-
-    def get_location_from_coordinate(latitude, longitude, coordtype = 5)
-      params = { location: "%s,%s" % [latitude, longitude], coordtype: coordtype, key: GeoApi.config.key }
-      result = send_request(params)
-      if result && result["status"] == 0 && result["result"]
-        databack = Hash.new
-        databack["address"] = result["result"]["address"]
-        databack["province"] = result["result"]["address_component"]["province"]
-        databack["city"] = result["result"]["address_component"]["city"]
-        databack["region"] = result["result"]["address_component"]["district"]
-        databack["detail"] = result["result"]["address_component"]["street"] + result["result"]["address_component"]["street_number"]
-        databack["latitude"] = result["result"]["location"]["lat"].to_s
-        databack["longitude"] = result["result"]["location"]["lng"].to_s
-
-        return databack
-      else
-        return nil
-      end
-    end
-
-    def get_coordinate_from_string(location, city = nil)
-      params = { address: location, region: city, key: GeoApi.config.key }
-      result = send_request(params)
-
-      if result["status"] == 0
-        return result["result"]
-      else
-        return nil
-      end
-    end
-
-
-    private
-    def send_request(params)
-      uri = URI(GeoApi.config.server)
-      params[:output] = 'json'
-      uri.query = URI.encode_www_form(params)
-      res = Net::HTTP.get_response(uri)
-      log = GeoApi::Models::LocationLog.new
-      log.url = uri
-      begin
-        log.request = JSON.parse(params.to_json)
-      rescue
-        log.raw_request = params
-      end
-      log.response = JSON.parse(res.body) if res.is_a?(Net::HTTPSuccess)# && !res.body.blank?
-      log.save
-      result = JSON.parse(res.body) if res.is_a?(Net::HTTPSuccess)# && !res.body.blank?
-
-      return result
-    end
-
-  end
-end