linguara 0.0.5 → 0.0.6

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

data/lib/linguara/active_record.rb

@@ -44,7 +44,7 @@ module Linguara
      protected
       
       def linguara_key_name(field, index)
-        "#{self.class.class_name}_#{self.id}_#{index}_#{field}"
+        "linguara_#{self.class.class_name}_#{self.id}_#{index}_#{field}"
       end
 
       #override this if you want to have a customised method for determining which language to use.

data/lib/linguara/translation.rb

@@ -1,22 +1,56 @@
 class Translation
   
-  attr_accessor :translation_hash
+  attr_accessor :translation_hash, :element
   
   def initialize(element,options = {})
-    unless options[:translation] && options[:translation][:due_date]
-      options[:translation] = Hash.new
-      options[:translation][:due_date] ||= Date.today + Linguara.configuration.request_valid_for.to_i.days unless Linguara.configuration.request_valid_for.blank?
-      options[:translation][:due_date] ||= Date.today + 1.month
+    unless options[:due_date]
+      options[:due_date] ||= Date.today + Linguara.configuration.request_valid_for.to_i.days unless Linguara.configuration.request_valid_for.blank?
+      options[:due_date] ||= Date.today + 1.month
     end
     options[:return_url] ||= Linguara.configuration.return_url
     options[:source_language] ||= I18n.locale.to_s
-    options[:content] = Hash.new
-    options[:content][:plain] = Hash.new
-    options[:content][:plain][:paragraphs] = element.fields_to_send
+    self.element = element#.fields_to_send
     self.translation_hash = options
   end
   
   def to_hash
-    self.translation_hash
+    ret = {}
+    ret[:translation] = self.translation_hash
+    ret
+  end
+
+  def to_xml(options = {}, builder_options = {})
+    builder_options[:indent] ||= 2
+    xml = builder_options[:builder] ||= Builder::XmlMarkup.new(:indent => builder_options[:indent])
+    xml.instruct! unless builder_options[:skip_instruct]
+    xml.translation do
+      self.translation_hash.merge(options).each_pair do |k, v|
+        next if k.blank? or v.blank?
+        tag_element(xml, k, v)
+      end
+      xml.content :type => 'xml' do
+        self.element.fields_to_send.each_pair do |k, v|
+          xml.paragraph v, :id => k
+        end
+      end
+    end
+  end
+
+  private
+
+  def to_xml_recursive(xml, object)
+    object.each_pair do |k, v|
+      tag_element(xml, k, v)
+    end
+  end
+
+  def tag_element(builder, k, v)
+    if v.kind_of?(Hash)
+      builder.tag!(k) do
+        to_xml_recursive(builder, v)
+      end
+    else
+      builder.tag!(k, v)
+    end
   end
 end

data/lib/linguara/utils.rb

@@ -1,21 +1,9 @@
 module Linguara
   module Utils
-     #TODO describe it, spec and move somewhere else
-     # http://www.keyongtech.com/5211204-nested-http-params-on-ruby
-     def serialize_form_data(data, path = "",serialized_params = [])
-        if data.kind_of? Hash
-          data.each_pair{|k,v| token = (path == "" ? CGI::escape(k.to_s) :  "[#{CGI::escape(k.to_s)}]"); serialize_form_data(v, "#{path}#{token}",serialized_params)}
-        else
-          #end of recursion
-          serialized_params << "#{path}=#{CGI::escape(data.to_s)}"
-        end
-
-        return serialized_params.join("&") if (path == "")
-      end
       
-      def  strip_blank_attributes(data)
-        data = data.each_pair { |k,v| v.is_a?(Hash) ? (strip_blank_attributes(v)) : (v) }
-        data.delete_if { |k,v| v.blank?}
-      end
+    def strip_blank_attributes(data)
+      data = data.each_pair { |k,v| v.is_a?(Hash) ? (strip_blank_attributes(v)) : (v) }
+      data.delete_if { |k,v| v.blank?}
+    end
   end
 end

data/lib/linguara.rb

@@ -37,36 +37,31 @@ module Linguara
     def send_translation_request(element, options = {})
       translation = Translation.new(element, options) 
       url= URI.parse("#{Linguara.configuration.server_path}api/translations.xml")
-      req = prepare_request(url, translation.to_hash.merge( :authorization => true))
-      send_linguara_request(req, url)
+      send_linguara_request(url, :post, translation.to_xml(strip_blank_attributes(options).merge(authorization_options)))
     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)
+      send_linguara_request(url, :post, authorization_xml)
     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)
+      send_linguara_request(url, :get)
     end
     
     # 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)
+      send_linguara_request(url, :get)
     end
     
     # 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)
+      send_linguara_request(url, :get)
     end
     
     def available_languages
@@ -102,30 +97,33 @@ module Linguara
     end
     
     private
-    
-    def prepare_request(url, data = {} )
-      data = strip_blank_attributes(data)
-      if data[:method] == :get
+
+    def authorization_options
+      {
+        :site_url => Linguara.configuration.site_url,
+        :account_token => Linguara.configuration.api_key
+      }
+    end
+
+    def authorization_xml
+      "<translation><site_url>#{Linguara.configuration.site_url}</site_url><account_token>#{Linguara.configuration.api_key}</account_token></translation>"
+    end
+
+    def prepare_request(url, method, data)
+      if method == :get
         req = Net::HTTP::Get.new(url.path)
-        data.delete(:method)
       else
         req = Net::HTTP::Post.new(url.path)
       end
-      if data[:authorization]   
-        data.delete(:authorization)
-        req.body = serialize_form_data({
-          :site_url => Linguara.configuration.site_url,
-          :account_token => Linguara.configuration.api_key
-         }.merge(data))
-      else
-        req.body = serialize_form_data(data)
-      end
-      req.content_type = 'application/x-www-form-urlencoded'
+      #log("BODY ----- :\n\n #{data}")
+      req.body = "#{data}"
+      req.content_type = 'text/xml'
       req.basic_auth(Linguara.configuration.user, Linguara.configuration.password)
       req
     end
-    
-    def send_linguara_request(req, url)
+
+    def send_linguara_request(url, method, data = '' )
+      req = prepare_request url, method, data
       #TODO handle timeout
       begin
         log("SENDING LINGUARA REQUEST TO #{url.path}: \n#{req.body}")

data/linguara.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{linguara}
-  s.version = "0.0.5"
+  s.version = "0.0.6"
 
   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-30}
+  s.date = %q{2010-08-11}
   s.description = %q{Gem to integrate with linguara api}
   s.email = %q{aleks@kumulator.pl}
   s.extra_rdoc_files = [

data/spec/linguara_spec.rb

@@ -76,35 +76,24 @@ describe "Linguara" do
   describe '#prepare_request' do
     before :each do
       @url = URI.parse("http://www.example.com/api/translations")
-      @options = { :translation => { :translator => { :city => "Prague"}}}
+      @data = '<translation><site_url>text.com</site_url><account_token>abcdefg</account_token></translation>'
     end
     
     it 'sets :POST by deafault' do
-      request = Linguara.send(:prepare_request, @url, @options)
+      request = Linguara.send(:prepare_request, @url, :post, @data)
       request.is_a?(Net::HTTP::Post).should be_true
       request.body.include?("post").should be_false
     end
     
     it 'sets :GET when option given' do
-      request = Linguara.send(:prepare_request, @url, @options.merge(:method => :get))
+      request = Linguara.send(:prepare_request, @url, :get, @data)
       request.is_a?(Net::HTTP::Get).should be_true
       request.body.include?("get").should be_false
     end
     
-    it 'skips blank parameters' do
-      request = Linguara.send(:prepare_request, @url, @options.merge(:blank_attribute => ""))
-      request.body.include?("blank_attribute").should be_false
-    end
-    
-    it 'skips blank parameters deep' do
-      request = Linguara.send(:prepare_request, @url, @options.merge(:blank_parent => { :blank_attribute => ""}))
-      request.body.include?("blank_attribute").should be_false
-      request.body.include?("blank_parent").should be_false
-    end
-    
-    it 'sets content type to application/x-www-form-urlencoded' do
-      request = Linguara.send(:prepare_request, @url, @options)
-      request.content_type.should be_eql("application/x-www-form-urlencoded")    
+    it 'sets content type to text/xml' do
+      request = Linguara.send(:prepare_request, @url, :get, @data)
+      request.content_type.should be_eql("text/xml")
     end
   
   end

data/spec/translation_spec.rb

@@ -7,18 +7,18 @@ describe Translation do
   end
   
   it 'creates default due_date on default' do
-    subject.to_hash[:translation][:due_date].should eql(Date.today + Linguara.configuration.request_valid_for.to_i.days)
+    subject.to_xml.should match(Regexp.new("<due_date>#{Date.today + Linguara.configuration.request_valid_for.to_i.days}</due_date>"))
   end
   
   it 'creates return_url on default' do
-    subject.to_hash[:return_url].should eql(Linguara.configuration.return_url)
+    subject.to_xml.should match(Regexp.new("<return_url>#{Linguara.configuration.return_url}</return_url>"))
   end
   
   it 'sets source language on default' do
-    subject.to_hash[:source_language].should eql(I18n.locale.to_s)
+    subject.to_xml.should match(Regexp.new("<source_language>#{I18n.locale.to_s}</source_language>"))
   end
 
   it 'creates paragraphs for model' do
-    subject.to_hash[:content][:plain][:paragraphs].should eql(@blog_post.fields_to_send)
+    subject.to_xml.should match(Regexp.new("(<paragraph id=['|\"].*['|\"]>[^<>]+</paragraph>\s*)+"))
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: linguara
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Aleksander Dabrowski
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-30 00:00:00 +02:00
+date: 2010-08-11 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency