fanyi_api 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ff7d13c1eecc30e7b8079ad40b1d8746ab89514
-  data.tar.gz: 6a8123cc48afd24a16a952cb2046adeacd371389
+  metadata.gz: 5acb20d9fb0e14a8cacd63ddee7ed7e869aec194
+  data.tar.gz: 590dd6f6532468c99e46ad38487ba9e55c72ee7a
 SHA512:
-  metadata.gz: b6a44dfadfb3e5bbfd0ce2d4674d8a64c047af50e680525cafe1e734426d8851824356a86d2b80dc31b4ce4d50086f67666c2bdc35566096228cbf3fad793415
-  data.tar.gz: e2440d50b2214944710b99838048476b8ea0ccd5ed71694f07b05bc715192ed2ddd67a2b0cbe87a50967066366420474275035d7424ec9aac0299bb3e8884bfd
+  metadata.gz: 0a18358323939d825777fdd444cb05dd4bd194861287532b4c779f34fac6f378c565ef0ca94a5e7e21ecc16af20a0bde9af17de711857f9704dadaf68848a678
+  data.tar.gz: e01e652c752e223a37c31925b32d3f4cbd87343d0a1e356a59a6db8425d291a3a47d6080b2b00f2404934d617ba6c8dbd3886ef3a97e0d9face62921e5e410d2

data/lib/fanyi_api.rb

@@ -6,6 +6,7 @@ module FanyiAPI
 
   require_relative 'fanyi_api/strategies/default'
   require_relative 'fanyi_api/strategies/youdao'
+  require_relative 'fanyi_api/strategies/iciba'
 
   require_relative 'fanyi_api/api'
   require_relative 'fanyi_api/requester'

data/lib/fanyi_api/requester.rb

@@ -9,8 +9,7 @@ module FanyiAPI
 
     def call(query)
       raise InvalidQuery, "Invalid query" if query.blank?
-      url  = URI.encode(request_url)
-      resp = conn.get request_url, q: query
+      resp = conn.get request_url, { query_key => query } 
       parse resp
     end
 

data/lib/fanyi_api/strategies/default.rb

@@ -2,6 +2,7 @@ module FanyiAPI
   module Strategies
 
     InvalidStrategy = Class.new ArgumentError
+    InvalidKey      = Class.new ArgumentError
 
     class Default
 

data/lib/fanyi_api/strategies/iciba.rb

@@ -0,0 +1,30 @@
+module FanyiAPI
+  module Strategies
+    
+    class Iciba < Default
+
+      def initialize(params={})
+        @options = {
+          host:       "http://dict-co.iciba.com/api/dictionary.php",
+          type:       "json"
+        }.merge(params)
+      end
+
+      def api_url
+        @api_url ||= "#{@options[:host]}?type=#{@options[:type]}"
+      end
+
+      def request_url
+        raise InvalidKey, "Key is not provided!" if @options[:key].nil?
+
+        @request_url ||= api_url + "&key=" + @options[:key]
+      end
+
+      def query_key
+        :w
+      end
+
+    end
+  end
+
+end

data/lib/fanyi_api/strategies/youdao.rb

@@ -1,8 +1,6 @@
 module FanyiAPI
   module Strategies
 
-    InvalidKey   = Class.new ArgumentError
-
     class Youdao < Default
 
       def initialize(params={})
@@ -25,6 +23,10 @@ module FanyiAPI
         @request_url ||= api_url + "&keyfrom=" + @options[:keyfrom] + "&key=" + @options[:key]
       end
 
+      def query_key
+        :q
+      end
+
     end
   end
 

data/lib/fanyi_api/version.rb

@@ -1,5 +1,5 @@
 module FanyiAPI
 
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 
 end

data/spec/fanyi_api/strategies/iciba_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+describe FanyiAPI::Strategies::Iciba do
+
+  let(:strategy) { FanyiAPI::Strategies::Iciba.new(key: "key") }
+
+  it "returns api url" do
+    expect(strategy.api_url).to eq \
+      "http://dict-co.iciba.com/api/dictionary.php?type=json"
+  end
+
+  it "returns request url" do
+    expect(strategy.request_url).to eq \
+      "http://dict-co.iciba.com/api/dictionary.php?type=json&key=key"
+  end
+
+  describe "#raise_error" do
+
+    it "raise key not found if type is not provided" do
+      expect { FanyiAPI::Strategies::Iciba.new.request_url }.to \
+        raise_error(FanyiAPI::Strategies::InvalidKey)
+    end
+
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fanyi_api
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Qi He
@@ -48,12 +48,14 @@ files:
 - lib/fanyi_api/api.rb
 - lib/fanyi_api/requester.rb
 - lib/fanyi_api/strategies/default.rb
+- lib/fanyi_api/strategies/iciba.rb
 - lib/fanyi_api/strategies/youdao.rb
 - lib/fanyi_api/version.rb
 - lib/fanyi_api.rb
 - spec/fanyi_api/api_spec.rb
 - spec/fanyi_api/requester_spec.rb
 - spec/fanyi_api/strategies/default_spec.rb
+- spec/fanyi_api/strategies/iciba_spec.rb
 - spec/fanyi_api/strategies/youdao_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/he9qi/fanyi_api
@@ -84,5 +86,6 @@ test_files:
 - spec/fanyi_api/api_spec.rb
 - spec/fanyi_api/requester_spec.rb
 - spec/fanyi_api/strategies/default_spec.rb
+- spec/fanyi_api/strategies/iciba_spec.rb
 - spec/fanyi_api/strategies/youdao_spec.rb
 - spec/spec_helper.rb