phraseapp_updater 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d67eacb35853fba62acb15d0d75cde0ce6f9e404
-  data.tar.gz: a5b4673fe4b9bd243abcc40a75fed90879fcf9a3
+  metadata.gz: b0d34620e813a3d8381bb9e69718c4eddf00861c
+  data.tar.gz: 83376f665f0c2a2db922f5297f2a29890700be54
 SHA512:
-  metadata.gz: 5212349be6b3b61355fafcccb042f733a43c1a790830970b0f80a3c5bc3d3235f628ca0557ff0dce8c3ce67778233da2c758ab65ff6eb584f513c452c7a79058
-  data.tar.gz: 3bf0fd14f412b895bfc59f6665c5d378a1921242ff8a09e03cc94730a2d05ccf00fbd9337f2518c400a703f5775da363097a0c334f6e91a5bfa5d42b6f72c430
+  metadata.gz: e17e637e811441675d66c88a948913ba8526a014934405889b31422200991e66cc68d8cc9e0a733d99cd98f87e7b0f6f051fa0b358d5d15f3af8f47ad6eb28c3
+  data.tar.gz: 4b3e48725db68140f04d6c12f836ce82e6514151b652525331925ea3a8b690209fdf2d67ff5c6594c2f0b75c7629ffd3e1254ca1a191ff43228edc4e224f101a

data/README.markdown

@@ -2,7 +2,7 @@
 
 [![Build Status](https://travis-ci.org/iknow/phraseapp_updater.svg?branch=master)](https://travis-ci.org/iknow/phraseapp_updater)
 
-**Version** 0.1.6
+**Version** 0.1.7
 
 This is a tool for merging PhraseApp locale data with locale data
 committed in your project.
@@ -89,7 +89,7 @@ committed to your application's respository.  These will be used in the
 merge with the files on PhraseApp.
 
 ```
-phraseapp_updater push --new_locales_path="/data/previous", --previous_locales_path="/data/new" --phraseapp_api_key="yourkey" --phraseapp_project_id="projectid --file_format=json"
+phraseapp_updater push --new_locales_path="/data/new", --previous_locales_path="/data/previous" --phraseapp_api_key="yourkey" --phraseapp_project_id="projectid --file_format=json"
 ```
 
 The arguments provided to the command can also be specified as shell
@@ -160,7 +160,6 @@ If you'd like to contribute, these would be very helpful!
 * Separating downloading and resolving data from PhraseApp from pushing
   back up to it, to enable different kinds of workflows.
 * Expose the changed files on the command line.
-* Implement other `LocaleFile`s with `parse` for non-JSON types.
 * Checking if PhraseApp files changed during execution before upload, to reduce the race condition window.
 * More specs for the API and shell.
 

data/bin/phraseapp_updater

@@ -57,6 +57,7 @@ class PhraseAppUpdaterCLI < Thor
   option :phraseapp_api_key,     type: :string,                  desc: "PhraseApp API key. Shell variable: PA_API_KEY"
   option :phraseapp_project_id,  type: :string,                  desc: "PhraseApp project ID. Shell variable: PA_PROJECT_ID"
   option :config_file_path,      type: :string,                  desc: "Path to .phraseapp.yml config file to read API key and project ID."
+  option :file_format,           type: :string,                  desc: "Filetype of localization files."
 
   def pull
     phraseapp_api_key, phraseapp_project_id, file_format = load_phraseapp_configuration(options)

data/lib/phraseapp_updater/locale_file/json_file.rb

@@ -8,7 +8,9 @@ Oj.default_options = {mode: :strict}
 class PhraseAppUpdater
   class LocaleFile
     class JSONFile < LocaleFile
-      EXTENSION = "json"
+      EXTENSION      = "json"
+      PHRASEAPP_TYPE = "nested_json"
+
       def self.from_hash(name, hash)
         new(name, MultiJson.dump(hash))
       end

data/lib/phraseapp_updater/locale_file/yaml_file.rb

@@ -2,7 +2,9 @@ require 'psych'
 class PhraseAppUpdater
   class LocaleFile
     class YAMLFile < LocaleFile
-      EXTENSION = "yml"
+      EXTENSION      = "yml"
+      PHRASEAPP_TYPE = "yml"
+
       def self.from_hash(name, hash)
         new(name, Psych.dump(hash))
       end

data/lib/phraseapp_updater/phraseapp_api.rb

@@ -46,7 +46,7 @@ class PhraseAppUpdater
     def download_file(locale, skip_unverified)
       download_params = PhraseApp::RequestParams::LocaleDownloadParams.new
 
-      download_params.file_format                  = "nested_json"
+      download_params.file_format                  = @locale_file_class.const_get(:PHRASEAPP_TYPE)
       download_params.skip_unverified_translations = skip_unverified
 
       phraseapp_request { @client.locale_download(@project_id, locale.id, download_params) }
@@ -142,7 +142,7 @@ class PhraseAppUpdater
     def create_upload_params(locale_name)
       upload_params = PhraseApp::RequestParams::UploadParams.new
       upload_params.file_encoding       = "UTF-8"
-      upload_params.file_format         = "nested_json"
+      upload_params.file_format         = @locale_file_class.const_get(:PHRASEAPP_TYPE)
       upload_params.locale_id           = locale_name
       upload_params.skip_unverification = false
       upload_params.update_translations = true

data/lib/phraseapp_updater/version.rb

@@ -1,3 +1,3 @@
 class PhraseAppUpdater
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

data/lib/phraseapp_updater/yml_config_loader.rb

@@ -32,6 +32,10 @@ class PhraseAppUpdater
 
     private
 
+    # TODO As this information is now duplicated in the file type
+    # classes, it would be better to pass this around and use it to determine
+    # which class to instantiate. Maybe? Should probably go along with a change
+    # to the command line which forces the use of PhraseApp types.
     def convert(phraseapp_file_format)
       case phraseapp_file_format
       when "nested_json"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phraseapp_updater
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Kevin Griffin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-31 00:00:00.000000000 Z
+date: 2017-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor