juhe_ruby 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f855a236ca62e1b5eeedbb1143f34a178d5a9ba2
-  data.tar.gz: 58a0ddce2ca3a2e579b0c7dfd2ca39a341aa1413
+  metadata.gz: 7efe5f04f612bc16d7e09e65cb6f2fb167a276f4
+  data.tar.gz: 3db3d59dfb27c9f4e02454df623567019b42db1d
 SHA512:
-  metadata.gz: 49c01ea189dc1fff7b6f287773276671da002704bfb652556410df3c7848873031947d010220316303f694774cad464ff7a5121fa612d1fafcba236f2916af41
-  data.tar.gz: 590f39e638ff6d43640537a9dbe721dd60be296cbf26823322a105346d2e545cb35074ac678b6d99bfd18acfb07d23fd9ae64c247e616084a16150dcf7e6e2c6
+  metadata.gz: 9ab3b545c5e844313864761184e085ec9308ee388a5f6644e7e10bc57257c70ab3f07d82199fde37fe8fc26b0c693c3a983fcae23cbf4584b1e989daf18f671f
+  data.tar.gz: 0af455ab11fa6bf67829b38a484782496113b883624ac6b403c77158ca6ef57f631e3c728f311f48af5a0c40f4efa2cd37b694bcd47f490287a6ff0a3f8c2d6c

data/README.md

@@ -22,9 +22,11 @@ $ gem install juhe_ruby
 ## 用法
 
 ### 常用快递查询
-为app_key一次赋值，多次查询
+目前支持的快递公司，`%w[顺丰 申通 圆通 韵达 天天 EMS 中通 汇通]`详细的请在[聚合页面](http://www.juhe.cn/docs/api/id/43/aid/103)上查询。api在第一次查询的时候也会调用支持快递公司查询借口。
+
+具体用法为express_app_key一次赋值，多次查询：
 ```ruby
-Juhe.app_key = "d85fa433fb8f30419dc1b3697b035b3d" # 注册时，聚合提供的app_key
+Juhe.express_app_key = "d85fa433fb8f30419dc1b3697b035b3d" # 注册时，聚合提供的app_key
 Juhe::Express.search("顺丰", "575677355677")
 ```
 或者直接将app_key作为参数:
@@ -83,7 +85,7 @@ Juhe::Express.search("顺丰", "575677355677", app_key: "d85fa433fb8f30419dc1b36
 ```
 程序第一次运行会获取快递公司列表，如果想手动刷新快递公司信息：
 ```ruby
-Juhe.app_key = "d85fa433fb8f30419dc1b3697b035b3d"
+Juhe.express_app_key = "d85fa433fb8f30419dc1b3697b035b3d"
 Juhe::Express.refresh_companies
 # or
 Juhe::Express.refresh_companies(app_key: "d85fa433fb8f30419dc1b3697b035b3d")

data/lib/juhe_ruby/express.rb

@@ -2,45 +2,17 @@ require "open-uri"
 require "json"
 
 module Juhe
-
-  module ExpressCompany
-    BASE_URL = "http://v.juhe.cn/exp/com"
-
-    def self.included(base)
-      base.extend ClassMethods
-    end
+  module Express
+    BASE_URL = "http://v.juhe.cn/exp"
 
     class << self
       attr_accessor :companies
     end
 
-    module ClassMethods
-      def company_code_of(company_name, options = nil)
-        refresh_companies(options) if @companies.nil?
-
-        @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
-
-  module Express
-    include ExpressCompany
-
-    BASE_URL = "http://v.juhe.cn/exp/index"
-
     def self.search(company_name, number, options = nil)
-      app_key = (options[:app_key] if options) || Juhe.app_key
+      app_key = (options[:app_key] if options) || Juhe.express_app_key
       url = BASE_URL \
-            + "?key=" \
+            + "/index?key=" \
             + app_key \
             + "&no=" + number \
             + "&com=" + company_code_of(company_name, options)
@@ -49,5 +21,20 @@ module Juhe
       raise result["reason"] if result["resultcode"] != "200"
       result["result"]
     end
+
+    def self.company_code_of(company_name, options = nil)
+      refresh_companies(options) if @companies.nil?
+
+      @companies.each do |company|
+        return company["no"] if company["com"] == company_name
+      end
+    end
+
+    def self.refresh_companies(options)
+      app_key = (options[:app_key] if options) || Juhe.express_app_key
+      result = JSON.parse(open(BASE_URL+"/com?key="+app_key).read)
+      raise result["reason"] if result["resultcode"] != "200"
+      @companies = result["result"]
+    end
   end
 end

data/lib/juhe_ruby/version.rb

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

data/lib/juhe_ruby.rb

@@ -3,6 +3,11 @@ require "juhe_ruby/express"
 
 module Juhe
   class << self
-    attr_accessor :app_key
+    modules = Juhe.constants.map{ |el| Juhe.const_get(el) }.select{ |m| m.instance_of?(Module) }
+    modules.each do |mod|
+      if mod.to_s =~ /\AJuhe::(.*)/
+        attr_accessor "#{$1.downcase}_app_key".to_sym
+      end
+    end
   end
 end

data/test/express/express_test.rb

@@ -2,12 +2,12 @@ require "test_helper"
 
 class Juhe::ExpressTest < Test::Unit::TestCase
   def setup
-    Juhe.app_key = "d85fa433fd8f30419dc1b3697b035b3d"
+    Juhe.express_app_key = "d85fa433fd8f30419dc1b3697b035b3d"
   end
 
   def test_app_key
-    Juhe.app_key = "123456"
-    assert_equal(Juhe.app_key, "123456")
+    Juhe.express_app_key = "123456"
+    assert_equal(Juhe.express_app_key, "123456")
   end
 
   def test_company_of_name
@@ -19,7 +19,7 @@ class Juhe::ExpressTest < Test::Unit::TestCase
   end
 
   def test_search_with_app_key
-    Juhe.app_key = ""
+    Juhe.express_app_key = ""
     result = Juhe::Express.search(
       "顺丰",
       "575677355677",
@@ -27,4 +27,11 @@ class Juhe::ExpressTest < Test::Unit::TestCase
     )
     assert_equal(result["com"], "sf")
   end
+
+  def test_only_the_first_company_query_uses_api
+    first_time = Juhe::Express.company_code_of("申通") # => "sto"
+    Juhe::express_app_key = "wrong app key"
+    second_time = Juhe::Express.company_code_of("申通")
+    assert_equal(first_time, second_time)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: juhe_ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - linuxnerd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-23 00:00:00.000000000 Z
+date: 2014-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler