Using instance methods instead of class constants to convey formatter capabilities.

lib/twine/cli.rb

@@ -46,7 +46,7 @@ module Twine
         opts.on('-u', '--untagged', 'If you have specified tags using the --tags flag, then only those tags will be selected. If you also want to select all strings that are untagged, then you can specify this option to do so.') do |u|
           options[:untagged] = true
         end
-        formats = Formatters.formatters.map { |f| f.class::FORMAT_NAME }
+        formats = Formatters.formatters.map(&:format_name)
         opts.on('-f', '--format FORMAT', "The file format to read or write (#{formats.join(', ')}). Additional formatters can be placed in the formats/ directory.") do |format|
           unless formats.include?(format.downcase)
             raise Twine::Error.new "Invalid format: #{format}"

lib/twine/formatters/abstract.rb

@@ -6,15 +6,27 @@ module Twine
       attr_accessor :strings
       attr_accessor :options
 
-      def self.can_handle_directory?(path)
-        return false
-      end
-
       def initialize(strings = StringsFile.new, options = {})
         @strings = strings
         @options = options
       end
 
+      def format_name
+        raise NotImplementedError.new("You must implement format_name in your formatter class.")
+      end
+
+      def extension
+        raise NotImplementedError.new("You must implement extension in your formatter class.")
+      end
+
+      def can_handle_directory?(path)
+        raise NotImplementedError.new("You must implement can_handle_directory? in your formatter class.")
+      end
+
+      def default_file_name
+        raise NotImplementedError.new("You must implement default_file_name in your formatter class.")
+      end
+
       def set_translation_for_key(key, lang, value)
         value = value.gsub("\n", "\\n")
 
@@ -63,10 +75,6 @@ module Twine
         end
       end
 
-      def default_file_name
-        raise NotImplementedError.new("You must implement default_file_name in your formatter class.")
-      end
-
       def determine_language_given_path(path)
         raise NotImplementedError.new("You must implement determine_language_given_path in your formatter class.")
       end

lib/twine/formatters/android.rb

@@ -7,9 +7,6 @@ module Twine
     class Android < Abstract
       include Twine::Placeholders
 
-      FORMAT_NAME = 'android'
-      EXTENSION = '.xml'
-      DEFAULT_FILE_NAME = 'strings.xml'
       LANG_CODES = Hash[
         'zh' => 'zh-Hans',
         'zh-rCN' => 'zh-Hans',
@@ -20,12 +17,20 @@ module Twine
         # TODO: spanish
       ]
 
-      def self.can_handle_directory?(path)
+      def format_name
+        'android'
+      end
+
+      def extension
+        '.xml'
+      end
+
+      def can_handle_directory?(path)
         Dir.entries(path).any? { |item| /^values.*$/.match(item) }
       end
 
       def default_file_name
-        return DEFAULT_FILE_NAME
+        return 'strings.xml'
       end
 
       def determine_language_given_path(path)

lib/twine/formatters/apple.rb

@@ -1,16 +1,20 @@
 module Twine
   module Formatters
     class Apple < Abstract
-      FORMAT_NAME = 'apple'
-      EXTENSION = '.strings'
-      DEFAULT_FILE_NAME = 'Localizable.strings'
+      def format_name
+        'apple'
+      end
 
-      def self.can_handle_directory?(path)
+      def extension
+        '.strings'
+      end
+
+      def can_handle_directory?(path)
         Dir.entries(path).any? { |item| /^.+\.lproj$/.match(item) }
       end
 
       def default_file_name
-        return DEFAULT_FILE_NAME
+        return 'Localizable.strings'
       end
 
       def determine_language_given_path(path)

lib/twine/formatters/django.rb

@@ -1,16 +1,20 @@
 module Twine
   module Formatters
     class Django < Abstract
-      FORMAT_NAME = 'django'
-      EXTENSION = '.po'
-      DEFAULT_FILE_NAME = 'strings.po'
+      def format_name
+        'django'
+      end
 
-      def self.can_handle_directory?(path)
-      Dir.entries(path).any? { |item| /^.+\.po$/.match(item) }
+      def extension
+        '.po'
+      end
+
+      def can_handle_directory?(path)
+        Dir.entries(path).any? { |item| /^.+\.po$/.match(item) }
       end
 
       def default_file_name
-        return DEFAULT_FILE_NAME
+        return 'strings.po'
       end
 
       def determine_language_given_path(path)

lib/twine/formatters/flash.rb

@@ -1,16 +1,20 @@
 module Twine
   module Formatters
     class Flash < Abstract
-      FORMAT_NAME = 'flash'
-      EXTENSION = '.properties'
-      DEFAULT_FILE_NAME = 'resources.properties'
+      def format_name
+        'flash'
+      end
 
-      def self.can_handle_directory?(path)
+      def extension
+        '.properties'
+      end
+
+      def can_handle_directory?(path)
         return false
       end
 
       def default_file_name
-        return DEFAULT_FILE_NAME
+        return 'resources.properties'
       end
 
       def determine_language_given_path(path)

lib/twine/formatters/gettext.rb

@@ -3,16 +3,20 @@
 module Twine
   module Formatters
     class Gettext < Abstract
-      FORMAT_NAME = 'gettext'
-      EXTENSION = '.po'
-      DEFAULT_FILE_NAME = 'strings.po'
+      def format_name
+        'gettext'
+      end
 
-      def self.can_handle_directory?(path)
+      def extension
+        '.po'
+      end
+
+      def can_handle_directory?(path)
         Dir.entries(path).any? { |item| /^.+\.po$/.match(item) }
       end
 
       def default_file_name
-        return DEFAULT_FILE_NAME
+        return 'strings.po'
       end
 
       def determine_language_given_path(path)

lib/twine/formatters/jquery.rb

@@ -1,16 +1,20 @@
 module Twine
   module Formatters
     class JQuery < Abstract
-      FORMAT_NAME = 'jquery'
-      EXTENSION = '.json'
-      DEFAULT_FILE_NAME = 'localize.json'
+      def format_name
+        'jquery'
+      end
 
-      def self.can_handle_directory?(path)
+      def extension
+        '.json'
+      end
+
+      def can_handle_directory?(path)
         Dir.entries(path).any? { |item| /^.+\.json$/.match(item) }
       end
 
       def default_file_name
-        return DEFAULT_FILE_NAME
+        return 'localize.json'
       end
 
       def determine_language_given_path(path)

lib/twine/formatters/tizen.rb

@@ -7,9 +7,6 @@ module Twine
     class Tizen < Abstract
       include Twine::Placeholders
 
-      FORMAT_NAME = 'tizen'
-      EXTENSION = '.xml'
-      DEFAULT_FILE_NAME = 'strings.xml'
       LANG_CODES = Hash[
         'eng-GB' => 'en',
         'rus-RU' => 'ru',
@@ -22,15 +19,21 @@ module Twine
         'por-PT' => 'pt',
         'ukr-UA' => 'uk'
       ]
-      DEFAULT_LANG_CODES = Hash[
-      ]
 
-      def self.can_handle_directory?(path)
+      def format_name
+        'tizen'
+      end
+
+      def extension
+        '.xml'
+      end
+
+      def can_handle_directory?(path)
         Dir.entries(path).any? { |item| /^values.*$/.match(item) }
       end
 
       def default_file_name
-        return DEFAULT_FILE_NAME
+        return 'strings.xml'
       end
 
       def determine_language_given_path(path)

lib/twine/runner.rb

@@ -140,7 +140,7 @@ module Twine
           formatter = formatter_for_format(@options[:format])
           @strings.language_codes.each do |lang|
             if @options[:languages] == nil || @options[:languages].length == 0 || @options[:languages].include?(lang)
-              file_name = lang + formatter.class::EXTENSION
+              file_name = lang + formatter.extension
               real_path = File.join(dir, file_name)
               zip_path = File.join('Locales', file_name)
               formatter.write_file(real_path, lang)
@@ -228,17 +228,17 @@ module Twine
     end
 
     def determine_format_given_path(path)
-      formatter = Formatters.formatters.find { |f| f.class::EXTENSION == File.extname(path) }
-      return formatter.class::FORMAT_NAME if formatter
+      formatter = Formatters.formatters.find { |f| f.extension == File.extname(path) }
+      return formatter.format_name if formatter
     end
 
     def determine_format_given_directory(directory)
-      formatter = Formatters.formatters.find { |f| f.class.can_handle_directory?(directory) }
-      return formatter.class::FORMAT_NAME if formatter
+      formatter = Formatters.formatters.find { |f| f.can_handle_directory?(directory) }
+      return formatter.format_name if formatter
     end
 
     def formatter_for_format(format)
-      formatter = Formatters.formatters.find { |f| f.class::FORMAT_NAME == format }
+      formatter = Formatters.formatters.find { |f| f.format_name == format }
       return nil unless formatter
       formatter.strings = @strings
       formatter.options = @options

test/test_cli.rb

@@ -246,13 +246,13 @@ class CLITestCase < TwineTestCase
     end
 
     def test_format
-      random_format = Twine::Formatters.formatters.sample.class::FORMAT_NAME
+      random_format = Twine::Formatters.formatters.sample.format_name
       parse_with "--format #{random_format}"
       assert_equal random_format, @options[:format]
     end
 
     def test_format_ignores_case
-      random_format = Twine::Formatters.formatters.sample.class::FORMAT_NAME
+      random_format = Twine::Formatters.formatters.sample.format_name
       parse_with "--format #{random_format.upcase}"
       assert_equal random_format, @options[:format]
     end