eric_tools 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db3336f28702f22ed3431fff3642b4fcf02818af
-  data.tar.gz: d952f91e7a6ace9401a7aa750e7e671d4c86f5cf
+  metadata.gz: 5fb1fb6cc60b5a28bd2f16ef58f8475ec0a66b49
+  data.tar.gz: 691d3f191af96e0e7f753711d30a450596669bef
 SHA512:
-  metadata.gz: 27332345884273f9c52bcc1c56254a49fb11107193db6bb42919c8d004c280bf2e610ca21a8c7a69ef3d2692aa29513778d97a9de7b70255e3c44bbde20a5a78
-  data.tar.gz: ec9525e5904b71b52cae2e1cb06c00db6c061be90e9980fdcfd2ec3ed6ffffdc5658edeedcb47359249503795b9903b5f74c429355f81467ed7d28913955fe20
+  metadata.gz: 9d09bf9a8dbc10698f9691f56195f76f5dd7d0871c9343745a497f8609873dea7856c187565f3b4191f53c3cfbb2b3bc729f4325dd79146de33d4ff1ae25d602
+  data.tar.gz: 8a9b74bb0fe87b23056784c8e3ea6370c287943a9645aa1fa391309db903b270bbd1b22edc30a4a9a0e513fe5e587ff8c4c108cf1154fcefb11c90fae154a2e5

data/Gemfile

@@ -2,3 +2,6 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in eric_tools.gemspec
 gemspec :name => 'eric_tools'
+
+gem 'nokogiri'
+gem 'rest-client'

data/Rakefile

@@ -1,2 +1,8 @@
 require "bundler/gem_tasks"
 
+Rake::TestTask.new do |t|
+  t.libs << 'test'
+end
+
+desc "Run tests"
+task :default => :test

data/eric_tools.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.version       = EricTools::VERSION
   spec.authors       = ["刘晓琦"]
   spec.email         = ["ericliu@ikidstv.com"]
-  spec.summary       = %q{一些简单的类方法}
-  spec.description   = %q{详细描述后续再加}
+  spec.summary       = %q{在Rails框架基础上，对一些类增加一些工具方法。同时封装了一些平时比较常用的函数，如uuid, 随字数，根据ip获得城市名称等}
+  spec.description   = %q{1.在Rails框架基础上，对一些类增加一些工具方法。 2.增加了一些工具类，如uuid,生成随机字符串，根据Ip获取城市名称等  3.一些有用的正则表达式}
   spec.homepage      = ""
   spec.license       = "MIT"
 
@@ -18,9 +18,12 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency 'rubygems', '~> 0'
-  spec.add_development_dependency "bundler", "~> 1.6"
-  spec.add_development_dependency "rake", "~> 0"
-  spec.add_development_dependency "nokogiri", '~> 0'
+
+
+
+  spec.add_dependency "nokogiri", '~> 1.6'
+  spec.add_dependency 'rest-client', '~> 1.8'
+
+
 
 end

data/lib/eric_tools.rb

@@ -1,5 +1,7 @@
 require 'nokogiri'
+require 'rest_client'
 require "eric_tools/version"
+require 'json'
 
 require File.dirname(__FILE__) + '/eric_tools/array.rb'
 require File.dirname(__FILE__) + '/eric_tools/business_exception.rb'
@@ -12,12 +14,24 @@ require File.dirname(__FILE__) + '/eric_tools/symbol.rb'
 require File.dirname(__FILE__) + '/eric_tools/time.rb'
 require File.dirname(__FILE__) + '/eric_tools/version.rb'
 
-
-
-
 module EricTools
+
+  ##
+  # ===功能描述
+  # 根据ip获取城市名称。
+  # ===参数说明
+  # ak：需要从百度申请每个应用的ak，用于根据ip查找城市名称，每个ak每天限制调用100万次。
+  # ip: 需要获取城市名称的ip
+  # ===返回值
+  # 返回一个hash , 其中，通地
+  # :city 获取城市名称
+  # :province 获以省份名称
+  # :address 地址详细信息：如 CN|上海|上海|None|CHINANET|0|0
+  # ===示例
+  # EricTools.uuid
   def self.uuid
     UUIDTools::UUID.timestamp_create.to_s
+
   end
 
   #type＝1表示只包含数字，type＝2表示只包含字母，type＝3表示都包含
@@ -32,6 +46,26 @@ module EricTools
     end
   end
 
+  ##
+  # ===功能描述
+  # 根据ip获取城市名称。
+  # ===参数说明
+  # ak：需要从百度申请每个应用的ak，用于根据ip查找城市名称，每个ak每天限制调用100万次。
+  # ip: 需要获取城市名称的ip
+  # ===返回值
+  # 返回一个hash , 其中，通地
+  # :city 获取城市名称
+  # :province 获以省份名称
+  # :address 地址详细信息：如 CN|上海|上海|None|CHINANET|0|0
+  # ===示例
+  # EricTools.get_city_name_from_ip {:ak=> 'HS8ViRxQT0xMu8d3uARISMif', :ip => '101.231.116.38', :default_province => '上海', :default_city => '上海'}
+
+  def self.get_city_name_from_ip options
+    response = RestClient.get("http://api.map.baidu.com/location/ip?ak=#{options[:ak]}&ip=#{options[:ip]}")
+    response = JSON.parse(response.body)
+    {:address => response["address"], :province => response["content"]["address_detail"]["province"], :city => response["content"]["address_detail"]["city"]} rescue {}
+  end
+
   module RegularConstants
     EmailRegular = /\A[\w+\-.]+@[a-z\d\-]+(?:\.[a-z\d\-]+)*\.[a-z]+\z/i
     UserNameRegular = /\A[a-zA-Z_\d\s-]*\z/

data/lib/eric_tools/version.rb

@@ -1,3 +1,3 @@
 module EricTools
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/test/test_eric_tools.rb

@@ -0,0 +1,7 @@
+require 'eric_tools'
+describe "get_city_name_from_ip" do
+  it 'should be shanghai' do
+    response = EricTools.get_city_name_from_ip :ak => 'HS8ViRxQT0xMu8d3uARISMif', :ip => '101.231.116.38'
+    response["city"].equal? '上海'
+  end
+end

metadata

@@ -1,37 +1,23 @@
 --- !ruby/object:Gem::Specification
 name: eric_tools
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - 刘晓琦
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-04 00:00:00.000000000 Z
+date: 2015-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rubygems
-  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: bundler
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -39,34 +25,20 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
-  name: rake
-  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: nokogiri
+  name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: '1.8'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-description: 详细描述后续再加
+        version: '1.8'
+description: 1.在Rails框架基础上，对一些类增加一些工具方法。 2.增加了一些工具类，如uuid,生成随机字符串，根据Ip获取城市名称等  3.一些有用的正则表达式
 email:
 - ericliu@ikidstv.com
 executables: []
@@ -91,6 +63,7 @@ files:
 - lib/eric_tools/symbol.rb
 - lib/eric_tools/time.rb
 - lib/eric_tools/version.rb
+- test/test_eric_tools.rb
 homepage: ''
 licenses:
 - MIT
@@ -114,5 +87,6 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: 一些简单的类方法
-test_files: []
+summary: 在Rails框架基础上，对一些类增加一些工具方法。同时封装了一些平时比较常用的函数，如uuid, 随字数，根据ip获得城市名称等
+test_files:
+- test/test_eric_tools.rb