0.2.1

Author: tomasc

CHANGELOG.md

@@ -1,6 +1,7 @@
 # CHANGELOG
 
-## 0.2.0
+## 0.2.1
 
+* refactor to avoid conflicts between classes
 * `render_help_for` renamed to `render_hashtags_help_for`
 * add `hashtags` class to the `dropdownClassName` option

lib/assets/javascripts/hashtags/hashtags.coffee

@@ -56,6 +56,7 @@
       $.getJSON( url , q: term, class_name: data.class_name )
         .done( (resp) ->
           callback $.map( resp, (resource) ->
+            console.log Handlebars.compile(match_template)(resource), term
             if Handlebars.compile(match_template)(resource).match(///#{term}///i) then resource else null
           )
         )

lib/hashtags/base.rb

@@ -51,7 +51,10 @@ def self.trigger
       raise NotImplementedError
     end
 
+    # matched against as user types
+    # typically this would equal to the .template (match what you see)
     def self.match_template
+      template
     end
 
     # used to expire field with tags

lib/hashtags/mongoid_extension.rb

@@ -3,38 +3,41 @@
 
 Mongoid::Fields.option :hashtags do |cls, field, value|
   return if value == false
+  return if cls.respond_to?(:hashtags)
 
-  cls.define_singleton_method(:hashtags) { @hashtags ||= {} } unless cls.respond_to?(:hashtags)
-  options = value.is_a?(Hash) ? value.slice(*%i(only except)) : {}
+  cls.define_singleton_method :hashtags do
+    options = (value.is_a?(Hash) ? value.slice(*%i(only except)) : {})
 
-  cls.hashtags[field.name].define_singleton_method :dom_data do
-    Hashtags::Builder.dom_data(options)
-  end
-
-  cls.hashtags[field.name].define_singleton_method :help do
-    Hashtags::Builder.help(options)
-  end
-
-  cls.hashtags[field.name].define_singleton_method :options do
-    options
+    @hashtags ||= {}
+    @hashtags[field.name] ||= OpenStruct.new(
+      dom_data: Hashtags::Builder.dom_data(options),
+      help: Hashtags::Builder.help(options),
+      options: options
+    )
+    @hashtags
   end
 
   field.define_singleton_method :demongoize do |*args|
     res = super(*args)
+
     res.define_singleton_method :to_markup do
-      field.type.new(
-        Hashtags::Builder.to_markup(res.to_s, options).html_safe
-      )
+      ho = field.options[:hashtags]
+      options = (ho.is_a?(Hash) ? ho.slice(*%i(only except)) : {})
+      field.type.new(Hashtags::Builder.to_markup(res.to_s, options).html_safe)
     end
+
     res.define_singleton_method :to_hashtag do
-      field.type.new(
-        Hashtags::Builder.to_hashtag(res.to_s, options).html_safe
-      )
+      ho = field.options[:hashtags]
+      options = (ho.is_a?(Hash) ? ho.slice(*%i(only except)) : {})
+      field.type.new(Hashtags::Builder.to_hashtag(res.to_s, options).html_safe)
     end
+
     res
   end
 
-  field.define_singleton_method :mongoize do |value|
-    Hashtags::Builder.to_hashtag(super(value.to_s), options)
+  field.define_singleton_method :mongoize do |val|
+    ho = field.options[:hashtags]
+    options = (ho.is_a?(Hash) ? ho.slice(*%i(only except)) : {})
+    Hashtags::Builder.to_hashtag(super(val.to_s), options)
   end
 end

lib/hashtags/resource.rb

@@ -55,10 +55,6 @@ def self.match_index
       2
     end
 
-    def self.match_template
-      "{{ #{tag_attribute} }}"
-    end
-
     def self.replace
       "#{trigger}#{resource_name}:{{ #{tag_attribute} }}({{ id }})"
     end

lib/hashtags/user.rb

@@ -51,10 +51,6 @@ def self.match_index
       2
     end
 
-    def self.match_template
-      "{{ #{tag_attribute} }}"
-    end
-
     def self.replace
       "#{trigger}{{ #{tag_attribute} }}"
     end

test/hashtags/mongoid_extension_test.rb

@@ -7,6 +7,7 @@
 
   let(:str) { "User tag: #{user_tag}" }
   let(:doc) { ExtensionDoc.new(text: str) }
+  let(:doc2) { ExtensionDoc2.new(text: str) }
 
   it { doc.text.must_equal str }
   it { doc.text.must_be_kind_of doc.class.fields['text'].type }
@@ -19,6 +20,12 @@
         doc.text.to_markup.must_equal "User tag: #{user.name}"
       end
     end
+
+    it 'does not convert if not supported' do
+      ::User.stub(:find, user_result) do
+        doc2.text.to_markup.wont_equal "User tag: #{user.name}"
+      end
+    end
   end
 
   describe '#to_hashtag' do
@@ -30,6 +37,12 @@
         doc.text.to_hashtag.must_equal 'User tag: @Sunny'
       end
     end
+
+    it 'does not convert if not supported' do
+      ::User.stub(:find, user_result) do
+        doc2.text.to_hashtag.wont_equal 'User tag: @Sunny'
+      end
+    end
   end
 
   describe '.hashtags' do
@@ -38,4 +51,9 @@
     it { ExtensionDoc.hashtags['text'].help.must_be_kind_of Array }
     it { ExtensionDoc.hashtags['text'].options.must_equal({}) }
   end
+
+  describe 'options defined on various classes should not influence each other' do
+    it { ExtensionDoc.hashtags['text'].options.must_equal({}) }
+    it { ExtensionDoc2.hashtags['text'].options.must_equal({ only: [VarTag] }) }
+  end
 end

test/support/mongoid_extension_classes.rb

@@ -2,3 +2,8 @@ class ExtensionDoc
   include Mongoid::Document
   field :text, type: String, hashtags: true
 end
+
+class ExtensionDoc2
+  include Mongoid::Document
+  field :text, type: String, hashtags: { only: [VarTag] }
+end