web_translate_it 2.0.2 → 2.0.3

data/history.md

@@ -1,3 +1,9 @@
+## Version 2.0.3 / 2012-06-07
+
+* Fix: String#translation_for('xx') should not return an array of all translations. #88
+* Fix: Term#translation_for('xx') should not return an array of all term translations.
+* String#find and Term#find now return nil if no element was found with that ID.
+
 ## Version 2.0.2 / 2012-06-06
 
 * String, Translation, Term and TermTranslation classes now raise exceptions and display useful error messages. #87

data/lib/web_translate_it/string.rb

@@ -86,6 +86,7 @@ module WebTranslateIt
     end
     
     # Find a String based on its ID
+    # Return a String object, or nil if not found.
     #
     # Implementation Example:
     #
@@ -104,8 +105,9 @@ module WebTranslateIt
       request.add_field("X-Client-Version", WebTranslateIt::Util.version)
 
       begin
-        response = Util.handle_response(Connection.http_connection.request(request), true, true)
-        string = WebTranslateIt::String.new(YAML.load(response))
+        response = Connection.http_connection.request(request)
+        return nil if response.code.to_i == 404
+        string = WebTranslateIt::String.new(YAML.load(response.body))
         string.new_record = false
         return string
       rescue Timeout::Error
@@ -165,7 +167,9 @@ module WebTranslateIt
     #
     
     def translation_for(locale)
-      return self.translations unless self.translations == []
+      translation = self.translations.detect{ |t| t.locale == locale }
+      return translation if translation
+      return nil if self.new_record
       request = Net::HTTP::Get.new("/api/projects/#{Connection.api_key}/strings/#{self.id}/locales/#{locale}/translations.yaml")
       request.add_field("X-Client-Name", "web_translate_it")
       request.add_field("X-Client-Version", WebTranslateIt::Util.version)

data/lib/web_translate_it/term.rb

@@ -54,7 +54,7 @@ module WebTranslateIt
         terms = []
         while(request) do
           response = Connection.http_connection.request(request)
-          YAML.load(response).each do |term_response|
+          YAML.load(response.body).each do |term_response|
             term = WebTranslateIt::Term.new(term_response)
             term.new_record = false
             terms.push(term)
@@ -77,6 +77,7 @@ module WebTranslateIt
     end
     
     # Find a Term based on its ID
+    # Returns a Term object or nil if not found.
     #
     # Implementation Example:
     #
@@ -95,7 +96,8 @@ module WebTranslateIt
       request.add_field("X-Client-Version", WebTranslateIt::Util.version)
 
       begin
-        response = Util.handle_response(Connection.http_connection.request(request), true, true)
+        response = Connection.http_connection.request(request)
+        return nil if response.code.to_i == 404
         term = WebTranslateIt::Term.new(YAML.load(response.body))
         term.new_record = false
         return term
@@ -156,7 +158,9 @@ module WebTranslateIt
     #
     
     def translation_for(locale)
-      return self.translations unless self.translations == []
+      translation = self.translations.detect{ |t| t.locale == locale }
+      return translation if translation
+      return nil if self.new_record
       request = Net::HTTP::Get.new("/api/projects/#{Connection.api_key}/terms/#{self.id}/locales/#{locale}/translations.yaml")
       request.add_field("X-Client-Name", "web_translate_it")
       request.add_field("X-Client-Version", WebTranslateIt::Util.version)

data/spec/web_translate_it/string_spec.rb

@@ -93,7 +93,7 @@ describe WebTranslateIt::String do
         string_fetched.should_not be_nil
         
         string_fetched.delete
-        lambda { WebTranslateIt::String.find(string.id) }.should raise_error
+        WebTranslateIt::String.find(string.id).should be_nil
       end
     end
   end
@@ -133,4 +133,27 @@ describe WebTranslateIt::String do
       end
     end
   end
+  
+  describe "#translation_for" do
+    it "should fetch translations" do
+      translation = WebTranslateIt::Translation.new({ "locale" => "en", "text" => "Hello" })
+      string = WebTranslateIt::String.new({ "key" => "bacon", "translations" => [translation] })
+      WebTranslateIt::Connection.new(api_key) do
+        string.save
+        string_fetched = WebTranslateIt::String.find(string.id)
+        string_fetched.translation_for("en").should_not be_nil
+        string_fetched.translation_for("en").text.should == "Hello"
+        string_fetched.translation_for("fr").should be_nil
+        string.delete
+      end
+    end
+    
+    it "should not return a stale object" do
+      string = WebTranslateIt::String.new({ :key => "bacon" })
+      translation = WebTranslateIt::Translation.new({ :locale => "es", :text => "text", :string_id => string.id })
+      string.translations << translation
+      string.translation_for('fr').should be_nil
+      string.translation_for('es').should_not be_nil
+    end
+  end
 end

data/version

@@ -1 +1 @@
-2.0.2
+2.0.3

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: web_translate_it
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-06 00:00:00.000000000 Z
+date: 2012-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multipart-post