juhe_ruby 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 684f19c825860c8b271bdc072aa07967d537ee94
-  data.tar.gz: f56c7b9b7eb8448ac3128ed8fd5df7ccd5aa6a29
+  metadata.gz: f855a236ca62e1b5eeedbb1143f34a178d5a9ba2
+  data.tar.gz: 58a0ddce2ca3a2e579b0c7dfd2ca39a341aa1413
 SHA512:
-  metadata.gz: 74bdf713ce1a3f79e9adfd72c87fd564359e231ef1e9063da027323df058b19f2dd93e34c2b2837a730830c55732ee76e4dd0d800988860e6ac9c57410aafb35
-  data.tar.gz: 2c3e65b1dc430ee01019c606394eea931aca858c2f1252230ccbdb898176cbb3e3438cc3e528c9905c645b40a51c737e8ad62b25626296a5bc1ea855108b2584
+  metadata.gz: 49c01ea189dc1fff7b6f287773276671da002704bfb652556410df3c7848873031947d010220316303f694774cad464ff7a5121fa612d1fafcba236f2916af41
+  data.tar.gz: 590f39e638ff6d43640537a9dbe721dd60be296cbf26823322a105346d2e545cb35074ac678b6d99bfd18acfb07d23fd9ae64c247e616084a16150dcf7e6e2c6

data/README.md

@@ -29,15 +29,15 @@ Juhe::Express.search("顺丰", "575677355677")
 ```
 或者直接将app_key作为参数:
 ```ruby
-Juhe::Express.search("顺丰", "575677355677", "d85fa433fb8f30419dc1b3697b035b3d")
+Juhe::Express.search("顺丰", "575677355677", app_key: "d85fa433fb8f30419dc1b3697b035b3d")
 ```
 返回Hash数组：
 ```ruby
 [
   {
-    "datetime":"2013-06-25 10:44:05",# 时间
-    "remark":"已收件",# 描述
-    "zone":"台州市"# 区域
+    "datetime":"2013-06-25 10:44:05", # 时间
+    "remark":"已收件", # 描述
+    "zone":"台州市" # 区域
   },
   {
   "datetime":"2013-06-25 11:05:21",
@@ -81,3 +81,10 @@ Juhe::Express.search("顺丰", "575677355677", "d85fa433fb8f30419dc1b3697b035b3d
   }
 ]
 ```
+程序第一次运行会获取快递公司列表，如果想手动刷新快递公司信息：
+```ruby
+Juhe.app_key = "d85fa433fb8f30419dc1b3697b035b3d"
+Juhe::Express.refresh_companies
+# or
+Juhe::Express.refresh_companies(app_key: "d85fa433fb8f30419dc1b3697b035b3d")
+```

data/lib/juhe_ruby/express.rb

@@ -10,16 +10,25 @@ module Juhe
       base.extend ClassMethods
     end
 
+    class << self
+      attr_accessor :companies
+    end
+
     module ClassMethods
-      def company_code_of(company_name, app_key = nil)
-        app_key ||= Juhe.app_key
-        result = JSON.parse(open(BASE_URL+"?key="+app_key).read)
-        raise result["reason"] if result["resultcode"] != "200"
+      def company_code_of(company_name, options = nil)
+        refresh_companies(options) if @companies.nil?
 
-        result["result"].each do |company|
+        @companies.each do |company|
           return company["no"] if company["com"] == company_name
         end
       end
+
+      def refresh_companies(options)
+        app_key = (options[:app_key] if options) || Juhe.app_key
+        result = JSON.parse(open(BASE_URL+"?key="+app_key).read)
+        raise result["reason"] if result["resultcode"] != "200"
+        @companies = result["result"]
+      end
     end
   end
 
@@ -28,19 +37,17 @@ module Juhe
 
     BASE_URL = "http://v.juhe.cn/exp/index"
 
-    def self.search(company_name, number, app_key = nil)
-      app_key ||= Juhe.app_key
+    def self.search(company_name, number, options = nil)
+      app_key = (options[:app_key] if options) || Juhe.app_key
       url = BASE_URL \
             + "?key=" \
             + app_key \
             + "&no=" + number \
-            + "&com=" + company_code_of(company_name, app_key)
+            + "&com=" + company_code_of(company_name, options)
 
       result = JSON.parse(open(url).read)
-      raise result["reason"].to_s if result["resultcode"] != "200"
+      raise result["reason"] if result["resultcode"] != "200"
       result["result"]
     end
   end
-
-
 end

data/lib/juhe_ruby/version.rb

@@ -1,3 +1,3 @@
 module JuheRuby
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/test/express/express_test.rb

@@ -0,0 +1,30 @@
+require "test_helper"
+
+class Juhe::ExpressTest < Test::Unit::TestCase
+  def setup
+    Juhe.app_key = "d85fa433fd8f30419dc1b3697b035b3d"
+  end
+
+  def test_app_key
+    Juhe.app_key = "123456"
+    assert_equal(Juhe.app_key, "123456")
+  end
+
+  def test_company_of_name
+    assert_equal(Juhe::Express.company_code_of("申通"), "sto")
+  end
+
+  def test_search_without_app_key
+    assert_equal(Juhe::Express.search("顺丰", "575677355677")["com"], "sf")
+  end
+
+  def test_search_with_app_key
+    Juhe.app_key = ""
+    result = Juhe::Express.search(
+      "顺丰",
+      "575677355677",
+      app_key: "d85fa433fd8f30419dc1b3697b035b3d"
+    )
+    assert_equal(result["com"], "sf")
+  end
+end

data/test/test_helper.rb

@@ -0,0 +1,2 @@
+require 'test/unit'
+require "juhe_ruby"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: juhe_ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - linuxnerd
@@ -54,6 +54,8 @@ files:
 - lib/juhe_ruby.rb
 - lib/juhe_ruby/express.rb
 - lib/juhe_ruby/version.rb
+- test/express/express_test.rb
+- test/test_helper.rb
 homepage: https://github.com/linuxnerd/juhe_ruby
 licenses:
 - MIT
@@ -78,4 +80,6 @@ rubygems_version: 2.1.10
 signing_key: 
 specification_version: 4
 summary: '"聚合ruby api"'
-test_files: []
+test_files:
+- test/express/express_test.rb
+- test/test_helper.rb