gmaps4rails 0.0.13 → 0.0.14

data/app/controllers/gmaps4rails/gmaps_controller.rb

@@ -3,13 +3,15 @@ module Gmaps4rails
     unloadable    
     
     def index
-      @model = params["model"]
-      @filter = params["filter"]
-      @options = params["options"]
-      if @model.constantize.is_gmappable? == true
-        @objects = @model.constantize.gmaps4rails_filter(@filter, @options)
+      if request.xhr?
+        @model = params["model"]
+        @filter = params["filter"]
+        @options = params["options"]
+        if @model.constantize.is_gmappable? == true
+          @objects = @model.constantize.gmaps4rails_filter(@filter, @options)
+        end
       end
-    end
+   end
         
   end
 end

data/app/views/gmaps4rails/_gmaps4rails.html.erb

@@ -1,39 +1,8 @@
 <% content_for :head do %>
-<style type="text/css"> 
-
-   #map-container {
-     padding: 6px;
-     border-width: 1px;
-     border-style: solid;
-     border-color: #ccc #ccc #999 #ccc;
-     -webkit-box-shadow: rgba(64, 64, 64, 0.5) 0 2px 5px;
-     -moz-box-shadow: rgba(64, 64, 64, 0.5) 0 2px 5px;
-     box-shadow: rgba(64, 64, 64, 0.1) 0 2px 5px;
-     width: 800px;
-   }
-
-   #gmaps4rails_map {
-     width: 800px;
-     height: 400px;
-   }
-
-   #actions {
-     list-style: none;
-     padding: 0;
-   }
-
-   #inline-actions {
-     padding-top: 10px;
-   }
-
-   .item {
-     margin-left: 20px;
-   }
-</style>
+<%= stylesheet_link_tag 'gmaps4rails' %>
 <script src="http://www.google.com/jsapi"></script> 
-<script type="text/javascript" src='http://google-maps-utility-library-v3.googlecode.com/svn/tags/markerclusterer/1.0/src/markerclusterer.js'>
-</script>
-<script type="text/javascript"> 
+<script type="text/javascript" src='http://google-maps-utility-library-v3.googlecode.com/svn/tags/markerclusterer/1.0/src/markerclusterer.js'></script>
+<script type="text/javascript" charset="utf-8">
 var styles = [{
   url: 'http://google-maps-utility-library-v3.googlecode.com/svn/tags/markerclusterer/1.0/images/people35.png',
   height: 35,
@@ -51,9 +20,9 @@ var gmaps4rails_model = '<%= model %>';
 var gmaps4rails_map_center_lat = <%= model.constantize.gmaps4rails_map_options["latitude"] %>;
 var gmaps4rails_map_center_long = <%= model.constantize.gmaps4rails_map_options["longitude"] %>;
 var gmaps4rails_map_zoom = <%= model.constantize.gmaps4rails_map_options["zoom"] %>;
-var gmaps4rails_base_url = '<%= url_for gmaps_path%>';
+var gmaps4rails_base_url = '<%= url_for gmaps_path %>';
 </script>
-<script src="/javascripts/gmaps4rails.js" type="text/javascript"></script>    
+<%=javascript_include_tag 'gmaps4rails' %>
 <% end %>
     <div id="map-container"> 
       <div id="gmaps4rails_map"></div> 

data/config/routes.rb

@@ -5,8 +5,8 @@ Rails.application.routes.draw do
 
   #match mount_at => 'gmaps4rails/gmaps#index'
  
-  resources :gmaps, :only => [ :index ],
-                         :controller => "gmaps4rails/gmaps"#,
+  resources :gmaps, :only => [ :index ], :controller => "gmaps4rails/gmaps"
+                          #,
    #                      :path_prefix => mount_at
                          #:name_prefix => "gmaps4rails_"
 

data/lib/application_helper.rb

@@ -1,13 +1,15 @@
 module ApplicationHelper
+
   def gmaps4rails_filters_display(model)
     if model.constantize.respond_to?("gmaps4rails_filters") 
       display = '<form name="gmaps4rails_form">'
-    	display += '<select name="gmaps4rails_list" onChange="gmaps4rails_resfreshmap()">'
-    	model.constantize.gmaps4rails_filters.each do |filter_hash|
-    		display += '<option value="' + filter_hash["filter"] + '+' + filter_hash["options"] +'">' + filter_hash["display"]
-    	end
-    	display += '</select></form>'
+      display += '<select name="gmaps4rails_list" onChange="gmaps4rails_resfreshmap()">'
+      model.constantize.gmaps4rails_filters.each do |filter_hash|
+        display += '<option value="' + filter_hash["filter"] + '+' + filter_hash["options"] +'">' + filter_hash["display"]
+      end
+      display += '</select></form>'
     end
     return display
   end
-end
+  
+end

data/lib/gmaps4rails.rb

@@ -1,6 +1,30 @@
-module Gmaps4rails
-  require 'engine' if defined?(Rails) && Rails::VERSION::MAJOR == 3
-  require 'acts_as_gmappable/base'
+if defined?(Rails) && Rails::VERSION::MAJOR == 3
+  module Gmaps4rails
+  #  require 'rails/all'
+    require "rails"
+    require "action_controller"
+  #  require 'action_controller'
+    require 'application_helper'
+    require 'acts_as_gmappable/base'
+  
+    class Engine < Rails::Engine
+       # config.autoload_paths += %W(#{config.root}/lib)
+       # 
+       # initializer "static assets" do |app|
+       #   app.middleware.use ::ActionDispatch::Static, "#{root}/public%s"
+       # end
+       # 
+       # def self.activate
+       #   Dir.glob(File.join(File.dirname(__FILE__), "../app/**/*.rb")) do |c|
+       #     Rails.env.production? ? require(c) : load(c)
+       #   end
+       # end
+       # 
+       # config.to_prepare &method(:activate).to_proc
+       # initializer 'gmaps.helper' do |app|
+       #     ActionView::Base.send :include, Gmaps4rails::GmapsHelper
+       # end
+     end
+  end
 end
 
-

data/lib/rails/generators/gmaps4rails/gmaps4rails_generator.rb

@@ -0,0 +1,75 @@
+require 'rails/generators'
+require 'rails/generators/migration'
+
+class Gmaps4railsGenerator < Rails::Generators::Base
+  include Rails::Generators::Migration
+
+  def self.source_root
+    File.join(File.dirname(__FILE__), 'templates')
+  end
+   
+  def self.next_migration_number(dirname) #:nodoc:
+    if ActiveRecord::Base.timestamped_migrations
+      Time.now.utc.strftime("%Y%m%d%H%M%S")
+    else
+      "%.3d" % (current_migration_number(dirname) + 1)
+    end
+  end
+
+
+  # Every method that is declared below will be automatically executed when the generator is run
+  
+  def create_migration_file
+    f = File.open File.join(File.dirname(__FILE__), 'templates', 'schema.rb')
+    schema = f.read; f.close
+    
+    schema.gsub!(/ActiveRecord::Schema.*\n/, '')
+    schema.gsub!(/^end\n*$/, '')
+
+    f = File.open File.join(File.dirname(__FILE__), 'templates', 'migration.rb')
+    migration = f.read; f.close
+    migration.gsub!(/SCHEMA_AUTO_INSERTED_HERE/, schema)
+    
+    tmp = File.open "tmp/~migration_ready.rb", "w"
+    tmp.write migration
+    tmp.close
+
+    migration_template  '../../../tmp/~migration_ready.rb',
+                        'db/migrate/create_gmaps4rails_tables.rb'
+    remove_file 'tmp/~migration_ready.rb'
+  end
+
+  def copy_initializer_file
+    copy_file 'initializer.rb', 'config/initializers/gmaps4rails.rb'
+  end
+
+  def update_application_template
+    f = File.open "app/views/layouts/application.html.erb"
+    layout = f.read; f.close
+    
+    if layout =~ /<%=[ ]+yield[ ]+%>/
+      print "    \e[1m\e[34mquestion\e[0m  Your layouts/application.html.erb layout currently has the line <%= yield %>. This gem needs to change this line to <%= content_for?(:content) ? yield(:content) : yield %> to support its nested layouts. This change should not affect any of your existing layouts or views. Is this okay? [y/n] "
+      begin
+        answer = gets.chomp
+      end while not answer =~ /[yn]/i
+      
+      if answer =~ /y/i
+        
+        layout.gsub!(/<%=[ ]+yield[ ]+%>/, '<%= content_for?(:content) ? yield(:content) : yield %>')
+
+        tmp = File.open "tmp/~application.html.erb", "w"
+        tmp.write layout; tmp.close
+
+        remove_file 'app/views/layouts/application.html.erb'
+        copy_file '../../../tmp/~application.html.erb', 
+                  'app/views/layouts/application.html.erb'
+        remove_file 'tmp/~application.html.erb'
+      end
+    elsif layout =~ /<%=[ ]+content_for\?\(:content\) \? yield\(:content\) : yield[ ]+%>/
+      puts "    \e[1m\e[33mskipping\e[0m  layouts/application.html.erb modification is already done."
+    else
+      puts "    \e[1m\e[31mconflict\e[0m  The gem is confused by your layouts/application.html.erb. It does not contain the default line <%= yield %>, you may need to make manual changes to get this gem's nested layouts working. Visit ###### for details."
+    end
+  end
+  
+end

data/lib/rails/generators/gmaps4rails/templates/initializer.rb

@@ -0,0 +1,8 @@
+module Gmaps4rails
+  class Engine < Rails::Engine
+
+    config.mount_at = '/gmaps4rails'
+    config.widget_factory_name = 'Factory Name'
+        
+  end
+end

data/lib/rails/generators/gmaps4rails/templates/migration.rb

@@ -0,0 +1,9 @@
+class CreateGmaps4railsTables < ActiveRecord::Migration
+  def self.up
+    SCHEMA_AUTO_INSERTED_HERE
+  end
+
+  def self.down
+    drop_table :gmaps4rails_widgets
+  end
+end

data/lib/rails/generators/gmaps4rails/templates/schema.rb

@@ -0,0 +1,11 @@
+ActiveRecord::Schema.define(:version => 0) do
+
+    create_table :gmaps4rails_widgets, :force => true do |t|
+      t.string    :title
+      t.datetime  :created_at
+      t.datetime  :updated_at
+    end
+
+    add_index :gmaps4rails_widgets, [:title]
+
+end

data/lib/rails/railties/tasks.rake

@@ -0,0 +1,8 @@
+namespace :gmaps4rails do
+  
+  desc "example gem rake task"
+  task :report => :environment do
+    puts "you just ran the example gem rake task"
+  end
+
+end

data/lib/tasks/install.rake

@@ -0,0 +1,9 @@
+namespace :gmaps4rails do
+  desc "Copies all migrations and assets (NOTE: This will be obsolete with Rails 3.1)"
+  task :install do
+    source = File.join(File.dirname(__FILE__), '..', '..', 'public')
+    destination = File.join(Rails.root, 'public')
+    puts "INFO: Mirroring assets from #{source} to #{destination}"
+    Spree::FileUtilz.mirror_files(source, destination)
+  end
+end

data/public/stylesheets/gmaps4rails.css

@@ -0,0 +1,28 @@
+#map-container {
+  padding: 6px;
+  border-width: 1px;
+  border-style: solid;
+  border-color: #ccc #ccc #999 #ccc;
+  -webkit-box-shadow: rgba(64, 64, 64, 0.5) 0 2px 5px;
+  -moz-box-shadow: rgba(64, 64, 64, 0.5) 0 2px 5px;
+  box-shadow: rgba(64, 64, 64, 0.1) 0 2px 5px;
+  width: 800px;
+}
+
+#gmaps4rails_map {
+  width: 800px;
+  height: 400px;
+}
+
+#actions {
+  list-style: none;
+  padding: 0;
+}
+
+#inline-actions {
+  padding-top: 10px;
+}
+
+.item {
+  margin-left: 20px;
+}

data/test/test_helper.rb

@@ -0,0 +1,56 @@
+ENV["RAILS_ENV"] = "test"
+
+require 'test/unit'
+require 'rubygems'
+require 'yaml'
+require 'active_record'
+require 'mysql'
+
+require 'app/models/gmaps4rails/widget.rb'
+
+def gmaps4rails_widget( fixture_name )
+  id = @@fixtures['gmaps4rails_widget'][ fixture_name.to_s ][ 'id' ]
+  gmaps4rails::Widget.find( id )
+end
+
+def load_schema
+  config = YAML::load( IO.read( File.dirname(__FILE__) + '/database.yml') )
+
+  # Manually initialize the database
+  conn = Mysql.real_connect( config['mysql']['host'], config['mysql']['username'], config['mysql']['password'] )
+  conn.query( "CREATE DATABASE IF NOT EXISTS #{config['mysql']['database']}" )
+  
+  ActiveRecord::Base.establish_connection( config['mysql'] )
+  ActiveRecord::Base.connection()
+  
+  load(File.dirname(__FILE__) + "/../" +
+    "lib/rails/generators/gmaps4rails/templates/schema.rb")
+
+  @@fixtures = {}
+  
+  load_fixture( 'gmaps4rails_widget' )
+end
+
+def load_fixture( table )
+  @@fixtures[ table ] = {}
+  fixture = YAML::load( IO.read( File.dirname(__FILE__) + "/fixtures/#{table}.yml") )
+  @@fixtures[ table ] = fixture
+
+  klass = class_eval table.titleize.gsub(/ /, '::')
+
+  fixture.each do |record_name, record|
+    record.each do |column, value|
+      if ( match = column.match(/(.*)_id/) )
+        fixture_reference = "gmaps4rails_" + match[1].pluralize
+        if value.is_a? Symbol
+          r = class_eval "#{fixture_reference}( '#{value}' )"
+          record[ column ] = r.id
+        end
+      end
+    end
+      
+    r = klass.create( record )
+    @@fixtures[ table ][ record_name ][ 'id' ] = r.id
+  end
+
+end

data/test/unit/gmaps4rails_widget_test.rb

@@ -0,0 +1,11 @@
+require 'test_helper'
+
+class WidgetTest < Test::Unit::TestCase
+  load_schema
+
+  def test_fixtures_are_working
+    assert_equal gmaps4rails_widget(:first).title, "This is the title"
+  end
+  
+    
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gmaps4rails
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: false
   segments: 
   - 0
   - 0
-  - 13
-  version: 0.0.13
+  - 14
+  version: 0.0.14
 platform: ruby
 authors: 
 - Benjamin Roth
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-21 00:00:00 +01:00
+date: 2010-11-24 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,20 +42,25 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - app/controllers/gmaps4rails/gmaps_controller.rb
-- app/helpers/application_helper.rb
-- app/helpers/gmaps4rails/Gmaps_helper.rb
+- app/helpers/gmaps4rails/gmaps_helper.rb
 - app/views/gmaps4rails/_gmaps4rails.html.erb
-- app/views/gmaps4rails/_map.html.erb
-- app/views/gmaps4rails/gmaps/index.json.erb
-- app/views/gmaps4rails/gmaps/index.xml.builder
+- app/views/gmaps4rails/gmaps/index.js.erb
 - config/routes.rb
 - lib/acts_as_gmappable/base.rb
 - lib/application_helper.rb
-- lib/engine.rb
 - lib/gmaps4rails.rb
+- lib/rails/generators/gmaps4rails/gmaps4rails_generator.rb
+- lib/rails/generators/gmaps4rails/templates/initializer.rb
+- lib/rails/generators/gmaps4rails/templates/migration.rb
+- lib/rails/generators/gmaps4rails/templates/schema.rb
+- lib/rails/railties/tasks.rake
+- lib/tasks/install.rake
 - public/images/marker.png
 - public/javascripts/gmaps4rails.js
+- public/stylesheets/gmaps4rails.css
 - README.rdoc
+- test/test_helper.rb
+- test/unit/gmaps4rails_widget_test.rb
 has_rdoc: true
 homepage: http://github.com/apneadiving/Gmaps4rails
 licenses: []
@@ -90,5 +95,6 @@ rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: IN HEAVY DEV. Will enable easy display of items (taken from a model) on a Google Map. Uses Javascript API V3.
-test_files: []
-
+test_files: 
+- test/test_helper.rb
+- test/unit/gmaps4rails_widget_test.rb

data/app/helpers/application_helper.rb

@@ -1,2 +0,0 @@
-## Look in lib/application_helper.rb
-## I can't figure out how to get it included unless I put it that directory

data/app/views/gmaps4rails/_map.html.erb

@@ -1,63 +0,0 @@
-<% content_for(:head) do %>
-<meta name="viewport" content="initial-scale=1.0, user-scalable=no" />
-<script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=false"> </script>
-<script type="text/javascript" src="/javascripts/gmaps4rails.js"> </script>
-<script type="text/javascript">
-	var gmaps4rails_map;
-	var gmaps4rails_Options;
-	var gmaps4rails_ctaLayer;
-	var gmaps4rails_model;
-
-	jQuery(document).ready(function() {
-		gmaps4rails_init("User");
-	});
-
-
-  function gmaps4rails_init(model) {
-	  gmaps4rails_model = model;
-	  var myLatLng = new google.maps.LatLng(0,0);
-	  gmaps4rails_Options = {
-	  	    zoom: 0,
-	  	    center: myLatLng,
-	  	    mapTypeId: google.maps.MapTypeId.ROADMAP
-	    	  }
-	  gmaps4rails_map = new google.maps.Map(document.getElementById("gmaps4rails_canvas"), gmaps4rails_Options);
-		create_map();
-}
-
-	function create_map(filter_value) {
-		var date = new Date();
-		//adding the date (which is a unique parameter, enables to bypass google map's cache on google server)
-		var request = 'http://furious-robot-66.heroku.com/gmaps.xml?model=' + gmaps4rails_model + '&time=' + date.getTime();
-		if (!(filter_value == null))
-			{
-			split_filter_value = filter_value.split('+');
-			if (!(split_filter_value[0] == null))
-				{
-					request += '&filter=' + split_filter_value[0];
-				}
-			if (!(split_filter_value[1] == null))
-				{
-				request += '&options=' + split_filter_value[1];
-				}
-			}
-	  gmaps4rails_ctaLayer = new google.maps.KmlLayer(request);
-	  gmaps4rails_ctaLayer.setMap(gmaps4rails_map);
-	}
-
-	function gmaps4rails_raz(){
-	  gmaps4rails_map = new google.maps.Map(document.getElementById("gmaps4rails_canvas"), gmaps4rails_myOptions);
-  }
-
-function gmaps4rails_resfreshmap()
-   {
-	 gmaps4rails_raz();
-   var index = document.gmaps4rails_form.gmaps4rails_list.selectedIndex;
-   var filter_value = document.gmaps4rails_form.gmaps4rails_list.options[index].value;
-	 create_map(filter_value);
-   }
-</script>
-<% end %>
-
-<div id="gmaps4rails_canvas" style="width:100%; height:100%"></div>
-

data/app/views/gmaps4rails/gmaps/index.xml.builder

@@ -1,99 +0,0 @@
-xml.instruct! :xml, :version=>"1.0"
-xml.kml do
-  xml.Document do
-    #if @objects.first.respond_to?('gmaps4rails_marker')
-      xml.Style('id' => 'normalPlacemark') do
-        xml.IconStyle do 
-          xml.Icon "<href>" + @objects.first.gmaps4rails_marker + "</href>"
-        end
-      end
-      
-      xml.Style('id' => 'highlightPlacemark') do
-        xml.IconStyle do 
-          xml.Icon "<href>" + @objects.first.gmaps4rails_marker_hover + "</href>"
-        end
-      end   
-      
-      xml.Style('id' => 'customMap') do
-        xml.Pair do
-          xml.key 'normal'
-          xml.StyleUrl '#normalPlacemark'
-        end
-        xml.Pair do
-          xml.key 'highlight'
-          xml.StyleUrl '#highlightPlacemark'
-        end
-      end
-      
-
-    # <Document>
-    #     <name>Highlighted Icon</name>
-    #     <description>Place your mouse over the icon to see it display the new icon</description>
-    #     <Style id="highlightPlacemark">
-    #       <IconStyle>
-    #         <Icon>
-    #           <href>http://maps.google.com/mapfiles/kml/paddle/red-stars.png</href>
-    #         </Icon>
-    #       </IconStyle>
-    #     </Style>
-    #     <Style id="normalPlacemark">
-    #       <IconStyle>
-    #         <Icon>
-    #           <href>http://maps.google.com/mapfiles/kml/paddle/wht-blank.png</href>
-    #         </Icon>
-    #       </IconStyle>
-    #     </Style>
-    #     <StyleMap id="exampleStyleMap">
-    #       <Pair>
-    #         <key>normal</key>
-    #         <styleUrl>#normalPlacemark</styleUrl>
-    #       </Pair>
-    #       <Pair>
-    #         <key>highlight</key>
-    #         <styleUrl>#highlightPlacemark</styleUrl>
-    #       </Pair>
-    #     </StyleMap>
-    #     <Placemark>
-    #       <name>Roll over this icon</name>
-    #       <styleUrl>#exampleStyleMap</styleUrl>
-    #       <Point>
-    #         <coordinates>-122.0856545755255,37.42243077405461,0</coordinates>
-    #       </Point>
-    #     </Placemark>
-    #   </Document>
-
-    if @objects.first.respond_to?('gmaps4rails_info')
-      @objects.each do |object|
-
-        xml.Placemark do
-          desc = object.gmaps4rails_info
-          lat = object.gmaps4rails_latitude.nil? ? "" : object.gmaps4rails_latitude
-          long = object.gmaps4rails_longitude.nil? ? "" : object.gmaps4rails_longitude
-          xml.styleUrl "#customMap"
-          xml.description '<![CDATA[' + desc + ']]>'
-          xml.Point do
-            str = long + "," + lat + ",0"
-            xml.coordinates(str)
-          end
-        end #placemark
-      end
-    else
-      @objects.each do |object|
-        xml.Placemark do
-          desc = object.gmaps4rails_picture.nil? ? "" : '<img width="40" heigth="40" src="' + object.gmaps4rails_picture + '">'
-          xml.styleUrl "#customMap"
-          desc += object.gmaps4rails_description.nil? ? "" : object.gmaps4rails_description
-          lat = object.gmaps4rails_latitude.nil? ? "" : object.gmaps4rails_latitude
-          long = object.gmaps4rails_longitude.nil? ? "" : object.gmaps4rails_longitude
-
-          xml.description '<![CDATA[' + desc +']]>'
-          xml.Point do
-            str = long + "," + lat + ",0"
-            xml.coordinates(str)
-          end
-        end #placemark
-      end
-    end
-
-  end #Document
-end #kml

data/lib/engine.rb

@@ -1,43 +0,0 @@
-require 'rails'
-require 'action_controller'
-require 'application_helper'
-require 'acts_as_gmappable/base'
-#require 'gmaps4rails'
-
-# module Gmaps4rails
-#   class Engine < Rails::Engine
-#     # Config defaults
-#     config.widget_factory_name = "gmaps4rails"
-#     config.mount_at = '/'
-#     
-#     # Check the gem config
-#     initializer "check config" do |app|
-#       # make sure mount_at ends with trailing slash
-#       config.mount_at += '/'  unless config.mount_at.last == '/'
-#     end
-#     
-#     initializer "static assets" do |app|
-#       app.middleware.use ::ActionDispatch::Static, "#{root}/public"
-#     end
-#     
-#   end
-# end
-
-module Gmaps4rails
-  class Engine < Rails::Engine
-
-    config.autoload_paths += %W(#{config.root}/lib)
-    
-    initializer "static assets" do |app|
-      app.middleware.use ::ActionDispatch::Static, "#{root}/public"
-    end
-
-    def self.activate
-      Dir.glob(File.join(File.dirname(__FILE__), "../app/**/*.rb")) do |c|
-        Rails.env.production? ? require(c) : load(c)
-      end
-    end
-
-    config.to_prepare &method(:activate).to_proc
-  end
-end