linguara 0.0.6 → 0.0.7

data/VERSION

@@ -1 +1 @@
-0.0.6
+0.0.7

data/lib/linguara.rb

@@ -18,16 +18,26 @@ module Linguara
       yield(configuration)
     end
     
-    # Use this method in your controller to accepr and save incoming translations
-    def accept_translation(translation)
-      target_language = translation[:target_language]
-      translation[:paragraphs].each do |key,value|
-        class_name,id,order,field_name = key.split('_')
+    # Use this method in your controller to accept and save incoming translations
+    def accept_translation(body, params)
+      #raise ActiveRecord::StatementInvalid, 'Authorization data is missing or invalid' #TODO
+      raise 'Malformed request body' if params[:translation].blank?
+      target_language = params[:translation][:target_language]
+
+      doc = Nokogiri::XML(body)
+
+      paragraphs = doc.xpath('/translation/completed_translation/content/paragraph')
+      paragraphs.each do |p|
+        log("DOC: #{p.attribute('id')} --- #{p.inner_html}")
+        key = p.attribute('id').to_s
+        value = p.inner_html.to_s
+
+        linguara_name, class_name,id,order,field_name = key.split('_')
         original_locale = I18n.locale
         element = class_name.constantize.find(id)
         
         I18n.locale = target_language
-        element.send("#{field_name}=", value.gsub(/<p>(.*?)<\/p>/, "\\1\n") )
+        element.send("#{field_name}=", value.gsub(/<p>(.*?)<\/p>/, "\\1\n") ).gsub(/<br {0,1}\/{0,1}>/, "\n")
         element.save(false)
         I18n.locale = original_locale
       end
@@ -49,19 +59,19 @@ module Linguara
     # Sends languages request
     def send_languages_request(options={})
       url= URI.parse("#{Linguara.configuration.server_path}api/languages.xml")
-      send_linguara_request(url, :get)
+      send_linguara_request(url, :get, options_to_xml(options))
     end
     
     # Sends specializations request
     def send_specializations_request(options = {})
       url= URI.parse("#{Linguara.configuration.server_path}api/specializations.xml")
-      send_linguara_request(url, :get)
+      send_linguara_request(url, :get, options_to_xml(options))
     end
     
     # Sends translators request
     def send_translators_request(options = {})
       url= URI.parse("#{Linguara.configuration.server_path}api/translators.xml")
-      send_linguara_request(url, :get)
+      send_linguara_request(url, :get, options_to_xml(options))
     end
     
     def available_languages

data/lib/linguara/translation.rb

@@ -3,10 +3,9 @@ class Translation
   attr_accessor :translation_hash, :element
   
   def initialize(element,options = {})
-    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[:translation] ||= {}
+    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
     options[:return_url] ||= Linguara.configuration.return_url
     options[:source_language] ||= I18n.locale.to_s
     self.element = element#.fields_to_send
@@ -15,7 +14,7 @@ class Translation
   
   def to_hash
     ret = {}
-    ret[:translation] = self.translation_hash
+    ret[:request] = self.translation_hash
     ret
   end
 
@@ -23,14 +22,14 @@ class Translation
     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
+    xml.request 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
+      xml.content :type => 'html' do
         self.element.fields_to_send.each_pair do |k, v|
-          xml.paragraph v, :id => k
+          xml.paragraph(:id => k) {|x| x << v}
         end
       end
     end
@@ -40,6 +39,7 @@ class Translation
 
   def to_xml_recursive(xml, object)
     object.each_pair do |k, v|
+      next if k.blank? or v.blank?
       tag_element(xml, k, v)
     end
   end

data/lib/linguara/utils.rb

@@ -5,5 +5,37 @@ module Linguara
       data = data.each_pair { |k,v| v.is_a?(Hash) ? (strip_blank_attributes(v)) : (v) }
       data.delete_if { |k,v| v.blank?}
     end
+
+    def options_to_xml(options)
+      return '' if options.blank?
+      xml = Builder::XmlMarkup.new
+      xml.request do
+        options.each_pair do |k, v|
+          next if k.blank? or v.blank?
+          tag_element(xml, k, v)
+        end
+      end
+      return xml.target!
+    end
+
+    private
+
+    def options_to_xml_recursive(xml, object)
+      object.each_pair do |k, v|
+        next if k.blank? or v.blank?
+        tag_element(xml, k, v)
+      end
+    end
+
+    def tag_element(builder, k, v)
+      if v.kind_of?(Hash)
+        builder.tag!(k) do
+          options_to_xml_recursive(builder, v)
+        end
+      else
+        builder.tag!(k, v)
+      end
+    end
+
   end
 end

data/linguara.gemspec

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

data/spec/linguara_spec.rb

@@ -18,13 +18,7 @@ describe "Linguara" do
      blog_post.save
      id = blog_post.id
      lambda {
-       Linguara.accept_translation(            
-            :paragraphs => {
-             "BlogPost_#{id}_0_title" => "Hello World!",
-             "BlogPost_#{id}_1_body" => "Today is great weather, and I am going to EuRuKo."
-            },
-           :source_language =>"pl", 
-           :target_language =>"en"
+       Linguara.accept_translation("<translation><completed_translation><content><paragraph id='linguara_BlogPost_#{id}_0_body'>Today is great weather, and I am going to EuRuKo.</paragraph><paragraph id='linguara_BlogPost_#{id}_0_title'>Hello World!</paragraph></content></completed_translation></translation>", {:translation => { :source_language =>"pl", :target_language =>"en"}}
        )
      }.should change(BlogPost, :count).by(0)
      translation = BlogPost.last

metadata

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