detect_language 1.0.3 → 1.0.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 3eec3e59102acef4077e83636c3b1ce52866800f
+  data.tar.gz: 7e5402f124611bc840d2ac82e9db819e86e12a76
+SHA512:
+  metadata.gz: 82bba14b46f34f1afa1f32414d156cf49c2a1cc2a7329cbdd5812b566e5e344326d09d410f40abc70be2acb9f3a3886eaae20a223adcf08e24b6d55449fab04e
+  data.tar.gz: 2435578b1aded7ad01896501e0de0b161de96c6028f306aea4332d7efa458935686d01381ac5c9d636e02a84a0a0b223cec856cdd35e6f23cc799c34d72eebd4

data/.travis.yml

@@ -2,6 +2,7 @@ rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
+  - 2.0.0
   - jruby-18mode # JRuby in 1.8 mode
   - jruby-19mode # JRuby in 1.9 mode
   - rbx-18mode

data/README.md

@@ -3,7 +3,7 @@ Detect Language API Client [![Build Status](https://secure.travis-ci.org/detectl
 
 Detects language of given text. Returns detected language codes and scores.
 
-Before using Detect Language API client you setup your personal API key.
+Before using Detect Language API client you have to setup your personal API key.
 You can get it by signing up at http://detectlanguage.com
 
 ## Installation
@@ -64,6 +64,23 @@ Result is array of detections in the same order as the texts were passed.
       [ {"language"=>"lt", "isReliable"=>false, "confidence"=>0.04918032786885246},
         {"language"=>"lv", "isReliable"=>false, "confidence"=>0.03350083752093803} ] ]
 
+### Getting your account status
+
+    DetectLanguage.user_status
+
+#### Result
+
+    {"date"=>"2013-11-17", "requests"=>95, "bytes"=>2223, "plan"=>"FREE", "plan_expires"=>nil,
+     "daily_requests_limit"=>5000, "daily_bytes_limit"=>1048576, "status"=>"ACTIVE"}
+
+### Getting list detectable languages
+
+    DetectLanguage.languages
+
+#### Result
+
+Array of language codes and names.
+
 ## License
 
 Detect Language API Client is free software, and may be redistributed under the terms specified in the MIT-LICENSE file.

data/lib/detect_language/client.rb

@@ -11,12 +11,21 @@ module DetectLanguage
       @configuration = configuration
     end
 
-    def execute(method, params)
-      http = setup_http_connection
+    def post(method, params = {})
+      execute(method, params, :http_method => Net::HTTP::Post)
+    end
+
+    def get(method, params = {})
+      execute(method, params, :http_method => Net::HTTP::Get)
+    end
 
-      request_params = params.merge(:key => configuration.api_key)
+    private
 
-      request = Net::HTTP::Post.new(request_uri(method))
+    def execute(method, params, options)
+      http            = setup_http_connection
+      http_method     = options[:http_method]
+      request_params  = params.merge(:key => configuration.api_key)
+      request         = http_method.new(request_uri(method))
 
       if RUBY_VERSION == '1.8.7'
         set_form_data_18(request, request_params)
@@ -36,12 +45,10 @@ module DetectLanguage
       end
     end
 
-    private
-
     def parse_response(response_body)
       response = JSON.parse(response_body)
 
-      if response["error"].nil?
+      if response.is_a?(Array) || response["error"].nil?
         response
       else
         raise Exception.new(response["error"]["message"])
@@ -88,4 +95,4 @@ module DetectLanguage
     end
 
   end
-end
+end

data/lib/detect_language/version.rb

@@ -1,3 +1,3 @@
 module DetectLanguage
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 end

data/lib/detect_language.rb

@@ -23,7 +23,7 @@ module DetectLanguage
 
     def detect(data)
       key = data.is_a?(Array) ? 'q[]' : 'q'
-      result = client.execute(:detect, key => data)
+      result = client.post(:detect, key => data)
       result['data']['detections']
     end
 
@@ -36,5 +36,13 @@ module DetectLanguage
         detections[0]['language']
       end
     end
+
+    def user_status
+      client.post('user/status')
+    end
+
+    def languages
+      client.get('languages')
+    end
   end
 end

data/spec/detect_language_spec.rb

@@ -4,9 +4,14 @@ require 'spec_helper'
 
 describe DetectLanguage do
 
+  let(:api_key) { '93dfb956a294140a4370a09584af2ef6' }
+
+  before do
+    DetectLanguage.configuration.api_key = api_key
+  end
+
   context "configuration" do
     it "should have default configuration values" do
-      subject.configuration.api_key.should      be_nil
       subject.configuration.api_version.should  == '0.2'
       subject.configuration.host.should         == 'ws.detectlanguage.com'
       subject.configuration.user_agent.should   == 'Detect Language API ruby gem'
@@ -21,12 +26,17 @@ describe DetectLanguage do
     end
   end
 
-  context "detection" do
-    before do
-      # testing key
-      subject.configuration.api_key = "24c3185fef623b537a4df60df0a8d4d9"
+  context 'invalid api key' do
+    let(:api_key) { 'invalid' }
+
+    it "should raise exception for invalid key" do
+      lambda {
+        subject.detect("Hello world")
+      }.should raise_error(::DetectLanguage::Exception)
     end
+  end
 
+  context "detection" do
     it "should detect languages" do
       result = subject.detect("Hello world")
       result[0]['language'].should == "en"
@@ -47,16 +57,24 @@ describe DetectLanguage do
     end
   end
 
-  it "should raise exception for invalid key" do
-    old_api_key = subject.configuration.api_key
+  describe '.user_status' do
+    subject(:user_status) { DetectLanguage.user_status }
 
-    subject.configuration.api_key = "invalid"
+    it 'fetches user status' do
+      expect(user_status['date']).to be_kind_of(String)
+      expect(user_status['requests']).to be_kind_of(Integer)
+      expect(user_status['bytes']).to be_kind_of(Integer)
+      expect(user_status['plan']).to be_kind_of(String)
+      expect(user_status['daily_requests_limit']).to be_kind_of(Integer)
+      expect(user_status['daily_bytes_limit']).to be_kind_of(Integer)
+    end
+  end
 
-    lambda {
-      subject.detect("Hello world")
-    }.should raise_error(::DetectLanguage::Exception)
+  describe '.languages' do
+    subject(:languages) { DetectLanguage.languages }
 
-    subject.configuration.api_key = old_api_key
+    it 'fetches list of detectable languages' do
+      expect(languages).to include({'code' => 'en', 'name' => 'ENGLISH'})
+    end
   end
-
-end
+end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: detect_language
 version: !ruby/object:Gem::Version
-  version: 1.0.3
-  prerelease: 
+  version: 1.0.4
 platform: ruby
 authors:
 - Laurynas Butkus
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-17 00:00:00.000000000 Z
+date: 2013-11-17 00:00:00.000000000 Z
 dependencies: []
 description: Language Detection API Client
 email:
@@ -35,33 +34,26 @@ files:
 - spec/spec_helper.rb
 homepage: https://github.com/detectlanguage/detect_language
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -807280730191114243
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -807280730191114243
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Detects language of given text. Returns detected language codes and scores.
 test_files:
 - spec/detect_language_spec.rb