abracadabra 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d4e4740ccd71a82f5d189f3db3e1ebd524a4d1d
-  data.tar.gz: 5892da4ddc2675a8b6b9b9a7d56ba69669299341
+  metadata.gz: 7cb45804338fe71758c94d2b1d99dc80ab717d8a
+  data.tar.gz: 530aeb3bae6e383a2b38e80eebc69b244506882a
 SHA512:
-  metadata.gz: 310f8d4e36515555ba7776da77d22558d7855ac23b54a74bd228f979b80ebb2b6a41151927665dbea59def894fd0d2cd639b8f9643e73ccdd39709d090175617
-  data.tar.gz: 39501d3e2e6ea72bdfe5e5e93ebfa20351744d00451e1b10b289fe6e37552d72d94c0012d7057dc3f4651b8a1f3fcd2c8802e56cee72de88dc9f306c71144f71
+  metadata.gz: 73fecc08bc118c530dc84389865f346ece46b5ef6ab3faa8dcfda9f80fb2a1c04111d75ef763e44b956b09dc16389330fa4ee9a297874df5f58ddb6bfad9db7f
+  data.tar.gz: 14995d84dff4f4369643cecbd528e46218fad781381090c06ea1bb2054cfa3a720f3621941b515edc0b37d35916d2c143115971d57c28cf7808e9278a9ab9491

data/README.md

@@ -1,6 +1,6 @@
 # Abracadabra
 
-A lightweight gem for swapping out text with a fully-compliant Rails form in one click.
+A lightweight gem for swapping out text with a fully-compliant Rails 4 form in one click.
 
 Much of the concepts and html mark-up were taken from the awesome [x-editable](http://vitalets.github.io/x-editable/) plugin and the Rails version of this, [x-editable-rails](https://github.com/werein/x-editable-rails). However, this was written from the ground up and uses fully Rails-compliant forms without hacking into x-editable's core files, or overriding them.
 
@@ -36,13 +36,13 @@ In your `application.js`, AFTER Jquery (required), include the javascript file:
 
 ## Helpers
 
-The bread and butter of abracadabra is its helper, `click_to_edit`. Its pretty much as readable as it gets:
+The bread and butter of abracadabra is its helper, `click_to_edit`. It's pretty much as readable as it gets:
 
 ```ruby
 <%= click_to_edit @user, path: user_path(@user), attribute: :name %>
 ```
 
-When a user clicks the link generated by this helper, a form with a text field input will replace the link. It's fully Rails compliant, and looks identical to a `form_for` with `remote: true`. Here's what it looks like:
+When a user clicks the link generated by this helper, a form with a text field input will replace the link. It's fully Rails compliant, and the form markup that is generated is identical to a `form_for` with `remote: true`. Here's what it looks like:
 
 ![Abracadabra Demo](http://recordit.co/CbgPTahYix.gif "Abracadabra Demo")
 
@@ -73,7 +73,7 @@ method: "patch"
 # Default: "patch"
 
 remote: true
-# Same as link_to's remote: true, form submits via AJAX.
+# Same as link_to's `remote: true`, form submits via AJAX.
 # Default: true
 
 # IMPORTANT: `type` will be ignored if `remote = false` is used. HTML is the default 
@@ -89,6 +89,10 @@ type: :js
 
 2. I would love the different Bootstrap classes to be overridable with an initializer (config/abracadabra.rb) so that any framework could be used. Same with the Font-Awesome button classes.
 
+3. I would love for a `buttons: false` option to be offered that would allow only `Tab`, `Enter` and `Escape` to submit or cancel the form submission.
+
+4. I would love for a `tabbable: true` option to be offered that would tab to the next text input with the `abracadabra` class.
+
 Any other ideas, feel free to contribute!
 
 1. Fork it ( http://github.com/TrevorHinesley/abracadabra/fork )

data/abracadabra.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.version       = Abracadabra::Rails::VERSION
   spec.authors       = ["Trevor Hinesley"]
   spec.email         = ["trevor.hinesley@gmail.com"]
-  spec.summary       = %q{A lightweight gem for swapping out text with a fully-compliant Rails form in one click using JQuery.}
-  spec.description   = %q{Abracadabra: A lightweight gem for swapping out text with a fully-compliant Rails form in one click using JQuery and rails.js.}
+  spec.summary       = %q{A lightweight gem for swapping out text with a fully-compliant Rails 4 form in one click using JQuery.}
+  spec.description   = %q{Abracadabra: A lightweight gem for swapping out text with a fully-compliant Rails 4 form in one click using JQuery and rails.js.}
   spec.homepage      = "https://github.com/TrevorHinesley/abracadabra"
   spec.license       = "MIT"
 
@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "rails", ">= 4.0.0"
+  spec.add_dependency "rails", ">= 3.2.11"
 
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"

data/app/assets/javascripts/abracadabra.js

@@ -1,21 +1,38 @@
 $(function() {
+  function closeAbracadabra(element) {
+    $element = $(element);
+    if($element.hasClass("abracadabra-container")) {
+      container = $element;
+    } else {
+      container = $element.parents(".abracadabra-container");
+    }
+    value = container.find(".abracadabra-input").val();
+    container.siblings(".abracadabra").text(value).show();
+    container.remove();
+  }
+
   $("body").on("ajax:success", ".abracadabra-form", function(e) {
-    $(e.target).find(".abracadabra-cancel").click();
+    closeAbracadabra(this);
   })
 
   $("body").on("click", ".abracadabra-cancel", function() {
-    container = $(this).closest(".abracadabra-container");
-    value = $(this).parents(".abracadabra-buttons").siblings().find("input").val();
-    container.siblings(".abracadabra").text(value).show();
-    $(this).closest(".abracadabra-container").remove();
+    closeAbracadabra(this);
   });
 
-  $("body").on("keydown", ".abracadabra-input input", function(e) {
-    if (e.which == 9)
+  $("body").on("keydown", ".abracadabra-input", function(e) {
+    // Press Tab to submit (same function as Enter key)
+    if (e.keyCode == 9)
     {
       e.preventDefault();
       $(this.form).submit();
     }
+
+    // Press Escape to cancel
+    if (e.keyCode == 27)
+    {
+      e.preventDefault();
+      closeAbracadabra(this);
+    }
   });
   
   $(".abracadabra").on("click", function() {
@@ -23,29 +40,29 @@ $(function() {
     link.hide();
     path = link.data("path");
     attribute = link.data("attribute");
-    form_method = link.data("method");
+    formMethod = link.data("method");
     remote = ((link.data("remote") == true) ? " data-remote=\"true\"" : "");
 
     if(remote == "") {
-      auth_token = "<input name=\"authenticity_token\" type=\"hidden\" value=\"" + $("meta[name=\"csrf-token\"]").attr("content") + "\">";
+      authToken = "<input name=\"authenticity_token\" type=\"hidden\" value=\"" + $("meta[name=\"csrf-token\"]").attr("content") + "\">";
       type = "";
     } else {
-      auth_token = "";
+      authToken = "";
       type = " data-type=\"" + link.data("type") + "\"";
     }
 
-    instance_class = link.data("class");
-    input_value = link.text().replace(/"|\\"/g, "&quot;");
-    input_id = instance_class + "_" + attribute;
-    input_name = instance_class + "[" + attribute + "]";
+    instanceClass = link.data("class");
+    inputValue = link.text().replace(/"|\\"/g, "&quot;");
+    inputId = instanceClass + "_" + attribute;
+    inputName = instanceClass + "[" + attribute + "]";
 
     buttons = "<button type=\"submit\" class=\"btn btn-primary abracadabra-submit\"><i class=\"fa fa-check\"></i></button><button type=\"button\" class=\"btn abracadabra-cancel\"><i class=\"fa fa-times\"></i></button>";
-    open_form_tag = "<form accept-charset=\"UTF-8\" action=\"" + path + "\"" + remote + type + " class=\"form-inline abracadabra-form\" method=\"post\">";
-    hidden_method_tags = "<div style=\"display:none;\"><input name=\"utf8\" type=\"hidden\" value=\"&#10003;\"><input name=\"_method\" type=\"hidden\" value=\"" + form_method + "\">" + auth_token + "</div>";
-    input = "<input type=\"text\" class=\"form-control\" id=\"" + input_id + "\" name=\"" + input_name + "\" value=\"" + input_value + "\">";
+    openFormTag = "<form accept-charset=\"UTF-8\" action=\"" + path + "\"" + remote + type + " class=\"form-inline abracadabra-form\" method=\"post\">";
+    hiddenMethodTags = "<div style=\"display:none;\"><input name=\"utf8\" type=\"hidden\" value=\"&#10003;\"><input name=\"_method\" type=\"hidden\" value=\"" + formMethod + "\">" + authToken + "</div>";
+    input = "<input type=\"text\" class=\"form-control abracadabra-input\" id=\"" + inputId + "\" name=\"" + inputName + "\" value=\"" + inputValue + "\">";
     
-    html = "<span class=\"abracadabra-container abracadabra-inline\">" + open_form_tag + hidden_method_tags;
-    html += "<div class=\"control-group\"><div><div class=\"abracadabra-input\">" + input + "</div>";
+    html = "<span class=\"abracadabra-container abracadabra-inline\">" + openFormTag + hiddenMethodTags;
+    html += "<div class=\"control-group\"><div class=\"abracadabra-input-and-button-wrapper\"><div class=\"abracadabra-input-container\">" + input + "</div>";
     html += "<div class=\"abracadabra-buttons\">" + buttons + "</div></div></form></span>";
 
     link.after(html);

data/app/assets/stylesheets/abracadabra.css

@@ -10,12 +10,12 @@
 
 .abracadabra-container { display: block; }
 
-.abracadabra-container > form > .control-group > div > .abracadabra-input {
+.abracadabra-container > .abracadabra-form > .control-group > .abracadabra-input-and-button-wrapper > .abracadabra-input-container {
   width: 60%;
   display: inline-block;
 }
 
-.abracadabra-container > form > .control-group > div > .abracadabra-buttons {
+.abracadabra-container > .abracadabra-form > .control-group > .abracadabra-input-and-button-wrapper > .abracadabra-buttons {
   width: 40%;
   display: inline-block;
 }

data/lib/abracadabra/version.rb

@@ -1,5 +1,5 @@
 module Abracadabra
   module Rails
-    VERSION = "1.0.4"
+    VERSION = "1.0.5"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: abracadabra
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Trevor Hinesley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-31 00:00:00.000000000 Z
+date: 2014-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 3.2.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 3.2.11
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: 'Abracadabra: A lightweight gem for swapping out text with a fully-compliant
-  Rails form in one click using JQuery and rails.js.'
+  Rails 4 form in one click using JQuery and rails.js.'
 email:
 - trevor.hinesley@gmail.com
 executables: []
@@ -149,7 +149,7 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: A lightweight gem for swapping out text with a fully-compliant Rails form
+summary: A lightweight gem for swapping out text with a fully-compliant Rails 4 form
   in one click using JQuery.
 test_files:
 - test/dummy/.gitignore