controller etc

Author: tomasc

app/controllers/hashtags/resources_controller.rb

@@ -1,28 +1,28 @@
 module Hashtags
   class ResourcesController < ApplicationController
-    respond_to :json
-
     def index
-      respond_with resources_as_json, root: false
+      respond_to do |format|
+        format.json { render json: resources_as_json, root: false }
+      end
     end
 
     private
 
     def resources_as_json
-      return unless hashtag_class
-      # @resources_as_json ||= hashtag_resource_class.as_json(query)
-    end
-
-    def hashtag_class
-      Resource.find_by_resource_type(resource_type)
+      return unless hashtag_class.present?
+      @resources_as_json ||= hashtag_class.resources_for_query(query)
     end
 
     def query
       URI.decode(params.fetch(:q, nil).to_s)
     end
 
-    def resource_type
-      params[:resource_type]
+    def hashtag_class
+      class_name.safe_constantize
+    end
+
+    def class_name
+      params[:class_name]
     end
   end
 end

config/routes.rb

@@ -1,3 +1,5 @@
 Hashtags::Engine.routes.draw do
-  get 'resources' => 'resources#index', as: :resources
+  namespace :hashtags do
+    get 'resources' => 'resources#index', as: :resources
+  end
 end

lib/assets/javascripts/hashtags/hashtags.coffee

@@ -33,10 +33,8 @@
         context: (text) -> text.toLowerCase()
         match: ///#{data.match_regexp}///
         search: (term, callback, match) =>
-          if data.values
-            @search_values(data, term, callback, match)
-          else
-            @search_remote(data, term, callback, match)
+          if data.values then @search_values(data, term, callback, match)
+          else @search_remote(data, term, callback, match)
         replace: (resource, event) -> Handlebars.compile(data.replace)(resource)
         template: (resource, term) -> Handlebars.compile(data.template)(resource)
       }

lib/hashtags/base.rb

@@ -105,7 +105,7 @@ def self.template
 
     # return JSON version of resources that match query
     # this is returned when user starts typing (the query)
-    def self.resources_for_query(query)
+    def self.json_for_query(query)
       raise NotImplementedError
     end
 

lib/hashtags/builder.rb

@@ -33,7 +33,7 @@ def to_hashtag(str)
     # render textcomplete dom data
     def dom_data
       { hashtags: {
-        path: Engine.routes.url_helpers.resources_path,
+        path: Engine.routes.url_helpers.hashtags_resources_path,
         strategies: hashtag_strategies
       } }
     end

lib/hashtags/resource.rb

@@ -48,7 +48,7 @@ def self.help_values
     # JS
 
     def self.match_regexp
-      /(#{trigger}#{resource_name}\:)(\w*)\z/
+      /(#{Regexp.escape(trigger)}#{resource_name}\:)(\w{1,})\z/
     end
 
     def self.match_index

lib/hashtags/user.rb

@@ -44,19 +44,19 @@ def self.help_values
     # JS
 
     def self.match_regexp
-      /(\A#{trigger}|\s#{trigger})(\w{1,})\z/
+      /(\A#{Regexp.escape(trigger)}|\s#{Regexp.escape(trigger)})(\w{1,})\z/
     end
 
     def self.match_index
-      1
+      2
     end
 
     def self.match_template
       "{{ #{tag_attribute} }}"
     end
 
     def self.replace
-      "$1{{ #{tag_attribute} }}"
+      "#{trigger}{{ #{tag_attribute} }}"
     end
 
     def self.template
@@ -68,24 +68,24 @@ def self.template
     # updates found tags with tag value from resource
     # @jtschichold => @JTschichold
     def hashtag(match)
-      return unless id = match[self.class.match_index]
+      return unless id = match[self.class.match_index-1]
       return unless user = resource(id)
       Handlebars::Context.new
-                         .compile(self.class.replace.gsub('$1', Regexp.escape(self.class.trigger)))
+                         .compile(self.class.replace)
                          .call(self.class.tag_attribute => user.send(self.class.tag_attribute))
     end
 
     # replaces tags with result from resource
     # @JTschichold => Jan Tschichold
     def markup(match)
-      return unless id = match[self.class.match_index]
+      return unless id = match[self.class.match_index-1]
       return unless user = resource(id)
       user.send(self.class.result_attribute)
     end
 
     # finds resource based on tag_attribute_value
     # for example: resource_class.where(username: tag_attribute_value).first
-    def resource(tag_attribute_value)
+    def resource(value)
       raise NotImplemented
     end
   end

lib/hashtags/variable.rb

@@ -20,15 +20,15 @@ def self.help_values
     # JS
 
     def self.match_regexp
-      /(\A#{Regexp.escape(trigger)}|\s#{Regexp.escape(trigger)})(\w*)\z/
+      /(\A#{Regexp.escape(trigger)}|\s#{Regexp.escape(trigger)})(\w{1,})\z/
     end
 
     def self.match_index
       2
     end
 
     def self.replace
-      "#{trigger}1{{ this }}"
+      "#{trigger}{{ this }}"
     end
 
     def self.template

test/hashtags/builder_test.rb

@@ -1,10 +1,10 @@
 require 'test_helper'
 
 describe Hashtags::Builder do
-  let(:user) { ::User.new('JTschichold', 'Jan Tschichold') }
+  let(:user) { ::User.find('JTschichold') }
   let(:user_tag) { "@#{user.id}" }
 
-  let(:res) { ::MyResource.new('123', 'Resource') }
+  let(:res) { ::MyResource.find(1) }
   let(:resource_name) { 'my_resource' }
   let(:res_tag) { "##{resource_name}:#{res.title}(#{res.id})" }
 
@@ -19,13 +19,7 @@
   let(:options) { {} }
 
   describe '.to_markup' do
-    let(:to_markup) do
-      ::User.stub(:find, user_result) do
-        ::MyResource.stub(:find, resource_result) do
-          Hashtags::Builder.to_markup(str, options)
-        end
-      end
-    end
+    let(:to_markup) { Hashtags::Builder.to_markup(str, options) }
 
     it { to_markup.must_equal "User tag: #{user.name}, resource tag: #{res.title}, variable tag: #{var_1}" }
 
@@ -41,17 +35,9 @@
   end
 
   describe '.to_hashtag' do
-    let(:to_hashtag) do
-      ::User.stub(:find, user_result) do
-        ::MyResource.stub(:find, resource_result) do
-          Hashtags::Builder.to_hashtag(str, options)
-        end
-      end
-    end
+    let(:to_hashtag) { Hashtags::Builder.to_hashtag(str, options) }
 
-    before do
-      user.id = 'Sunny'
-    end
+    before { user.id = 'Sunny' }
 
     it { to_hashtag.must_equal "User tag: @Sunny, resource tag: #{res_tag}, variable tag: #{var_tag}" }
 

test/hashtags/resource_test.rb

@@ -1,8 +1,8 @@
 require 'test_helper'
 
 describe Hashtags::Resource do
-  let(:res_1) { ::MyResource.new('123', 'Resource 1') }
-  let(:res_2) { ::MyResource.new('456', 'Resource 2') }
+  let(:res_1) { ::MyResource.find(1) }
+  let(:res_2) { ::MyResource.find(2) }
   let(:str) { "Resources: #my_resource:#{res_1.title}(#{res_1.id}) & #my_resource:#{res_2.title}(#{res_2.id})" }
 
   subject { MyResourceTag.new(str) }
@@ -11,24 +11,14 @@
   it { Hashtags::Resource.find_by_resource_type(:my_resource).must_equal MyResourceTag }
 
   describe '#to_markup' do
-    it 'should replace hastags with markup' do
-      find_result = lambda do |id|
-        case id
-        when res_1.id then res_1
-        when res_2.id then res_2
-        end
-      end
-
-      ::MyResource.stub(:find, find_result) do
-        subject.to_markup.must_equal "Resources: #{res_1.title} & #{res_2.title}"
-      end
-    end
+    it { subject.to_markup.must_equal "Resources: #{res_1.title} & #{res_2.title}" }
   end
 
   describe '#to_hashtag' do
-    it 'updates the original str with new values' do
+    before do
+      res_1.id = 3
       res_1.title = 'Sunny'
-      subject.to_hashtag.must_equal "Resources: #my_resource:Sunny(#{res_1.id}) & #my_resource:#{res_2.title}(#{res_2.id})"
     end
+    it { subject.to_hashtag.must_equal "Resources: #my_resource:Sunny(#{res_1.id}) & #my_resource:#{res_2.title}(#{res_2.id})" }
   end
 end

test/hashtags/user_test.rb

@@ -1,33 +1,20 @@
 require 'test_helper'
 
 describe Hashtags::User do
-  let(:user_1) { ::User.new('JTschichold', 'Jan Tschichold') }
-  let(:user_2) { ::User.new('KGerstner', 'Karl Gerstner') }
+  let(:user_1) { ::User.find('JTschichold') }
+  let(:user_2) { ::User.find('KGerstner') }
   let(:str) { "Say hello to @#{user_1.id} and @#{user_2.id}!" }
 
   subject { UserTag.new(str) }
 
   it { UserTag.cache_key.must_equal User.cache_key }
 
   describe '#to_markup' do
-    it 'should replace hastags with markup' do
-      find_result = lambda do |id|
-        case id
-        when user_1.id then user_1
-        when user_2.id then user_2
-        end
-      end
-
-      ::User.stub(:find, find_result) do
-        subject.to_markup.must_equal "Say hello to #{user_1.name} and #{user_2.name}!"
-      end
-    end
+    it { subject.to_markup.must_equal "Say hello to #{user_1.name} and #{user_2.name}!" }
   end
 
   describe '#to_hashtag' do
-    it 'updates the original str with new values' do
-      user_1.id = 'Sunny'
-      subject.to_hashtag.must_equal "Say hello to @Sunny and @#{user_2.id}!"
-    end
+    before { user_1.id = 'Sunny' }
+    it { subject.to_hashtag.must_equal "Say hello to @Sunny and @#{user_2.id}!" }
   end
 end

test/support/resource_classes.rb

@@ -3,6 +3,14 @@ def self.cache_key
     'cache_key'
   end
 
-  def self.find(value)
+  def self.all
+    [
+      new(1, 'Resource 1'),
+      new(2, 'Resource 2')
+    ]
+  end
+
+  def self.find(id)
+    all.detect{ |i| i.id == id.to_i }
   end
 end

test/support/resource_tags.rb

@@ -11,6 +11,12 @@ def self.result_attribute
     :title
   end
 
+  def self.resources_for_query(query)
+    resource_class.all.select do |res|
+      res.title =~ /#{Regexp.escape(query)}/i
+    end
+  end
+
   def resource(value)
     self.class.resource_class.find(value)
   end

test/support/user_classes.rb

@@ -3,7 +3,15 @@ def self.cache_key
     'cache_key'
   end
 
-  def self.find(value)
+  def self.all
+    [
+      new('JTschichold', 'Jan Tschichold'),
+      new('KGerstner', 'Karl Gerstner')
+    ]
+  end
+
+  def self.find(id)
+    all.detect{ |i| i.id == id.to_s }
   end
 
   def to_s

test/support/user_tags.rb

@@ -11,6 +11,12 @@ def self.result_attribute
     :name
   end
 
+  def self.resources_for_query(query)
+    resource_class.all.select do |res|
+      res.id =~ /#{Regexp.escape(query)}/i
+    end
+  end
+
   def resource(value)
     self.class.resource_class.find(value)
   end