jquery-atwho-rails 0.4.11 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: edd22436434bb09eecdc9e926d6a14a1f1f9a177
-  data.tar.gz: bbd43f1b9adf1c0294327d166f7b33d1b5b5a961
+  metadata.gz: ec1b0e0e1b0876d6881d5bc64f8a08ab858a3399
+  data.tar.gz: 97e3bfd53d3df6ce4b6223d9532711563bc86510
 SHA512:
-  metadata.gz: 7b51f3042fb10491bfb2b09ed3c5df937b9006086a7e40e898111b730c7fc48ae14907ff44214c5ce5daee8c82724b90083f7be603384ac74ae43ab89bb3e879
-  data.tar.gz: d4a0286f34a546f694f46ee7d93b27cf98687db0bc724056129b863804a1b0b0a1d3da21f31da6a996f9dd17c2420db31f50aaeca043a0669152dbe2e6b0644a
+  metadata.gz: c61673d1cb967107e63e150726e4b0780b5f349caa140b4460a0e8d20334054263f9dd3c85e95277de1af5f0afd64eb9c6a7115687849a8f21c65846509d59d8
+  data.tar.gz: e02326f5c3ae2782022b11c349951efa636f80afb72549368f1a89c5bbd63995dafff2210e797e1af03286cd9722fa44b02e019a68f4b12b20a756e2b93bf161

data/Appraisals

@@ -0,0 +1,3 @@
+appraise "rails30" do
+  gem "rails", "~> 3.0.0"
+end

data/Gemfile

@@ -1,5 +1,10 @@
-#source "http://rubygems.org"
-source "http://ruby.taobao.org"
+if ENV['TRAVIS']
+  source 'https://rubygems.org'
+else
+  source 'http://ruby.taobao.org'
+end
 
 # Specify your gem's dependencies in jquery-atwho-rails.gemspec
 gemspec
+
+gem 'appraisal'

data/README.md

@@ -3,8 +3,10 @@
 Bind your textarea
 
 ```javascript
-data = ['tom','john'];
-$('textarea').atwho({at:"@", 'data':data});
+$(function(){
+    data = ['tom','john'];
+    $('textarea').atwho({at:"@", 'data':data});
+});
 ```
 
 that's it, check it out!
@@ -17,12 +19,12 @@ Issue command line bellow:
 `rails generate atwho:install`  
 then It will show in `public/[javascript|stylesheets]/` directory.
 
-#### Rails 3.1.x
+#### Rails >= 3.1.x
 Add this gem in `Gemfile` like this:  
 `gem jquery-atwho-rails`  
 
 then add    
-` //= require jquery.atwho/index `  to `app/assets/javascripts/application.js` 
+` //= require jquery.atwho `  to `app/assets/javascripts/application.js` 
 and add ` //=require jquery.atwho ` to `app/assets/stylesheets/applications.css`  
 
 #### History Versions 
@@ -32,4 +34,4 @@ All in [At.js](https://github.com/ichord/At.js) project.
 ---
 #### Test generator
 Just issue  
-`bundle` then `rspec`
+`bundle` then `appraisal rails30 rspec`

data/Rakefile

@@ -1,3 +1,5 @@
+require 'rubygems'
+require 'bundler/setup'
 require "bundler/gem_tasks"
 
 at_dir = "tmp/At.js"

data/gemfiles/rails30.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "http://ruby.taobao.org"
+
+gem "appraisal"
+gem "rails", "~> 3.0.0"
+
+gemspec :path => "../"

data/gemfiles/rails30.gemfile.lock

@@ -0,0 +1,105 @@
+PATH
+  remote: ../
+  specs:
+    jquery-atwho-rails (0.4.11)
+
+GEM
+  remote: http://ruby.taobao.org/
+  specs:
+    abstract (1.0.0)
+    actionmailer (3.0.20)
+      actionpack (= 3.0.20)
+      mail (~> 2.2.19)
+    actionpack (3.0.20)
+      activemodel (= 3.0.20)
+      activesupport (= 3.0.20)
+      builder (~> 2.1.2)
+      erubis (~> 2.6.6)
+      i18n (~> 0.5.0)
+      rack (~> 1.2.5)
+      rack-mount (~> 0.6.14)
+      rack-test (~> 0.5.7)
+      tzinfo (~> 0.3.23)
+    activemodel (3.0.20)
+      activesupport (= 3.0.20)
+      builder (~> 2.1.2)
+      i18n (~> 0.5.0)
+    activerecord (3.0.20)
+      activemodel (= 3.0.20)
+      activesupport (= 3.0.20)
+      arel (~> 2.0.10)
+      tzinfo (~> 0.3.23)
+    activeresource (3.0.20)
+      activemodel (= 3.0.20)
+      activesupport (= 3.0.20)
+    activesupport (3.0.20)
+    appraisal (1.0.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    arel (2.0.10)
+    builder (2.1.2)
+    diff-lcs (1.2.5)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
+    generator_spec (0.9.2)
+      activesupport (>= 3.0.0)
+      railties (>= 3.0.0)
+    i18n (0.5.4)
+    json (1.8.1)
+    mail (2.2.20)
+      activesupport (>= 2.3.6)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.25.1)
+    polyglot (0.3.5)
+    rack (1.2.8)
+    rack-mount (0.6.14)
+      rack (>= 1.0.0)
+    rack-test (0.5.7)
+      rack (>= 1.0)
+    rails (3.0.20)
+      actionmailer (= 3.0.20)
+      actionpack (= 3.0.20)
+      activerecord (= 3.0.20)
+      activeresource (= 3.0.20)
+      activesupport (= 3.0.20)
+      bundler (~> 1.0)
+      railties (= 3.0.20)
+    railties (3.0.20)
+      actionpack (= 3.0.20)
+      activesupport (= 3.0.20)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (~> 0.14.4)
+    rake (10.3.2)
+    rdoc (3.12.2)
+      json (~> 1.4)
+    rspec (3.0.0)
+      rspec-core (~> 3.0.0)
+      rspec-expectations (~> 3.0.0)
+      rspec-mocks (~> 3.0.0)
+    rspec-core (3.0.4)
+      rspec-support (~> 3.0.0)
+    rspec-expectations (3.0.4)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.0.0)
+    rspec-mocks (3.0.4)
+      rspec-support (~> 3.0.0)
+    rspec-support (3.0.4)
+    thor (0.14.6)
+    treetop (1.4.15)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.41)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal
+  generator_spec
+  jquery-atwho-rails!
+  rails (~> 3.0.0)
+  rspec

data/lib/assets/javascripts/jquery.atwho/jquery.atwho.js

@@ -1,4 +1,4 @@
-/*! jquery.atwho - v0.4.11 - 2014-04-27
+/*! jquery.atwho - v0.5.0 - 2014-07-14
 * Copyright (c) 2014 chord.luo <chord.luo@gmail.com>; 
 * homepage: http://ichord.github.com/At.js 
 * Licensed MIT
@@ -13,7 +13,7 @@
     }
   })(function($) {
 
-var $CONTAINER, Api, App, Atwho, Controller, DEFAULT_CALLBACKS, KEY_CODE, Model, View,
+var $CONTAINER, Api, App, Controller, DEFAULT_CALLBACKS, KEY_CODE, Model, View,
   __slice = [].slice;
 
 App = (function() {
@@ -28,25 +28,36 @@ App = (function() {
   }
 
   App.prototype.setIframe = function(iframe) {
-    var error;
     if (iframe) {
       this.window = iframe.contentWindow;
       this.document = iframe.contentDocument || this.window.document;
-      this.iframe = iframe;
-      return this;
+      return this.iframe = iframe;
     } else {
-      this.document = this.$inputor[0].ownerDocument;
-      this.window = this.document.defaultView || this.document.parentWindow;
-      try {
-        return this.iframe = this.window.frameElement;
-      } catch (_error) {
-        error = _error;
-      }
+      this.document = document;
+      this.window = window;
+      return this.iframe = null;
     }
   };
 
   App.prototype.controller = function(at) {
-    return this.controllers[this.alias_maps[at] || at || this.current_flag];
+    var c, current, current_flag, _ref;
+    if (this.alias_maps[at]) {
+      current = this.controllers[this.alias_maps[at]];
+    } else {
+      _ref = this.controllers;
+      for (current_flag in _ref) {
+        c = _ref[current_flag];
+        if (current_flag === at) {
+          current = c;
+          break;
+        }
+      }
+    }
+    if (current) {
+      return current;
+    } else {
+      return this.controllers[this.current_flag];
+    }
   };
 
   App.prototype.set_context_for = function(at) {
@@ -76,15 +87,20 @@ App = (function() {
     })(this)).on('scroll.atwhoInner', (function(_this) {
       return function(e) {
         var _ref;
-        return (_ref = _this.controller()) != null ? _ref.view.hide() : void 0;
+        return (_ref = _this.controller()) != null ? _ref.view.hide(e) : void 0;
       };
     })(this)).on('blur.atwhoInner', (function(_this) {
       return function(e) {
         var c;
         if (c = _this.controller()) {
-          return c.view.hide(c.get_opt("display_timeout"));
+          return c.view.hide(e, c.get_opt("display_timeout"));
         }
       };
+    })(this)).on('click.atwhoInner', (function(_this) {
+      return function(e) {
+        var _ref;
+        return (_ref = _this.controller()) != null ? _ref.view.hide(e) : void 0;
+      };
     })(this));
   };
 
@@ -153,7 +169,7 @@ App = (function() {
     switch (e.keyCode) {
       case KEY_CODE.ESC:
         e.preventDefault();
-        view.hide();
+        view.hide(e);
         break;
       case KEY_CODE.UP:
         e.preventDefault();
@@ -183,7 +199,7 @@ App = (function() {
           return;
         }
         e.preventDefault();
-        view.choose();
+        view.choose(e);
         break;
       default:
         $.noop();
@@ -274,7 +290,9 @@ Controller = (function() {
   Controller.prototype.catch_query = function() {
     var caret_pos, content, end, query, start, subtext;
     content = this.content();
-    caret_pos = this.$inputor.caret('pos');
+    caret_pos = this.$inputor.caret('pos', {
+      iframe: this.app.iframe
+    });
     subtext = content.slice(0, caret_pos);
     query = this.callbacks("matcher").call(this, this.at, subtext, this.get_opt('start_with_space'));
     if (typeof query === "string" && query.length <= this.get_opt('max_len', 20)) {
@@ -296,9 +314,9 @@ Controller = (function() {
 
   Controller.prototype.rect = function() {
     var c, scale_bottom;
-    if (!(c = this.$inputor.caret({
+    if (!(c = this.$inputor.caret('offset', this.pos - 1, {
       iframe: this.app.iframe
-    }).caret('offset', this.pos - 1))) {
+    }))) {
       return;
     }
     if (this.$inputor.attr('contentEditable') === 'true') {
@@ -344,37 +362,32 @@ Controller = (function() {
   };
 
   Controller.prototype.insert = function(content, $li) {
-    var $inputor, $insert_node, class_name, content_node, insert_node, pos, range, sel, source, start_str, text;
+    var $inputor, content_node, pos, range, sel, source, start_str, text, wrapped_content;
     $inputor = this.$inputor;
-    if ($inputor.attr('contentEditable') === 'true') {
-      class_name = "atwho-view-flag atwho-view-flag-" + (this.get_opt('alias') || this.at);
-      content_node = "" + content + "<span contenteditable='false'>&nbsp;<span>";
-      insert_node = "<span contenteditable='false' class='" + class_name + "'>" + content_node + "</span>";
-      $insert_node = $(insert_node, this.app.document).data('atwho-data-item', $li.data('item-data'));
-      if (this.app.document.selection) {
-        $insert_node = $("<span contenteditable='true'></span>", this.app.document).html($insert_node);
-      }
-    }
+    wrapped_content = this.callbacks('inserting_wrapper').call(this, $inputor, content, this.get_opt("suffix"));
     if ($inputor.is('textarea, input')) {
-      content = '' + content;
       source = $inputor.val();
       start_str = source.slice(0, Math.max(this.query.head_pos - this.at.length, 0));
-      text = "" + start_str + content + " " + (source.slice(this.query['end_pos'] || 0));
+      text = "" + start_str + wrapped_content + (source.slice(this.query['end_pos'] || 0));
       $inputor.val(text);
-      $inputor.caret('pos', start_str.length + content.length + 1);
+      $inputor.caret('pos', start_str.length + wrapped_content.length, {
+        iframe: this.app.iframe
+      });
     } else if (range = this.range) {
       pos = range.startOffset - (this.query.end_pos - this.query.head_pos) - this.at.length;
       range.setStart(range.endContainer, Math.max(pos, 0));
       range.setEnd(range.endContainer, range.endOffset);
       range.deleteContents();
-      range.insertNode($insert_node[0]);
+      content_node = $(wrapped_content, this.app.document)[0];
+      range.insertNode(content_node);
+      range.setEndAfter(content_node);
       range.collapse(false);
       sel = this.app.window.getSelection();
       sel.removeAllRanges();
       sel.addRange(range);
     } else if (range = this.ie8_range) {
       range.moveStart('character', this.query.end_pos - this.query.head_pos - this.at.length);
-      range.pasteHTML(content_node);
+      range.pasteHTML(wrapped_content);
       range.collapse(false);
       range.select();
     }
@@ -504,7 +517,7 @@ View = (function() {
       return $(e.currentTarget).addClass('cur');
     }).on('click', (function(_this) {
       return function(e) {
-        _this.choose();
+        _this.choose(e);
         return e.preventDefault();
       };
     })(this));
@@ -514,13 +527,16 @@ View = (function() {
     return this.$el.is(":visible");
   };
 
-  View.prototype.choose = function() {
+  View.prototype.choose = function(e) {
     var $li, content;
     if (($li = this.$el.find(".cur")).length) {
       content = this.context.insert_content_for($li);
       this.context.insert(this.context.callbacks("before_insert").call(this.context, content, $li), $li);
-      this.context.trigger("inserted", [$li]);
-      return this.hide();
+      this.context.trigger("inserted", [$li, e]);
+      this.hide(e);
+    }
+    if (this.context.get_opt("hide_without_suffix")) {
+      return this.stop_showing = true;
     }
   };
 
@@ -562,6 +578,10 @@ View = (function() {
 
   View.prototype.show = function() {
     var rect;
+    if (this.stop_showing) {
+      this.stop_showing = false;
+      return;
+    }
     this.context.mark_range();
     if (!this.visible()) {
       this.$el.show();
@@ -572,12 +592,15 @@ View = (function() {
     }
   };
 
-  View.prototype.hide = function(time) {
+  View.prototype.hide = function(e, time) {
     var callback;
-    if (isNaN(time && this.visible())) {
+    if (!this.visible()) {
+      return;
+    }
+    if (isNaN(time)) {
       this.context.reset_rect();
       this.$el.hide();
-      return this.context.trigger('hidden');
+      return this.context.trigger('hidden', [e]);
     } else {
       callback = (function(_this) {
         return function() {
@@ -707,13 +730,32 @@ DEFAULT_CALLBACKS = {
     if (!query) {
       return li;
     }
-    regexp = new RegExp(">\\s*(\\w*)(" + query.replace("+", "\\+") + ")(\\w*)\\s*<", 'ig');
+    regexp = new RegExp(">\\s*(\\w*?)(" + query.replace("+", "\\+") + ")(\\w*)\\s*<", 'ig');
     return li.replace(regexp, function(str, $1, $2, $3) {
       return '> ' + $1 + '<strong>' + $2 + '</strong>' + $3 + ' <';
     });
   },
   before_insert: function(value, $li) {
     return value;
+  },
+  inserting_wrapper: function($inputor, content, suffix) {
+    var new_suffix, wrapped_content;
+    new_suffix = suffix === "" ? suffix : suffix || " ";
+    if ($inputor.is('textarea, input')) {
+      return '' + content + new_suffix;
+    } else if ($inputor.attr('contentEditable') === 'true') {
+      new_suffix = suffix === "" ? suffix : suffix || "&nbsp;";
+      if (/firefox/i.test(navigator.userAgent)) {
+        wrapped_content = "<span>" + content + new_suffix + "</span>";
+      } else {
+        suffix = "<span contenteditable='false'>" + new_suffix + "<span>";
+        wrapped_content = "<span contenteditable='false'>" + content + suffix + "</span>";
+      }
+      if (this.app.document.selection) {
+        wrapped_content = "<span contenteditable='true'>" + content + "</span>";
+      }
+      return wrapped_content;
+    }
   }
 };
 
@@ -724,36 +766,9 @@ Api = {
       return c.model.load(data);
     }
   },
-  getInsertedItemsWithIDs: function(at) {
-    var c, ids, items;
-    if (!(c = this.controller(at))) {
-      return [null, null];
-    }
-    if (at) {
-      at = "-" + (c.get_opt('alias') || c.at);
-    }
-    ids = [];
-    items = $.map(this.$inputor.find("span.atwho-view-flag" + (at || "")), function(item) {
-      var data;
-      data = $(item).data('atwho-data-item');
-      if (ids.indexOf(data.id) > -1) {
-        return;
-      }
-      if (data.id) {
-        ids.push = data.id;
-      }
-      return data;
-    });
-    return [ids, items];
-  },
-  getInsertedItems: function(at) {
-    return Api.getInsertedItemsWithIDs.apply(this, [at])[1];
-  },
-  getInsertedIDs: function(at) {
-    return Api.getInsertedItemsWithIDs.apply(this, [at])[0];
-  },
   setIframe: function(iframe) {
-    return this.setIframe(iframe);
+    this.setIframe(iframe);
+    return null;
   },
   run: function() {
     return this.dispatch();
@@ -764,18 +779,6 @@ Api = {
   }
 };
 
-Atwho = {
-  init: function(options) {
-    var $this, app;
-    app = ($this = $(this)).data("atwho");
-    if (!app) {
-      $this.data('atwho', (app = new App(this)));
-    }
-    app.reg(options.at, options);
-    return this;
-  }
-};
-
 $CONTAINER = $("<div id='atwho-container'></div>");
 
 $.fn.atwho = function(method) {
@@ -784,13 +787,14 @@ $.fn.atwho = function(method) {
   $('body').append($CONTAINER);
   result = null;
   this.filter('textarea, input, [contenteditable=true]').each(function() {
-    var app;
+    var $this, app;
+    if (!(app = ($this = $(this)).data("atwho"))) {
+      $this.data('atwho', (app = new App(this)));
+    }
     if (typeof method === 'object' || !method) {
-      return Atwho.init.apply(this, _args);
-    } else if (Api[method]) {
-      if (app = $(this).data('atwho')) {
-        return result = Api[method].apply(app, Array.prototype.slice.call(_args, 1));
-      }
+      return app.reg(method.at, method);
+    } else if (Api[method] && app) {
+      return result = Api[method].apply(app, Array.prototype.slice.call(_args, 1));
     } else {
       return $.error("Method " + method + " does not exist on jQuery.caret");
     }
@@ -803,9 +807,11 @@ $.fn.atwho["default"] = {
   alias: void 0,
   data: null,
   tpl: "<li data-value='${atwho-at}${name}'>${name}</li>",
-  insert_tpl: "<span>${atwho-data-value}</span>",
+  insert_tpl: "<span id='${id}'>${atwho-data-value}</span>",
   callbacks: DEFAULT_CALLBACKS,
   search_key: "name",
+  suffix: void 0,
+  hide_without_suffix: false,
   start_with_space: true,
   highlight_first: true,
   limit: 5,

data/lib/assets/javascripts/jquery.atwho/jquery.caret.js

@@ -24,7 +24,7 @@
     }
   })(function($) {
     "use strict";
-    var EditableCaret, InputCaret, Mirror, Utils, configure, methods, oDocument, oFrame, oWindow, pluginName, setContextBy;
+    var EditableCaret, InputCaret, Mirror, Utils, discoveryIframeOf, methods, oDocument, oFrame, oWindow, pluginName, setContextBy;
     pluginName = 'caret';
     EditableCaret = (function() {
       function EditableCaret($inputor) {
@@ -204,7 +204,7 @@
       };
 
       InputCaret.prototype.getPosition = function(pos) {
-        var $inputor, at_rect, format, html, mirror, start_range;
+        var $inputor, at_rect, end_range, format, html, mirror, start_range;
         $inputor = this.$inputor;
         format = function(value) {
           return value.replace(/</g, '&lt').replace(/>/g, '&gt').replace(/`/g, '&#96').replace(/"/g, '&quot').replace(/\r\n|\r|\n/g, "<br />");
@@ -213,8 +213,10 @@
           pos = this.getPos();
         }
         start_range = $inputor.val().slice(0, pos);
-        html = "<span>" + format(start_range) + "</span>";
-        html += "<span id='caret'>|</span>";
+        end_range = $inputor.val().slice(pos);
+        html = "<span style='position: relative; display: inline;'>" + format(start_range) + "</span>";
+        html += "<span id='caret' style='position: relative; display: inline;'>|</span>";
+        html += "<span style='position: relative; display: inline;'>" + format(end_range) + "</span>";
         mirror = new Mirror($inputor);
         return at_rect = mirror.create(html).rect();
       };
@@ -237,7 +239,7 @@
 
     })();
     Mirror = (function() {
-      Mirror.prototype.css_attr = ["overflowY", "height", "width", "paddingTop", "paddingLeft", "paddingRight", "paddingBottom", "marginTop", "marginLeft", "marginRight", "marginBottom", "fontFamily", "borderStyle", "borderWidth", "wordWrap", "fontSize", "lineHeight", "overflowX", "text-align"];
+      Mirror.prototype.css_attr = ["borderBottomWidth", "borderLeftWidth", "borderRightWidth", "borderTopStyle", "borderRightStyle", "borderBottomStyle", "borderLeftStyle", "borderTopWidth", "boxSizing", "fontFamily", "fontSize", "fontWeight", "height", "letterSpacing", "lineHeight", "marginBottom", "marginLeft", "marginRight", "marginTop", "outlineWidth", "overflow", "overflowX", "overflowY", "paddingBottom", "paddingLeft", "paddingRight", "paddingTop", "textAlign", "textOverflow", "textTransform", "whiteSpace", "wordBreak", "wordWrap"];
 
       function Mirror($inputor) {
         this.$inputor = $inputor;
@@ -250,9 +252,11 @@
           position: 'absolute',
           left: -9999,
           top: 0,
-          zIndex: -20000,
-          'white-space': 'pre-wrap'
+          zIndex: -20000
         };
+        if (this.$inputor.prop('tagName') === 'TEXTAREA') {
+          this.css_attr.push('width');
+        }
         $.each(this.css_attr, function(i, p) {
           return css[p] = _this.$inputor.css(p);
         });
@@ -317,37 +321,39 @@
     oDocument = null;
     oWindow = null;
     oFrame = null;
-    setContextBy = function(iframe) {
-      oFrame = iframe;
-      oWindow = iframe.contentWindow;
-      return oDocument = iframe.contentDocument || oWindow.document;
-    };
-    configure = function($dom, settings) {
-      var error, iframe;
-      if ($.isPlainObject(settings) && (iframe = settings.iframe)) {
-        $dom.data('caret-iframe', iframe);
-        return setContextBy(iframe);
-      } else if (iframe = $dom.data('caret-iframe')) {
-        return setContextBy(iframe);
+    setContextBy = function(settings) {
+      var iframe;
+      if (iframe = settings != null ? settings.iframe : void 0) {
+        oFrame = iframe;
+        oWindow = iframe.contentWindow;
+        return oDocument = iframe.contentDocument || oWindow.document;
       } else {
-        oDocument = $dom[0].ownerDocument;
-        oWindow = oDocument.defaultView || oDocument.parentWindow;
-        try {
-          return oFrame = oWindow.frameElement;
-        } catch (_error) {
-          error = _error;
-        }
+        oFrame = void 0;
+        oWindow = window;
+        return oDocument = document;
+      }
+    };
+    discoveryIframeOf = function($dom) {
+      var error;
+      oDocument = $dom[0].ownerDocument;
+      oWindow = oDocument.defaultView || oDocument.parentWindow;
+      try {
+        return oFrame = oWindow.frameElement;
+      } catch (_error) {
+        error = _error;
       }
     };
-    $.fn.caret = function(method) {
+    $.fn.caret = function(method, value, settings) {
       var caret;
-      if (typeof method === 'object') {
-        configure(this, method);
-        return this;
-      } else if (methods[method]) {
-        configure(this);
+      if (methods[method]) {
+        if ($.isPlainObject(value)) {
+          setContextBy(value);
+          value = void 0;
+        } else {
+          setContextBy(settings);
+        }
         caret = Utils.contentEditable(this) ? new EditableCaret(this) : new InputCaret(this);
-        return methods[method].apply(caret, Array.prototype.slice.call(arguments, 1));
+        return methods[method].apply(caret, [value]);
       } else {
         return $.error("Method " + method + " does not exist on jQuery.caret");
       }

data/lib/assets/stylesheets/jquery.atwho.css

@@ -9,7 +9,7 @@
     border-radius: 3px;
     box-shadow: 0 0 5px rgba(0,0,0,0.1);
     min-width: 120px;
-    z-index: 10;
+    z-index: 11110 !important;
 }
 
 .atwho-view .cur {

data/lib/generators/atwho/install_generator.rb

@@ -12,7 +12,8 @@ if ::Rails.version < "3.1" || !::Rails.application.config.assets.enabled
 
         def copy_js
           say_status("copying js", " jquery.atwho.js (#{Jquery::Atwho::Rails::VERSION})", :green)
-          copy_file "javascripts/jquery.atwho.js", "public/javascripts/jquery.atwho.js"
+          copy_file "javascripts/jquery.atwho/jquery.caret.js", "public/javascripts/jquery.atwho/jquery.caret.js"
+          copy_file "javascripts/jquery.atwho/jquery.atwho.js", "public/javascripts/jquery.atwho/jquery.atwho.js"
           #copy_file "javascripts/jquery.atwho.min.js", "public/javascripts/jquery.atwho.min.js"
         end
 

data/lib/jquery-atwho-rails/version.rb

@@ -1,7 +1,7 @@
 module Jquery
   module Atwho
     module Rails
-      VERSION = "0.4.11"
+      VERSION = "0.5.0"
     end
   end
 end

data/spec/generators/install_generator_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Atwho::Generators::InstallGenerator do
   include GeneratorSpec::TestCase
-  
+
   destination File.expand_path("../../../tmp/", __FILE__)
   before(:all) do
     prepare_destination
@@ -10,13 +10,9 @@ describe Atwho::Generators::InstallGenerator do
   end
 
   it "generate assets files" do
-    js_prefix = "public/javascripts"
-    css_prefix = "public/stylesheets"
-
-    assert_file "#{js_prefix}/jquery.atwho.js"
-    #assert_file "#{js_prefix}/jquery.atwho.min.js"
-
-    assert_file "#{css_prefix}/jquery.atwho.css"
-    #assert_file "#{css_prefix}/jquery.atwho.min.css"
+    if ::Rails.version < "3.1"
+      assert_file "public/javascripts/jquery.atwho/jquery.atwho.js"
+      assert_file "public/stylesheets/jquery.atwho.css"
+    end
   end
 end

data/spec/spec_helper.rb

@@ -19,5 +19,5 @@ Rails.application.config.root = Rails.root
 #Rails::Generators.configure!
 
 #Rails.application.config.assets.enabled = true
+require "generator_spec"
 require 'generators/atwho/install_generator'
-require 'generator_spec/test_case'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jquery-atwho-rails
 version: !ruby/object:Gem::Version
-  version: 0.4.11
+  version: 0.5.0
 platform: ruby
 authors:
 - ichord
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-23 00:00:00.000000000 Z
+date: 2014-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -48,11 +48,14 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- Appraisals
 - Gemfile
 - LICENSE-MIT
 - README.md
 - Rakefile
 - changelog.md
+- gemfiles/rails30.gemfile
+- gemfiles/rails30.gemfile.lock
 - jquery-atwho-rails.gemspec
 - lib/assets/javascripts/jquery.atwho/index.js
 - lib/assets/javascripts/jquery.atwho/jquery.atwho.js