diff --git a/lib/twine/formatters/abstract.rb b/lib/twine/formatters/abstract.rb index c337a60..4bd8c09 100644 --- a/lib/twine/formatters/abstract.rb +++ b/lib/twine/formatters/abstract.rb @@ -20,7 +20,7 @@ module Twine end def can_handle_directory?(path) - raise NotImplementedError.new("You must implement can_handle_directory? in your formatter class.") + Dir.entries(path).any? { |item| /^.+#{Regexp.escape(extension)}$/.match(item) } end def default_file_name diff --git a/lib/twine/formatters/android.rb b/lib/twine/formatters/android.rb index 7996304..0108de8 100644 --- a/lib/twine/formatters/android.rb +++ b/lib/twine/formatters/android.rb @@ -20,7 +20,7 @@ module Twine end def default_file_name - return 'strings.xml' + 'strings.xml' end def determine_language_given_path(path) diff --git a/lib/twine/formatters/apple.rb b/lib/twine/formatters/apple.rb index 056ada7..44ce7a4 100644 --- a/lib/twine/formatters/apple.rb +++ b/lib/twine/formatters/apple.rb @@ -14,7 +14,7 @@ module Twine end def default_file_name - return 'Localizable.strings' + 'Localizable.strings' end def determine_language_given_path(path) diff --git a/lib/twine/formatters/django.rb b/lib/twine/formatters/django.rb index 19685b3..5c88766 100644 --- a/lib/twine/formatters/django.rb +++ b/lib/twine/formatters/django.rb @@ -9,23 +9,17 @@ module Twine '.po' end - def can_handle_directory?(path) - Dir.entries(path).any? { |item| /^.+\.po$/.match(item) } - end - def default_file_name - return 'strings.po' + 'strings.po' end def determine_language_given_path(path) - path_arr = path.split(File::SEPARATOR) - path_arr.each do |segment| - match = /(..)\.po$/.match(segment) - if match - return match[1] - end - end - + path_arr = path.split(File::SEPARATOR) + path_arr.each do |segment| + match = /(..)\.po$/.match(segment) + return match[1] if match + end + return end diff --git a/lib/twine/formatters/flash.rb b/lib/twine/formatters/flash.rb index 3aaee70..b4e7a30 100644 --- a/lib/twine/formatters/flash.rb +++ b/lib/twine/formatters/flash.rb @@ -9,12 +9,8 @@ module Twine '.properties' end - def can_handle_directory?(path) - return false - end - def default_file_name - return 'resources.properties' + 'resources.properties' end def determine_language_given_path(path) diff --git a/lib/twine/formatters/gettext.rb b/lib/twine/formatters/gettext.rb index 90553bd..d63e944 100644 --- a/lib/twine/formatters/gettext.rb +++ b/lib/twine/formatters/gettext.rb @@ -11,12 +11,8 @@ module Twine '.po' end - def can_handle_directory?(path) - Dir.entries(path).any? { |item| /^.+\.po$/.match(item) } - end - def default_file_name - return 'strings.po' + 'strings.po' end def determine_language_given_path(path) diff --git a/lib/twine/formatters/jquery.rb b/lib/twine/formatters/jquery.rb index bfe8d4c..658b4d2 100644 --- a/lib/twine/formatters/jquery.rb +++ b/lib/twine/formatters/jquery.rb @@ -9,12 +9,8 @@ module Twine '.json' end - def can_handle_directory?(path) - Dir.entries(path).any? { |item| /^.+\.json$/.match(item) } - end - def default_file_name - return 'localize.json' + 'localize.json' end def determine_language_given_path(path) diff --git a/lib/twine/formatters/tizen.rb b/lib/twine/formatters/tizen.rb index 21ba771..5df03c3 100644 --- a/lib/twine/formatters/tizen.rb +++ b/lib/twine/formatters/tizen.rb @@ -33,7 +33,7 @@ module Twine end def default_file_name - return 'strings.xml' + 'strings.xml' end def determine_language_given_path(path)