radiant-event_map-extension 1.3.5 → 1.3.6

data/event_map_extension.rb

@@ -13,10 +13,12 @@ class EventMapExtension < Radiant::Extension
   end
 
   def activate
-    require 'angle_conversions'           # adds String.to_latlng and some degree/radian conversions to Numeric
-    require 'grid_ref'                    # converts from UK grid references to lat/long
-    EventVenue.send :include, Mappable    # adds geolocation on validation
-    Page.send :include, EventMapTags      # currently only a basic events:googlemap tag
+    require 'angle_conversions'             # adds degree/radian conversions to Numeric
+    require 'string_conversions'            # adds lat/long and gridref conversions to String
+    require 'grid_ref'                      # converts coordinates from UK grid references to lat/long
+    EventVenue.send :include, Mappable      # adds geolocation on validation
+    Page.send :include, EventMapTags        # defines a very basic events:googlemap tag
+                                            # the real work is done when the EventVenuesController builds javascript
   end
   
 end

data/lib/grid_ref.rb

@@ -1,6 +1,7 @@
 # adapted from Geography::NationalGrid by and (c) P Kent
 # with reference to the Ordnance Survey guide to coordinate systems in the UK
 # http://www.ordnancesurvey.co.uk/oswebsite/gps/information/coordinatesystemsinfo/guidecontents/
+
 class Ellipsoid
   attr_accessor :a, :b, :e2
 
@@ -263,30 +264,3 @@ private
   end
   
 end
-
-class String
-  def is_gridref?
-    !!(self.upcase =~ /^(H(P|T|U|Y|Z)|N(A|B|C|D|F|G|H|J|K|L|M|N|O|R|S|T|U|W|X|Y|Z)|OV|S(C|D|E|G|H|J|K|M|N|O|P|R|S|T|U|W|X|Y|Z)|T(A|F|G|L|M|Q|R|V)){1}\d{4}(NE|NW|SE|SW)?$|((H(P|T|U|Y|Z)|N(A|B|C|D|F|G|H|J|K|L|M|N|O|R|S|T|U|W|X|Y|Z)|OV|S(C|D|E|G|H|J|K|M|N|O|P|R|S|T|U|W|X|Y|Z)|T(A|F|G|L|M|Q|R|V)){1}(\d{4}|\d{6}|\d{8}|\d{10}))$/)
-  end
-
-  def is_latlng?
-    !!(self =~ /(-?\d+\.\d+)[,\s]+(-?\d+\.\d+)/)
-  end
-
-  def to_latlng(options = {})
-    if is_latlng?
-      self
-    elsif is_gridref?
-      GridRef.new(self, options).to_latlng
-    end
-  end
-  
-  def to_wgs84(options = {})
-    if is_latlng?
-      self
-    elsif is_gridref?
-      GridRef.new(self, options.merge(:datum => :wgs84)).to_latlng
-    end
-  end
-  
-end

data/lib/mappable.rb

@@ -55,7 +55,7 @@ private
       else
         bias = Radiant::Config['event_map.zone'] || 'uk'
         geo = Geokit::Geocoders::MultiGeocoder.geocode(location, :bias => bias)
-        errors.add(:postcode, "Could not Geocode location: please specify here") if !geo.success
+        errors.add(:postcode, "Could not Geocode location: please specify here") unless geo.success
         self.lat, self.lng = geo.lat, geo.lng if geo.success
       end
     end

data/lib/radiant-event_map-extension.rb

@@ -1,5 +1,5 @@
 module RadiantEventMapExtension
-  VERSION = '1.3.5'
+  VERSION = '1.3.6'
   SUMMARY = %Q{Event geocoding and map extension for Radiant CMS}
   DESCRIPTION = "Small additions to the event_calendar that geocode calendar events and display on a google map. Separated here because perhaps only of interest to a few."
   URL = "http://github.com/radiant/radiant-event_calendar-extension"

data/lib/string_conversions.rb

@@ -0,0 +1,36 @@
+class String
+  require 'grid_ref'
+  attr_accessor :coordinates
+  
+  def is_gridref?
+    !!(self.upcase =~ /^(H(P|T|U|Y|Z)|N(A|B|C|D|F|G|H|J|K|L|M|N|O|R|S|T|U|W|X|Y|Z)|OV|S(C|D|E|G|H|J|K|M|N|O|P|R|S|T|U|W|X|Y|Z)|T(A|F|G|L|M|Q|R|V)){1}\d{4}(NE|NW|SE|SW)?$|((H(P|T|U|Y|Z)|N(A|B|C|D|F|G|H|J|K|L|M|N|O|R|S|T|U|W|X|Y|Z)|OV|S(C|D|E|G|H|J|K|M|N|O|P|R|S|T|U|W|X|Y|Z)|T(A|F|G|L|M|Q|R|V)){1}(\d{4}|\d{6}|\d{8}|\d{10}))$/)
+  end
+
+  def is_latlng?
+    !!coordinates
+  end
+
+  def coordinates
+    if matches = self.match(/(-?\d+\.\d+)[,\s]+(-?\d+\.\d+)/)
+      matches[1,2].join(', ')
+    else
+      nil
+    end
+  end
+  
+  def to_latlng(options = {})
+    if is_gridref?
+      GridRef.new(self, options).to_latlng
+    else
+      self.coordinates
+    end
+  end
+  
+  def to_wgs84(options = {})
+    if is_gridref?
+      GridRef.new(self, options.merge(:datum => :wgs84)).to_latlng
+    else
+      self.coordinates
+    end
+  end
+end

data/spec/lib/conversions_spec.rb

@@ -0,0 +1,52 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe String do
+  describe "that is already a lat/long pair" do
+    it "should respond negatively to .is_gridref?" do
+      "54.07469997904575,-3.175048828125".is_gridref?.should be_false
+    end
+    
+    it "should respond positively to .is_latlng?" do
+      "54.07469997904575,-3.175048828125".is_latlng?.should be_true
+      "54.07469997904575 -3.175048828125".is_latlng?.should be_true
+      "54.07469997904575 3.175048828125".is_latlng?.should be_true
+      "54.0 -3.0".is_latlng?.should be_true
+      "54 3".is_latlng?.should be_false
+      "543".is_latlng?.should be_false
+      "54-3".is_latlng?.should be_false
+    end
+    
+    it "should respond to .to_latlng with coordinates" do
+      "54.07469997904575 -3.175048828125".to_latlng.should == "54.07469997904575, -3.175048828125"
+    end
+
+    it "should convert to grid ref"
+  end
+
+  describe "that is a grid reference" do
+    it "should respond positively to .is_gridref?" do
+      "SD123456".is_gridref?.should be_true
+    end
+    
+    it "should respond to .to_latlng with coordinates" do
+      "SD2873178452".to_latlng.should == "54.196698, -3.092537"
+    end
+
+    it "should pass through options to the grid ref" do
+      "SD2873178452".to_latlng(:datum => :wgs84).should == "54.19685, -3.093901"
+      "SD2873178452".to_wgs84.should == "54.19685, -3.093901"
+    end
+  end
+
+  describe "that is a not recognised as a grid reference" do
+    it "should respond negatively to .is_gridref?" do
+      "banana".is_gridref?.should be_false
+    end
+    
+    it "should return nil to .to_latlng" do
+      lambda{ "banana".to_latlng }.should_not raise_error
+      "banana".to_latlng.should be_nil
+    end
+  end
+  
+end

data/spec/lib/grid_ref_spec.rb

@@ -9,7 +9,7 @@ describe GridRef do
     lambda{ GridRef.new("SD1234567890") }.should_not raise_error
   end
   
-  describe " standard transformation" do
+  describe "standard transformation" do
     before do
       @gr = GridRef.new("SD2873178452")
     end
@@ -59,32 +59,3 @@ describe GridRef do
     end
   end
 end
-
-describe String do
-  describe "that is a grid reference" do
-    it "should respond positively to .is_gridref?" do
-      "SD123456".is_gridref?.should be_true
-    end
-    
-    it "should respond to .to_latlng with coordinates" do
-      "SD2873178452".to_latlng.should == "54.196698, -3.092537"
-    end
-
-    it "should pass through options to the grid ref" do
-      "SD2873178452".to_latlng(:datum => :wgs84).should == "54.19685, -3.093901"
-      "SD2873178452".to_wgs84.should == "54.19685, -3.093901"
-    end
-  end
-
-  describe "that is a not recognised as a grid reference" do
-    it "should respond negatively to .is_gridref?" do
-      "banana".is_gridref?.should be_false
-    end
-    
-    it "should return nil to .to_latlng" do
-      lambda{ "banana".to_latlng }.should_not raise_error
-      "banana".to_latlng.should be_nil
-    end
-  end
-  
-end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-event_map-extension
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: 
   segments: 
   - 1
   - 3
-  - 5
-  version: 1.3.5
+  - 6
+  version: 1.3.6
 platform: ruby
 authors: 
 - William Ross
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-18 00:00:00 +01:00
+date: 2011-07-28 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -78,13 +78,14 @@ files:
 - lib/grid_ref.rb
 - lib/mappable.rb
 - lib/radiant-event_map-extension.rb
+- lib/string_conversions.rb
 - lib/tasks/event_map_extension_tasks.rake
 - public/images/map_icons/pink-dot.png
 - public/images/map_icons/shadow.png
-- radiant-event_map-extension-1.3.4.gem
 - radiant-event_map-extension.gemspec
 - Rakefile
 - README.md
+- spec/lib/conversions_spec.rb
 - spec/lib/grid_ref_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
@@ -93,7 +94,7 @@ has_rdoc: true
 homepage: http://github.com/radiant/radiant-event_calendar-extension
 licenses: []
 
-post_install_message: "\n  Add this to your radiant project with:\n\n    config.gem 'radiant-event_map-extension', :version => '~> 1.3.5'\n\n  "
+post_install_message: "\n  Add this to your radiant project with:\n\n    config.gem 'radiant-event_map-extension', :version => '~> 1.3.6'\n\n  "
 rdoc_options: []
 
 require_paths: 
@@ -124,6 +125,7 @@ signing_key:
 specification_version: 3
 summary: Event geocoding and map extension for Radiant CMS
 test_files: 
+- spec/lib/conversions_spec.rb
 - spec/lib/grid_ref_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb