administrate-field-lat_lng 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3260d1e92ba771aa44684b1a4a331d190f32398d
-  data.tar.gz: 7b0947439729b3e0cb3846436fa8dee1e52f510b
+  metadata.gz: de3768c65e7d54cd9b914185502556f1f7459555
+  data.tar.gz: eabd37eddee8c3da13065e68dc6867081c745329
 SHA512:
-  metadata.gz: ea155442ec41f82a6d1d18495a10e23850bd48d6bf44c611ce9901a122c1d8862e5e0e38a1973a9cac94d1879e5eaf71b8d1905fa71572dc97be68243e11dc14
-  data.tar.gz: 8b5ffa1cf408810f67665b6b4794808f70e56e696ee0fea06525ad8d966fa68c05dc760e90f749e5f111b390b16d800a71bb764042d038b960aef19cae3f542d
+  metadata.gz: 0c14d45874ac4712006a04bcb815d1f58ace87311b25c203b62cd669d84b2254ca97759eb40af3f7c51cc3fe3c727a9733ac0af2c924f6a887b17da65c095012
+  data.tar.gz: 39b911797963b3c77aad09010fd65404d1fb2a317f4de7a37c362c5206a33bcb3c4e63ddb4e828719aafb87945496cba21d8ca9cf3bcc48c51c7d8412174c97d

data/administrate-field-lat_lng.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "administrate-field-lat_lng"
-  spec.version       = "1.0.2"
+  spec.version       = "1.1.0"
   spec.authors       = ["Rich Daley"]
   spec.email         = ["rich@fishpercolator.co.uk"]
 
@@ -17,7 +17,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'administrate', '~> 0.2.1'
+  spec.add_dependency 'administrate', '>= 0.2.1', '<= 0.3.0'
+  spec.add_dependency 'leaflet-rails', '~> 1.0'
 
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "rake", "~> 10.0"

data/app/assets/javascripts/lat_lng.js

@@ -0,0 +1,4 @@
+/**
+ * Include Leaflet's JS
+ *= require leaflet
+ */

data/app/assets/stylesheets/lat_lng.css

@@ -0,0 +1,20 @@
+/**
+ * Include Leaflet's base css
+ *= require leaflet
+ */
+
+ .field-unit {
+   flex-flow: row wrap;
+ }
+ .map-container {
+   clear: both;
+   width: 100%;
+ }
+ #latlngmap {
+   margin-top: 1.5em;
+   width: 500px;
+   height: 500px;
+ }
+ .field-unit #latlngmap {
+   margin-left: 17.0596086%;
+ }

data/app/views/fields/lat_lng/_form.html.erb

@@ -1,4 +1,3 @@
-<%= render 'fields/lat_lng/includes' if field.lng? %>
 <div class="field-unit__label">
   <%= f.label field.attribute %>
 </div>

data/app/views/fields/lat_lng/_map.html.erb

@@ -23,7 +23,9 @@
     // Add a marker if the field has been set already
     var marker;
     if (lng !== undefined) {
-      marker = L.marker(latlng);
+      var icon = new L.Icon.Default();
+      var options = { icon: icon };
+      marker = L.marker(latlng, options);
       marker.addTo(map);
     }
     <% if edit %>

data/app/views/fields/lat_lng/_show.html.erb

@@ -1,4 +1,3 @@
-<%= render 'fields/lat_lng/includes' if field.lat? %>
 <%= field.to_s %>
 <%= render 'fields/lat_lng/var', field: field %>
 <%= render 'fields/lat_lng/map', edit: false, field: field if field.lng? %>

data/lib/administrate/field/lat_lng.rb

@@ -1,15 +1,18 @@
 require 'administrate/field/base'
+require 'leaflet-rails'
 require 'rails'
 
 module Administrate
   module Field
     class LatLng < Base
       class Engine < ::Rails::Engine
+        config.assets.precompile << %w(lat_lng.js lat_lng.css) if config.respond_to? :assets
+        if defined?(Administrate::Engine)
+          Administrate::Engine.add_javascript 'lat_lng.js'
+          Administrate::Engine.add_stylesheet 'lat_lng.css'
+        end
       end
-      
-      JS_URL  = "//cdnjs.cloudflare.com/ajax/libs/leaflet/0.7.7/leaflet.js"
-      CSS_URL = "//cdnjs.cloudflare.com/ajax/libs/leaflet/0.7.7/leaflet.css"
-      
+
       # True if the :lat option has been provided, or field is called :lat
       def lat?
         options.fetch(:lat, attribute == :lat)

metadata

@@ -1,29 +1,49 @@
 --- !ruby/object:Gem::Specification
 name: administrate-field-lat_lng
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Rich Daley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-23 00:00:00.000000000 Z
+date: 2017-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: administrate
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.1
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.1
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+- !ruby/object:Gem::Dependency
+  name: leaflet-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -97,8 +117,9 @@ files:
 - README.md
 - Rakefile
 - administrate-field-lat_lng.gemspec
+- app/assets/javascripts/lat_lng.js
+- app/assets/stylesheets/lat_lng.css
 - app/views/fields/lat_lng/_form.html.erb
-- app/views/fields/lat_lng/_includes.html.erb
 - app/views/fields/lat_lng/_index.html.erb
 - app/views/fields/lat_lng/_map.html.erb
 - app/views/fields/lat_lng/_show.html.erb

data/app/views/fields/lat_lng/_includes.html.erb

@@ -1,23 +0,0 @@
-<% content_for :stylesheet do %>
-  <link rel="stylesheet" href="<%= Administrate::Field::LatLng::CSS_URL %>" />
-  <style text="text/css">
-  .field-unit {
-    flex-flow: row wrap;
-  }
-  .map-container {
-    clear: both;
-    width: 100%;
-  }
-  #latlngmap {
-    margin-top: 1.5em;
-    width: 500px;
-    height: 500px;
-  }
-  .field-unit #latlngmap {
-    margin-left: 17.0596086%;
-  }
-  </style>
-<% end %> 
-<% content_for :javascript do %>
-  <script src="<%= Administrate::Field::LatLng::JS_URL %>"></script>
-<% end %>