hashtags 0.1.2 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0cb6c025ac00ec488f3606c30d1fe1bc52864deb
-  data.tar.gz: 8c80d45a0d2a58264217b57a83c5cb051116f8b0
+  metadata.gz: 3398fdce12caeb726d4adc16b28b799ccd9ed5db
+  data.tar.gz: ce30097b9e991abaad5afe8e7753bba7d0bc6604
 SHA512:
-  metadata.gz: bd6389a9708ec563fd32338872fa6151c5474a42ddad99fd5789ee743a7bfd2aa107c5ee42700f182e269d2700acde97a42678c8574efd843746c808666a466c
-  data.tar.gz: f5ce031172ef994e4f431905c1a41f71ca15f0b82ade9a74b477f364d5782b934c656f31dec58874e3ff4b1972fb544af378560a98d4d48183b4ee09572ce961
+  metadata.gz: 73b1538ba00e4032592226e93565858244fb9c13107e1b29318cc5b010ddea1efcd9fafccf46aa8c9dec7065cd1734d40a787df8fdcaa416fd57156cf3448195
+  data.tar.gz: a12ceef70226d683696d1669f12a83438b23da3998180460297089ff9c7e1d1f90b60e75f1e9ba1b68bca8ee69a2eee1ea2b4f31e0dd29a67db1fdeff69757c3

data/CHANGELOG.md

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

data/README.md

@@ -142,7 +142,7 @@ Implement the `values` class method instead of the `resources_for_query` to prel
 See `Hashtags::Variable` and override its methods on your subclass as necessary. Typically it would be at least the following:
 
 ```ruby
-class VariableTag < Hashtags::Resource
+class VariableTag < Hashtags::Variable
   def self.values(hashtag_classes = Hashtags::Variable.descendants)
     # %w(
     #   variable_1
@@ -235,7 +235,7 @@ In a form:
 ```slim
 fieldset
   = form.text_area :text, data: form.object.class.hashtags['text'].dom_data
-  = render_help_for(form.object.class, :text)
+  = render_hashtags_help_for(form.object.class, :text)
 ```
 
 ## Development

data/app/helpers/hashtags/view_helper.rb

@@ -1,6 +1,6 @@
 module Hashtags
   module ViewHelper
-    def render_help_for(cls, field_name)
+    def render_hashtags_help_for(cls, field_name)
       return unless help = cls.hashtags[field_name.to_s].help
       render 'hashtags/help', help: help
     end

data/lib/assets/javascripts/hashtags/hashtags.coffee

@@ -21,7 +21,12 @@
       @init()
 
     init: ->
-      @$element.textcomplete(@get_strategies())
+      @$element.textcomplete(
+        @get_strategies(),
+        {
+          dropdownClassName: 'hashtags dropdown-menu textcomplete-dropdown'
+        }
+      )
 
     get_data: -> @$element.data 'hashtags'
     get_default_path: -> @get_data()['path']

data/lib/assets/stylesheets/hashtags/textcomplete.scss

@@ -1,4 +1,4 @@
-ul.textcomplete-dropdown {
+ul.hashtags.textcomplete-dropdown {
   background-color: white;
   border: 1px solid;
   list-style: none;

data/lib/hashtags/base.rb

@@ -51,7 +51,10 @@ module Hashtags
       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

data/lib/hashtags/mongoid_extension.rb

@@ -3,38 +3,41 @@ require 'ostruct'
 
 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

data/lib/hashtags/resource.rb

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

data/lib/hashtags/resource_type.rb

@@ -18,7 +18,7 @@ module Hashtags
     # JS
 
     def self.match_regexp
-      /(\A#{trigger}|\s#{trigger})(\w*)\z/
+      /(#{trigger})(\w*)\z/
     end
 
     def self.match_index

data/lib/hashtags/user.rb

@@ -44,17 +44,13 @@ module Hashtags
     # JS
 
     def self.match_regexp
-      /(\A#{Regexp.escape(trigger)}|\s#{Regexp.escape(trigger)})(\w{1,})\z/
+      /(#{Regexp.escape(trigger)})(\w{1,})\z/
     end
 
     def self.match_index
       2
     end
 
-    def self.match_template
-      "{{ #{tag_attribute} }}"
-    end
-
     def self.replace
       "#{trigger}{{ #{tag_attribute} }}"
     end

data/lib/hashtags/variable.rb

@@ -20,7 +20,7 @@ module Hashtags
     # JS
 
     def self.match_regexp
-      /(\A#{Regexp.escape(trigger)}|\s#{Regexp.escape(trigger)})(\w{1,})\z/
+      /(#{Regexp.escape(trigger)})(\w{1,})\z/
     end
 
     def self.match_index

data/lib/hashtags/version.rb

@@ -1,3 +1,3 @@
 module Hashtags
-  VERSION = '0.1.2'.freeze
+  VERSION = '0.2.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hashtags
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.2
 platform: ruby
 authors:
 - Tomas Celizna
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-24 00:00:00.000000000 Z
+date: 2017-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: handlebars
@@ -187,6 +187,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - Guardfile
 - LICENSE.txt
@@ -236,7 +237,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Rails engine to facilitate inline text hashtags.