slimkeyfy 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ee5c9bad4a4451f742d2dd6cc4b58200fccc293
-  data.tar.gz: fb7116389730093d186eed6e347653d73651191a
+  metadata.gz: d7b087050604856e414040ee52a0f0f6193d6262
+  data.tar.gz: fda6549ae39e62bc4a14d90a87aa416e8a62cf8a
 SHA512:
-  metadata.gz: ec2d6e0334284b0b23dbdbde0b7e6642ed9bfb2356cfa25171b3b2fcde8b61294b6fce9c4cc809c22014291b74e2436062641086e6d28bd58dc30f9baa76ed1c
-  data.tar.gz: ccb8f003cfd001ece01588eb6186aebd3902ff93a159f4c667b952a5c03baabc9e6dae4e05647fa3cb7c5e69ec94afa25e314165a656b58b1e004261482cf686
+  metadata.gz: 1789730769336204cfd93fefaa65bd6e01c4e086d6114b79468c73f71e2582288d7baea132ae2219569782f82a428470b56b8f30efbfedd7dc144003ab41000a
+  data.tar.gz: b115559e8670e99b43c50805b935d162d698b820a187751880bdba8c7a2fcc63f44c8f849fdf3c43facf9d0dba436075a90977b389ba386936669b0744adb2c6

data/README.md

@@ -1,14 +1,17 @@
 Slimkeyfy
 =
 Extract plain Strings from .slim views and Rails controllers to replace them with I18n's t() method. Keys with it's translations will be streamed to a YAML file.
+
+Read more in this blog post: [PhraseApp Blog: Make your Rails App localizable with Slimkeyfy](http://blog.phraseapp.com/post/96450272307/make-your-rails-app-localizable-with-slimkeyfy)
+
 ```ruby
 slimkeyfy app/views/users/show.html.slim en
 # users/show.html.slim
 h1 Hello World!
 # converts to
-h1= t('.hello_world') 
+h1= t('.hello_world')
 # config/locales/users.en.yaml
-# en: 
+# en:
 #   user:
 #     show:
 #       hello_world: Hello World!
@@ -79,7 +82,7 @@ your_app_name/
 
 > pwd
 ../your_app_name/
- 
+
 > slimkeyfy app/views/users/ en
 ... choose your changes here (y/n/x/a)
 
@@ -88,22 +91,22 @@ your_app_name/
     show.html.slim
     new.html.slim.bak
     show.html.slim.bak
-    
+
 > ls config/locales/
     user.en.yml
     en.yml
-    
+
 > cat ../users/new.html.slim.bak
   h1 Hello World!
-    
+
 > cat ../users/new.html.slim
   h1= t('.hello_world')
- 
+
 > cat config/locales/en.yml
   --
   en:
     keys..
-          
+
 > cat config/locales/users.en.yml
   ---
   en:
@@ -117,13 +120,13 @@ Suggested Workflow
 -
 As HTML is not 100% parsable there will be errors in the conversion. To minimize your error rate we suggest to approach each view or view_folder individually. The i18n-tasks gem helped a lot by finding errors. Always double check your views and make sure that everything went smoothly. Especially double check all your links. Here is an example workflow:
 ```ruby
-# 1. create a branch for a view folder 
+# 1. create a branch for a view folder
 > git checkout -b users_localization
 
 # 2. slimkeyfy the view folder you would like to tag
 > slimkeyfy app/views/users/ en
 
-# 3. go through all files and verify/add missing translations 
+# 3. go through all files and verify/add missing translations
 # (check against the .bak files (use git diff))
 > git diff app/views/users/views.html.slim
 

data/lib/slimkeyfy/console/command_line.rb

@@ -52,9 +52,9 @@ class SlimKeyfy::Console::Commandline
 
     wrong_usage if (input.nil? or locale.nil?)
 
-    if File.directory?(input) then
+    if File.directory?(input)
       directory_translate(input)
-    elsif File.file?(input) then
+    elsif File.file?(input)
       translate
     else
       raise "Please provide a file or directory!"
@@ -65,7 +65,7 @@ class SlimKeyfy::Console::Commandline
   def directory_translate(input)
     rec = @options.fetch(:recursive, false)
     SlimKeyfy::Slimutils::MFileUtils.walk(input, rec).each do |rec_input|
-      if File.file?(rec_input) and SlimKeyfy::Slimutils::MFileUtils.is_valid_extension?(rec_input) then
+      if File.file?(rec_input) and SlimKeyfy::Slimutils::MFileUtils.is_valid_extension?(rec_input)
         @options[:input] = rec_input
         translate
       end
@@ -73,7 +73,7 @@ class SlimKeyfy::Console::Commandline
   end
 
   def translate
-    unless SlimKeyfy::Slimutils::MFileUtils.is_valid_extension?(@options[:input]) then
+    unless SlimKeyfy::Slimutils::MFileUtils.is_valid_extension?(@options[:input])
       puts "invalid extension!"
       return
     end

data/lib/slimkeyfy/console/io_action.rb

@@ -2,9 +2,9 @@ class SlimKeyfy::Console::IOAction
   def self.yes_or_no?(msg)
     puts "#{msg} (y|n)"
     arg = STDIN.gets.chomp
-    if arg =~ /[yY](es)?/ then
+    if arg =~ /[yY](es)?/
       true
-    elsif arg =~ /[nN]o?/ then
+    elsif arg =~ /[nN]o?/
       false
     else
       puts "Provide either (y)es or (n)o!"
@@ -14,13 +14,13 @@ class SlimKeyfy::Console::IOAction
   def self.choose(msg)
     puts "#{msg} (y|n) (x for tagging | (a)bort)"
     arg = STDIN.gets.chomp
-    if arg =~ /[yY](es)?/ then
+    if arg =~ /[yY](es)?/
       "y"
-    elsif arg =~ /[nN]o?/ then
+    elsif arg =~ /[nN]o?/
       "n"
-    elsif arg =~ /x/ then
+    elsif arg =~ /x/
       "x"
-    elsif arg =~ /a/ then
+    elsif arg =~ /a/
       "a"
     else
       puts "Either (y)es, (n)o, (x) for tagging or (a) to abort"

data/lib/slimkeyfy/console/printer.rb

@@ -7,12 +7,12 @@ class SlimKeyfy::Console::Printer
   def self.unix_diff(bak_path, file_path)
     result = "Please install colordiff or diff (brew install colordiff)"
     colordiff, diff = `which colordiff`, `which diff`
-    if not colordiff.empty? then
+    if not colordiff.empty?
       result = `colordiff #{bak_path} #{file_path}`
-    elsif not diff.empty? then
+    elsif not diff.empty?
       result =`diff #{bak_path} #{file_path}`
     end
-    if result.nil? or result.strip.empty? then
+    if result.nil? or result.strip.empty?
       puts "No changes for comparison found!"
     else
       puts "#{result}"

data/lib/slimkeyfy/console/translate.rb

@@ -17,9 +17,9 @@ class SlimKeyfy::Console::Translate
   end
 
   def transformer
-    if @extension == "slim" then
+    if @extension == "slim"
       SlimKeyfy::Transformer::SlimTransformer
-    elsif @extension == "rb" then
+    elsif @extension == "rb"
       SlimKeyfy::Transformer::ControllerTransformer
     else
       puts "Unknown extension type!"
@@ -69,11 +69,11 @@ class SlimKeyfy::Console::Translate
   end
 
   def finalize!
-    if @changes then
-      if SlimKeyfy::Console::IOAction.yes_or_no?("Do you like to review your changes?") then
+    if @changes
+      if SlimKeyfy::Console::IOAction.yes_or_no?("Do you like to review your changes?")
         SlimKeyfy::Console::Printer.unix_diff(@bak_path, @original_file_path)
       end
-      if SlimKeyfy::Console::IOAction.yes_or_no?("Do you like to save your changes?") then
+      if SlimKeyfy::Console::IOAction.yes_or_no?("Do you like to save your changes?")
         @yaml_processor.store!
         puts "Saved! at #{@original_file_path}"
         SlimKeyfy::Slimutils::MFileUtils.rm(@bak_path) if @no_backup

data/lib/slimkeyfy/slimutils/file_utils.rb

@@ -39,9 +39,8 @@ class SlimKeyfy::Slimutils::MFileUtils
     file_path.split(".").last
   end
   def self.is_valid_extension?(file_path)
-    ext = self.file_extension(file_path)
-    return false if (ext.nil? or ext.empty?)
-    (ext.end_with?("slim") or ext.end_with?("rb"))
+    return false if (file_path.nil? or file_path.empty?)
+    (file_path.end_with?(".slim") or file_path.end_with?(".rb"))
   end
 end
 

data/lib/slimkeyfy/slimutils/yaml_processor.rb

@@ -12,12 +12,12 @@ class SlimKeyfy::Slimutils::YamlProcessor
   end
 
   def process_output_file(yaml_output)
-    if yaml_output.nil? then
+    if yaml_output.nil?
       dir_of_key = @key_base.split(".").first
       yaml_output = default_yaml(dir_of_key, @locale)
     end
     path = File.expand_path(yaml_output.to_s)
-    if File.exist?(path) then 
+    if File.exist?(path) 
       path
     else
       SlimKeyfy::Slimutils::FileWriter.write(path, "---")
@@ -32,8 +32,11 @@ class SlimKeyfy::Slimutils::YamlProcessor
 
   def load_hash
     h = YAML::load_file(@yaml_output)
-    if h then h[@locale]
-    else {} end
+    if h
+      h[@locale]
+    else 
+      {} 
+    end
   end
 
   def default_yaml(key, locale)

data/lib/slimkeyfy/transformer/slim_transformer.rb

@@ -1,7 +1,7 @@
 class SlimKeyfy::Transformer::SlimTransformer < SlimKeyfy::Transformer::BaseTransformer
 
   HTML_TAGS = /^(?<html_tag>'|\||([a-z\.]+[0-9\-]*)+)/
-  EQUALS = /(([a-z\.]+[0-9\-]*)*=.*)/
+  EQUALS = /#?([a-z0-9\.\-\s]+)?\=.*/
 
   BEFORE =        /(?<before>.*)/
   TRANSLATION =   /(?<translation>(".*?"|'.*?'))/
@@ -32,9 +32,9 @@ class SlimKeyfy::Transformer::SlimTransformer < SlimKeyfy::Transformer::BaseTran
     unindented_line = @word.unindented_line
 
     result = 
-    if unindented_line.match(EQUALS) then
+    if unindented_line.match(EQUALS)
       parse_html_arguments(unindented_line)
-    elsif @word.head.match(HTML_TAGS) then
+    elsif @word.head.match(HTML_TAGS)
       parse_html
     else nil_elem end
 
@@ -50,7 +50,7 @@ class SlimKeyfy::Transformer::SlimTransformer < SlimKeyfy::Transformer::BaseTran
     body = @word.tail.join(" ")
     body, tagged_with_equals = SlimKeyfy::Transformer::Whitespacer.convert_nbsp(body, tagged_with_equals)
 
-    if body.match(LINK_TO) != nil then
+    if body.match(LINK_TO) != nil
       body = link_tos(body)
     end
     
@@ -72,7 +72,7 @@ class SlimKeyfy::Transformer::SlimTransformer < SlimKeyfy::Transformer::BaseTran
 
   def link_tos(line)
     m = line.match(LINK_TO)
-    if m != nil then
+    if m != nil
       _, translation = m[:html_tag], match_string(m[:translation])
       translation_key = update_hashes(translation)
       line = line.gsub(m[:translation], translation_key)

data/lib/slimkeyfy/transformer/word.rb

@@ -27,7 +27,7 @@ class SlimKeyfy::Transformer::Word
   end
 
   def i18nString(translation_key)
-    if @extension == "rb" then
+    if @extension == "rb"
       "t('#{@key_base}.#{translation_key}')"
     else
       "t('.#{translation_key}')"

data/lib/slimkeyfy/version.rb

@@ -1,3 +1,3 @@
 module SlimKeyfy
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slimkeyfy
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Dynport GmbH
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-02 00:00:00.000000000 Z
+date: 2015-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -145,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Extract plain strings from slim templates to replace them with calls to I18n's