geofsh 0.1.1 → 0.1.2

data/README.md

@@ -32,9 +32,7 @@ An example of using Geofsh with simple_form:
 
 Google maps can easily be incorporated into your rails app using geofsh gem.  First, you must include google's javascript api:
 
-    = javascript_include_tag "https://maps.googleapis.com/maps/api/js?key=YOUR_API_KEY_HERE&sensor=false"
-
-For instructions on how to recieve a google map's API key, visit [Google's api tutorial](https://developers.google.com/maps/documentation/javascript/tutorial#api_key). 
+    = javascript_include_tag "http://maps.google.com/maps/api/js?sensor=false"
 
 To enable google maps in your rails app, simply add a div to your view with the element id 'google-map':
 

data/geofsh.gemspec

@@ -12,6 +12,7 @@ Gem::Specification.new do |gem|
   gem.summary       = %q{Provides latitude and longitude from HTML5 geolocation API and automatically places them in corresponding form fields}
   gem.homepage      = "https://github.com/joofsh/geofsh"
 
+  gem.add_dependency "coffee-rails", "~> 3.2.1"
   gem.add_dependency "railties", "~> 3.1"
 
   gem.files         = `git ls-files`.split($/)

data/lib/geofsh/version.rb

@@ -1,3 +1,3 @@
 module Geofsh
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/testapp/app/views/home/index.html.erb

@@ -1,4 +1,4 @@
-<%= javascript_include_tag "https://maps.googleapis.com/maps/api/js?key=AIzaSyDBmbRrJZrO5IExRamjDLBgyWzTLs1Ohx8&sensor=false" %>
+<%= javascript_include_tag "http://maps.google.com/maps/api/js?sensor=false" %>
 <%= javascript_include_tag 'geofsh' %>
 
 <p> This is your latitude and longitude input fields. Are they working? </p>

data/testapp/spec/{requests → integration}/home_spec.rb

@@ -8,11 +8,13 @@ describe 'Home Requests' do
 
 
   it 'loads geofsh lat/lng data into fields', js: true do
+    sleep 1.5
     find_field('latitude').value.should_not be_blank
     find_field('longitude').value.should_not be_blank
   end
 
   it 'loads a google map', js: true do
+    sleep 1.5
     page.should have_selector "div#google-map"
     page.should have_selector "div", text: "Satellite"
     page.should have_selector "img", src: "https://maps.gstatic.com/mapfiles/google_white.png"

data/vendor/assets/javascripts/geofsh.coffee

@@ -0,0 +1,40 @@
+googleMap = (geolat, geolng) ->
+  geoCoords = new google.maps.LatLng(geolat, geolng)
+  mapOptions =
+    zoom: 16
+    center: geoCoords
+    mapTypeId: google.maps.MapTypeId.ROADMAP
+
+  map = new google.maps.Map(document.getElementById("google-map"), mapOptions)
+  addMarker geoCoords, map, "You are here!"
+
+addMarker = (position, map, title) ->
+  marker = new google.maps.Marker(
+    position: position
+    map: map
+    title: title
+  )
+
+geolocSuccess = (position) ->
+  geolat = position.coords.latitude
+  geolng = position.coords.longitude
+  $("input#latitude").val geolat if $("input#latitude")
+  $("input#longitude").val geolng if $("input#longitude")
+  googleMap geolat, geolng if $("#google-map")
+
+geolocError = ->
+  hideGeoLoc()
+  "Geolocation Unsuccessful"
+
+hideGeoLoc = ->
+  $(".geoloc-hide").parent().hide()
+
+getPosition = ->
+  if navigator.geolocation
+    navigator.geolocation.getCurrentPosition geolocSuccess, geolocError
+  else
+    hideGeoLoc()
+    "Geolocation not supported"
+
+$ ->
+  getPosition()

data/vendor/assets/javascripts/geofsh.js

@@ -1,43 +1,50 @@
-(function(){
-  var geolocError, addMarker, getPosition, hideAddressAndZip, hideGeoLoc, geolocSuccess, googleMap, mapOptions, map, marker, geolat, geolng, geoCoords;
+// Generated by CoffeeScript 1.3.3
+(function() {
+  var addMarker, geolocError, geolocSuccess, getPosition, googleMap, hideGeoLoc;
 
   googleMap = function(geolat, geolng) {
-    if(document.getElementById("google-map")){
-      geoCoords = new google.maps.LatLng(geolat, geolng);
-      mapOptions = {
-        zoom: 16,
-        center: geoCoords,
-        mapTypeId: google.maps.MapTypeId.ROADMAP
-      };
-
-      map = new google.maps.Map(document.getElementById("google-map"), mapOptions);
-      addMarker(geoCoords, "You are here!");
-    }
+    var geoCoords, map, mapOptions;
+    geoCoords = new google.maps.LatLng(geolat, geolng);
+    mapOptions = {
+      zoom: 16,
+      center: geoCoords,
+      mapTypeId: google.maps.MapTypeId.ROADMAP
+    };
+    map = new google.maps.Map(document.getElementById("google-map"), mapOptions);
+    return addMarker(geoCoords, map, "You are here!");
   };
 
-  addMarker = function(position, title) {
-    marker = new google.maps.Marker({
+  addMarker = function(position, map, title) {
+    var marker;
+    return marker = new google.maps.Marker({
       position: position,
       map: map,
       title: title
-      });
-  }
+    });
+  };
+
   geolocSuccess = function(position) {
+    var geolat, geolng;
     geolat = position.coords.latitude;
     geolng = position.coords.longitude;
-    $('input#latitude').val(geolat);
-    $('input#longitude').val(geolng);
-    return googleMap(geolat, geolng);
+    if ($("input#latitude")) {
+      $("input#latitude").val(geolat);
+    }
+    if ($("input#longitude")) {
+      $("input#longitude").val(geolng);
+    }
+    if ($("#google-map")) {
+      return googleMap(geolat, geolng);
+    }
   };
 
   geolocError = function() {
-  hideGeoLoc();
-  return "Geolocation Unsuccessful";
+    hideGeoLoc();
+    return "Geolocation Unsuccessful";
   };
 
-
   hideGeoLoc = function() {
-  return $('.geoloc-hide').parent().hide();
+    return $(".geoloc-hide").parent().hide();
   };
 
   getPosition = function() {
@@ -49,9 +56,8 @@
     }
   };
 
-
   $(function() {
     return getPosition();
-  })
-}).call(this);
+  });
 
+}).call(this);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geofsh
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-07 00:00:00.000000000 Z
+date: 2012-12-19 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: coffee-rails
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.1
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -58,7 +74,6 @@ files:
 - testapp/app/models/.gitkeep
 - testapp/app/views/home/index.html.erb
 - testapp/app/views/layouts/application.html.erb
-- testapp/app/views/layouts/application.html.haml
 - testapp/config.ru
 - testapp/config/application.rb
 - testapp/config/boot.rb
@@ -86,11 +101,12 @@ files:
 - testapp/public/robots.txt
 - testapp/script/rails
 - testapp/spec/controllers/home_controller_spec.rb
-- testapp/spec/requests/home_spec.rb
+- testapp/spec/integration/home_spec.rb
 - testapp/spec/spec_helper.rb
 - testapp/vendor/assets/javascripts/.gitkeep
 - testapp/vendor/assets/stylesheets/.gitkeep
 - testapp/vendor/plugins/.gitkeep
+- vendor/assets/javascripts/geofsh.coffee
 - vendor/assets/javascripts/geofsh.js
 homepage: https://github.com/joofsh/geofsh
 licenses: []
@@ -104,18 +120,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 225897693785589626
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 225897693785589626
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -124,3 +134,4 @@ specification_version: 3
 summary: Provides latitude and longitude from HTML5 geolocation API and automatically
   places them in corresponding form fields
 test_files: []
+has_rdoc: 

data/testapp/app/views/layouts/application.html.haml

@@ -1,10 +0,0 @@
-!!!
-%html
-  %head
-    %title Testapp
-    = stylesheet_link_tag    "application", :media => "all"
-    = javascript_include_tag "application"
-    = csrf_meta_tags
-  %body
-    = yield
-