google_maps_by_pete 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 494e0d522b467a5257086be196c726a5832de561c4d9c5b43f6c20fcb51f0135
-  data.tar.gz: 94a108f0fa5893f4c2c9b22287023f9f82017be0778cad6c49eb950e957258f5
+  metadata.gz: 419a07f23a0dadcf6aa04dbfb048c18b8ed441ccb63fb45be5c966784c58fdfc
+  data.tar.gz: 7502eff88f07582cdffa5b13232ff5c5f74a64c4e088a53e723a17b7a19c7170
 SHA512:
-  metadata.gz: ca9238b3c0bd0b8fc99ef3ab697471f7a2d98cca8de199e411fed20373b3ef5380fb6479afbbb6c6c6bb950382203703058e39ee55db89b5d8e4c4b34c94bb2b
-  data.tar.gz: bf05a8f6f2739802b749e27dd803d3303a4fc626fafaf86d02312d196122af340bf3d60a11a7bb74d7d0cedfb6e73ce791c5b6ef03b15249ac691f32127aa3e1
+  metadata.gz: 4e77e8685eddd34f00a5bc3c78323f5129f69f4e6f2d6e25da68156a366009a5f5be4c1a0848fec9b6d926544f5a444164b3a6f92caaa26b8839860a23e8557b
+  data.tar.gz: d37cd4229d7e0163f5ef11ceee20f1ad2caf9cdbe7c1ee9ab16c8ebcc46da6f2a13d4e903e45e22fbd79135d2eacea05ec224d98dcd58a59194ed77b893be2eb

data/.gitignore

@@ -6,3 +6,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+*.gem

data/README.md

@@ -1,6 +1,10 @@
-# Google Maps By Pete
+# Ruby On Rails Google Maps By Pete
+
+An agile way to implement Google Maps geolocation in a Ruby On Rails scaffold
+## Support
+
+Ruby On Rails: 5, 6, 7
 
-An agile way to implement Google Maps localization on a scaffold in Ruby On Rails
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -19,28 +23,62 @@ bundle install
 ## Usage
 Let's create a example for a Place scaffold:
 
-1. Go to your application's directory in Terminal and run the command:
+1. Let's create a new rails app:
+
+```ruby
+rails new myapp --database=postgresql
+```
+
+2. Create the database:
+
+```ruby
+bundle exec rake db:create
+```
+
+3. Go to your application's directory in Terminal and run the command:
+
+```ruby
+bundle exec rails g scaffold Place name:string description:text
+```
+
+4. Add this line to your application's Gemfile:
 
 ```ruby
-rails g scaffold Place name:string description:text
+gem 'google_maps_by_pete'
 ```
-2. Go to your application's directory in Terminal and run the command:
+
+5. Go to your application's directory in Terminal and run:
+
+```ruby
+bundle install
+```
+
+6. Go to your application's directory in Terminal and run the command:
 ```ruby
 bundle exec rake 'install_google_maps_by_pete[Place]'
 ```
-3. Add jQuery to your layout file: 
+7. Add jQuery to your layout file: /app/views/layouts/application.html.erb
 ```html
 <script src='/google_maps_by_pete/jquery-3.6.0.min.js'></script>
 ```
-4. Add maps.css to your layout file: 
+8. Add maps.css to your layout file: /app/views/layouts/application.html.erb
 ```html
 <link rel='stylesheet' href='/google_maps_by_pete/maps.css'>
 ```
-5. Add this to your _form.html.erb file: 
+9. Paste this partial to your _form.html.erb file: /app/views/places/_form.html.erb
+
 ```ruby
 <%= render 'shared/google_maps_by_pete', api_key: 'your_google_api_key',  height: '500px', center_map_on: {lat: 25.761681, lng: -80.191788}, model: place%>
 ```
 
+10. Allow parameters (lat and lng) in your controller: /app/controllers/places_controller.rb
+
+```ruby
+def place_params
+   params.require(:place).permit(:name, :description, :lat, :lng)
+end
+```
+
 ## Video Tutorial
 
 Watch this video to see how it works
@@ -51,8 +89,8 @@ Watch this video to see how it works
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/google_maps_by_pete. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/[USERNAME]/google_maps_by_pete/blob/master/CODE_OF_CONDUCT.md).
+Bug reports and pull requests are welcome on GitHub at https://github.com/peterconsuegra/google_maps_by_pete. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/peterconsuegra/google_maps_by_pete/blob/master/CODE_OF_CONDUCT.md).
 
 ## Code of Conduct
 
-Everyone interacting in the GoogleMapsByPete project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/[USERNAME]/google_maps_by_pete/blob/master/CODE_OF_CONDUCT.md).
+Everyone interacting in the GoogleMapsByPete project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/peterconsuegra/google_maps_by_pete/blob/master/CODE_OF_CONDUCT.md).

data/lib/google_maps_by_pete/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GoogleMapsByPete
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/lib/peterconsuegra_recipes.rb

@@ -1,16 +1,40 @@
 require 'colorize'
-
+require 'fileutils'
+require "tty-file"
 
 module PeterConsuegraRecipes  
   
   def self.move_templates(src_folder,dest_folder,files)
+    FileUtils.mkdir_p dest_folder
     files.each do |file_name|
-      #puts "src_folder: #{src_folder} dest_folder: #{dest_folder}".blue
       FileUtils.cp(src_folder+file_name,dest_folder+file_name)
       puts "file copied to: #{dest_folder+file_name}".green
     end
   end
   
+  def self.move_template(src_folder,dest_folder,file)
+    FileUtils.mkdir_p dest_folder
+    FileUtils.cp src_folder+file,dest_folder+file
+    puts "File copied to: #{dest_folder+file}".green
+  end
+  
+  def self.add_route(base_route,action_name,method)
+    rails_app_folder = Dir.pwd 
+    route_file="#{rails_app_folder}/config/routes.rb"
+    route_code = "#{method} '/#{base_route}_#{action_name}', to: '#{base_route}##{action_name}'"
+    PeterConsuegraRecipes::append_before_last_appearance_of("end",route_code,route_file)
+    puts "Adding route: #{route_code}".blue
+  end
+  
+  def self.add_concern_to_controller(code,controller_file,controller_class)
+    rails_app_folder = Dir.pwd 
+    file="#{rails_app_folder}/app/controllers/#{controller_file}"
+    #puts "class #{controller_class} < ApplicationController"
+    #code="include FilesByPete\n"
+    TTY::File.inject_into_file file, code, after: "class #{controller_class} < ApplicationController\n"
+    puts "Adding concern to controller #{file}: #{code}".blue
+  end
+  
   def self.append_before_last_appearance_of(string,code,file)
     File.open(file, 'r+') do |file|
       lines = file.each_line.to_a
@@ -37,7 +61,7 @@ module PeterConsuegraRecipes
     hash["controller_file"] = hash["table_name"]+"_controller.rb"
     hash["controller_class"] = hash["table_name"].titleize.gsub(' ','')+"Controller"
     hash["base_route"] = hash["table_name"]
-    puts hash
+    #puts hash
     return hash
   end
   

data/lib/tasks/install_google_maps_by_pete.rake

@@ -1,68 +1,44 @@
 require_relative '../peterconsuegra_recipes'
-require 'fileutils'
-require "tty-file"
+require 'colorize'
 
-#bundle exec rake 'install_google_maps_by_pete[place]'
+#bundle exec rake 'install_google_maps_by_pete[model]'
 
-desc 'install_google_maps_by_pete required files'
+desc 'install google_maps_by_pete required files'
 task :install_google_maps_by_pete, [:model] do |t, args|
   
-  #require all models
+  #Require all models
   Dir.glob("#{Rails.root}/app/models/*.rb").each { |file| require file }
   
-  #route files
+  #Folders path
   rails_app_folder = Dir.pwd 
   gem_folder = File.expand_path('../../../.', __FILE__)
-    
-  #Get scaffold vars
-  hash = PeterConsuegraRecipes::get_scaffold_vars(args[:model])
-  
-  #Templates folder
   src_folder="#{gem_folder}/templates/"
   
-  #Adding partials
-  dest_folder="#{rails_app_folder}/app/views/shared/"
-  file="_google_maps_by_pete.html.erb"
-  FileUtils.mkdir_p dest_folder
-  FileUtils.cp src_folder+file,dest_folder+file
-  puts "File copied to: #{dest_folder+file}".green
-  
-  #Adding concern
-  dest_folder="#{rails_app_folder}/app/controllers/concerns/"
-  file="maps_by_pete.rb"
-  FileUtils.mkdir_p dest_folder
-  FileUtils.cp src_folder+file,dest_folder+file
-  puts "File copied to: #{dest_folder+file}".green
+  #Get scaffold vars
+  hash = PeterConsuegraRecipes::get_scaffold_vars(args[:model])
   
-  #Copy maps.css file
-  dest_folder="#{rails_app_folder}/public/google_maps_by_pete/"
-  file="maps.css"
-  FileUtils.mkdir_p dest_folder
-  FileUtils.cp src_folder+file,dest_folder+file
-  puts "File copied to: #{dest_folder+file}".green
+  #Adding partial
+  PeterConsuegraRecipes::move_template(src_folder,"#{rails_app_folder}/app/views/shared/","_google_maps_by_pete.html.erb")
+
+  #Adding concern file
+  PeterConsuegraRecipes::move_template(src_folder,"#{rails_app_folder}/app/controllers/concerns/","maps_by_pete.rb")
   
-  #Copy jquery-3.6.0.min.js file
-  dest_folder="#{rails_app_folder}/public/google_maps_by_pete/"
-  file="jquery-3.6.0.min.js"
-  FileUtils.mkdir_p dest_folder
-  FileUtils.cp src_folder+file,dest_folder+file
-  puts "File copied to: #{dest_folder+file}".green
-   
-  #Adding route to routes.rb
-  file="#{rails_app_folder}/config/routes.rb"
-  code = "post '/#{hash['base_route']}/set_location', to: '#{hash['base_route']}#set_location'"
-  PeterConsuegraRecipes::append_before_last_appearance_of("end",code,file)
-  puts "Adding route: #{code}".blue
+  #Adding js and css assets
+  PeterConsuegraRecipes::move_templates(src_folder,"#{rails_app_folder}/public/google_maps_by_pete/",["jquery-3.6.0.min.js","maps.css"])
+     
+  #Adding route
+  PeterConsuegraRecipes::add_route(hash['base_route'],"set_location","post")
   
-  #Adding include GoogleMapsByPete in Controller
-  file="#{rails_app_folder}/app/controllers/#{hash['controller_file']}"
-  code="include MapsByPete\n"
-  TTY::File.inject_into_file file, code, after: "class #{hash['controller_class']} < ApplicationController\n"
-  puts "Adding concern to controller #{file}: include MapsByPete".blue
+  #Adding concern to controller
+  PeterConsuegraRecipes::add_concern_to_controller("include MapsByPete\n",hash['controller_file'],hash['controller_class'])
   
-  #Add required migration
+  #Adding lat and lng fields to model
+  puts "Running command:".blue
+  puts "rails generate migration AddFieldsTo#{hash['model_class']} lat:decimal{10-6} lng:decimal{10-6}".green
   `rails generate migration AddFieldsTo#{hash['model_class']} lat:decimal{10-6} lng:decimal{10-6}`
   sleep 2
+  puts "Running command:".blue
+  puts "rake db:migrate".green
   `rake db:migrate`
   
   #Print necessary code 
@@ -73,10 +49,9 @@ task :install_google_maps_by_pete, [:model] do |t, args|
   puts "<script src='/google_maps_by_pete/jquery-3.6.0.min.js'></script>".red
   puts "Add maps.css to your layout file:".red
   puts "<link rel='stylesheet' href='/google_maps_by_pete/maps.css'>".red
-  puts "Add this to your _form.html.erb file:".red
+  puts "Add this partial to your _form.html.erb file:".red
   puts "<%= render 'shared/google_maps_by_pete', api_key: 'your_google_api_key',  height: '500px', center_map_on: {lat: 25.761681, lng: -80.191788}, model: #{hash['model'].downcase}%>".red
-  puts "Allow lat and lng params in your controller #{hash['controller_file']}:".red
+  puts "Allow :lat and :lng params in your controller #{hash['controller_file']}:".red
   puts "params.require(:#{hash['model'].downcase}).permit(:lat, :lng)".red
- 
   
 end

data/templates/_google_maps_by_pete.html.erb

@@ -8,7 +8,8 @@
 <%center_map_on_lng = -80.191788%>
 <%end%>
 
-
+<%table_name =  model.class.table_name%>
+<%set_location_route = "/#{table_name}_set_location"%>
 
 <div id="type-selector" class="controls">
 	  <input type="radio" name="type" id="changetype-all" checked="checked">
@@ -117,7 +118,7 @@
 			
 			//Save model lat and lng
 			<%if defined? model%>
-				set_location("/<%=model.class.name.downcase%>s/set_location",marker.position.lat(),marker.position.lng(),"<%=model.class.name%>",<%=model.id%>)
+				set_location("<%=set_location_route%>",marker.position.lat(),marker.position.lng(),"<%=model.class.name%>",<%=model.id%>)
 			<%end%>
 
 		    infowindow.setContent('<div><strong>' + place.name + '</strong><br>' + address);

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: google_maps_by_pete
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Pedro Consuegra
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-12-29 00:00:00.000000000 Z
+date: 2022-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -55,7 +55,6 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- google_maps_by_pete-0.1.41.gem
 - google_maps_by_pete.gemspec
 - lib/.DS_Store
 - lib/google_maps_by_pete.rb