localio 0.1.6 → 0.2.0

data/lib/localio/processor.rb

@@ -5,6 +5,7 @@ require 'localio/processors/csv_processor'
 
 module Processor
   def self.load_localizables(platform_options, service, options)
+    puts "Service: #{service}"
     case service
       when :google_drive
         GoogleDriveProcessor.load_localizables platform_options, options
@@ -18,4 +19,4 @@ module Processor
         raise ArgumentError, 'Unsupported service! Try with :google_drive, :csv, :xlsx or :xls in the source argument'
     end
   end
-end
+end

data/lib/localio/processors/csv_processor.rb

@@ -36,8 +36,17 @@ class CsvProcessor
     for column in 1..csv_file[first_valid_row_index].count-1
       col_all = csv_file[first_valid_row_index][column].to_s
       col_all.each_line(' ') do |col_text|
-        default_language = col_text.downcase.gsub('*', '') if col_text.include? '*'
-        languages.store col_text.downcase.gsub('*', ''), column unless col_text.to_s == ''
+        default_language = col_text.gsub('*', '') if col_text.include? '*'
+        lang = col_text.gsub('*', '')
+
+        unless platform_options[:avoid_lang_downcase]
+          default_language = default_language.downcase
+          lang = lang.downcase
+        end
+
+        unless col_text.to_s == ''
+          languages.store lang, column
+        end
       end
     end
 
@@ -78,4 +87,4 @@ class CsvProcessor
 
   end
 
-end
+end

data/lib/localio/processors/google_drive_processor.rb

@@ -1,6 +1,5 @@
 require 'google_drive'
 require 'localio/term'
-require 'localio/config_store'
 
 class GoogleDriveProcessor
 
@@ -19,9 +18,11 @@ class GoogleDriveProcessor
     client_id = options[:client_id]
     client_secret = options[:client_secret]
 
-    # We need client_id / client_secret
-    raise ArgumentError, ':client_id required for Google Drive. Check how to get it here: https://developers.google.com/drive/web/auth/web-server' if client_id.nil?
-    raise ArgumentError, ':client_secret required for Google Drive. Check how to get it here: https://developers.google.com/drive/web/auth/web-server' if client_secret.nil?
+    # We need client_id / client_secret (unless a service-account key is supplied)
+    unless options[:client_token].is_a?(String) && File.file?(options[:client_token].to_s)
+      raise ArgumentError, ':client_id required for Google Drive. Check how to get it here: https://developers.google.com/drive/web/auth/web-server' if client_id.nil?
+      raise ArgumentError, ':client_secret required for Google Drive. Check how to get it here: https://developers.google.com/drive/web/auth/web-server' if client_secret.nil?
+    end
 
     override_default = nil
     override_default = platform_options[:override_default] unless platform_options.nil? or platform_options[:override_default].nil?
@@ -29,50 +30,23 @@ class GoogleDriveProcessor
     # Log in and get spreadsheet
     puts 'Logging in to Google Drive...'
     begin
-      client = Google::APIClient.new application_name: 'Localio', application_version: Localio::VERSION
-      auth = client.authorization
-      auth.client_id = client_id
-      auth.client_secret = client_secret
-      auth.scope =
-          "https://docs.google.com/feeds/" +
-              "https://www.googleapis.com/auth/drive " +
-              "https://spreadsheets.google.com/feeds/"
-      auth.redirect_uri = "urn:ietf:wg:oauth:2.0:oob"
-
-      config = ConfigStore.new
-
-      access_token = nil
-
-      if options.has_key?(:client_token)
-        puts 'Refreshing auth token...'
-        auth.refresh_token = options[:client_token]
-        auth.refresh!
-        access_token = auth.access_token
-      elsif config.has? :refresh_token
-        puts 'Refreshing auth token...'
-        auth.refresh_token = config.get :refresh_token
-        auth.refresh!
-        access_token = auth.access_token
+      session = nil
+
+      # Service-account key file (JSON) path supplied via :client_token
+      if options[:client_token].is_a?(String) && File.file?(options[:client_token].to_s)
+        session = GoogleDrive::Session.from_service_account_key(options[:client_token])
       else
-        puts "1. Open this page in your browser:\n#{auth.authorization_uri}\n\n"
-        puts "2. Enter the authorization code shown in the page: "
-        auth.code = $stdin.gets.chomp
-        auth.fetch_access_token!
-        access_token = auth.access_token
+        # OAuth2 config-file flow (from_config saves/loads the refresh token)
+        config_path = File.join(Dir.home, '.localio_gdrive_config.json')
+        session = GoogleDrive::Session.from_config(
+          config_path,
+          client_id: client_id,
+          client_secret: client_secret
+        )
       end
-
-    if !options.has_key?(:client_token)
-      puts 'Store auth data...'
-      config.store :refresh_token, auth.refresh_token
-      config.store :access_token, auth.access_token
-      config.persist
-    end
-
-      # Creates a session
-      session = GoogleDrive.login_with_oauth(access_token)
     rescue => e
       puts "Error: #{e.inspect}"
-      raise 'Couldn\'t access Google Drive. Check your values for :client_id and :client_secret, and delete :access_token if present (you might need to refresh its value so please remove it)'
+      raise 'Couldn\'t access Google Drive. Check your values for :client_id and :client_secret.'
     end
     puts 'Logged in!'
 
@@ -90,9 +64,14 @@ class GoogleDriveProcessor
         abort "More than one match found (#{matching_spreadsheets.join ', '}). You have to be more specific!"
     end
 
+    sheet = options[:sheet]
+    worksheet = if sheet.is_a? Integer
+                  matching_spreadsheets[0].worksheets[sheet]
+                elsif sheet.is_a? String
+                  matching_spreadsheets[0].worksheets.detect { |s| s.title == sheet }
+                end
+
 
-    # TODO we could pass a :page_index in the options hash and get that worksheet instead, defaulting to zero?
-    worksheet = matching_spreadsheets[0].worksheets[0]
     raise 'Unable to retrieve the first worksheet from the spreadsheet. Are there any pages?' if worksheet.nil?
 
     # At this point we have the worksheet, so we want to store all the key / values
@@ -114,8 +93,17 @@ class GoogleDriveProcessor
     for column in 2..worksheet.max_cols
       col_all = worksheet[first_valid_row_index, column]
       col_all.each_line(' ') do |col_text|
-        default_language = col_text.downcase.gsub('*', '') if col_text.include? '*'
-        languages.store col_text.downcase.gsub('*', ''), column unless col_text.to_s == ''
+        default_language = col_text.gsub('*', '') if col_text.include? '*'
+        lang = col_text.gsub('*', '')
+
+        unless platform_options[:avoid_lang_downcase]
+          default_language = default_language.downcase
+          lang = lang.downcase
+        end
+
+        unless col_text.to_s == ''
+          languages.store lang, column
+        end
       end
     end
 

data/lib/localio/processors/xls_processor.rb

@@ -40,8 +40,17 @@ class XlsProcessor
     for column in 1..worksheet.column_count
       col_all = worksheet[first_valid_row_index, column].to_s
       col_all.each_line(' ') do |col_text|
-        default_language = col_text.downcase.gsub('*','') if col_text.include? '*'
-        languages.store col_text.downcase.gsub('*',''), column unless col_text.to_s == ''
+        default_language = col_text.gsub('*', '') if col_text.include? '*'
+        lang = col_text.gsub('*', '')
+
+        unless platform_options[:avoid_lang_downcase]
+          default_language = default_language.downcase
+          lang = lang.downcase
+        end
+
+        unless col_text.to_s == ''
+          languages.store lang, column
+        end
       end
     end
 
@@ -82,4 +91,4 @@ class XlsProcessor
 
   end
 
-end
+end

data/lib/localio/processors/xlsx_processor.rb

@@ -43,8 +43,17 @@ class XlsxProcessor
     for column in 1..worksheet.rows[first_valid_row_index].count-1
       col_all = worksheet.rows[first_valid_row_index][column].to_s
       col_all.each_line(' ') do |col_text|
-        default_language = col_text.downcase.gsub('*','') if col_text.include? '*'
-        languages.store col_text.downcase.gsub('*',''), column unless col_text.to_s == ''
+        default_language = col_text.gsub('*', '') if col_text.include? '*'
+        lang = col_text.gsub('*', '')
+
+        unless platform_options[:avoid_lang_downcase]
+          default_language = default_language.downcase
+          lang = lang.downcase
+        end
+
+        unless col_text.to_s == ''
+          languages.store lang, column
+        end
       end
     end
     
@@ -85,4 +94,4 @@ class XlsxProcessor
 
   end
 
-end
+end

data/lib/localio/template_handler.rb

@@ -6,11 +6,13 @@ class TemplateHandler
     full_template_path = File.join(File.dirname(File.expand_path(__FILE__)), "templates/#{template_name}")
     input_file = File.open(full_template_path, 'rb')
     template = input_file.read
+   
     input_file.close
     renderer = ERB.new(template)
     output = renderer.result(segments.get_binding)
     output_file = File.new(generated_file_name, 'w')
-    output_file.write(output)
+    output_replace = output.gsub(",}", "}")
+    output_file.write(output_replace)
     output_file.close
 
     destination_path = File.join(target_directory, generated_file_name)

data/lib/localio/templates/android_localizable.erb

@@ -1,11 +1,23 @@
 <!-- Localizable created with localio. DO NOT MODIFY. -->
 <resources>
 <%
+node_keys =[]
 @segments.each do |term|
      if term.is_comment? %>
   <!-- <%= term.translation %> -->
-<% else %>  <string name="<%= term.key %>"><%= term.translation %></string>
-<%   end
+<% else 
+    if term.key == '[init-node]' or term.key == '[end-node]'
+          node_keys << term.translation if term.key == '[init-node]'
+          node_keys.pop if term.key == '[end-node]'
+      else
+        if node_keys.length() > 0
+            key_join = node_keys.join("_")+"_"+term.key
+        else
+            key_join = term.key
+        end
+%>  <string name="<%= key_join %>"><%= term.translation %></string>
+<%    end 
+    end
   end
 %>
 </resources>

data/lib/localio/templates/ios_constant_localizable.erb

@@ -6,6 +6,20 @@ GENERATED - DO NOT MODIFY - use localio instead.
 Created by localio.
 */
 
-<% @segments.each do |term| %>
-#define		<%= term.key %>		NSLocalizedString(@"<%= term.translation %>",nil)<%
+<% 
+node_keys = []
+@segments.each do |term|
+    if term.key == '[init-node]' or term.key == '[end-node]'
+        node_keys << term.translation if term.key == '[init-node]'
+        node_keys.pop if term.key == '[end-node]'
+    else
+        if node_keys.length() >0
+            key_join = node_keys.join("_").capitalize+"_"+term.key.downcase
+        else
+            key_join = term.key
+        end
+%>
+#define		kLocale<%= key_join %>		NSLocalizedString(@"_<%= key_join %>",nil)
+<%
+    end
 end %>

data/lib/localio/templates/ios_localizable.erb

@@ -6,12 +6,27 @@ GENERATED - DO NOT MODIFY - use the localio gem instead.
 Created by localio.
 */
 
-<% @segments.each do |term| %>
-<%
-  if term.is_comment?
+<% 
+  node_keys = []
+  @segments.each do |term| 
+    if term.is_comment?
+%>
+  // <%= term.translation %>
+<% 
+    else 
+      if term.key == '[init-node]' or term.key == '[end-node]'
+          node_keys << term.translation if term.key == '[init-node]'
+          node_keys.pop if term.key == '[end-node]'
+      else
+        if node_keys.length() > 0
+            key_join = node_keys.join("_").capitalize+"_"+term.key.downcase
+        else
+            key_join = term.key
+        end
 %>
-// <%= term.translation %>
-<% else %>"<%= term.key %>" = "<%= term.translation %>";<%
+  "_<%= key_join %>" = "<%= term.translation %>";
+<%
+      end
     end
   end
 %>

data/lib/localio/templates/java_properties_localizable.erb

@@ -1,10 +1,24 @@
 # Localizable created with localio. DO NOT MODIFY.
 #
 # Language: <%= @language %>
-<% @segments.each do |term|
+<%
+node_keys = []
+@segments.each do |term|
 	if term.is_comment? %>
 # <%= term.translation %>
-<% 	else %><%= term.key %>=<%= term.translation %>
+<% 
+else
+    if term.key == '[init-node]' or term.key == '[end-node]'
+        node_keys << term.translation if term.key == '[init-node]'
+        node_keys.pop if term.key == '[end-node]'
+    else
+      if node_keys.length() > 0
+        key_join = node_keys.join("_")+"_"+term.key
+      else
+        key_join = term.key
+      end
+%><%= key_join %>=<%= term.translation %>
 <%  end
   end
+end
 %>

data/lib/localio/templates/json_localizable.erb

@@ -4,12 +4,13 @@
         "language": "<%= @language %>"
     },
     "translations": {
-<%   @segments.each do |term|
+<%   @segments.each.with_index do |term, index|
          term_value = term.translation
          term_key = term.key
-
-         term_key = '___comment___' if term.is_comment?
-%>      "<%= term_key %>": "<%= term_value %>"<% unless term == @segments.last %>,<% end %>
-<%     end %>
+         count_to_string = index.to_s
+         term_key = '___comment_'+count_to_string+'___' if term.is_comment?
+        if term.key == '[init-node]'%>  
+    "<%= term_value %>": {<% elsif term.key == '[end-node]'%>}<% unless term == @segments.last %>,<% end %><% else %>
+    "<%= term_key %>": "<%= term_value %>"<% unless term == @segments.last %>,<% end %><% end end %>
     }
 }

data/lib/localio/templates/rails_localizable.erb

@@ -4,10 +4,22 @@
 
 <%= @language %>:
 <%
+node_keys = []
 @segments.each do |term|
-     if term.is_comment? %>
+    if term.is_comment? %>
 # <%= term.translation %>
-<% else %>  <%= term.key %>: "<%= term.translation %>"
-<%   end
+<% else 
+    if term.key == '[init-node]' or term.key == '[end-node]'
+      node_keys << term.translation if term.key == '[init-node]'
+      node_keys.pop if term.key == '[end-node]'
+    else
+      if node_keys.length() > 0
+        key_join = node_keys.join("_")+"_"+term.key
+      else
+        key_join = term.key
+      end
+%>  <%= key_join %>: "<%= term.translation %>"
+<%  end    
   end
+end
 %>

data/lib/localio/templates/resx_localizable.erb

@@ -122,14 +122,26 @@
     <comment>Controls the Language and ensures that the font for all elements in the RootFrame aligns with the app's language. Set to the language code of this resource file's language.</comment>
   </data>
 <%
+node_keys = []
 @segments.each do |term|
      if term.is_comment? %>
   <!-- <%= term.translation %> -->
-<% else %>  <data name="<%= term.key %>" xml:space="preserve">
+<% else 
+ if term.key == '[init-node]' or term.key == '[end-node]'
+      node_keys << term.translation if term.key == '[init-node]'
+      node_keys.pop if term.key == '[end-node]'
+    else
+      if node_keys.length() > 0
+        key_join = node_keys.join().capitalize+term.key.capitalize
+      else
+        key_join = term.key
+      end
+%>  <data name="<%= key_join %>" xml:space="preserve">
     <value><![CDATA[<%= term.translation %>]]></value>
     <comment/>
   </data>
-<%   end
+<%  end
+   end
   end
 %>
 

data/lib/localio/templates/swift_constant_localizable.erb

@@ -8,6 +8,19 @@ Created by localio
 
 import Foundation
 
-<% @segments.each do |term| %>
-let <%= term.key %>: String = { return NSLocalizedString("<%= term.translation %>", comment: "") }()<%
+<% 
+node_keys = []
+@segments.each do |term| 
+    if term.key == '[init-node]' or term.key == '[end-node]'
+        node_keys << term.translation if term.key == '[init-node]'
+        node_keys.pop if term.key == '[end-node]'
+    else
+        if node_keys.length() >0
+            key_join = node_keys.join("_").capitalize+"_"+term.key.downcase
+        else
+            key_join = term.key
+        end
+%>
+let kLocale<%= key_join %>: String = { return NSLocalizedString("_<%= key_join %>", comment: "") }()<%
+    end
 end %>

data/lib/localio/version.rb

@@ -1,3 +1,3 @@
 module Localio
-  VERSION = "0.1.6"
+  VERSION = "0.2.0"
 end

data/lib/localio/writers/ios_writer.rb

@@ -25,7 +25,7 @@ class IosWriter
 
         unless term.is_comment?
           constant_key = ios_constant_formatter term.keyword
-          constant_value = key
+          constant_value = translation
           constant_segment = Segment.new(constant_key, constant_value, lang)
           constant_segments.segments << constant_segment
         end
@@ -45,11 +45,11 @@ class IosWriter
   private
 
   def self.ios_key_formatter(key)
-    '_'+key.space_to_underscore.strip_tag.capitalize
+    key.space_to_underscore.strip_tag.capitalize
   end
 
   def self.ios_constant_formatter(key)
-    'kLocale'+key.space_to_underscore.strip_tag.camel_case
+    key.space_to_underscore.strip_tag.camel_case
   end
 
 end

data/lib/localio/writers/swift_writer.rb

@@ -25,7 +25,7 @@ class SwiftWriter
 
         unless term.is_comment?
           constant_key = swift_constant_formatter term.keyword
-          constant_value = key
+          constant_value = translation
           constant_segment = Segment.new(constant_key, constant_value, lang)
           constant_segments.segments << constant_segment
         end
@@ -44,10 +44,10 @@ class SwiftWriter
   private
 
   def self.swift_key_formatter(key)
-    '_'+key.space_to_underscore.strip_tag.capitalize
+     key.space_to_underscore.strip_tag.capitalize
   end
 
   def self.swift_constant_formatter(key)
-    'kLocale'+key.space_to_underscore.strip_tag.camel_case
+    key.space_to_underscore.strip_tag.camel_case
   end
 end

data/localio.gemspec

@@ -1,35 +1,29 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'localio/version'
 
 Gem::Specification.new do |spec|
-  spec.name = "localio"
-  spec.version = Localio::VERSION
-  spec.authors = ["Nacho Lopez"]
-  spec.email = ["nacho@nlopez.io"]
-  spec.description = %q{Automatic Localizable file generation for multiple platforms (Rails YAML, Android, Java Properties, iOS, JSON, .NET ResX)}
-  spec.summary = %q{Automatic Localizable file generation for multiple type of files, like Android string.xml, Xcode Localizable.strings, JSON files, Rails YAML files, Java properties, etc. reading from Google Drive and Excel spreadsheets as base.}
-  spec.homepage = "http://github.com/mrmans0n/localio"
-  spec.license = "MIT"
+  spec.name          = "localio"
+  spec.version       = Localio::VERSION
+  spec.authors       = ["Nacho Lopez"]
+  spec.email         = ["nacho@nlopez.io"]
+  spec.description   = %q{Automatic Localizable file generation for multiple platforms}
+  spec.summary       = %q{Generates Android, iOS, Rails, JSON, Java Properties, and .NET ResX localization files from spreadsheet sources.}
+  spec.homepage      = "https://github.com/mrmans0n/localio"
+  spec.license       = "MIT"
 
-  spec.files = `git ls-files`.split($/)
-  spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
+  spec.files         = `git ls-files`.split("\n")
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.executables << "localize"
+  spec.required_ruby_version = ">= 3.2"
 
-  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "rspec",   "~> 3.0"
+  spec.add_development_dependency "rake",    "~> 13.0"
 
-  spec.required_ruby_version = ">= 1.9.2"
-
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
-
-  spec.add_dependency "micro-optparse", "~> 1.2"
-  spec.add_dependency "google_drive", "~> 1.0"
-  spec.add_dependency "spreadsheet", "~> 1.0"
-  spec.add_dependency "simple_xlsx_reader", "~> 1.0"
-  spec.add_dependency "nokogiri", "~> 1.6"
+  spec.add_dependency "google_drive",        "~> 3.0"
+  spec.add_dependency "spreadsheet",         "~> 1.3"
+  spec.add_dependency "simple_xlsx_reader",  "~> 2.0"
+  spec.add_dependency "nokogiri",            "~> 1.16"
+  spec.add_dependency "csv",                 "~> 3.2"
 end

data/spec/fixtures/sample.csv

@@ -0,0 +1,11 @@
+Title Row,,,
+[key],*en,es,fr
+[comment],Section General,Section General,Section General
+app_name,My App,Mi Aplicación,Mon Application
+greeting,Hello %@ world,Hola %@ mundo,Bonjour %@ monde
+dots_test,Wait...,Espera...,Attendez...
+ampersand_test,Tom & Jerry,Tom & Jerry,Tom & Jerry
+[init-node],module,module,module
+nested_key,Module Key,Clave Módulo,Clé Module
+[end-node],end,end,end
+[end],,,

data/spec/localio/filter_spec.rb

@@ -0,0 +1,40 @@
+require 'localio/term'
+require 'localio/filter'
+
+RSpec.describe Filter do
+  let(:terms) do
+    ['app_name', 'app_title', 'settings_title', 'settings_back', '[comment]'].map { |kw| Term.new(kw) }
+  end
+
+  describe '.apply_filter' do
+    it 'returns all terms when no filters set' do
+      expect(Filter.apply_filter(terms, nil, nil)).to eq(terms)
+    end
+
+    context 'with only filter' do
+      it 'keeps terms matching the regex' do
+        result = Filter.apply_filter(terms, { keys: 'app_' }, nil)
+        expect(result.map(&:keyword)).to contain_exactly('app_name', 'app_title')
+      end
+
+      it 'returns empty array when nothing matches' do
+        expect(Filter.apply_filter(terms, { keys: 'nonexistent' }, nil)).to be_empty
+      end
+    end
+
+    context 'with except filter' do
+      it 'excludes terms matching the regex' do
+        result = Filter.apply_filter(terms, nil, { keys: 'settings_' })
+        expect(result.map(&:keyword)).not_to include('settings_title', 'settings_back')
+        expect(result.map(&:keyword)).to include('app_name', 'app_title')
+      end
+    end
+
+    context 'with both filters' do
+      it 'applies only first then except' do
+        result = Filter.apply_filter(terms, { keys: 'app_' }, { keys: 'title' })
+        expect(result.map(&:keyword)).to contain_exactly('app_name')
+      end
+    end
+  end
+end

data/spec/localio/formatter_spec.rb

@@ -0,0 +1,32 @@
+require 'localio/string_helper'
+require 'localio/formatter'
+
+RSpec.describe Formatter do
+  let(:smart_callback) { ->(key) { key.upcase } }
+
+  describe '.format' do
+    it ':smart delegates to callback' do
+      expect(Formatter.format('hello', :smart, smart_callback)).to eq('HELLO')
+    end
+
+    it ':none returns key unchanged' do
+      expect(Formatter.format('Hello World', :none, smart_callback)).to eq('Hello World')
+    end
+
+    it ':camel_case converts to CamelCase' do
+      expect(Formatter.format('hello world', :camel_case, smart_callback)).to eq('HelloWorld')
+    end
+
+    it ':camel_case strips single-letter bracket tags' do
+      expect(Formatter.format('[a]hello', :camel_case, smart_callback)).to eq('Hello')
+    end
+
+    it ':snake_case converts spaces to underscores and downcases' do
+      expect(Formatter.format('Hello World', :snake_case, smart_callback)).to eq('hello_world')
+    end
+
+    it 'raises ArgumentError for unknown formatter' do
+      expect { Formatter.format('key', :unknown, smart_callback) }.to raise_error(ArgumentError)
+    end
+  end
+end