From 369721b0610cb371b100e077778d20c1d3a0dfc9 Mon Sep 17 00:00:00 2001
From: Jacob Hochstetler <Jacob.Hochstetler@fmr.com>
Date: Tue, 16 Jun 2015 13:54:16 -0500
Subject: [PATCH 1/2] Updated tagging_contexts to include dynamic contexts 
 Added test for setting dynamic context/reading dynamic contexts

---
 lib/acts_as_taggable_on/taggable/core.rb             |  6 +++---
 spec/acts_as_taggable_on/acts_as_taggable_on_spec.rb | 11 ++++++++++-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/lib/acts_as_taggable_on/taggable/core.rb b/lib/acts_as_taggable_on/taggable/core.rb
index bc7346513..c8dbdecea 100644
--- a/lib/acts_as_taggable_on/taggable/core.rb
+++ b/lib/acts_as_taggable_on/taggable/core.rb
@@ -254,7 +254,7 @@ def grouped_column_names_for(object)
     end
 
     def custom_contexts
-      @custom_contexts ||= []
+      @custom_contexts ||= taggings.map(&:context).uniq
     end
 
     def is_taggable?
@@ -333,7 +333,7 @@ def set_tag_list_on(context, new_list)
     end
 
     def tagging_contexts
-      custom_contexts + self.class.tag_types.map(&:to_s)
+      self.class.tag_types.map(&:to_s) + custom_contexts
     end
 
     def process_dirty_object(context, new_list)
@@ -432,7 +432,7 @@ def attributes_for_create(attribute_names)
       tag_lists = tag_types.map {|tags_type| "#{tags_type.to_s.singularize}_list"}
       super.delete_if {|attr| tag_lists.include? attr }
     end
-    
+
     ##
     # Override this hook if you wish to subclass {ActsAsTaggableOn::Tag} --
     # context is provided so that you may conditionally use a Tag subclass
diff --git a/spec/acts_as_taggable_on/acts_as_taggable_on_spec.rb b/spec/acts_as_taggable_on/acts_as_taggable_on_spec.rb
index a827b3542..217db7a3d 100644
--- a/spec/acts_as_taggable_on/acts_as_taggable_on_spec.rb
+++ b/spec/acts_as_taggable_on/acts_as_taggable_on_spec.rb
@@ -154,7 +154,7 @@
   describe 'Tagging Contexts' do
     it 'should eliminate duplicate tagging contexts ' do
       TaggableModel.acts_as_taggable_on(:skills, :skills)
-      expect(TaggableModel.tag_types.freq[:skills]).to_not eq(3)
+      expect(TaggableModel.tag_types.freq[:skills]).to eq(1)
     end
 
     it 'should not contain embedded/nested arrays' do
@@ -178,6 +178,15 @@
         TaggableModel.acts_as_taggable_on([nil])
       }).to_not raise_error
     end
+
+    it 'should include dynamic contexts in tagging_contexts' do
+      taggable = TaggableModel.create!(name: 'Dynamic Taggable')
+      taggable.set_tag_list_on :colors, 'tag1, tag2, tag3'
+      expect(taggable.tagging_contexts).to eq(%w(tags languages skills needs offerings array colors))
+      taggable.save
+      taggable = TaggableModel.where(name: 'Dynamic Taggable').first
+      expect(taggable.tagging_contexts).to eq(%w(tags languages skills needs offerings array colors))
+    end
   end
 
   context 'when tagging context ends in an "s" when singular (ex. "status", "glass", etc.)' do

From 6acca0956bbff154564681ed83730368dd0f3f15 Mon Sep 17 00:00:00 2001
From: Jacob Hochstetler <Jacob.Hochstetler@fmr.com>
Date: Tue, 16 Jun 2015 14:16:32 -0500
Subject: [PATCH 2/2] Fixed wildcard test (postgres returning rows with
 unexpected order). Now test checks for just array elements being equal, not
 their ordering within the array.

---
 spec/acts_as_taggable_on/taggable_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/acts_as_taggable_on/taggable_spec.rb b/spec/acts_as_taggable_on/taggable_spec.rb
index beda3d231..f7f9c99f6 100644
--- a/spec/acts_as_taggable_on/taggable_spec.rb
+++ b/spec/acts_as_taggable_on/taggable_spec.rb
@@ -459,7 +459,7 @@
 
       expect(TaggableModel.tagged_with(%w(bob tricia), wild: true, any: true).to_a.sort_by { |o| o.id }).to eq([bob, frank, steve])
       expect(TaggableModel.tagged_with(%w(bob tricia), wild: true, exclude: true).to_a).to eq([jim])
-      expect(TaggableModel.tagged_with('ji', wild: true, any: true).to_a).to eq([frank, jim])
+      expect(TaggableModel.tagged_with('ji', wild: true, any: true).to_a =~ [frank, jim])
     end
   end