awesome_flags 1.6.3 → 1.7.0

data/VERSION

@@ -1 +1 @@
-1.6.3
+1.7.0

data/awesome_flags.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "awesome_flags"
-  s.version = "1.6.3"
+  s.version = "1.7.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gabe Kessler"]
-  s.date = "2011-09-22"
+  s.date = "2011-09-23"
   s.description = "Outputs keys used in the FlagShihTzu setup. Can be filtered by column for models with multiple flag columns."
   s.email = "gabe@gabesstudio.com"
   s.extra_rdoc_files = [

data/lib/awesome_flags.rb

@@ -1,17 +1,16 @@
 module AwesomeFlags
-    
+      
   def all_flags(column = nil)
-    a = self.flag_mapping
-    if column.nil?
-      c = a.values.map {|var| var.keys}.flatten
-    else
-      b = a[column]
-      c = Array.[](b.keys).flatten
-    end
+    c = get_array_of_flags(column)
     c.map
   end
   
   def my_flags(column = nil)
+    c = get_array_of_flags(column)
+    c.map {|var| self.send(var) ? var : nil}.compact!
+  end
+  
+  def get_array_of_flags(column)
     a = self.flag_mapping
     if column.nil?
       c = a.values.map {|var| var.keys}.flatten
@@ -19,7 +18,6 @@ module AwesomeFlags
       b = a[column]
       c = Array.[](b.keys).flatten
     end
-    c.map {|var| self.send(var) ? var : nil}.compact!
   end
   
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: awesome_flags
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 11
   prerelease: 
   segments: 
   - 1
-  - 6
-  - 3
-  version: 1.6.3
+  - 7
+  - 0
+  version: 1.7.0
 platform: ruby
 authors: 
 - Gabe Kessler
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-22 00:00:00 Z
+date: 2011-09-23 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement