GoogleMaps model updated to v3

Rafael Martins
1 parent da48ccac
Showing 3 changed files with 3 additions and 64 deletions Show diff stats
app/models/google_maps.rb
test/unit/google_maps_test.rb
test/unit/location_block_test.rb
 class GoogleMaps
-  extend ActionView::Helpers::TagHelper
-
-  class << self
-
-    include ApplicationHelper
-
-    def enabled?(domain)
-      domain = Domain.find_by_name(domain)
-      domain ? !domain.google_maps_key.nil? : false
-    end
-
-    def key(domainname)
-      domain = Domain.find_by_name(domainname)
-      domain && domain.google_maps_key || ''
-    end
-
-    def initial_zoom
-      NOOSFERO_CONF['googlemaps_initial_zoom'] || 4
-    end
-
-    def api_url(domain)
-      "http://maps.google.com/maps?file=api&amp;v=2&amp;key=#{key(domain)}"
-    end
-
+  def self.initial_zoom
+    NOOSFERO_CONF['googlemaps_initial_zoom'] || 4
   end
+
 end
@@ -2,25 +2,6 @@ require File.dirname(__FILE__) + &#39;/../test_helper&#39;
 class GoogleMapsTest < ActiveSupport::TestCase
-  def setup
-    @domain = fast_create(Domain, :name => 'example-domain', :google_maps_key => 'DOMAIN_KEY')
-  end
-
-  attr_reader :domain
-
-  should 'enable when key on domain is defined' do
-    assert GoogleMaps.enabled?(domain.name)
-  end
-
-  should 'disable if key on domain is not defined' do
-    fast_create(Domain, :name => 'domain-without-key')
-    assert !GoogleMaps.enabled?('domain-without-key')
-  end
-
-  should 'point correctly to google maps' do
-    assert_equal 'http://maps.google.com/maps?file=api&amp;v=2&amp;key=DOMAIN_KEY', GoogleMaps.api_url(domain.name)
-  end
-
   should 'provide initial_zoom setting' do
     with_constants :NOOSFERO_CONF => {'googlemaps_initial_zoom' => 2} do
       assert_equal 2, GoogleMaps.initial_zoom
@@ -32,18 +13,4 @@ class GoogleMapsTest &lt; ActiveSupport::TestCase
     assert_equal 4, GoogleMaps.initial_zoom
   end
-  should 'have different keys to different domains' do
-    other_domain = fast_create(Domain, :name => 'different-domain', :google_maps_key => 'DIFFERENT_DOMAIN_KEY')
-
-    assert_equal 'http://maps.google.com/maps?file=api&amp;v=2&amp;key=DOMAIN_KEY', GoogleMaps.api_url(domain.name)
-    assert_equal 'http://maps.google.com/maps?file=api&amp;v=2&amp;key=DIFFERENT_DOMAIN_KEY', GoogleMaps.api_url(other_domain.name)
-  end
-
-  should 'not crash without a domain' do
-    Domain.delete_all
-    assert_nothing_raised do
-      GoogleMaps.key('example.com')
-    end
-  end
-
 end
@@ -18,13 +18,6 @@ class LocationBlockTest &lt; ActiveSupport::TestCase
     assert_tag_in_string block.content, :tag => 'i'
   end
-  should 'display localization map' do
-    profile.lat = 0
-    profile.lng = 0
-    profile.save!
-    assert_tag_in_string block.content, :tag => 'img'
-  end
-
   should 'be editable' do
     assert LocationBlock.new.editable?
   end
1	class GoogleMaps	1	class GoogleMaps
2		2
3	- extend ActionView::Helpers::TagHelper
4	-
5	- class << self
6	-
7	- include ApplicationHelper
8	-
9	- def enabled?(domain)
10	- domain = Domain.find_by_name(domain)
11	- domain ? !domain.google_maps_key.nil? : false
12	- end
13	-
14	- def key(domainname)
15	- domain = Domain.find_by_name(domainname)
16	- domain && domain.google_maps_key \|\| ''
17	- end
18	-
19	- def initial_zoom
20	- NOOSFERO_CONF['googlemaps_initial_zoom'] \|\| 4
21	- end
22	-
23	- def api_url(domain)
24	- "http://maps.google.com/maps?file=api&v=2&key=#{key(domain)}"
25	- end
26	-	3	+ def self.initial_zoom
		4	+ NOOSFERO_CONF['googlemaps_initial_zoom'] \|\| 4
27	end	5	end
		6	+
28	end	7	end
	@@ -2,25 +2,6 @@ require File.dirname(__FILE__) + '/../test_helper'		@@ -2,25 +2,6 @@ require File.dirname(__FILE__) + '/../test_helper'
2		2
3	class GoogleMapsTest < ActiveSupport::TestCase	3	class GoogleMapsTest < ActiveSupport::TestCase
4		4
5	- def setup
6	- @domain = fast_create(Domain, :name => 'example-domain', :google_maps_key => 'DOMAIN_KEY')
7	- end
8	-
9	- attr_reader :domain
10	-
11	- should 'enable when key on domain is defined' do
12	- assert GoogleMaps.enabled?(domain.name)
13	- end
14	-
15	- should 'disable if key on domain is not defined' do
16	- fast_create(Domain, :name => 'domain-without-key')
17	- assert !GoogleMaps.enabled?('domain-without-key')
18	- end
19	-
20	- should 'point correctly to google maps' do
21	- assert_equal 'http://maps.google.com/maps?file=api&v=2&key=DOMAIN_KEY', GoogleMaps.api_url(domain.name)
22	- end
23	-
24	should 'provide initial_zoom setting' do	5	should 'provide initial_zoom setting' do
25	with_constants :NOOSFERO_CONF => {'googlemaps_initial_zoom' => 2} do	6	with_constants :NOOSFERO_CONF => {'googlemaps_initial_zoom' => 2} do
26	assert_equal 2, GoogleMaps.initial_zoom	7	assert_equal 2, GoogleMaps.initial_zoom
	@@ -32,18 +13,4 @@ class GoogleMapsTest < ActiveSupport::TestCase		@@ -32,18 +13,4 @@ class GoogleMapsTest < ActiveSupport::TestCase
32	assert_equal 4, GoogleMaps.initial_zoom	13	assert_equal 4, GoogleMaps.initial_zoom
33	end	14	end
34		15
35	- should 'have different keys to different domains' do
36	- other_domain = fast_create(Domain, :name => 'different-domain', :google_maps_key => 'DIFFERENT_DOMAIN_KEY')
37	-
38	- assert_equal 'http://maps.google.com/maps?file=api&v=2&key=DOMAIN_KEY', GoogleMaps.api_url(domain.name)
39	- assert_equal 'http://maps.google.com/maps?file=api&v=2&key=DIFFERENT_DOMAIN_KEY', GoogleMaps.api_url(other_domain.name)
40	- end
41	-
42	- should 'not crash without a domain' do
43	- Domain.delete_all
44	- assert_nothing_raised do
45	- GoogleMaps.key('example.com')
46	- end
47	- end
48	-
49	end	16	end
	@@ -18,13 +18,6 @@ class LocationBlockTest < ActiveSupport::TestCase		@@ -18,13 +18,6 @@ class LocationBlockTest < ActiveSupport::TestCase
18	assert_tag_in_string block.content, :tag => 'i'	18	assert_tag_in_string block.content, :tag => 'i'
19	end	19	end
20		20
21	- should 'display localization map' do
22	- profile.lat = 0
23	- profile.lng = 0
24	- profile.save!
25	- assert_tag_in_string block.content, :tag => 'img'
26	- end
27	-
28	should 'be editable' do	21	should 'be editable' do
29	assert LocationBlock.new.editable?	22	assert LocationBlock.new.editable?
30	end	23	end