linguara 0.0.1 → 0.0.2

data/.gitignore

@@ -19,3 +19,4 @@ rdoc
 pkg
 
 ## PROJECT::SPECIFIC
+stats

data/README.rdoc

@@ -1,6 +1,6 @@
 = linguara
 
-Description goes here.
+This gem allows integratation with Linguara WebAPI. 
 
 == Note on Patches/Pull Requests
  
@@ -16,4 +16,4 @@ Description goes here.
 
 Copyright (c) 2010 Aleksander Dabrowski. See LICENSE for details.
 
-Thanks to: Piotr Barczuk. Additional thanks to Łukasz Adamczak, and Jurek Prokop, who was starring at me when I was programming hard parts.
+Thanks to: Piotr Barczuk. Additional thanks to Łukasz Adamczak, and Jurek Prokop, who were starring at mine screen while I was programming hard parts.

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/lib/linguara.rb

@@ -1,14 +1,16 @@
 require 'net/http'
 require 'uri'
 require 'linguara/configuration'
+require 'linguara/utils'
 
 module Linguara
+  extend Linguara::Utils
   autoload :ActiveRecord, 'linguara/active_record'
   
   class << self
     attr_accessor :configuration
     
-    def configure(silent = false)
+    def configure
       self.configuration ||= Configuration.new
       yield(configuration)
     end
@@ -16,7 +18,7 @@ module Linguara
     def accept_translation(translation)
       target_language = translation[:target_language]
       translation[:paragraph].each do |key,value|
-        class_name,id,field_name = value[:id].split('_')
+        class_name,id,order,field_name = value[:id].split('_')
         content = value[:content]
         original_locale = I18n.locale
         element = class_name.constantize.find(id)
@@ -27,6 +29,33 @@ module Linguara
         I18n.locale = original_locale
       end
     end
+    
+    def send_request(element)
+      url= URI.parse(Linguara.configuration.server_path)
+      req = Net::HTTP::Post.new(url.path)
+      req.body = serialize_form_data({
+        :translation => {
+          :return_url => Linguara.configuration.return_url,
+          :due_date => '27-06-2010',
+          :source_language =>"pl", 
+          :target_language =>"en",
+          :paragraph  => element.fields_to_send,
+          :account_token => Linguara.configuration.api_key}})
+      req.content_type = 'application/x-www-form-urlencoded'
+      req.basic_auth Linguara.configuration.user, Linguara.configuration.password
+      #TODO handle timeout
+      begin
+        res = Net::HTTP.new(url.host, url.port).start {|http| http.request(req) }   
+      rescue Errno::ETIMEDOUT 
+        handle_request_error
+      end
+    end
+    
+    # ovverride 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
+    end
+    
   end
 end
 

data/lib/linguara/active_record.rb

@@ -11,67 +11,31 @@ module Linguara
         class_inheritable_accessor :linguara_translation_attribute_names
               
         self.linguara_translation_attribute_names = attr_names.map(&:to_sym)
-        
-        after_create :send_to_linguara 
+
+        before_save :send_to_linguara 
       end
     end
     
     module InstanceMethods
-     protected
-     
-     #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 == "" ? url_encode(k) :  "[#{url_encode(k)}]"); serialize_form_data(v, "#{path}#{token}",serialized_params)}
-        elsif data.kind_of? Array
-          data.each{|v| serialize_form_data(v, "#{path}[]", serialized_params) }
-        else
-          #end of recursion
-          serialized_params << "#{path}=#{url_encode(data)}"
-        end
-
-        return serialized_params.join("&") if (path == "")
-      end
-      
-      def linguara_key_name(field)
-        "#{self.class.class_name}_#{self.id}_#{field}"
-      end      
       
       def fields_to_send
         prepared_fields =  {}
-        linguara_translation_attribute_names.each do |name|
-          prepared_fields[linguara_key_name(name)] = { :id => linguara_key_name(name), :content => self.send(name) }
+        linguara_translation_attribute_names.each_with_index do |name, index|
+          key_name = linguara_key_name(name, index)
+          prepared_fields[key_name] = { :id => key_name, :content => self.send(name) }
         end 
         prepared_fields
       end
+      
+     protected
+      
+      def linguara_key_name(field, index)
+        "#{self.class.class_name}_#{self.id}_#{index}_#{field}"
+      end      
 
       def send_to_linguara
-        url = URI.parse(Linguara.configuration.server_path)
-        req = Net::HTTP::Post.new(url.path)
-        req.body = serialize_form_data({
-          :translation => {
-            :return_url => Linguara.configuration.return_url,
-            :due_date => '27-06-2010',
-            :source_language =>"pl", 
-            :target_language =>"en",
-            :paragraph  => fields_to_send,
-            :account_token => Linguara.configuration.api_key}})
-        req.content_type = 'application/x-www-form-urlencoded'
-        req.basic_auth Linguara.configuration.user, Linguara.configuration.password
-        
-        logger.info(req.method)
-        logger.info(req.path)
-        logger.info(req.body)
-        logger.info(req.body_stream)
-        
-        res = Net::HTTP.new(url.host, url.port).start {|http| http.request(req) }   
-        
-        logger.info(res.code)
-        logger.info(res.message)
-        logger.info(res.body)
-      end
- 
+        Linguara.send_request(self)
+      end 
      
     end
   end

data/lib/linguara/configuration.rb

@@ -1,7 +1,5 @@
 module Linguara
   class Configuration
-    OPTIONS = [:api_key, :server_path]
-    
     attr_accessor :api_key, :server_path, :return_url, :user, :password
     
     def initialize

data/lib/linguara/utils.rb

@@ -0,0 +1,18 @@
+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 == "" ? url_encode(k) :  "[#{url_encode(k)}]"); serialize_form_data(v, "#{path}#{token}",serialized_params)}
+        elsif data.kind_of? Array
+          data.each{|v| serialize_form_data(v, "#{path}[]", serialized_params) }
+        else
+          #end of recursion
+          serialized_params << "#{path}=#{url_encode(data)}"
+        end
+
+        return serialized_params.join("&") if (path == "")
+      end
+  end
+end

data/linguara.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{linguara}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Aleksander Dabrowski"]
-  s.date = %q{2010-05-28}
+  s.date = %q{2010-06-05}
   s.description = %q{Gem to integrate with linguara api}
   s.email = %q{aleks@kumulator.pl}
   s.extra_rdoc_files = [
@@ -26,7 +26,11 @@ Gem::Specification.new do |s|
      "lib/linguara.rb",
      "lib/linguara/active_record.rb",
      "lib/linguara/configuration.rb",
+     "lib/linguara/utils.rb",
      "linguara.gemspec",
+     "spec/data/schema.rb",
+     "spec/helper_model/blog_post.rb",
+     "spec/helper_model/database_mock.rb",
      "spec/linguara_spec.rb",
      "spec/spec.opts",
      "spec/spec_helper.rb"
@@ -37,7 +41,10 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Gem to integrate with linguara api}
   s.test_files = [
-    "spec/linguara_spec.rb",
+    "spec/data/schema.rb",
+     "spec/helper_model/blog_post.rb",
+     "spec/helper_model/database_mock.rb",
+     "spec/linguara_spec.rb",
      "spec/spec_helper.rb"
   ]
 

data/spec/data/schema.rb

@@ -0,0 +1,6 @@
+ActiveRecord::Schema.define do
+  create_table :blog_posts, :force => true do |t|
+    t.string   :title
+    t.text     :body
+  end
+end

data/spec/helper_model/blog_post.rb

@@ -0,0 +1,3 @@
+class BlogPost < ActiveRecord::Base  
+  translates_with_linguara :title, :body
+end

data/spec/helper_model/database_mock.rb

@@ -0,0 +1,7 @@
+def prepare_database
+  config = { :adapter => 'sqlite3', :database => ':memory:' }
+  ActiveRecord::Base.establish_connection(config)
+  schema_path ||= File.expand_path(File.dirname(__FILE__) + '/../data/schema.rb')
+  ActiveRecord::Migration.verbose = false
+  ActiveRecord::Base.silence { load(schema_path) }
+end

data/spec/linguara_spec.rb

@@ -1,7 +1,45 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "Linguara" do
-  it "fails" do
-    fail "hey buddy, you should probably rename this file and start specing for real"
+  
+  it "should sent message to linguara for translatable classes" do
+    FakeWeb.register_uri(:post, 'http://www.example.com/', :exception => Net::HTTPError)  
+    blog_post = BlogPost.new( :title => "Title text", :body => "Body text")
+    lambda { 
+      blog_post.save
+    }.should raise_error(Net::HTTPError)
+  end
+  
+  it 'should accept correct translation' do
+     FakeWeb.register_uri(:post, 'http://www.example.com/', :body => 'response_for_linguara', :status => 200)  
+     blog_post = BlogPost.new( :title => "Old title", :body => "Old body")
+     blog_post.save
+     id = blog_post.id
+     lambda {
+       Linguara.accept_translation(            
+            :paragraph => {
+             "BlogPost_#{id}_0_title"=> { :id =>"BlogPost_#{id}_0_title", :content =>"Hello World!"},
+             "BlogPost_#{id}_1_body"=> { :id =>"BlogPost_#{id}_1_body", :content =>"Today is great weather, and I am going to EuRuKo."}
+            },
+           :source_language =>"pl", 
+           :target_language =>"en"
+       )
+     }.should change(BlogPost, :count).by(0)
+     translation = BlogPost.last
+     translation.title.should eql("Hello World!")
+     translation.body.should eql("Today is great weather, and I am going to EuRuKo.")
+  end
+
+end
+
+describe 'Linguara::ActiveRecord' do
+  it "should prepare fields to translation" do
+    blog_post = BlogPost.new( :title => "Title text", :body => "Body text")
+    fields_to_send = blog_post.fields_to_send.to_a.sort { |a,b| a[0] <=> b[0] }
+    fields_to_send.size.should eql(2)
+    # It's complicated becouse linguara API is complicated. It will be much simplier in future
+    fields_to_send.first[1][:content].should eql("Title text")
+    fields_to_send.last[1][:content].should eql("Body text")
   end
 end
+

data/spec/spec_helper.rb

@@ -1,9 +1,27 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+
+require 'rubygems'
+require 'active_record'
+require 'active_support'
+require 'helper_model/database_mock'
 require 'linguara'
+require 'helper_model/blog_post'
+require "erb"
+include ERB::Util
 require 'spec'
 require 'spec/autorun'
+require 'fakeweb'
+
+prepare_database
+
+Linguara.configure do |config|
+  config.api_key = 'api_keu'
+  config.server_path = 'http://www.example.com/'
+  config.return_url = 'http://maverick.kumulator.com:82/linguara'
+end
 
 Spec::Runner.configure do |config|
   
 end
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: linguara
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Aleksander Dabrowski
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-28 00:00:00 +02:00
+date: 2010-06-05 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -53,7 +53,11 @@ files:
 - lib/linguara.rb
 - lib/linguara/active_record.rb
 - lib/linguara/configuration.rb
+- lib/linguara/utils.rb
 - linguara.gemspec
+- spec/data/schema.rb
+- spec/helper_model/blog_post.rb
+- spec/helper_model/database_mock.rb
 - spec/linguara_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
@@ -92,5 +96,8 @@ signing_key:
 specification_version: 3
 summary: Gem to integrate with linguara api
 test_files: 
+- spec/data/schema.rb
+- spec/helper_model/blog_post.rb
+- spec/helper_model/database_mock.rb
 - spec/linguara_spec.rb
 - spec/spec_helper.rb