transifex-interface-ruby 0.0.1 → 0.0.2

data/Rakefile

@@ -1 +1 @@
-require "bundler/gem_tasks"
+require "bundler/gem_tasks"

data/lib/transifex.rb

@@ -1,87 +1,84 @@
-require 'net/http'
-require 'multi_json'
-require 'yaml'
-require 'uri'
-require 'digest/md5'
-
-require "transifex/version"
-require "transifex/resource_components/translation_components/utilities"
-require "transifex/crud_requests"
-require "transifex/errors"
-require "transifex/formats"
-require "transifex/project"
-require "transifex/projects"
-require "transifex/json"
-require "transifex/languages"
-require "transifex/language"
-require "transifex/project_components/language"
-require "transifex/project_components/language_components/coordinators"
-require "transifex/project_components/language_components/reviewers"
-require "transifex/project_components/language_components/translators"
-require "transifex/project_components/languages"
-require "transifex/resource"
-require "transifex/resource_components/content"
-require "transifex/resource_components/source"
-require "transifex/resource_components/stats"
-require "transifex/resource_components/translation"
-require "transifex/resource_components/translation_components/string"
-require "transifex/resource_components/translation_components/strings"
-require "transifex/resources"
-
-
-
-module Transifex
-  
-  class Configuration 
-    attr_accessor :client_login, :client_secret, :root_url
-
-    def root_url
-      @root_url ||= "https://www.transifex.com/api/2"      
-    end 
-  end
-
-  class << self
-    attr_accessor :configuration
-  end
-
-  def self.configure
-    self.configuration ||= Configuration.new
-    yield configuration
-  end
-
-  def self.build_request_url(url='')
-    URI(self.configuration.root_url + url)    
-  end
-
-  def self.query_api(method, url, params={})
-    uri = build_request_url(url)
-
-    res = Net::HTTP.start(uri.host, 80) do |http|
-      req = Net::HTTP::const_get(method.capitalize).new(uri.request_uri, request_headers)
-      req.basic_auth self.configuration.client_login, self.configuration.client_secret
-      req.body = Transifex::JSON.dump(params)
-      http.request req
-    end
-
-    begin
-      data = Transifex::JSON.load(res.body.nil? ? '' : res.body)
-    rescue
-      data = res.body
-    end
-
-    unless (res.is_a? Net::HTTPOK) || (res.is_a? Net::HTTPCreated) || (res.is_a? Net::HTTPNoContent)
-      error = TransifexError.new(uri, res.code, data)
-      raise error
-    end    
-
-    data
-  end
-
-  def self.request_headers    
-    request_headers = {      
-      'Content-Type' => 'application/json',
-      'Accept' => 'application/json',
-      'User-Agent' => "Transifex-interface-ruby/#{Transifex::VERSION}"
-    }    
-  end
-end
+require 'net/http'
+require 'multi_json'
+require 'yaml'
+require 'uri'
+require 'digest/md5'
+
+require "transifex/version"
+require "transifex/resource_components/translation_components/utilities"
+require "transifex/crud_requests"
+require "transifex/errors"
+require "transifex/formats"
+require "transifex/project"
+require "transifex/projects"
+require "transifex/json"
+require "transifex/languages"
+require "transifex/language"
+require "transifex/project_components/language"
+require "transifex/project_components/language_components/coordinators"
+require "transifex/project_components/language_components/reviewers"
+require "transifex/project_components/language_components/translators"
+require "transifex/project_components/languages"
+require "transifex/resource"
+require "transifex/resource_components/content"
+require "transifex/resource_components/source"
+require "transifex/resource_components/stats"
+require "transifex/resource_components/translation"
+require "transifex/resource_components/translation_components/string"
+require "transifex/resource_components/translation_components/strings"
+require "transifex/resources"
+
+module Transifex
+  class << self
+    attr_accessor :configuration
+
+    def configure
+      self.configuration ||= Configuration.new
+      yield configuration
+    end
+
+    def build_request_url(url='')
+      URI(self.configuration.root_url + url)
+    end
+
+    def query_api(method, url, params={})
+      uri = build_request_url(url)
+
+      res = Net::HTTP.start(uri.host, uri.port, use_ssl: true) do |http|
+        req = Net::HTTP::const_get(method.capitalize).new(uri.request_uri, request_headers)
+        req.basic_auth self.configuration.client_login, self.configuration.client_secret
+        req.body = Transifex::JSON.dump(params)
+        http.request req
+      end
+
+      begin
+        data = Transifex::JSON.load(res.body.nil? ? '' : res.body)
+      rescue
+        data = res.body
+      end
+
+      unless (res.is_a? Net::HTTPOK) || (res.is_a? Net::HTTPCreated) || (res.is_a? Net::HTTPNoContent)
+        error = TransifexError.new(uri, res.code, data)
+        raise error
+      end
+
+      data
+    end
+
+    def request_headers
+      request_headers = {
+        'Content-Type' => 'application/json',
+        'Accept' => 'application/json',
+        'User-Agent' => "Transifex-interface-ruby/#{Transifex::VERSION}"
+      }
+    end
+  end
+
+  class Configuration
+    attr_accessor :client_login, :client_secret, :root_url
+
+    def root_url
+      @root_url ||= "https://www.transifex.com/api/2"
+    end
+  end
+end

data/lib/transifex/crud_requests.rb

@@ -1,15 +1,15 @@
 module Transifex
   module CrudRequests
-    class << self      
+    class << self
       def generate_url(object, params = {})
         class_name_string = object.class.name.split("::").last.downcase.to_s
         url = ""
-        if object.class.respond_to?(:parents)
-          object.class.parents.map{|parent| url += "/" + parent.to_s + "/" + object.instance_variable_get("@" + parent.to_s + "_slug")}                      
-        end          
+        if object.class.respond_to?(:authors)
+          object.class.authors.map{|author| url += "/" + author.to_s + "/" + object.instance_variable_get("@" + author.to_s + "_slug")}
+        end
         url += "/" + class_name_string
         url += "/" + object.instance_variable_get("@" + class_name_string + "_slug") if object.instance_variable_defined?("@" + class_name_string + "_slug")
-        params.each do |param| 
+        params.each do |param|
           url = add_param(url, param[0], param[1])
         end
         url
@@ -17,7 +17,7 @@ module Transifex
 
       def add_param(url, param_name, param_value)
         uri = URI(url)
-        params = URI.decode_www_form(uri.query || []) << [param_name, param_value]
+        params = URI.decode_www_form(uri.query || "") << [param_name, param_value]
         uri.query = URI.encode_www_form(params)
         uri.to_s
       end
@@ -26,12 +26,12 @@ module Transifex
     module Fetch
       module InstanceMethods
         def fetch(options = {})
-          url = CrudRequests.generate_url(self, options)  
+          url = CrudRequests.generate_url(self, options)
           Transifex.query_api(:get, url)
         end
       end
       def self.included(receiver)
-        receiver.send(:include, InstanceMethods)                 
+        receiver.send(:include, InstanceMethods)
       end
     end
     module Create
@@ -40,7 +40,7 @@ module Transifex
           missing_keys = self.class::CREATE_REQUIRED_PARAMS - params.keys
           raise MissingParametersError.new(missing_keys) unless (missing_keys == [:repository_url] || missing_keys == [:private]) || missing_keys.empty?
           if params[:repository_url] && !params[:repository_url].empty? && params[:repository_url].match(/^(http|https|ftp):\/\/[a-zA-Z]+\.[a-zA-Z]+\.[a-zA-Z]+/).nil?
-            raise ParametersFormatError.new(:repository_url, "http|https|ftp://x.x.x") 
+            raise ParametersFormatError.new(:repository_url, "http|https|ftp://x.x.x")
           end
           unless options[:trad_from_file].nil?
             if params[:i18n_type] == "YAML"
@@ -54,46 +54,56 @@ module Transifex
           url = CrudRequests.generate_url(self)
           Transifex.query_api(:post, url, params)
         end
-      end    
-       
+      end
+
       def self.included(receiver)
-        receiver.send(:include, InstanceMethods)                 
+        receiver.send(:include, InstanceMethods)
       end
-    end    
+    end
     module Update
       module InstanceMethods
-        def update(params = {}, options = {})      
-          if params.is_a?(Hash) && params[:i18n_type] && params[:i18n_type] != "TXT"
-            if params[:i18n_type] == "YML"
-              params[:content] = YAML::load_file(params[:content]).to_yaml
-            else
-              file = File.open(params[:content], "rb")
-              params[:content] = file.read
-              file.close
+        def update(params = {}, options = {})
+          if params.is_a?(Hash) && params[:i18n_type]
+            if options[:trad_from_file]
+              case params[:i18n_type]
+              when "YML"
+                params[:content] = YAML::load_file(params[:content]).to_yaml
+              else
+                file = File.open(params[:content], "rb")
+                params[:content] = file.read
+                file.close
+              end
+            end
+
+            if params[:i18n_type] == "KEYVALUEJSON"
+              params[:content] = params[:content].to_json
             end
+
             # Deal with accents
-            params[:content] = params[:content].force_encoding('UTF-8')
-          end              
+            params[:content] = params[:content].force_encoding("UTF-8")
+          end
+
           url = CrudRequests.generate_url(self)
+
           Transifex.query_api(:put, url, params)
         end
-      end    
-       
+      end
+
       def self.included(receiver)
-        receiver.send(:include, InstanceMethods)                 
+        receiver.send(:include, InstanceMethods)
       end
     end
     module Delete
       module InstanceMethods
-        def delete(params = {}, options = {})          
+        def delete(params = {}, options = {})
           url = CrudRequests.generate_url(self)
           Transifex.query_api(:delete, url, params)
         end
-      end    
-       
+      end
+
       def self.included(receiver)
-        receiver.send(:include, InstanceMethods)                 
+        receiver.send(:include, InstanceMethods)
       end
-    end    
-  end  
-end
+    end
+  end
+end

data/lib/transifex/errors.rb

@@ -1,11 +1,10 @@
 module Transifex
-  
   class Error < StandardError
   end
 
   class MissingParametersError < Error
     def initialize(*missing_attributes)
-      super("The following attributes are missing:" + missing_attributes.join(','))
+      super("The following attributes are missing: " + missing_attributes.join(", "))
     end
   end
 
@@ -14,12 +13,13 @@ module Transifex
       super("The following parameter: " + parameter.to_s + " must follow the format: " + format_expected)
     end
   end
-  
+
   class TransifexError < Error
     attr_reader :request_url, :code, :details
+
     def initialize(request_url, code, details)
       @request_url, @code, @details = request_url, code, details
       super(details) if details
     end
   end
-end
+end

data/lib/transifex/project_components/language.rb

@@ -14,7 +14,7 @@ module Transifex
         @language_slug = language_code
       end
 
-      def self.parents
+      def self.authors
         [:project]      
       end
 

data/lib/transifex/project_components/language_components/coordinators.rb

@@ -14,16 +14,14 @@ module Transifex
           @language_slug = language_code
         end
 
-        def self.parents
+        def self.authors
           [:project, :language]
         end
 
-        def update(coordinators_list = {}, options = {})
-          params = {}
-          params[:coordinators] = coordinators_list
-          super(params, options)
+        def update(coordinators = [], options = {})
+          super({"coordinators" => coordinators}, options)
         end
       end
     end
   end
-end
+end

data/lib/transifex/project_components/language_components/reviewers.rb

@@ -14,20 +14,17 @@ module Transifex
           @language_slug = language_code
         end
 
-        def self.parents
+        def self.authors
           [:project, :language]
         end
 
-        def update(reviewers_list = {}, options = {})
+        def update(reviewers = [], options = {})
           # Transifex needs coordinators list to be passed also when updating reviewers list. Strange
           # Fetch the current coordinators list and add it to the params as a workaround.
-          fetched_language_infos = Transifex::Project.new(@project_slug).language(@language_slug).fetch
-          params = {}
-          params[:coordinators] = fetched_language_infos["coordinators"]          
-          params[:reviewers] = reviewers_list
-          super(params, options)
+          coordinators = Transifex::Project.new(@project_slug).language(@language_slug).coordinators.fetch
+          super(coordinators.merge({"reviewers" => reviewers}), options)
         end
       end
     end
   end
-end
+end

data/lib/transifex/project_components/language_components/translators.rb

@@ -14,20 +14,17 @@ module Transifex
           @language_slug = language_code
         end
 
-        def self.parents
+        def self.authors
           [:project, :language]
         end
-              
-        def update(translators_list = {}, options = {})
+
+        def update(translators = {}, options = {})
           # Transifex needs coordinators list to be passed also when updating reviewers list. Strange
           # Fetch the current coordinators list and add it to the params as a workaround.
-          fetched_language_infos = Transifex::Project.new(@project_slug).language(@language_slug).fetch
-          params = {}
-          params[:coordinators] = fetched_language_infos["coordinators"]          
-          params[:translators] = translators_list
-          super(params, options)
+          coordinators = Transifex::Project.new(@project_slug).language(@language_slug).coordinators.fetch
+          super(coordinators.merge({"translators" => translators}), options)
         end
       end
     end
   end
-end
+end

data/lib/transifex/project_components/languages.rb

@@ -13,7 +13,7 @@ module Transifex
         @project_slug = project_slug
       end
 
-      def self.parents
+      def self.authors
         [:project]      
       end 
     end    

data/lib/transifex/resource.rb

@@ -13,7 +13,7 @@ module Transifex
       @resource_slug = resource_slug
     end
 
-    def self.parents
+    def self.authors
       [:project]      
     end  
 

data/lib/transifex/resource_components/content.rb

@@ -12,7 +12,7 @@ module Transifex
         @project_slug = project_slug
         @resource_slug = resource_slug
       end
-      def self.parents
+      def self.authors
         [:project, :resource]      
       end
       def fetch_with_file(path_to_file = nil)