mousetrap-rails 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 510a6cd6f40ef2ba974a305bdf77d11292a13d3c
-  data.tar.gz: 4e080a4551b296c562d79807d0fbe9a38ee43798
+  metadata.gz: 51c1d6cf86a69c1b00cd4fb2b6f0f078b780cee0
+  data.tar.gz: a1193c616141eb56dd86283e6307ab7d27576c17
 SHA512:
-  metadata.gz: f7779a4ade4fb6ee4ad7871bb7bbd2eac1396fcb5282bf1225d5629f9b5a0d7513544ce1178c257f4d4662f4e760ea2b6dfffbdd9a352bb61fc48cc2fc8bce7c
-  data.tar.gz: 988ed39f05e62f268ad3f88f47a2f5f6909951956cc6017b9a68fd5b715a43b2effed1f78fabb8308b1471aa4b0d03e8ec4c168a258279ad1f62370d0b0a9f62
+  metadata.gz: ab650c2ee1e6c05554c810cc1b68e0c3eee7f9964dc824bd05fb9bc6a380d093bd75607594046d69eccc535f78de4fd4cd1c0714c7e74b7afc9d8ebaa1cb2b4b
+  data.tar.gz: 6f7aede7bfd66c11b2818d2ad7fb9e2d4ab12611fdf91babd6b28ca97b4a55f7b14595066ed6aac76d4bc78286ba521e4b8a0aa2910e5d50edd60ae1f5e191cb

data/.travis.yml

@@ -1,4 +1,7 @@
 language: ruby
 rvm:
-  - 1.9.3
   - 1.9.2
+  - 1.9.3
+  - 2.0.0
+  - ruby-head
+  - rbx-19mode

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## v0.0.12.wip
+
+* [] Add moustrap extensions generator
+
+## v0.0.11
+
+* add update mousetrap.js rake task
+* update mousetrap.js to 1.4.4
+
 ## v0.0.10
 
 * update mousetrap.js to 1.4.1

data/README.md

@@ -108,6 +108,12 @@ You can display key binding hints near links with `data-keybinding` attribute by
 
 Please submit all pull requests against latest `*.wip` branch. If your pull request contains new features, you **must** include relevant tests.
 
+You can easily update mousetrap.js library via rake task.
+
+```bash
+$ rake mousetrap:update
+```
+
 Thanks in advance!
 
 

data/Rakefile

@@ -3,3 +3,15 @@ require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 task :default => :spec
+
+namespace :mousetrap do
+  desc "Update Mousetrap javascript library from https://raw.github.com/ccampbell/mousetrap/master/mousetrap.js"
+  task :update do
+    ORIGIN_URL  = "https://raw.github.com/ccampbell/mousetrap/master/mousetrap.js"
+    FILE_PATH   = "vendor/assets/javascripts/mousetrap.js"
+    puts "Updating Mousetrap.js library from origin"
+    puts "#{ORIGIN_URL} -> #{FILE_PATH}\n\n"
+    system 'wget', ORIGIN_URL, "-O", FILE_PATH
+    puts "Mousetrap.js updated!"
+  end
+end

data/lib/generators/mousetrap/install/install_generator.rb

@@ -2,16 +2,20 @@ module Mousetrap
 
   # Mousetrap rails generators module
   module Generators
+
+    # Install generator implementation
     class InstallGenerator < ::Rails::Generators::Base
       desc "Copy Mousetrap default files"
       source_root File.expand_path('../templates', __FILE__)
 
-      # Copy keybindings scripts to assets folder
+      # Copy keybindings scripts to assets folder. This coffescript file
+      # provides unobtrusive way to use HTML5 data attributes for
+      # binding click and focus events to DOM elements.
       def copy_mousetrap
         copy_file "keybindings.js.coffee", "app/assets/javascripts/keybindings.js.coffee"
       end
 
-      # Inject moustrap scripts to application.js
+      # Inject mousetrap scripts to manifest file `application.js`
       def add_javascript_assets
         if File.exist?('app/assets/javascripts/application.js')
           insert_into_file "app/assets/javascripts/application.js", "//= require mousetrap\n", :after => "jquery_ujs\n"
@@ -20,7 +24,7 @@ module Mousetrap
         end
       end
 
-      # Inject moustrap styles to application.css
+      # Inject mousetrap styles to manifest file `application.css`
       def add_css_assets
         if File.exist?('app/assets/stylesheets/application.css')
           insert_into_file "app/assets/stylesheets/application.css", "*= require mousetrap\n ", :before => "*= require_tree ."

data/lib/generators/mousetrap/install/templates/keybindings.js.coffee

@@ -24,7 +24,7 @@ $ ->
   window.mouseTrapRails =
     showOnLoad: false           # Show/hide hotkey hints by default (on page load). Mostly for debugging purposes.
     toggleKeys: 'alt+shift+h'   # Keys combo to toggle hints visibility.
-    keysShown: false
+    keysShown: false            # State of hotkey hints
     toggleHints:  ->
       $('a[data-keybinding]').each (i, el) ->
         $el = $(el)

data/lib/mousetrap-rails/version.rb

@@ -1,5 +1,5 @@
 module Mousetrap
   module Rails
-    VERSION = "0.0.10"
+    VERSION = "0.0.11"
   end
 end

data/mousetrap-rails.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.signing_key = '/Users/nick/.ssh/gem-private_key.pem'
+  # gem.signing_key = '/Users/nick/.ssh/gem-private_key.pem'
   gem.cert_chain  = ['gem-public_cert.pem']
 
   gem.add_development_dependency 'rails', '~> 3.2.12'

data/spec/spec_helper.rb

@@ -24,12 +24,12 @@ RSpec.configure do |config|
   # config.mock_with :rr
 
   # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
-  config.fixture_path = "#{::Rails.root}/spec/fixtures"
+  # config.fixture_path = "#{::Rails.root}/spec/fixtures"
 
   # If you're not using ActiveRecord, or you'd prefer not to run each of your
   # examples within a transaction, remove the following line or assign false
   # instead of true.
-  config.use_transactional_fixtures = true
+  config.use_transactional_fixtures = false
 
   # If true, the base class of anonymous controllers will be inferred
   # automatically. This will be the default behavior in future versions of

data/vendor/assets/javascripts/mousetrap.js

@@ -17,7 +17,7 @@
  * Mousetrap is a simple keyboard shortcut library for Javascript with
  * no external dependencies
  *
- * @version 1.4.1
+ * @version 1.4.4
  * @url craig.is/killing/mice
  */
 (function() {
@@ -174,6 +174,13 @@
          */
         _ignoreNextKeyup = false,
 
+        /**
+         * temporary state where we will ignore the next keypress
+         *
+         * @type {boolean}
+         */
+        _ignoreNextKeypress = false,
+
         /**
          * are we currently inside of a sequence?
          * type of action ("keyup" or "keydown" or "keypress") or false
@@ -239,6 +246,12 @@
                 character = character.toLowerCase();
             }
 
+            // String.fromCharCode(32) for spacebar returns " " for the
+            // character name, make sure it matches the mousetrap name
+            if (character == ' ') {
+                return 'space';
+            }
+
             return character;
         }
 
@@ -496,9 +509,22 @@
         // modifier keys are ignored because you can have a sequence
         // that contains modifiers such as "enter ctrl+space" and in most
         // cases the modifier key will be pressed before the next key
-        if (e.type == _nextExpectedAction && !_isModifier(character)) {
+        //
+        // also if you have a sequence such as "ctrl+b a" then pressing the
+        // "b" key will trigger a "keypress" and a "keydown"
+        //
+        // the "keydown" is expected when there is a modifier, but the
+        // "keypress" ends up matching the _nextExpectedAction since it occurs
+        // after and that causes the sequence to reset
+        //
+        // we ignore keypresses in a sequence that directly follow a keydown
+        // for the same character
+        var ignoreThisKeypress = e.type == 'keypress' && _ignoreNextKeypress;
+        if (e.type == _nextExpectedAction && !_isModifier(character) && !ignoreThisKeypress) {
             _resetSequences(doNotReset);
         }
+
+        _ignoreNextKeypress = processedSequenceCallback && e.type == 'keydown';
     }
 
     /**
@@ -522,7 +548,8 @@
             return;
         }
 
-        if (e.type == 'keyup' && _ignoreNextKeyup == character) {
+        // need to use === for the character check because the character can be 0
+        if (e.type == 'keyup' && _ignoreNextKeyup === character) {
             _ignoreNextKeyup = false;
             return;
         }

metadata

@@ -1,35 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: mousetrap-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Nick Kugaevsky
 autorequire: 
 bindir: bin
 cert_chain:
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIDMDCCAhigAwIBAgIBADANBgkqhkiG9w0BAQUFADA+MQ0wCwYDVQQDDARuaWNr
-  MRkwFwYKCZImiZPyLGQBGRYJa3VnYWV2c2t5MRIwEAYKCZImiZPyLGQBGRYCcnUw
-  HhcNMTMwMTMxMTgxMjMwWhcNMTQwMTMxMTgxMjMwWjA+MQ0wCwYDVQQDDARuaWNr
-  MRkwFwYKCZImiZPyLGQBGRYJa3VnYWV2c2t5MRIwEAYKCZImiZPyLGQBGRYCcnUw
-  ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3SS01rsI5N3EUG3bSnfI2
-  pr4Exx9gKCBS5IxV7Ot+pQ2psIiWoenaS4fS2fsmvle92ClEx3NbUqnxxGDES0Eb
-  FkNHyAH9VwO36vS0loNv/Ox2sSaleUNV3JdvcP1Gm3xGtn9KWNcpuAwPfMl5BSYg
-  K4WU8zIkbLlwmrO6h85IYZrDwqghb6OCOwhb56d4byjoJE25brUxETxGVdsuVCDr
-  EQroS+D2BiMAEdwJcn/PepMx3lt+teZrjUoei5UXIcnZ28UYSnmXjXnkySlPXzRV
-  siLwUMAgGu665huUE5S8idW7ohSHTJv/kH98BoiWi7gi9HFMz4OJMMeR5rZk76Ql
-  AgMBAAGjOTA3MAkGA1UdEwQCMAAwHQYDVR0OBBYEFCdIKkB9lZ+com0wLBhLQDWe
-  YnbvMAsGA1UdDwQEAwIEsDANBgkqhkiG9w0BAQUFAAOCAQEANOubFddpzMXJflPv
-  vXXnWXYvZK2etSxzwewXXOhcbzwSxdU0T4NbKcrlhlFbjUDh/xF4Qzc1dB9OFG9r
-  ffIUKv0JtEyGM/mOaISsNp+oYUlXxXLNOsX8LT1r+337tQ627GoX/Z0RL5u8Mz6Q
-  KZUJhGQKNnIp6Rkz6sp4Zh2aqTLt8BDEA86kO+0v4LaVLqFEmLTypf7C568RTYlm
-  N8LaREQMM5YdvCIYWs5C6iNRVaDhT8bkuWNhtBis0H7YFAfsW1rn9np8OQ7nY2az
-  8dNQrBlKzc/RLwGGFT1gjzVlIb7/xtNdMdJQ6JwyljSJ70PbKAAzgBRdDLPt9BWt
-  3AH9mw==
-  -----END CERTIFICATE-----
-date: 2013-06-02 00:00:00.000000000 Z
+- gem-public_cert.pem
+date: 2013-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails

checksums.yaml.gz.sig

@@ -1,3 +0,0 @@
-��)
-�����i�y
-���I�Y���D�Ub�A�s���=����?R+V='\B��wakp;��򊖯#���K������pS���V�W���� �$��얡�1M?]qگ��J�F8�S�Zg�
F�d�أ��^ >H's\d5#Ova�i<oә�jl_��>��%U�0Z�e�軸���縿/��#��tu�.ۦrn����2y=�
�/�BF�/dB���J
��:YO�<lw�2�:h?w5��-�-[�