babelyoda 2.1.0 → 2.1.1

data/lib/babelyoda/tanker.rb

@@ -104,13 +104,15 @@ module Babelyoda
 	class Tanker
 		include Babelyoda::SpecificationLoader
 		
-		class FileNameInvalidError < RuntimeError ; end
+		class FileNameInvalidError < Exception ; end
+		class KeysetNameInvalidError < Exception ; end
 
     attr_accessor :endpoint
     attr_accessor :token
     attr_accessor :project_id
 
     def replace(keyset, language = nil)
+      validate_keyset_name!(keyset.name)
       doc = project_xml do |xml|
         keyset.to_xml(xml, language)
       end
@@ -131,11 +133,13 @@ module Babelyoda
     end
     
     def create(keyset_name)
+      validate_keyset_name!(keyset_name)
       post('/keysets/create/', { 'project-id' => project_id, 'keyset-id' => keyset_name })
     end
     
     def export(keyset_name = nil, languages = nil, status = nil, safe = false)
       payload = { 'project-id' => project_id }
+      validate_keyset_name!(keyset_name) if keyset_name
       payload.merge!({ 'keyset-id' => keyset_name }) if keyset_name
       if languages
         value = languages
@@ -148,6 +152,7 @@ module Babelyoda
     end
     
     def load_keyset(keyset_name, languages = nil, status = nil, safe = false)
+      validate_keyset_name!(keyset_name)
       doc = export(keyset_name, languages, status, safe)
       doc.css("keyset[@id='#{keyset_name}']").each do |keyset_node|
         keyset = Babelyoda::Keyset.parse_xml(keyset_node)
@@ -157,6 +162,7 @@ module Babelyoda
     end
     
     def drop_keyset!(keyset_name)
+      validate_keyset_name!(keyset_name)
       delete("/admin/project/#{project_id}/keyset/", { :keyset => keyset_name })
     end
     
@@ -204,16 +210,18 @@ module Babelyoda
     def post(method_name, payload)
       uri = URI(method(method_name))
       req = Net::HTTP::Post.new(uri.path)
+
       req['AUTHORIZATION'] = token
       req.content_type = multipart_content_type
       req.body = multipart_data(payload)
 
-      $logger.debug "POST URI: #{uri}"
-      $logger.debug "POST BODY: #{req.body}"
-
-      res = Net::HTTP.start(uri.host, uri.port) do |http|
+      debug_log = ''
+      conn = Net::HTTP.new(uri.host, uri.port)
+      conn.set_debug_output(debug_log)
+      res = conn.start do |http|
         http.request(req)
       end
+      $logger.debug "HTTP DEBUG: #{debug_log}"
       
       case res
       when Net::HTTPSuccess, Net::HTTPRedirection
@@ -231,11 +239,13 @@ module Babelyoda
       req = Net::HTTP::Get.new(uri.request_uri)
       req['AUTHORIZATION'] = token
 
-      $logger.debug "GET URI: #{uri}"
-
-      res = Net::HTTP.start(uri.host, uri.port) do |http|
+      debug_log = ''
+      conn = Net::HTTP.new(uri.host, uri.port)
+      conn.set_debug_output(debug_log)
+      res = conn.start do |http|
         http.request(req)
       end
+      $logger.debug "HTTP DEBUG: #{debug_log}"
 
       case res
       when Net::HTTPSuccess, Net::HTTPRedirection
@@ -253,11 +263,13 @@ module Babelyoda
       req = Net::HTTP::Delete.new(uri.request_uri)
       req['AUTHORIZATION'] = token
 
-      $logger.debug "DELETE URI: #{uri}"
-
-      res = Net::HTTP.start(uri.host, uri.port) do |http|
+      debug_log = ''
+      conn = Net::HTTP.new(uri.host, uri.port)
+      conn.set_debug_output(debug_log)
+      res = conn.start do |http|
         http.request(req)
       end
+      $logger.debug "HTTP DEBUG: #{debug_log}"
 
       case res
       when Net::HTTPSuccess, Net::HTTPRedirection
@@ -268,5 +280,11 @@ module Babelyoda
         raise Error.new(error)
       end
     end
+    
+    def validate_keyset_name!(keyset_name)
+      if keyset_name.match(/[\s\t]/)
+        raise KeysetNameInvalidError.new("Keyset name must NOT contain tabs or spaces: #{keyset_name}")
+      end
+    end
 	end
 end

data/lib/babelyoda/version.rb

@@ -1,3 +1,3 @@
 module Babelyoda
-  VERSION = "2.1.0"
+  VERSION = "2.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: babelyoda
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-27 00:00:00.000000000Z
+date: 2012-02-20 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70220783285460 !ruby/object:Gem::Requirement
+  requirement: &70356031935100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70220783285460
+  version_requirements: *70356031935100
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70220783285040 !ruby/object:Gem::Requirement
+  requirement: &70356031934680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70220783285040
+  version_requirements: *70356031934680
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70220783284600 !ruby/object:Gem::Requirement
+  requirement: &70356031934180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70220783284600
+  version_requirements: *70356031934180
 - !ruby/object:Gem::Dependency
   name: ruby_gntp
-  requirement: &70220783284180 !ruby/object:Gem::Requirement
+  requirement: &70356031933720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70220783284180
+  version_requirements: *70356031933720
 - !ruby/object:Gem::Dependency
   name: awesome_print
-  requirement: &70220783283640 !ruby/object:Gem::Requirement
+  requirement: &70356031933120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -68,10 +68,10 @@ dependencies:
         version: 1.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70220783283640
+  version_requirements: *70356031933120
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70220783282840 !ruby/object:Gem::Requirement
+  requirement: &70356031932240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -82,10 +82,10 @@ dependencies:
         version: 0.9.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *70220783282840
+  version_requirements: *70356031932240
 - !ruby/object:Gem::Dependency
   name: active_support
-  requirement: &70220783282100 !ruby/object:Gem::Requirement
+  requirement: &70356031931420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -96,10 +96,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70220783282100
+  version_requirements: *70356031931420
 - !ruby/object:Gem::Dependency
   name: rchardet19
-  requirement: &70220783281360 !ruby/object:Gem::Requirement
+  requirement: &70356031819460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,10 +110,10 @@ dependencies:
         version: 1.3.5
   type: :runtime
   prerelease: false
-  version_requirements: *70220783281360
+  version_requirements: *70356031819460
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &70220783280620 !ruby/object:Gem::Requirement
+  requirement: &70356031818600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -124,10 +124,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70220783280620
+  version_requirements: *70356031818600
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70220783279860 !ruby/object:Gem::Requirement
+  requirement: &70356031817800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -138,10 +138,10 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70220783279860
+  version_requirements: *70356031817800
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &70220783279120 !ruby/object:Gem::Requirement
+  requirement: &70356031816880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -152,10 +152,10 @@ dependencies:
         version: 1.0.7
   type: :runtime
   prerelease: false
-  version_requirements: *70220783279120
+  version_requirements: *70356031816880
 - !ruby/object:Gem::Dependency
   name: log4r-color
-  requirement: &70220783278400 !ruby/object:Gem::Requirement
+  requirement: &70356031815780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -163,7 +163,7 @@ dependencies:
         version: '1.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70220783278400
+  version_requirements: *70356031815780
 description: A simple utility to push/pull l10n resources of an Xcode project to/from
   the translators
 email:
@@ -220,18 +220,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2015034540121504841
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2015034540121504841
 requirements: []
 rubyforge_project: babelyoda
 rubygems_version: 1.8.10