linguara 0.0.4 → 0.0.5

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/lib/linguara/configuration.rb

@@ -1,6 +1,6 @@
 module Linguara
   class Configuration
-    attr_accessor :api_key, :server_path, :return_url, :user, :password, :request_valid_for, :site_url, :log, :return_request
+    attr_accessor :api_key, :server_path, :return_url, :user, :password, :request_valid_for, :site_url, :log
     
     def initialize
       self.log = true

data/lib/linguara/request.rb

@@ -0,0 +1,9 @@
+class LinguaraRequest
+  
+  attr_accessor :request, :response
+  
+  def initialize(options = {})
+    self.request = options[:request]
+    self.response = options[:response]
+  end
+end

data/lib/linguara.rb

@@ -1,8 +1,10 @@
 require 'net/http'
 require 'uri'
+require 'nokogiri'
 require 'linguara/configuration'
 require 'linguara/utils'
 require 'linguara/translation'
+require 'linguara/request'
 
 module Linguara
   extend Linguara::Utils
@@ -31,6 +33,7 @@ module Linguara
       end
     end
     
+    # Sends translation request
     def send_translation_request(element, options = {})
       translation = Translation.new(element, options) 
       url= URI.parse("#{Linguara.configuration.server_path}api/translations.xml")
@@ -38,30 +41,46 @@ module Linguara
       send_linguara_request(req, url)
     end
 
+    # Sends status request
     def send_status_query(translation_request_id)
       url= URI.parse("#{Linguara.configuration.server_path}api/translations/#{translation_request_id}/status.xml")
       req = prepare_request(url, :authorization => true)
       send_linguara_request(req, url)
     end
     
+    # Sends languages request
     def send_languages_request(options={})
       url= URI.parse("#{Linguara.configuration.server_path}api/languages.xml")
       req = prepare_request(url, options.merge(:method => :get))
       send_linguara_request(req, url)
     end
     
-    def send_specializations_request(options)
+    # Sends specializations request
+    def send_specializations_request(options = {})
       url= URI.parse("#{Linguara.configuration.server_path}api/specializations.xml")
       req = prepare_request(url, options.merge(:method => :get))
       send_linguara_request(req, url)
     end
     
-    def send_translators_request(options)
+    # Sends translators request
+    def send_translators_request(options = {})
       url= URI.parse("#{Linguara.configuration.server_path}api/translators.xml")
       req = prepare_request(url, options.merge(:method => :get))
       send_linguara_request(req, url)
     end
     
+    def available_languages
+      Nokogiri::XML(send_languages_request.response.body).xpath("//language").map do |element|
+        [element.xpath('name').inner_text, element.xpath('code').inner_text]
+      end
+    end
+    
+    def available_specializations
+      Nokogiri::XML(send_specializations_request.response.body).xpath("//specialization").map do |element|
+        [element.xpath('name').inner_text, element.xpath('id').inner_text]
+      end
+    end    
+    
     # Override this method if you want to perform some action when connection
     # with linguara cannot be established e.g. log request or redo the send
     def handle_request_error
@@ -112,12 +131,7 @@ module Linguara
         log("SENDING LINGUARA REQUEST TO #{url.path}: \n#{req.body}")
         res = Net::HTTP.new(url.host, url.port).start {|http| http.request(req) }
         log("LINGUARA RESPONSE: #{res.message} -- #{res.body}")
-        #TODO there should be object returned, whih contains request and respnse
-        if Linguara.configuration.return_request
-          return req
-        else
-          return res
-        end
+        return LinguaraRequest.new( :request => req, :response => res )
       rescue Errno::ETIMEDOUT 
         handle_request_error
       end

data/linguara.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{linguara}
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Aleksander Dabrowski", "Piotr Barczuk"]
-  s.date = %q{2010-07-23}
+  s.date = %q{2010-07-30}
   s.description = %q{Gem to integrate with linguara api}
   s.email = %q{aleks@kumulator.pl}
   s.extra_rdoc_files = [
@@ -27,6 +27,7 @@ Gem::Specification.new do |s|
      "lib/linguara.rb",
      "lib/linguara/active_record.rb",
      "lib/linguara/configuration.rb",
+     "lib/linguara/request.rb",
      "lib/linguara/translation.rb",
      "lib/linguara/utils.rb",
      "linguara.gemspec",

data/spec/linguara_spec.rb

@@ -36,7 +36,7 @@ describe "Linguara" do
     it 'sends request' do
       blog_post = BlogPost.new( :title => "Old title", :body => "Old body")
       FakeWeb.register_uri(:post, "http://www.example.com/api/translations.xml", :body => 'response_from_linguara', :status => 200) 
-      response = Linguara.send_translation_request(blog_post)
+      response = Linguara.send_translation_request(blog_post).response
       response.body.should eql('response_from_linguara')
     end     
   end
@@ -44,7 +44,7 @@ describe "Linguara" do
   describe '#send_status_query' do
     it 'sends request' do
       FakeWeb.register_uri(:post, "http://www.example.com/api/translations/5/status.xml", :body => 'response_from_linguara', :status => 200) 
-      response = Linguara.send_status_query(5)
+      response = Linguara.send_status_query(5).response
       response.body.should eql('response_from_linguara')
     end     
   end
@@ -52,7 +52,7 @@ describe "Linguara" do
   describe '#send_languages_request' do
     it 'sends request' do
       FakeWeb.register_uri(:get, "http://www.example.com/api/languages.xml", :body => 'response_from_linguara', :status => 200) 
-      response = Linguara.send_languages_request("city"=>"321", "specialization"=>"technical", "country"=>"pl", "native_speaker"=>"1", "max_price"=>"12")
+      response = Linguara.send_languages_request("city"=>"321", "specialization"=>"technical", "country"=>"pl", "native_speaker"=>"1", "max_price"=>"12").response
       response.body.should eql('response_from_linguara')
     end
   end
@@ -60,7 +60,7 @@ describe "Linguara" do
   describe '#send_specializations_request' do
     it 'sends request' do
       FakeWeb.register_uri(:get, "http://www.example.com/api/specializations.xml", :body => 'response_from_linguara', :status => 200) 
-      response = Linguara.send_specializations_request("language"=>"suomi", "sworn" => "1", "native_speaker"=>"1", "max_price"=>"12")
+      response = Linguara.send_specializations_request("language"=>"suomi", "sworn" => "1", "native_speaker"=>"1", "max_price"=>"12").response
       response.body.should eql('response_from_linguara')
     end
   end
@@ -68,7 +68,7 @@ describe "Linguara" do
   describe '#send_translators_request' do
     it 'sends request' do
       FakeWeb.register_uri(:get, "http://www.example.com/api/translators.xml", :body => 'response_from_linguara', :status => 200) 
-      response = Linguara.send_translators_request("city"=>"warsaw", "country"=>"pl", "max_price"=>"12", "query"=>"wojcisz", "target_language"=>"en", "source_language" => "pl")
+      response = Linguara.send_translators_request("city"=>"warsaw", "country"=>"pl", "max_price"=>"12", "query"=>"wojcisz", "target_language"=>"en", "source_language" => "pl").response
       response.body.should eql('response_from_linguara')
     end
   end
@@ -108,7 +108,54 @@ describe "Linguara" do
     end
   
   end
+  
+  describe '#available_languages' do
+    before :each do 
+      @response_body = "<?xml version='1.0' encoding='UTF-8'?>
+        <languages>
+          <language>
+            <code>pl</code>
+            <name>Polish</name>
+          </language>
+          <language>
+            <code>en</code>
+            <name>English</name>
+          </language>
+          <language>
+            <code>tlh</code>
+            <name>Klingon</name>
+          </language>
+       </languages>"
+      FakeWeb.register_uri(:get, "http://www.example.com/api/languages.xml", :body => @response_body, :status => 200)      
+    end
+    
+    it 'returns array with languages and codes' do
+      expected_array = [['Polish','pl'],['English','en'],['Klingon','tlh']]
+      Linguara.available_languages.should eql(expected_array)
+    end
+  end
 
+  describe '#available_specializations' do
+    before :each do 
+      @response_body = "<?xml version='1.0' encoding='UTF-8'?>
+        <specializations>
+          <specialization>
+            <id>2</id>
+            <name>IT</name>
+          </specialization>
+          <specialization>
+            <id>3</id>
+            <name>Architecture</name>
+          </specialization>
+       </specializations>"
+      FakeWeb.register_uri(:get, "http://www.example.com/api/specializations.xml", :body => @response_body, :status => 200)      
+    end
+    
+    it 'returns array with languages and codes' do
+      expected_array = [['IT','2'],['Architecture','3']]
+      Linguara.available_specializations.should eql(expected_array)
+    end
+  end
 end
 
 describe 'Linguara::ActiveRecord' do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: linguara
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Aleksander Dabrowski
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-23 00:00:00 +02:00
+date: 2010-07-30 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -55,6 +55,7 @@ files:
 - lib/linguara.rb
 - lib/linguara/active_record.rb
 - lib/linguara/configuration.rb
+- lib/linguara/request.rb
 - lib/linguara/translation.rb
 - lib/linguara/utils.rb
 - linguara.gemspec