From 6612d01e485d4e50174eebdf47c12d2d1e6d77a1 Mon Sep 17 00:00:00 2001
From: Sebastian Celis <scelis@mobiata.com>
Date: Thu, 9 Feb 2012 09:45:25 -0600
Subject: [PATCH] Move the row_matches_tag method to stringsfile.rb.

---
 lib/twine/formatters/abstract.rb | 16 ----------------
 lib/twine/formatters/android.rb  |  2 +-
 lib/twine/formatters/apple.rb    |  2 +-
 lib/twine/stringsfile.rb         | 17 +++++++++++++++++
 4 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/lib/twine/formatters/abstract.rb b/lib/twine/formatters/abstract.rb
index 6b6551a..277db5f 100644
--- a/lib/twine/formatters/abstract.rb
+++ b/lib/twine/formatters/abstract.rb
@@ -34,22 +34,6 @@ module Twine
         end
       end
 
-      def row_matches_tags?(row, tags)
-        if tags == nil || tags.length == 0
-          return true
-        end
-
-        if tags != nil && row.tags != nil
-          tags.each do |tag|
-            if row.tags.include? tag
-              return true
-            end
-          end
-        end
-
-        return false
-      end
-
       def translated_string_for_row_and_lang(row, lang, default_lang)
         row.translations[lang] || row.translations[default_lang]
       end
diff --git a/lib/twine/formatters/android.rb b/lib/twine/formatters/android.rb
index 18b8b48..ee3c926 100644
--- a/lib/twine/formatters/android.rb
+++ b/lib/twine/formatters/android.rb
@@ -76,7 +76,7 @@ module Twine
           strings.sections.each do |section|
             printed_section = false
             section.rows.each do |row|
-              if row_matches_tags?(row, tags)
+              if row.matches_tags?(tags)
                 unless printed_section
                   f.puts ''
                   if section.name && section.name.length > 0
diff --git a/lib/twine/formatters/apple.rb b/lib/twine/formatters/apple.rb
index dfda663..4d3699e 100644
--- a/lib/twine/formatters/apple.rb
+++ b/lib/twine/formatters/apple.rb
@@ -51,7 +51,7 @@ module Twine
           strings.sections.each do |section|
             printed_section = false
             section.rows.each do |row|
-              if row_matches_tags?(row, tags)
+              if row.matches_tag?(tags)
                 unless printed_section
                   f.puts ''
                   if section.name && section.name.length > 0
diff --git a/lib/twine/stringsfile.rb b/lib/twine/stringsfile.rb
index e8ae7ca..876acda 100644
--- a/lib/twine/stringsfile.rb
+++ b/lib/twine/stringsfile.rb
@@ -21,6 +21,23 @@ module Twine
       @tags = nil
       @translations = {}
     end
+    
+    def matches_tags?(tags)
+      # The user did not specify any tags. Everything passes.
+      if tags == nil || tags.length == 0
+        return true
+      end
+
+      if tags != nil && @tags != nil
+        tags.each do |tag|
+          if @tags.include? tag
+            return true
+          end
+        end
+      end
+
+      return false
+    end
   end
 
   class StringsFile