jvectormap-rails 1.0.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1804b1fc5df76401f9031bf93e3a339a8e754598
-  data.tar.gz: 44283990773208f6a1f0cf26c70ba5d65a6dbb6e
+  metadata.gz: 18c74cc7f5f22d91c70d75173b1b46ab2c889e51
+  data.tar.gz: 73a6bf2db4c756f7a08ab00d41fc49bfb8acdbc2
 SHA512:
-  metadata.gz: 297d6d8d4ba15fe1285adf483b950e054e5e644598755796c84e6f76c30921043d6625ed67f091c17f5651194234543e5d3cd9ae38a247155ffc173d9501c12b
-  data.tar.gz: 5500dcd46bcf5559b77a6f3c08d9b15ee6028d73a49e48ab23375a062327bb20357b0c2dc1b8590c33311a3c4240a8ca454257d17fcaf2a582ecda2e7a683f17
+  metadata.gz: 6e82164aa5a0a0e936d8667c940512074af1d55548e2bd45a32594ea3a94c8883281bf04e83736044d771774566483cfa0310d1cf62cc03057f7b9c74727a0e0
+  data.tar.gz: 73073eb680c475ce8b6dc7818b06b1ec5a61e3399ce739c7ae8a645a169d30278e44c4947aebd61ba1d1c7fc2fc5fd7df0e06e32dd2e10ae35385d3b294e50bc

data/Gemfile

@@ -1,3 +1,5 @@
 source :rubygems
 
-gemspec
+gemspec
+
+gem 'pry-byebug'

data/README.md

@@ -18,21 +18,26 @@ You can add jvectormap-rails to your `application.js` file using a require state
 //= require jvectormap
 ```
 
-To add support for whatever maps you want to use, include them from the `jvectormap/maps` path:
+Don't forget to add the CSS to your `application.css` file too:
+
+```
+*= require 'jvectormap'
+```
+
+To add support for whatever maps you want to use, include them in `application.js`:
 
 ```
-//= require jvectormap
 //= require jvectormap/maps/us_merc_en
 ```
 
-The basic pattern is `{country}-{region}_{city}_{projection}_{language}`.  For example, the map `us-il-chicago_mill_en` has a country of `us` (United States), region of `il` (Illinois), city of `chicago`, projection of `mill` (Miller), and a language of `en` (English).  Other common projections include Mercator (`merc`), and Albers equal area (`aea`).
+The basic pattern is `{country}-{region}_{city}_{projection}`.  For example, the map `us-il-chicago_mill` has a country of `us` (United States), region of `il` (Illinois), city of `chicago`, and a projection of `mill` (Miller).  Other common projections include Mercator (`merc`), and Albers equal area (`aea`).
 
 ### Asset Precompilation
 
 jvectormap-rails supports precompiling individual maps.  Add an initializer to your app, eg. `config/initializers/jvectormap.rb`:
 
 ```ruby
-JVectorMap::Rails.precompile_maps << "us_merc_en"
+JVectorMap::Rails.precompile_maps << 'us_merc'
 ```
 
 ### Rake Tasks

data/Rakefile

@@ -13,26 +13,26 @@ task :download_maps do
   # I wish there was a better way to get the map data, but I can't find a repo or anything, so here we are...
 
   output_dir = File.join(File.dirname(__FILE__), "vendor")
-  puts "Getting list of map urls..."
-  home = open("http://jvectormap.com/maps/").read
+  puts 'Getting list of map urls...'
+  home = open('http://jvectormap.com/maps/').read
   links = home.scan(/<a\shref="(\/maps.*)">/).flatten.uniq
 
   js_files = links.flat_map do |link|
     puts "Getting list of maps for #{link}..."
-    content = open(File.join("http://jvectormap.com", link)).read
+    content = open(File.join('http://jvectormap.com', link)).read
     content.scan(/<a\shref=\"(\/js\/jquery-jvectormap[\w\d\-]+\.js)">/).flatten.uniq
   end
 
   js_files.uniq.each do |file|
     puts "Downloading map #{File.basename(file)}..."
-    map_data = open(File.join("http://jvectormap.com", file)).read
-    save_name = map_data.scan(/\$\.fn\.vectorMap\('addMap',\s'([\w_\-]+)'/).flatten.first
-    File.open(File.join(output_dir, "assets/javascripts/jvectormap/maps", "#{save_name}.js"), "w+") do |f|
+    map_data = open(File.join('http://jvectormap.com', file)).read
+    save_name = map_data.scan(/jQuery\.fn\.vectorMap\('addMap',\s'([\w_\-]+)'/).flatten.first
+    File.open(File.join(output_dir, 'assets/javascripts/jvectormap/maps', "#{save_name}.js"), 'w+') do |f|
       f.write(map_data)
     end
   end
 
-  puts "Done."
+  puts 'Done.'
 end
 
-load "tasks/jvectormap.rake"
+load 'tasks/jvectormap.rake'

data/jvectormap-rails.gemspec

@@ -2,19 +2,19 @@ $:.unshift File.join(File.dirname(__FILE__), 'lib')
 require 'jvectormap/rails/version'
 
 Gem::Specification.new do |s|
-  s.name     = "jvectormap-rails"
+  s.name     = 'jvectormap-rails'
   s.version  = ::JVectorMap::Rails::VERSION
-  s.authors  = ["Cameron Dutro", "Kirill Lebedev"]
-  s.email    = ["camertron@gmail.com", "echo.bjornd@gmail.com"]
-  s.homepage = "https://github.com/bjornd/jvectormap"
+  s.authors  = ['Cameron Dutro', 'Kirill Lebedev']
+  s.email    = ['camertron@gmail.com', 'echo.bjornd@gmail.com']
+  s.homepage = 'https://github.com/bjornd/jvectormap'
 
-  s.description = s.summary = "jVectorMap for the Rails asset pipeline"
+  s.description = s.summary = 'jVectorMap for the Rails asset pipeline'
 
   s.platform = Gem::Platform::RUBY
   s.has_rdoc = true
 
-  s.add_dependency 'railties', '>= 3.1', '< 5.0'
+  s.add_dependency 'railties', '>= 3.1'
 
   s.require_path = 'lib'
-  s.files = Dir["{lib,vendor,tasks}/**/*", "Gemfile", "History.txt", "LICENSE", "README.md", "Rakefile", "jvectormap-rails.gemspec"]
+  s.files = Dir['{lib,vendor,tasks}/**/*', 'Gemfile', 'History.txt', 'LICENSE', 'README.md', 'Rakefile', 'jvectormap-rails.gemspec']
 end

data/lib/jvectormap-rails.rb

@@ -1,8 +1,7 @@
-# encoding: UTF-8
+require 'jvectormap/rails/engine'
 
 module JVectorMap
   module Rails
-
     class << self
 
       # maps that will be added to asset precompilation
@@ -11,16 +10,9 @@ module JVectorMap
       end
 
       def gem_root
-        File.expand_path(File.join(File.dirname(__FILE__), "../"))
+        File.expand_path(File.join(File.dirname(__FILE__), '../'))
       end
 
     end
-
   end
 end
-
-require 'rails'
-
-require 'jvectormap/rails/version'
-require 'jvectormap/rails/engine'
-require 'jvectormap/rails/railtie'

data/lib/jvectormap/rails/engine.rb

@@ -1,8 +1,17 @@
-# encoding: UTF-8
+require 'rails'
 
 module JVectorMap
   module Rails
     class Engine < ::Rails::Engine
+      rake_tasks do
+        load File.join(JVectorMap::Rails.gem_root, 'tasks/jvectormap.rake')
+      end
+
+      config.after_initialize do
+        ::Rails.application.config.assets.precompile += JVectorMap::Rails.precompile_maps.map do |map_name|
+          "jvectormap/maps/#{map_name}.js"
+        end
+      end
     end
   end
-end
+end

data/lib/jvectormap/rails/version.rb

@@ -1,8 +1,6 @@
-# encoding: UTF-8
-
 module JVectorMap
   module Rails
-    VERSION = "1.0.1"
-    JVECTORMAP_VERSION = "1.2.1"
+    VERSION = '2.0.0'
+    JVECTORMAP_VERSION = '2.0.3'
   end
-end
+end

data/tasks/jvectormap.rake

@@ -1,6 +1,9 @@
 namespace :jvectormap do
   task :maps do
-    path = File.expand_path(File.join(File.dirname(__FILE__), "../vendor/assets/javascripts/jvectormap/maps/**"))
-    puts Dir.glob(path).map { |file| File.basename(file).gsub(/\.js\z/, "") }.join("\r\n")
+    path = File.expand_path(
+      File.join(File.dirname(__FILE__), '../vendor/assets/javascripts/jvectormap/maps/**')
+    )
+
+    puts Dir.glob(path).map { |file| File.basename(file).gsub(/\.js\z/, '') }.join("\r\n")
   end
-end
+end

data/vendor/assets/javascripts/jvectormap.js

@@ -1,26 +1,33 @@
 //= require jvectormap/jquery-jvectormap.js
-//= require jvectormap/jquery-mousewheel.js
-//= require jvectormap/lib/jvectormap.js
-//= require jvectormap/lib/abstract-element.js
-//= require jvectormap/lib/abstract-canvas-element.js
-//= require jvectormap/lib/abstract-shape-element.js
-//= require jvectormap/lib/svg-element.js
-//= require jvectormap/lib/svg-group-element.js
-//= require jvectormap/lib/svg-canvas-element.js
-//= require jvectormap/lib/svg-shape-element.js
-//= require jvectormap/lib/svg-path-element.js
-//= require jvectormap/lib/svg-circle-element.js
-//= require jvectormap/lib/vml-element.js
-//= require jvectormap/lib/vml-group-element.js
-//= require jvectormap/lib/vml-canvas-element.js
-//= require jvectormap/lib/vml-shape-element.js
-//= require jvectormap/lib/vml-path-element.js
-//= require jvectormap/lib/vml-circle-element.js
-//= require jvectormap/lib/vector-canvas.js
-//= require jvectormap/lib/simple-scale.js
-//= require jvectormap/lib/ordinal-scale.js
-//= require jvectormap/lib/numeric-scale.js
-//= require jvectormap/lib/color-scale.js
-//= require jvectormap/lib/data-series.js
-//= require jvectormap/lib/proj.js
-//= require jvectormap/lib/world-map.js
+//= require jvectormap/lib/jquery-mousewheel.js
+//= require jvectormap/src/jvectormap.js
+//= require jvectormap/src/abstract-element.js
+//= require jvectormap/src/abstract-canvas-element.js
+//= require jvectormap/src/abstract-shape-element.js
+//= require jvectormap/src/svg-element.js
+//= require jvectormap/src/svg-group-element.js
+//= require jvectormap/src/svg-canvas-element.js
+//= require jvectormap/src/svg-shape-element.js
+//= require jvectormap/src/svg-path-element.js
+//= require jvectormap/src/svg-circle-element.js
+//= require jvectormap/src/svg-image-element.js
+//= require jvectormap/src/svg-text-element.js
+//= require jvectormap/src/vml-element.js
+//= require jvectormap/src/vml-group-element.js
+//= require jvectormap/src/vml-canvas-element.js
+//= require jvectormap/src/vml-shape-element.js
+//= require jvectormap/src/vml-path-element.js
+//= require jvectormap/src/vml-circle-element.js
+//= require jvectormap/src/vector-canvas.js
+//= require jvectormap/src/simple-scale.js
+//= require jvectormap/src/ordinal-scale.js
+//= require jvectormap/src/numeric-scale.js
+//= require jvectormap/src/color-scale.js
+//= require jvectormap/src/legend.js
+//= require jvectormap/src/data-series.js
+//= require jvectormap/src/proj.js
+//= require jvectormap/src/map-object.js
+//= require jvectormap/src/region.js
+//= require jvectormap/src/marker.js
+//= require jvectormap/src/map.js
+//= require jvectormap/src/multimap.js

data/vendor/assets/javascripts/jvectormap/jquery-jvectormap.js

@@ -1,10 +1,10 @@
 /**
- * jVectorMap version 1.2.1
+ * jVectorMap version 2.0.4
  *
- * Copyright 2011-2013, Kirill Lebedev
- * Licensed under the MIT license.
+ * Copyright 2011-2014, Kirill Lebedev
  *
  */
+
 (function( $ ){
   var apiParams = {
         set: {
@@ -26,18 +26,17 @@
   $.fn.vectorMap = function(options) {
     var map,
         methodName,
-        event,
         map = this.children('.jvectormap-container').data('mapObject');
 
     if (options === 'addMap') {
-      jvm.WorldMap.maps[arguments[1]] = arguments[2];
+      jvm.Map.maps[arguments[1]] = arguments[2];
     } else if ((options === 'set' || options === 'get') && apiParams[options][arguments[1]]) {
       methodName = arguments[1].charAt(0).toUpperCase()+arguments[1].substr(1);
       return map[options+methodName].apply(map, Array.prototype.slice.call(arguments, 2));
     } else {
       options = options || {};
       options.container = this;
-      map = new jvm.WorldMap(options);
+      map = new jvm.Map(options);
     }
 
     return this;

data/vendor/assets/javascripts/jvectormap/lib/jquery-mousewheel.js

@@ -0,0 +1,201 @@
+/*! Copyright (c) 2013 Brandon Aaron (http://brandon.aaron.sh)
+ * Licensed under the MIT License (LICENSE.txt).
+ *
+ * Version: 3.1.9
+ *
+ * Requires: jQuery 1.2.2+
+ */
+
+(function (factory) {
+    if ( typeof define === 'function' && define.amd ) {
+        // AMD. Register as an anonymous module.
+        define(['jquery'], factory);
+    } else if (typeof exports === 'object') {
+        // Node/CommonJS style for Browserify
+        module.exports = factory;
+    } else {
+        // Browser globals
+        factory(jQuery);
+    }
+}(function ($) {
+
+    var toFix  = ['wheel', 'mousewheel', 'DOMMouseScroll', 'MozMousePixelScroll'],
+        toBind = ( 'onwheel' in document || document.documentMode >= 9 ) ?
+                    ['wheel'] : ['mousewheel', 'DomMouseScroll', 'MozMousePixelScroll'],
+        slice  = Array.prototype.slice,
+        nullLowestDeltaTimeout, lowestDelta;
+
+    if ( $.event.fixHooks ) {
+        for ( var i = toFix.length; i; ) {
+            $.event.fixHooks[ toFix[--i] ] = $.event.mouseHooks;
+        }
+    }
+
+    var special = $.event.special.mousewheel = {
+        version: '3.1.9',
+
+        setup: function() {
+            if ( this.addEventListener ) {
+                for ( var i = toBind.length; i; ) {
+                    this.addEventListener( toBind[--i], handler, false );
+                }
+            } else {
+                this.onmousewheel = handler;
+            }
+            // Store the line height and page height for this particular element
+            $.data(this, 'mousewheel-line-height', special.getLineHeight(this));
+            $.data(this, 'mousewheel-page-height', special.getPageHeight(this));
+        },
+
+        teardown: function() {
+            if ( this.removeEventListener ) {
+                for ( var i = toBind.length; i; ) {
+                    this.removeEventListener( toBind[--i], handler, false );
+                }
+            } else {
+                this.onmousewheel = null;
+            }
+        },
+
+        getLineHeight: function(elem) {
+            return parseInt($(elem)['offsetParent' in $.fn ? 'offsetParent' : 'parent']().css('fontSize'), 10);
+        },
+
+        getPageHeight: function(elem) {
+            return $(elem).height();
+        },
+
+        settings: {
+            adjustOldDeltas: true
+        }
+    };
+
+    $.fn.extend({
+        mousewheel: function(fn) {
+            return fn ? this.bind('mousewheel', fn) : this.trigger('mousewheel');
+        },
+
+        unmousewheel: function(fn) {
+            return this.unbind('mousewheel', fn);
+        }
+    });
+
+
+    function handler(event) {
+        var orgEvent   = event || window.event,
+            args       = slice.call(arguments, 1),
+            delta      = 0,
+            deltaX     = 0,
+            deltaY     = 0,
+            absDelta   = 0;
+        event = $.event.fix(orgEvent);
+        event.type = 'mousewheel';
+
+        // Old school scrollwheel delta
+        if ( 'detail'      in orgEvent ) { deltaY = orgEvent.detail * -1;      }
+        if ( 'wheelDelta'  in orgEvent ) { deltaY = orgEvent.wheelDelta;       }
+        if ( 'wheelDeltaY' in orgEvent ) { deltaY = orgEvent.wheelDeltaY;      }
+        if ( 'wheelDeltaX' in orgEvent ) { deltaX = orgEvent.wheelDeltaX * -1; }
+
+        // Firefox < 17 horizontal scrolling related to DOMMouseScroll event
+        if ( 'axis' in orgEvent && orgEvent.axis === orgEvent.HORIZONTAL_AXIS ) {
+            deltaX = deltaY * -1;
+            deltaY = 0;
+        }
+
+        // Set delta to be deltaY or deltaX if deltaY is 0 for backwards compatabilitiy
+        delta = deltaY === 0 ? deltaX : deltaY;
+
+        // New school wheel delta (wheel event)
+        if ( 'deltaY' in orgEvent ) {
+            deltaY = orgEvent.deltaY * -1;
+            delta  = deltaY;
+        }
+        if ( 'deltaX' in orgEvent ) {
+            deltaX = orgEvent.deltaX;
+            if ( deltaY === 0 ) { delta  = deltaX * -1; }
+        }
+
+        // No change actually happened, no reason to go any further
+        if ( deltaY === 0 && deltaX === 0 ) { return; }
+
+        // Need to convert lines and pages to pixels if we aren't already in pixels
+        // There are three delta modes:
+        //   * deltaMode 0 is by pixels, nothing to do
+        //   * deltaMode 1 is by lines
+        //   * deltaMode 2 is by pages
+        if ( orgEvent.deltaMode === 1 ) {
+            var lineHeight = $.data(this, 'mousewheel-line-height');
+            delta  *= lineHeight;
+            deltaY *= lineHeight;
+            deltaX *= lineHeight;
+        } else if ( orgEvent.deltaMode === 2 ) {
+            var pageHeight = $.data(this, 'mousewheel-page-height');
+            delta  *= pageHeight;
+            deltaY *= pageHeight;
+            deltaX *= pageHeight;
+        }
+
+        // Store lowest absolute delta to normalize the delta values
+        absDelta = Math.max( Math.abs(deltaY), Math.abs(deltaX) );
+
+        if ( !lowestDelta || absDelta < lowestDelta ) {
+            lowestDelta = absDelta;
+
+            // Adjust older deltas if necessary
+            if ( shouldAdjustOldDeltas(orgEvent, absDelta) ) {
+                lowestDelta /= 40;
+            }
+        }
+
+        // Adjust older deltas if necessary
+        if ( shouldAdjustOldDeltas(orgEvent, absDelta) ) {
+            // Divide all the things by 40!
+            delta  /= 40;
+            deltaX /= 40;
+            deltaY /= 40;
+        }
+
+        // Get a whole, normalized value for the deltas
+        delta  = Math[ delta  >= 1 ? 'floor' : 'ceil' ](delta  / lowestDelta);
+        deltaX = Math[ deltaX >= 1 ? 'floor' : 'ceil' ](deltaX / lowestDelta);
+        deltaY = Math[ deltaY >= 1 ? 'floor' : 'ceil' ](deltaY / lowestDelta);
+
+        // Add information to the event object
+        event.deltaX = deltaX;
+        event.deltaY = deltaY;
+        event.deltaFactor = lowestDelta;
+        // Go ahead and set deltaMode to 0 since we converted to pixels
+        // Although this is a little odd since we overwrite the deltaX/Y
+        // properties with normalized deltas.
+        event.deltaMode = 0;
+
+        // Add event and delta to the front of the arguments
+        args.unshift(event, delta, deltaX, deltaY);
+
+        // Clearout lowestDelta after sometime to better
+        // handle multiple device types that give different
+        // a different lowestDelta
+        // Ex: trackpad = 3 and mouse wheel = 120
+        if (nullLowestDeltaTimeout) { clearTimeout(nullLowestDeltaTimeout); }
+        nullLowestDeltaTimeout = setTimeout(nullLowestDelta, 200);
+
+        return ($.event.dispatch || $.event.handle).apply(this, args);
+    }
+
+    function nullLowestDelta() {
+        lowestDelta = null;
+    }
+
+    function shouldAdjustOldDeltas(orgEvent, absDelta) {
+        // If this is an older event and the delta is divisable by 120,
+        // then we are assuming that the browser is treating this as an
+        // older mouse wheel event and that we should divide the deltas
+        // by 40 to try and get a more usable deltaFactor.
+        // Side note, this actually impacts the reported scroll distance
+        // in older browsers and can cause scrolling to be slower than native.
+        // Turn this off by setting $.event.special.mousewheel.settings.adjustOldDeltas to false.
+        return special.settings.adjustOldDeltas && orgEvent.type === 'mousewheel' && absDelta % 120 === 0;
+    }
+
+}));