bisu 1.10.1 → 1.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 41fa600d8b33846f4a860595f47093d7105a79f7690968c4b3d0428fec0936ea
-  data.tar.gz: 2f4fed77d3e7b4688c8c0dd77dff43f96c32f0e52f2ebde3343115c0f25249cb
+  metadata.gz: fd090e1e936ebc979392e5ba1cb44657bf0c716fdadbc1566f3aafa8252ff3dd
+  data.tar.gz: 89b8897c02e0ef9eba1945c125b43e4dff1fc38db73017d2eeca8b3ebb16674c
 SHA512:
-  metadata.gz: f3ea51eff598f91be9dfdcc43fc14e858e56839c956949d38777bbf551fea15021caa25264d4f9c70ca7e8086c8beb976cd9249a8efdf2fba4c2d1572558ba34
-  data.tar.gz: f27e7c904060eb9ae83807b8c4028db4e7cfbfecd963bb3ff5d4af30d417ce8a820b9ff99eceb58d972916b0ee948f81e1a31e9f001739c3e06108ca3aa9f4c9
+  metadata.gz: 521148f8d23cb2bc308eab074f90c2b964cee468a3fa65594504153d834b4878fd4b1dc9fcc96c7a04064e909b534bc6cafec49b199164d3b5d8310f215f8e36
+  data.tar.gz: a011abe84e8c72ef2ad755f64595141f03acbd7367b70c321fb867f059f3891debd4878545acfaa8bb7f59b5ea1562aae3683430d7613d05244249af6ce67315

data/CHANGELOG.md

@@ -2,6 +2,18 @@
 All notable changes to this project will be documented in this file.
 `Bisu` adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.10.2](https://github.com/hole19/bisu/releases/tag/v1.10.2)
+Released on 2021/08/30
+
+#### Fixed
+- Fixes bug where we were assuming "key" would always be the translations-key column title
+
+## [1.10.1](https://github.com/hole19/bisu/releases/tag/v1.10.1)
+Released on 2021/08/30
+
+#### Fixed
+- Crash caused by an unexpected redirect
+
 ## [1.10.0](https://github.com/hole19/bisu/releases/tag/v1.10.0)
 Released on 2021/08/30
 

data/README.md

@@ -74,6 +74,7 @@ Setup your configuration file
   dictionary:
     type: google_sheet
     url: <GOOGLE-DRIVE-SHEET-CSV-URL>
+    keys_column: <GOOGLE-DRIVE-KEY-COLUMN-TITLE>
   ```
 
 ##### OneSky integration:

data/generic.translatable.yml

@@ -4,6 +4,7 @@ type: iOS
 dictionary:
   type: google_sheet
   url: <GOOGLE-DRIVE-SHEET-CSV-URL>
+  keys_column: <GOOGLE-DRIVE-KEY-COLUMN-TITLE>
 
 translate:
   - in: path/to/1st/file.translatable

data/lib/bisu/config.rb

@@ -62,6 +62,7 @@ module Bisu
       elements: {
         type: { type: String },
         url: { type: String },
+        keys_column: { type: String },
       },
     }
 

data/lib/bisu/source/google_sheet.rb

@@ -4,8 +4,9 @@ require "csv"
 module Bisu
   module Source
     class GoogleSheet
-      def initialize(url)
+      def initialize(url, keys_column)
         @url = url
+        @keys_column = keys_column
       end
 
       def to_i18
@@ -20,7 +21,7 @@ module Bisu
 
         csv.each do |row|
           languages.each do |lang|
-            hash[lang][row["key"]] = row[lang] unless row[lang].nil?
+            hash[lang][row[@keys_column]] = row[lang] unless row[lang].nil?
           end
         end
 

data/lib/bisu/version.rb

@@ -1,4 +1,4 @@
 module Bisu
-  VERSION = '1.10.1'
+  VERSION = '1.10.2'
   VERSION_UPDATED_AT = '2021-08-30'
 end

data/lib/bisu.rb

@@ -59,7 +59,7 @@ module Bisu
     source =
       case config[:type]
       when "google_sheet"
-        Bisu::Source::GoogleSheet.new(config[:url])
+        Bisu::Source::GoogleSheet.new(config[:url], config[:keys_column])
       when "one_sky"
         Bisu::Source::OneSky.new(config[:api_key], config[:api_secret], config[:project_id], config[:file_name])
       when "url"
@@ -70,7 +70,7 @@ module Bisu
 
     save_to_path = options[:dictionary_save_path]
     if save_to_path && file = open_file(save_to_path, "w", false)
-      file.write(source.to_json)
+      file.write(deep_force_encoding(source).to_json)
       file.flush
       file.close
     end
@@ -149,4 +149,15 @@ module Bisu
 
     true
   end
+
+  def deep_force_encoding(hash)
+    hash.each do |_, value|
+      case value
+      when String
+        value.force_encoding(Encoding::UTF_8)
+      when Hash
+        deep_force_encoding(value)
+      end
+    end
+  end
 end

data/spec/fixtures/sample.translatable.yml

@@ -3,6 +3,7 @@ type: iOS
 dictionary:
   type: google_sheet
   url: sheet-public-url
+  keys_column: "key name"
 
 translate:
   - in: hole19/Localizable.strings.translatable

data/spec/fixtures/sample_google_response.csv

@@ -1,4 +1,4 @@
-key,en,ja,fr,de,ko
+key name,en,ja,fr,de,ko
 kConnectFacebook,Connect with Facebook,フェイスブックへ接続,Connexion par Facebook,Mit Facebook verbinden,페이스북으로 접속
 kNoNoNoMr,"No, no, no. Mr %{name} not here",,,,
 kTwitterServer,,,,,트위터 서버연결 실패. \n잠시 후 재시도.

data/spec/lib/bisu/config_spec.rb

@@ -6,6 +6,7 @@ describe Bisu::Config do
     dictionary: {
       type: "google_sheet",
       url: "https://abc1234567890",
+      keys_column: "key name",
     },
     translate: [
       { in: "path/to/file/to/1.ext.translatable",
@@ -36,7 +37,7 @@ describe Bisu::Config do
   describe "#dictionary" do
     subject(:dictionary) { config.dictionary }
 
-    it { should eq({ type: "google_sheet", url: "https://abc1234567890" }) }
+    it { should eq({ type: "google_sheet", url: "https://abc1234567890", keys_column: "key name" }) }
 
     context "when given a OneSky type dictionary" do
       before do

data/spec/lib/bisu/source/google_sheet_spec.rb

@@ -1,5 +1,5 @@
 describe Bisu::Source::GoogleSheet do
-  subject(:to_i18) { Bisu::Source::GoogleSheet.new(url).to_i18 }
+  subject(:to_i18) { Bisu::Source::GoogleSheet.new(url, "key name").to_i18 }
 
   let(:url) { "https://docs.google.com/spreadsheets/d/e/2PACX-1vTm6yu_zfbxKizC-PvUE1HVFCsplmiyz0s0qLSIGeokA7KtS3BgtqaA79CsfYfPsXH6xzUaP8HDTcj8/pub?gid=0&single=true&output=csv" }
   let(:response) { File.read("spec/fixtures/sample_google_response.csv") }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bisu
 version: !ruby/object:Gem::Version
-  version: 1.10.1
+  version: 1.10.2
 platform: ruby
 authors:
 - joaoffcosta