rspec-i18n 1.1.0 → 1.2.0

data/features/support/env.rb

@@ -0,0 +1,13 @@
+require 'aruba'
+
+module ArubaOverrides
+  def detect_ruby_script(cmd)
+    if cmd =~ /^rspec-i18n/
+      "ruby -S ../../bin/#{cmd}"
+    else
+      super(cmd)
+    end
+  end
+end
+
+World(ArubaOverrides)

data/lib/spec-i18n/command_line/language_help_formatter.rb

@@ -1,85 +1,91 @@
-require 'term/ansicolor'
-require 'terminal-table/import'
+require 'spec-i18n/spec_language'
 require 'spec-i18n/parser'
-  
+
+def require_terminal_table
+  begin
+    require 'terminal-table/import'
+  rescue LoadError
+    require 'rubygems'
+    require 'terminal-table/import'
+  end
+end
+
+require_terminal_table
+
 module SpecI18n
   module CommandLine
-    class LanguageHelpFormatter
-      
+    class Language
+      extend SpecI18n::Parser
       class << self
-        include SpecI18n::Parser
-        include Term::ANSIColor
-        
-        String.class_eval do
-          include Term::ANSIColor
-        end
-        
+                        
+        # List Name and Native Keywords of all the languages in the
+        # languages.yml
+        #
         def list_languages_and_exit(io)
           languages = list_languages
-          
-          languages_table = table do
+          print_table io, table_for_languages(languages), :exit => true
+        end
+        
+        # Return a table to use with command to list all languages
+        #
+        def table_for_languages(languages)
+          table do
             self.headings = ['Language', 'Name', 'Native']
-            languages.each do |language|
-              add_row language
-            end
+            languages.each { |language| add_row language }
           end
-          
-          print_table io, languages_table, :exit => true
         end
         
         def list_keywords_and_exit(io, lang)
-          
-          language = NaturalLanguage.get(lang)
-          
-          keywords = list_basic_keywords(language)
-          
-          print_table io, table(nil, *keywords)
-          
-          advanced_keywords = list_advanced_keywords(io, language)
-          
-          print_table io, advanced_keywords, :exit => true
+          language = NaturalLanguage.new(lang)
+          keywords_table(io, language)
+          matchers_table(io, language)
+          hooks_table(io, language)
+          Kernel.exit(0)
         end
         
-        def list_languages
-          languages = SpecI18n::SPEC_LANGUAGES.keys.sort.map do |lang|
-            [ lang, grep_value(lang, 'name'), grep_value(lang, 'native') ]
-          end
+        # Print the table to list all languages or keywords of a language
+        #
+        def print_table(io, raw, options={})
+          io.puts raw
+          Kernel.exit(0) if options[:exit]
         end
         
-        def grep_value(lang, key)
-          SpecI18n::SPEC_LANGUAGES[lang][key]
+        def keywords_table(io, language)
+          table_for_keywords = table do
+            self.headings = ['Rspec Keywords', 'Translated Keyword']
+            language.basic_keywords.sort.each do |rspec_keyword, translated_keyword|
+              add_row [rspec_keyword, translated_keyword.to_s.split('|').join(' / ')]
+            end
+          end
+          print_table io, table_for_keywords
         end
         
-        def list_basic_keywords(language)
-          NaturalLanguage::BASIC_KEYWORDS.map do |keyword|
-            words = language.keywords[keyword]            
-            [ keyword, words.split('|').join(' / ')] 
+        def matchers_table(io, language)
+          matchers = language.matchers
+          return if matchers.empty?
+          table_for_matchers = table do
+            self.headings = ['Rspec Matchers', 'Translated Keyword']
+            matchers.sort.each do |rspec_keyword, translated_keyword|
+              add_row [rspec_keyword, translated_keyword.split('|').join(' / ')]
+            end
           end
+          print_table io, table_for_matchers
+          true
         end
         
-        def list_advanced_keywords(io, language)
-          NaturalLanguage::ADVANCED_KEYWORDS.map do |keyword|
-            language_keywords = [keyword]
-            language.keywords[keyword].map do |key, values|
-              language_keywords << [key, values.to_s.split('|').join(' / ')]
+        def hooks_table(io, language)
+          hooks = language.hooks_permutation
+          return nil if hooks.empty?
+          table_for_hooks = table do
+            self.headings = ['Rspec Hooks', 'Translated Keyword']
+            hooks.each do |rspec_keyword, translated_keyword|
+              add_row [rspec_keyword, translated_keyword.join(' / ')]
             end
-            
-            keywords_table = table do
-              self.headings = [language_keywords.shift]
-              language_keywords.each do |keywords|
-                add_row keywords
-              end
-            end
-            
-            keywords_table
-            
           end
+          print_table io, table_for_hooks
+          true
         end
         
-        def print_table(io, raw, options={})
-          io.puts raw.to_s.send(options[:color] || :green).bold
-          Kernel.exit(0) if options[:exit]
-        end
       end
       
     end

data/lib/spec-i18n/command_line/main.rb

@@ -1,4 +1,3 @@
-require 'cucumber/formatter/color_io'
 require 'spec-i18n/command_line/options'
 require 'spec-i18n/platform'
 
@@ -11,11 +10,7 @@ module SpecI18n
       
       def initialize(args, out_stream = STDOUT, error_stream = STDERR)
         @args = args
-        if SpecI18n::WINDOWS
-          @out_stream   = out_stream == STDOUT ? Formatter::ColorIO.new(Kernel, STDOUT) : out_stream
-        else
-          @out_stream = out_stream
-        end
+        @out_stream = out_stream
         @error_stream = error_stream
       end
       

data/lib/spec-i18n/command_line/options.rb

@@ -14,34 +14,48 @@ module SpecI18n
         @args = args
         @args.extend(::OptionParser::Arguable)
         @args.options do |opts|
-          opts.banner = [ "Usage: rspec-i18n [options] [LANGUAGE]", "", "Examples:",
-            "rspec-i18n --language help", "rspec-i18n --language pt"].join("\n")            
-          opts.on("-l LANGUAGE", "--language LANGUAGE", "List keywords for a particular language",
-            %{Run with "--language help" to see all languages}) do |language|
-            print_languages(language)
-          end
-          opts.on_tail("-v", "--version", "Show version.") do
-            print_and_exit(SpecI18n::VERSION)
-          end
-          opts.on_tail("-h", "--help", "You're looking at it.") do
-            print_and_exit(opts.help)
-          end
+          banner(opts)
+          show_language_and_keywords(opts)
+          show_version(opts)
+          show_help(opts)
         end.parse!
         self
       end
       
-      def print_languages(language)
-        if language == 'help'
-          LanguageHelpFormatter.list_languages_and_exit(@output_stream)
-        else
-          LanguageHelpFormatter.list_keywords_and_exit(@output_stream, language)
+      def banner(opts)
+        opts.banner = [ "Usage: rspec-i18n [options] [LANGUAGE]", "", "Examples:",
+          "rspec-i18n --language help", "rspec-i18n --language pt"].join("\n")
+      end
+      
+      def show_language_and_keywords(opts)
+        opts.on("-l LANGUAGE", "--language LANGUAGE", "List keywords for a particular language",
+          %{Run with "--language help" to see all languages}) do |language|
+          print_languages(language)
         end
       end
       
+      def show_version(opts)
+        opts.on_tail("-v", "--version", "Show version.") do
+          print_and_exit(SpecI18n::VERSION)
+        end
+      end
+      
+      def show_help(opts)
+        opts.on_tail("-h", "--help", "You're looking at it.") do
+          print_and_exit(opts.help)
+        end
+      end
+      
+      def print_languages(language)
+        return Language.list_languages_and_exit(@output_stream) if language == 'help'
+        Language.list_keywords_and_exit(@output_stream, language)  
+      end
+      
       def print_and_exit(message)
         @output_stream.puts message
         Kernel.exit(0)
       end
+      
     end
   end
 end

data/lib/spec-i18n/dsl/main.rb

@@ -2,19 +2,38 @@ module Spec
   module DSL
     module Main
 
-      # Register adverbs for the dsl keywords
+      # Translate adverbs for the dsl keywords
       #
       # { "describe" => ["descreva", "contexto"]}
       # 
       # Register alias for the language specified
+      #
       def register_adverbs
-        language = SpecI18n.natural_language
-        @adverbs = language.dsl_keywords
-        @adverbs.each do |key, values|
+        natural_language.dsl_keywords.each do |key, values|
           values.map { |value| alias_method value, key }
         end
       end
 
+      # Translate adverbs for the shared_examples_for keyword
+      #
+      # { "shared_examples_for" => ['exemplos_distribuidos_para']}
+      #
+      def translate_shared_examples_for
+        natural_language.shared_examples_for_keywords.each do |shared_examples_method, shared_example_keywords|
+          shared_example_keywords.each { |keyword| alias_method keyword, shared_examples_method }
+        end
+      end
+      
+      # Translate adverbs for the share_as keywords
+      #
+      # { 'share_as' => ['distribua', 'distribua_como']}
+      #
+      def translate_share_as_keywords
+        natural_language.share_as_keywords.each do |share_as_method, share_as_keywords|
+          share_as_keywords.each { |keyword| alias_method keyword, share_as_method }
+        end
+      end
+      
     end
   end
 end

data/lib/spec-i18n/example.rb

@@ -1,3 +1,4 @@
 require 'spec-i18n/example/before_and_after_hooks'
 require 'spec-i18n/example/example_group_methods'
+require 'spec-i18n/example/pending'
 require 'spec-i18n/example/subject'

data/lib/spec-i18n/example/before_and_after_hooks.rb

@@ -2,15 +2,16 @@ module Spec
   module Example
     module BeforeAndAfterHooks
       
+      # Translate hooks(before and after) keywords
+      #
       def register_hooks
-        language = SpecI18n.natural_language
-        language.before_and_after_keywords.each do |key, values|
-          values.map do |value| 
-            alias_method value, key
-          end
+        natural_language.before_and_after_keywords.each do |key, values|
+          values.collect { |value| alias_method value, key }
         end
       end
   
+      # OverWriting a methor for rspec to work with hooks parameters
+      #
       def before_parts(scope)
 
         scope = grep_language_and_scope(scope) || scope
@@ -22,9 +23,11 @@ module Spec
         end
       end
       
+      # OverWriting a methor for rspec to work with hooks parameters
+      #
       def after_parts(scope)
         
-        scope = grep_language_and_scope(scope) || scope
+        scope = grep_language_and_scope(scope)
         
         case scope
         when :each; after_each_parts
@@ -33,15 +36,30 @@ module Spec
         end
       end
       
+      # Grep the tranlated scope
+      #
+      # pt:
+      #   hooks:
+      #     each: cada
+      #
+      #  grep_language_and_scope(:cada) # => :each
+      #  grep_language_and_scope(:each) # => :each
+      #
       def grep_language_and_scope(scope)
         if SpecI18n.spec_language
-          language = SpecI18n.natural_language
-          scope = grep_the_scope(scope, language.hooks_params_keywords)
+          hooks = natural_language.hooks_params_keywords
+          scope = grep_the_scope(scope, hooks)
+        else
+          scope
         end
       end
 
       # Receive a String Scope and return the scope in english for
       # the rspec run the right method
+      #
+      # grep_the_scope(:cada, { 'each' => [ 'cada' ] }) # => :each
+      # 
+      #
       def grep_the_scope(scope, hooks)
         scopes = [:each, :all, :suite]
         return scope if scopes.include?(scope)

data/lib/spec-i18n/example/example_group_methods.rb

@@ -3,12 +3,15 @@ module Spec
     module ExampleGroupMethods
       
         def self.register_example_adverbs
-          language = SpecI18n.natural_language
-          @adverbs = language.example_group_keywords
-          @adverbs.each do |key, values|
-            values.map do |value|
-              alias_method value, key
-            end
+          natural_language.example_group_keywords.each do |key, values|
+            values.each { |value|  alias_method value, key }
+          end
+        end
+        
+        # tranlated it_should_behave_like word
+        def self.translate_it_should_behave_like
+          natural_language.it_should_behave_like_keywords.each do |it_should_behave_like_method, it_should_behave_like_keywords|
+            it_should_behave_like_keywords.each { |keyword| alias_method keyword, it_should_behave_like_method}
           end
         end
         

data/lib/spec-i18n/example/pending.rb

@@ -0,0 +1,19 @@
+module Spec
+  module Example
+    module Pending
+      
+      class << self
+      
+        # Translate the pending word
+        #
+        def translate_pending_keywords
+          natural_language.pending_keywords.each do |pending_method, translated_methods|
+            translated_methods.each { |translated_method| alias_method translated_method, pending_method}
+          end
+        end
+      
+      end
+      
+    end
+  end
+end

data/lib/spec-i18n/example/subject.rb

@@ -5,8 +5,7 @@ module Spec
         # TODO: Removing Duplications
         class << self
           def register_subjects
-            language = SpecI18n.natural_language
-            subject_and_its_keywords = language.subject_keywords.merge(language.its_keywords)
+            subject_and_its_keywords = natural_language.subject_keywords.merge(natural_language.its_keywords)
             subject_and_its_keywords.each do |key, values|
               values.map { |value| alias_method value, key }
             end
@@ -16,8 +15,7 @@ module Spec
       module ExampleMethods
         class << self
           def register_subjects
-            language = SpecI18n.natural_language
-            subject_and_expectation_keywords = language.subject_keywords.merge(language.expectation_keywords)
+            subject_and_expectation_keywords = natural_language.subject_keywords.merge(natural_language.expectation_keywords)
             subject_and_expectation_keywords.each do |key, values|
               values.map { |value| alias_method value, key }
             end

data/lib/spec-i18n/expectations/extensions/kernel.rb

@@ -1,9 +1,11 @@
 module Kernel
+  
+  # Translate the <b>should</b> and <b>should_not</b> method
+  #
   def register_expectations_keywords
-    language = SpecI18n.natural_language
-    @adverbs = language.expectation_keywords
-    @adverbs.each do |key, values|
-      values.map { |value| alias_method value, key }
+    natural_language.expectation_keywords.each do |key, values|
+      values.collect { |value| alias_method value, key }
     end
   end
+  
 end