leaflet-rails 0.7.3 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 514333090001baba0d126fda802c52ab96c75699
-  data.tar.gz: b2bb1cf5169b9bab76c75936335db73d72d8ea0a
+  metadata.gz: 39fdde9beb6ebc940c68b0ff8b4798e6cd531e15
+  data.tar.gz: 8e8739dbee2d813cfe9c4da4d5302f6bb222d892
 SHA512:
-  metadata.gz: 42c7f28900cf74311aaf405c932d643310ef2697f109c8298c51ddfe7390d3c12638ed621e744b712ed03233fc7d46590157a862e9528518136f60857f10cefc
-  data.tar.gz: 704bfdcf6813e3f2812ab038a842654d91f36b14f3ea069c33a5e0d6b62036a232714397b1b36e66b5c6d3c59e98b070d987ff39d90ec7792c8d729fa925d376
+  metadata.gz: 353dfa942ec238a6d1c9c4028b088aed522f58d43f2222e6f51826f404c1e7825afc0f1a83d8b1e6525665c66e4d6f355fc0542e13b8984d88764840193c14a9
+  data.tar.gz: 82600a54859803f3ad7f5d85dc69dbeb31a6e4564e07856e5789e33bc87a4a55f2c67fc769f565b6704e605311a660e823a5a754a061ffe1d4507c51af259715

data/.gitignore

@@ -5,4 +5,7 @@ pkg/*
 
 /.rspec
 /coverage/
-/log/
+/log/
+.idea/*
+.ruby-gemset
+.ruby-version

data/README.md

@@ -35,6 +35,17 @@ If you are using Rails 4.1+ you will need to open your application-wide CSS file
 //= depend_on_asset "layers-2x.png"
 ```
 
+
+Version Parity
+==============
+
+leaflet-rails tries to keep version parity with leaflet.js. However, this isn't possible in all cases. Discrepancies have been noted below.
+
+| leaflet-rails  | leaflet.js | Reason |
+| ------------- | ------------- | ------|
+| 0.7.4  | 0.7.3  | Requested in #33 because of large gap between master and rubygems.org.|
+
+
 Helpers
 =======
 
@@ -47,6 +58,13 @@ Leaflet.attribution = "Your attribution statement"
 Leaflet.max_zoom = 18
 ```
 
+If you are using a tile layer which requires non-default subdomains such as [MapQuest-OSM Tiles](http://developer.mapquest.com/web/products/open/map), you can set the subdomains like this:
+
+```ruby
+Leaflet.tile_layer = "http://{s}.mqcdn.com/tiles/1.0.0/map/{z}/{x}/{y}.png"
+Leaflet.subdomains = ['otile1', 'otile2', 'otile3', 'otile4']
+```
+
 You will then be able to call the ```#map``` helper method in a view, and make sure that the helper method is inside an erb tag like so:
 ```ruby
 <div id="map">

data/leaflet-rails.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_development_dependency "rspec"
+  s.add_development_dependency "rspec", '<= 2.9.0'
   s.add_development_dependency "simplecov-rcov"
   s.add_development_dependency "actionpack", '>= 3.2.0'
   s.add_development_dependency "activesupport", '>= 3.2.0'

data/lib/leaflet-rails.rb

@@ -5,7 +5,8 @@ module Leaflet
   mattr_accessor :tile_layer
   mattr_accessor :attribution
   mattr_accessor :max_zoom
-
+  mattr_accessor :subdomains
+  
   module Rails
     class Engine < ::Rails::Engine
       initializer 'leaflet-rails.precompile' do |app|

data/lib/leaflet-rails/version.rb

@@ -1,5 +1,5 @@
 module Leaflet
   module Rails
-    VERSION = "0.7.3"
+    VERSION = "0.7.4"
   end
 end

data/lib/leaflet-rails/view_helpers.rb

@@ -1,3 +1,4 @@
+require 'active_support/inflector'
 module Leaflet
   module ViewHelpers
 
@@ -5,26 +6,47 @@ module Leaflet
       options[:tile_layer] ||= Leaflet.tile_layer
       options[:attribution] ||= Leaflet.attribution
       options[:max_zoom] ||= Leaflet.max_zoom
+      options[:subdomains] ||= Leaflet.subdomains
       options[:container_id] ||= 'map'
 
+      tile_layer = options.delete(:tile_layer) || Leaflet.tile_layer
+      attribution = options.delete(:attribution) || Leaflet.attribution
+      max_zoom = options.delete(:max_zoom) || Leaflet.max_zoom
+      container_id = options.delete(:container_id) || 'map'
+      no_container = options.delete(:no_container)
+      center = options.delete(:center)
+      markers = options.delete(:markers)
+      circles = options.delete(:circles)
+      polylines = options.delete(:polylines)
+      fitbounds = options.delete(:fitbounds)
+
+
       output = []
-      output << "<div id='#{options[:container_id]}'></div>" unless options[:no_container]
+      output << "<div id='#{container_id}'></div>" unless no_container
       output << "<script>"
-      output << "var map = L.map('#{options[:container_id]}')"
-      if options[:center]
-        output << "map.setView([#{options[:center][:latlng][0]}, #{options[:center][:latlng][1]}], #{options[:center][:zoom]})"
+      output << "var map = L.map('#{container_id}')"
+
+      if center
+        output << "map.setView([#{center[:latlng][0]}, #{center[:latlng][1]}], #{center[:zoom]})"
       end
-      if options[:markers]
-        options[:markers].each do |marker|
-          output << "marker = L.marker([#{marker[:latlng][0]}, #{marker[:latlng][1]}]).addTo(map)"
+
+      if markers
+        markers.each_with_index do |marker, index|
+          if marker[:icon]
+            icon_settings = prep_icon_settings(marker[:icon])
+            output << "var #{icon_settings[:name]}#{index} = L.icon({iconUrl: '#{icon_settings[:icon_url]}', shadowUrl: '#{icon_settings[:shadow_url]}', iconSize: #{icon_settings[:icon_size]}, shadowSize: #{icon_settings[:shadow_size]}, iconAnchor: #{icon_settings[:icon_anchor]}, shadowAnchor: #{icon_settings[:shadow_anchor]}, popupAnchor: #{icon_settings[:popup_anchor]}})"
+            output << "marker = L.marker([#{marker[:latlng][0]}, #{marker[:latlng][1]}], {icon: #{icon_settings[:name]}#{index}}).addTo(map)"
+          else
+            output << "marker = L.marker([#{marker[:latlng][0]}, #{marker[:latlng][1]}]).addTo(map)"
+          end          
           if marker[:popup]
             output << "marker.bindPopup('#{marker[:popup]}')"
           end
         end
       end
 
-      if options[:circles]
-        options[:circles].each do |circle|
+      if circles
+        circles.each do |circle|
           output << "L.circle(['#{circle[:latlng][0]}', '#{circle[:latlng][1]}'], #{circle[:radius]}, {
            color: '#{circle[:color]}',
            fillColor: '#{circle[:fillColor]}',
@@ -33,8 +55,8 @@ module Leaflet
         end
       end
 
-      if options[:polylines]
-         options[:polylines].each do |polyline|
+      if polylines
+         polylines.each do |polyline|
            _output = "L.polyline(#{polyline[:latlngs]}"
            _output << "," + polyline[:options].to_json if polyline[:options]
            _output << ").addTo(map);"
@@ -42,18 +64,40 @@ module Leaflet
          end
       end
 
-      if options[:fitbounds]
-        output << "map.fitBounds(L.latLngBounds(#{options[:fitbounds]}));"
+      if fitbounds
+        output << "map.fitBounds(L.latLngBounds(#{fitbounds}));"
+      end
+
+      output << "L.tileLayer('#{tile_layer}', {
+          attribution: '#{attribution}',
+          maxZoom: #{max_zoom},"
+      
+      if options[:subdomains]
+        output << "    subdomains: #{options[:subdomains]},"
+        options.delete( :subdomains )
+      end
+
+      options.each do |key, value|
+        output << "#{key.to_s.camelize(:lower)}: '#{value}',"
       end
+      output << "}).addTo(map)"
 
-      output << "L.tileLayer('#{options[:tile_layer]}', {
-          attribution: '#{options[:attribution]}',
-          maxZoom: #{options[:max_zoom]}
-      }).addTo(map)"
       output << "</script>"
       output.join("\n").html_safe
     end
 
+    private
+
+    def prep_icon_settings(settings)
+      settings[:name] = 'icon' if settings[:name].nil? or settings[:name].blank?
+      settings[:shadow_url] = '' if settings[:shadow_url].nil?
+      settings[:icon_size] = [] if settings[:icon_size].nil?
+      settings[:shadow_size] = [] if settings[:shadow_size].nil?
+      settings[:icon_anchor] = [0, 0] if settings[:icon_anchor].nil?
+      settings[:shadow_anchor] = [0, 0] if settings[:shadow_anchor].nil?
+      settings[:popup_anchor] = [0, 0] if settings[:popup_anchor].nil?
+      return settings
+    end
   end
 
 end

data/spec/view_helpers_spec.rb

@@ -63,6 +63,86 @@ describe Leaflet::ViewHelpers do
     result.should match(/marker = L\.marker\(\[51.52238797921441, -0.08366235665359283\]\).addTo\(map\)/)
     result.should match(/marker\.bindPopup\('Hello!'\)/)
   end
+
+  it 'should generate a marker with a popup and a custom icon' do
+    icon_options = { :name => 'house',
+                     :icon_url => 'images/house.png',
+                     :shadow_url => 'images/house_shadow.png',
+                     :icon_size => [38, 95],
+                     :shadow_size => [50, 64],
+                     :icon_anchor => [22, 94],
+                     :shadow_anchor => [4, 62],
+                     :popup_anchor => [-3, -76]}
+    result = @view.map(:center => {
+        :latlng => [51.52238797921441, -0.08366235665359283],
+        :zoom => 18
+    },
+    :markers => [
+         {
+             :latlng => [51.52238797921441, -0.08366235665359283],
+             :popup => "Hello!",
+             :icon => icon_options
+         }
+     ])
+    expected_icon_def = "var #{icon_options[:name]}0 = L.icon({iconUrl: '#{icon_options[:icon_url]}', shadowUrl: '#{icon_options[:shadow_url]}', iconSize: #{icon_options[:icon_size]}, shadowSize: #{icon_options[:shadow_size]}, iconAnchor: #{icon_options[:icon_anchor]}, shadowAnchor: #{icon_options[:shadow_anchor]}, popupAnchor: #{icon_options[:popup_anchor]}})"
+    result.should include(expected_icon_def)
+    result.should match(/marker = L\.marker\(\[51.52238797921441, -0.08366235665359283\], \{icon: house\d+\}\).addTo\(map\)/)
+    result.should match(/marker\.bindPopup\('Hello!'\)/)
+  end
+
+  it 'should generate many markers with popups and custom icons' do
+    icon_options = { :name => 'house',
+                     :icon_url => 'images/house.png',
+                     :shadow_url => 'images/house_shadow.png',
+                     :icon_size => [38, 95],
+                     :shadow_size => [50, 64],
+                     :icon_anchor => [22, 94],
+                     :shadow_anchor => [4, 62],
+                     :popup_anchor => [-3, -76]}
+    result = @view.map(:center => {
+        :latlng => [51.52238797921441, -0.08366235665359283],
+        :zoom => 18
+      },
+       :markers => [
+           {
+               :latlng => [51.52238797921441, -0.08366235665359283],
+               :popup => "Hello!",
+               :icon => icon_options
+           },
+           {
+               :latlng => [51.54238797921441, -0.08566235665359283],
+               :popup => "Farewell!",
+               :icon => icon_options
+           }
+       ])
+    expected_icon_def_1 = "var #{icon_options[:name]}0 = L.icon({iconUrl: '#{icon_options[:icon_url]}', shadowUrl: '#{icon_options[:shadow_url]}', iconSize: #{icon_options[:icon_size]}, shadowSize: #{icon_options[:shadow_size]}, iconAnchor: #{icon_options[:icon_anchor]}, shadowAnchor: #{icon_options[:shadow_anchor]}, popupAnchor: #{icon_options[:popup_anchor]}})"
+    expected_icon_def_2 = "var #{icon_options[:name]}1 = L.icon({iconUrl: '#{icon_options[:icon_url]}', shadowUrl: '#{icon_options[:shadow_url]}', iconSize: #{icon_options[:icon_size]}, shadowSize: #{icon_options[:shadow_size]}, iconAnchor: #{icon_options[:icon_anchor]}, shadowAnchor: #{icon_options[:shadow_anchor]}, popupAnchor: #{icon_options[:popup_anchor]}})"
+    result.should include(expected_icon_def_1)
+    result.should include(expected_icon_def_2)
+    result.should match(/marker = L\.marker\(\[51.52238797921441, -0.08366235665359283\], \{icon: house\d+\}\).addTo\(map\)/)
+    result.should match(/marker = L\.marker\(\[51.54238797921441, -0.08566235665359283\], \{icon: house\d+\}\).addTo\(map\)/)
+    result.should match(/marker\.bindPopup\('Hello!'\)/)
+    result.should match(/marker\.bindPopup\('Farewell!'\)/)
+  end
+
+  it 'should have defaults for icon options' do
+    icon_options = { :icon_url => 'images/house.png'}
+    result = @view.map(:center => {
+        :latlng => [51.52238797921441, -0.08366235665359283],
+        :zoom => 18
+    },
+     :markers => [
+         {
+             :latlng => [51.52238797921441, -0.08366235665359283],
+             :popup => "Hello!",
+             :icon => icon_options
+         }
+     ])
+    expected_icon_def = "var icon0 = L.icon({iconUrl: '#{icon_options[:icon_url]}', shadowUrl: '', iconSize: [], shadowSize: [], iconAnchor: [0, 0], shadowAnchor: [0, 0], popupAnchor: [0, 0]})"
+    result.should include(expected_icon_def)
+    result.should match(/marker = L\.marker\(\[51.52238797921441, -0.08366235665359283\], \{icon: icon\d+\}\).addTo\(map\)/)
+    result.should match(/marker\.bindPopup\('Hello!'\)/)
+  end
   
   it 'should override the method configuration options if set' do
     result = @view.map(:center => {
@@ -79,6 +159,26 @@ describe Leaflet::ViewHelpers do
   	  result.should match(/maxZoom: 4/)
   end
 
+  it 'should pass any configuration options to L.tileLayer if set' do
+    result = @view.map(:center => {
+        :latlng => [51.52238797921441, -0.08366235665359283],
+        :zoom => 18
+      },
+      :tile_layer => "http://{s}.someotherdomain.com/blabla/{z}/{x}/{y}.png",
+      :attribution => "Some other attribution text",
+      :max_zoom => 4,
+      :some_key => 'some value',
+      :key2 => 42
+      )
+
+      result.should match(/L.tileLayer\('http:\/\/{s}.someotherdomain\.com\/blabla\/{z}\/{x}\/{y}\.png'/)
+      result.should match(/attribution: 'Some other attribution text'/)
+      result.should match(/maxZoom: 4/)
+      result.should match(/someKey: 'some value'/)
+      result.should match(/key2: '42'/)
+
+  end
+
   it 'should have multiple map on single page' do
     result = @view.map(:container_id => "first_map", :center => {
               :latlng => [51.52238797921441, -0.08366235665359283],

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: leaflet-rails
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.4
 platform: ruby
 authors:
 - Akshay Joshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-24 00:00:00.000000000 Z
+date: 2014-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.9.0
 - !ruby/object:Gem::Dependency
   name: simplecov-rcov
   requirement: !ruby/object:Gem::Requirement