geo_labels 0.2.0 → 0.3.1

data/app/views/geo_labels/contacts/index.html.slim

@@ -1,17 +1,24 @@
 .ui.container
   = page_title :index, record_class
-  - if @records.any? or @q.conditions.present?
+    = render 'button-new-record'
+  - if @records.any? or @q.base.conditions.any?
     = search_form_for(@q, html: {class: 'ui form'}) do |f|
       = hidden_field_tag :per_page, params[:per_page], id: 'q_per_page'
       table.ui.compact.top.attached.striped.table
         thead
           tr
-            th= sort_link @q, :full_name, at(:full_name), default_order: :asc
-            th.column-filter.actions
+            th= sort_link @q, :name, at(:name), default_order: :asc
+            th= sort_link @q, :city, at(:city), default_order: :asc
+            th= sort_link @q, :department, at(:department), default_order: :asc
+            th= sort_link @q, :country, at(:country), default_order: :asc
+            th.collapsing.column-filter.actions
               = search_result_info @records
           = search_row class: 'ui mini form' do
-            th= f.text_field :full_name_cont, placeholder: at(:full_name)
-            th.column-filter.actions
+            th= f.search_field :name_cont, placeholder: at(:name)
+            th= f.search_field :city_cont, placeholder: at(:city)
+            th= f.search_field :department_cont, placeholder: at(:department)
+            th= f.search_field :country_cont, placeholder: at(:country)
+            th.collapsing.column-filter.actions
               button.ui.mini.primary.icon.button
                 i.filter.icon
               = link_to polymorphic_path(record_class, reset_q: true), class: 'clear-filters-button ui mini basic yellow icon button' do
@@ -19,8 +26,13 @@
         tbody
           - @records.each do |record|
             tr
-              td= link_to record.full_name, record
-              td.actions
+              td
+                = link_to record.name, record
+                /= address_tag record.address, title: record.description
+              td= record.city
+              td= record.department
+              td= record.country
+              td.collapsing.actions
                 = table_show_link record
                 = table_edit_link record
     .ui.bottom.attached.segment

data/app/views/geo_labels/contacts/show.html.slim

@@ -1,13 +1,35 @@
+- content_for :head
+  javascript:
+    setupRatings()
+
 .ui.container
   = page_title :show, @record, back: [record_class]
   table.ui.top.attached.compact.definition.table
     tbody
       tr
         td= t 'form.name'
-        td= @record.full_name
+        td
+          = @record.name
+          = address_tag @record.address, title: @record.description
       tr
         td= GeoLabels::Label.model_name.human_plural
-        td= @record.labels.map(&:name).join(', ')
+        td== @record.labels.map{ |label| link_to label.name, label }.join(', ')
+      tr
+        td Ratings
+        td
+          = show_rating_for @record, :food
+      tr
+        td= at :state
+        td
+          - unless @record.rejected?
+            = link_to 'Reject', geo_labels.reject_contact_path(@record.id), method: :put, class: 'ui right floated button negative'
+          - unless @record.approved?
+            = link_to 'Approve', geo_labels.approve_contact_path(@record.id), method: :put, class: 'ui right floated button positive'
+          .ui.basic.label class=(@record.state == 'rejected' ? 'red' : (@record.state == 'approved' ? 'green' : 'yelow'))
+            = @record.state
+      tr
+        td= at :description
+        td= @record.description
       - if @record.geocoded?
         tr
           td Location

data/app/views/geo_labels/dashboard/main.html.slim

@@ -4,7 +4,7 @@
     .field
       /label Blabla
       .fields
-        .eleven.wide.field
+        .eight.wide.field
           .ui.fluid.multiple.search.selection.dropdown
             = hidden_field_tag 'label_ids', params[:label_ids]
             i.dropdown.icon
@@ -15,6 +15,16 @@
                 .item data-value=label_id
                   = label_name
         .four.wide.field
+          .ui.fluid.multiple.selection.dropdown
+            /input name='q[state][]' value='approved' type='hidden'
+            = hidden_field_tag 'states', params[:states].presence || 'approved'
+            i.dropdown.icon
+            .default.text states
+            .menu
+              .item data-value='approved'    approved
+              .item data-value='recommended' recommended
+              .item data-value='rejected'    rejected
+        .three.wide.field
           .ui.buttons.fluid.and-or-switch-buttons
             = hidden_field_tag 'predication', params[:predication].presence || 'and'
             /= text_field_tag 'predication', 'and'
@@ -25,11 +35,23 @@
           button.ui.blue.icon.button
             i.search.icon
 
-
+-  if params[:label_ids].blank?
+  .ui.basic.pointing.label= t 'geo_labels.select_labels_text', models: GeoLabels::Label.model_name.human_plural
 - if @contacts.present?
-  .ui.horizontal.divider= GeoLabels::Contact.model_name.human_plural
-  .ui.segment
+  .ui.top.attached.tabular.menu
+    a.item.active data-tab='contacts'= GeoLabels::Contact.model_name.human_plural
+    a.item        data-tab='map' Map
+  .ui.bottom.attached.tab.segment.active data-tab='contacts'
+    .ui.list
+      - @contacts.each do |contact|
+        .ui.item
+          = link_to contact.name, contact
+          = address_tag contact.address, title: contact.description
+  .ui.bottom.attached.tab.segment data-tab='map'
+    #map-canvas
+  /.ui.horizontal.divider= GeoLabels::Contact.model_name.human_plural
+  /.ui.segment
     #map-canvas
   javascript:
     window.map_points = #{@contacts.map(&:map_attributes).to_json.html_safe};
-  script src="https://maps.googleapis.com/maps/api/js?key=#{Rails.application.config.x.geo_labels.google_api_key}&callback=initMap&v=weekly" defer
+  script src="https://maps.googleapis.com/maps/api/js?key=#{Rails.application.config.x.geo_labels.google_api_key}&v=weekly" defer

data/app/views/geo_labels/labels/index.html.slim

@@ -1,17 +1,21 @@
 .ui.container
   = page_title :index, record_class
-  - if @records.any? or @q.conditions.present?
+    span   
+    = link_to new_label_path
+      i.plus.icon
+  = link_to_labels_tree
+  /- if @records.any? or @q.base.conditions.any?
     = search_form_for(@q, html: {class: 'ui form'}) do |f|
       = hidden_field_tag :per_page, params[:per_page], id: 'q_per_page'
       table.ui.compact.top.attached.striped.table
         thead
           tr
             th= sort_link @q, :name, at(:name), default_order: :asc
-            th.column-filter.actions
+            th.collapsing.column-filter.actions
               = search_result_info @records
           = search_row class: 'ui mini form' do
             th= f.text_field :name_cont, placeholder: at(:name)
-            th.column-filter.actions
+            th.collapsing.column-filter.actions
               button.ui.mini.primary.icon.button
                 i.filter.icon
               = link_to polymorphic_path(record_class, reset_q: true), class: 'clear-filters-button ui mini basic yellow icon button' do
@@ -20,17 +24,17 @@
           - @records.each do |record|
             tr
               td= link_to record.name, record
-              td.actions
+              td.collapsing.actions
                 = table_show_link record
                 = table_edit_link record
     .ui.bottom.attached.segment
       = render 'button-new-record'
     = paginate @records
-  - else
+  /- else
     p= t 'collection.empty', models: record_class.model_name.human_plural
     = render 'button-new-record'
 
-  .ui.styled.accordion
+  /.ui.styled.accordion
     .title.active
       i.dropdown.icon
       = t 'geo_labels.tree_title'

data/app/views/geo_labels/labels/show.html.slim

@@ -7,6 +7,20 @@
         td= @record.name
       tr
         td Parents
-        td= @record.ancestors.map(&:name).join(' -> ')
+        td== @record.ancestors.map{ |label| link_to label.name, label }.join(' -> ')
+      tr
+        td Children
+        td
+          .ui.horizontal.bulleted.list
+            - @record.children.each do |child|
+              .item= link_to child.name, child
+      tr
+        td= GeoLabels::Contact.model_name.human_plural
+        td
+          .ui.list
+            - @record.associated_contacts.each do |contact|
+              .item
+                = link_to(contact.name, contact)
+                = address_tag contact.address, title: contact.description
   .ui.bottom.attached.segment
     = render 'button-edit-record', record: @record

data/app/views/layouts/geo_labels/application.html.slim

@@ -11,6 +11,8 @@ html lang="en"
 
     = stylesheet_link_tag    'geo_labels/application', media: 'all'
     = javascript_include_tag 'geo_labels/application'
+    javascript:
+      window.geo_labels = #{{paths: GeoLabels::Engine.client_paths}.to_json.html_safe};
     = content_for :head
   body
     header= render 'navigation'

data/config/environment.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 ### NOTE:
 # This is a dummy file to let the vim-rails vim plugin work with the rails engine

data/config/initializers/human_plural.rb

@@ -1,16 +1,19 @@
+# frozen_string_literal: true
+
 module ActiveModel
   class Name
+
     def human_plural
       # Try to find the plural name of a model. If none can be found try to find a non namespaced version and return that one
-      default = Proc.new do |path|
-        if path.present? and path['/'] # non namespaced model a/b/c => a
-          unnamespaced_path = path.sub(/\.(\w+)\/[\w\\]+/, '.\1')
-          I18n.t(unnamespaced_path, default: Proc.new{ human.pluralize })
+      default = proc do |path|
+        if path.present? and path['/'] # non namespaced model a.b.c/d/e => a.b.c
+          unnamespaced_path = path.sub(%r{\.(\w+)/[\w\\]+}, '.\1')
+          I18n.t(unnamespaced_path, default: proc{ human.pluralize })
         else
           human.pluralize
         end
       end
-      I18n.t("#{@klass.i18n_scope}.models.plural.#{i18n_key}", default: default )
+      I18n.t("#{@klass.i18n_scope}.models.plural.#{i18n_key}", default: default)
     end
   end
 end

data/config/locales/geo_labels.en.yml

@@ -3,3 +3,4 @@ en:
     export: Export
     import: Import
     tree_title: Tree
+    select_labels_text:  Select %{models} and search...

data/config/locales/geo_labels.es.yml

@@ -1,5 +1,14 @@
 es:
+  activerecord:
+    models:
+      geo_labels/contact: Contacto
+      geo_labels/label: Etiqueta
+      plural:
+        geo_labels/contact: Contactos
+        geo_labels/label: Etiquetas
+
   geo_labels:
     export: Exportar
     import: Importar
     tree_title: Árbol
+    select_labels_text:  Seleccionar %{models} y busca...

data/config/routes.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 GeoLabels::Engine.routes.draw do
   root 'dashboard#main'
 
@@ -8,6 +9,16 @@ GeoLabels::Engine.routes.draw do
     post :import_file
   end
 
-  resources :contacts
+  scope 'ratings', controller: :ratings do
+    post :set, as: :set_rating # post because of.. well.. $.post
+    get :get, as: :get_rating
+  end
+
+  resources :contacts do
+    member do
+      put :approve
+      put :reject
+    end
+  end
   resources :labels
 end

data/db/migrate/20221019150722_create_geo_labels_contacts.rb

@@ -1,4 +1,6 @@
+# frozen_string_literal: true
 class CreateGeoLabelsContacts < ActiveRecord::Migration[7.0]
+
   def change
     create_table :geo_labels_contacts do |t|
       t.string :first_name
@@ -10,11 +12,11 @@ class CreateGeoLabelsContacts < ActiveRecord::Migration[7.0]
       t.string :state
       t.string :country
       t.text :description
-      t.float :latitude
-      t.float :longitude
+      t.decimal :latitude, precision: 15, scale: 13
+      t.decimal :longitude, precision: 15, scale: 13
 
       t.timestamps
-      t.index [:latitude, :longitude]
+      t.index %i[latitude longitude]
     end
   end
 end

data/db/migrate/20221020180213_create_geo_labels_labels.rb

@@ -1,4 +1,6 @@
+# frozen_string_literal: true
 class CreateGeoLabelsLabels < ActiveRecord::Migration[7.0]
+
   def change
     create_table :geo_labels_labels do |t|
       t.string :name

data/db/migrate/20221020195346_create_geo_labels_contact_labels.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
 class CreateGeoLabelsContactLabels < ActiveRecord::Migration[7.0]
+
   def change
     create_table :geo_labels_contact_labels, id: false do |t|
-      #t.belongs_to :contact, null: false, foreign_key: true
-      #t.belongs_to :label, null: false, foreign_key: true
+      # t.belongs_to :contact, null: false, foreign_key: true
+      # t.belongs_to :label, null: false, foreign_key: true
       t.integer :contact_id, index: true
       t.integer :label_id, index: true
 

data/db/migrate/20230602182522_geo_labels_contacts_complex_name_to_name.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+class GeoLabelsContactsComplexNameToName < ActiveRecord::Migration[7.0]
+
+  def change
+    rename_column :geo_labels_contacts, :first_name, :name
+    remove_column :geo_labels_contacts, :middle_name
+    remove_column :geo_labels_contacts, :last_name
+  end
+end

data/db/migrate/20230726154822_add_state_to_geo_labels_contacts.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+class AddStateToGeoLabelsContacts < ActiveRecord::Migration[7.0]
+
+  def change
+    rename_column :geo_labels_contacts, :state, :department
+    add_column :geo_labels_contacts, :state, :string, default: 'approved'
+  end
+end

data/db/migrate/20230801145902_add_food_rating_to_geo_labels_contacts.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+class AddFoodRatingToGeoLabelsContacts < ActiveRecord::Migration[7.0]
+
+  def change
+    add_column :geo_labels_contacts, :food_rating, :integer, default: 0, null: false
+  end
+end

data/lib/geo_labels/engine.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'geocoder'
 require 'slim-rails'
 require 'coffee-rails'
@@ -11,24 +12,33 @@ require 'awesome_nested_set'
 
 module GeoLabels
   class Engine < ::Rails::Engine
+
     isolate_namespace GeoLabels
 
-    initializer "geo_labels.assets.precompile" do |main_app|
-      #app.config.assets.precompile << "config/engine_name_manifest.js"
-      main_app.config.assets.precompile << "geo_labels/application.css"
-      main_app.config.assets.precompile << "geo_labels/application.js"
+    initializer 'geo_labels.assets.precompile' do |main_app|
+      # app.config.assets.precompile << "config/engine_name_manifest.js"
+      main_app.config.assets.precompile << 'geo_labels/application.css'
+      main_app.config.assets.precompile << 'geo_labels/application.js'
 
       # Engine specific config
       main_app.config.x.geo_labels.application_title ||= -> { 'GEO-labels' }
       main_app.config.x.geo_labels.link_home_content ||= -> { '<i class="arrow left icon"></i> Back' }
-      main_app.config.x.geo_labels.google_api_key ||= "GOOGLE_API_KEY"
+      main_app.config.x.geo_labels.google_api_key ||= ENV['GOOGLE_API_KEY'] || 'GOOGLE_API_KEY'
+    end
+
+    def self.client_paths
+      {
+        mount:      routes.find_script_name({}),
+        get_rating: routes.url_helpers.get_rating_path,
+        set_rating: routes.url_helpers.set_rating_path
+      }
     end
 
     # add migrations to containing application
     initializer 'geo_labels.append_migrations' do |app|
       unless app.root.to_s.match root.to_s
-        config.paths["db/migrate"].expanded.each do |expanded_path|
-          app.config.paths["db/migrate"] << expanded_path
+        config.paths['db/migrate'].expanded.each do |expanded_path|
+          app.config.paths['db/migrate'] << expanded_path
         end
       end
     end

data/lib/geo_labels/exporter.rb

@@ -1,16 +1,13 @@
+# frozen_string_literal: true
 require 'yaml'
 module GeoLabels
   class Exporter
+
     def self.export_h
-      obj = {
+      {
         'labels'   => labels_tree,
-        'contacts' => GeoLabels::Contact.includes(:labels).map{ |contact|
-          contact.attributes.merge('labels' => contact.labels.map(&:name)).select{ |attr, val|
-            val.present? and not %w[id created_at updated_at].include?(attr)
-          }
-        }
+        'contacts' => contacts_h
       }
-      obj
     end
 
     def self.export_str
@@ -20,11 +17,11 @@ module GeoLabels
     # Formats the tree structure from labels_tree_h to a string output
     # can be called with add_punctuation: '-' to add dashes
     def self.labels_tree(add_punctuation: nil)
-      output = ""
-      tree_formatter = Proc.new do |items, lead_space|
+      output = ''
+      tree_formatter = proc do |items, lead_space|
         items.each do |item|
           output += "#{lead_space}#{item[:name]}\n"
-          tree_formatter.call(item[:children], lead_space + '  ') if item[:children].present?
+          tree_formatter.call(item[:children], "#{lead_space}  ") if item[:children].present?
         end
       end
       tree_formatter.call(labels_tree_h, '')
@@ -32,6 +29,23 @@ module GeoLabels
       output
     end
 
+    def self.contacts_h
+      GeoLabels::Contact.includes(:labels).map do |contact|
+        contact
+          .attributes
+          .slice(*%w[name street subsection city department country state description latitude longitude])
+          .merge('labels' => contact.labels.map(&:name))
+          .select { |_, v| v.present? }
+          .transform_values do |value|
+            case value
+            when Date, Time then value.iso8601
+            when BigDecimal then value.to_f
+            else value
+            end
+          end
+      end
+    end
+
     # Returns an array having the tree structure as ruby objects
     def self.labels_tree_h
       labels = GeoLabels::Label.order(:name).to_a

data/lib/geo_labels/importer.rb

@@ -1,27 +1,28 @@
+# frozen_string_literal: true
 module GeoLabels
   module Importer
     def self.import(subject)
-      yaml_h = case subject
-      when String
-        if subject.start_with?('/') or subject.start_with?('./')
-          YAML.load_file(subject)
-        else
-          YAML.load(subject)
-        end
-      when File                               then YAML.load(subject.read)
-      when Pathname                           then YAML.load(subject.read)
-      when ActionDispatch::Http::UploadedFile then YAML.load(subject.read)
-      else
-        raise "Argument not recognized"
-      end
+      yaml_h =  case subject
+                when String
+                  if subject.start_with?('/') or subject.start_with?('./')
+                    YAML.load_file(subject)
+                  else
+                    YAML.safe_load(subject)
+                  end
+                when File                               then YAML.safe_load(subject.read)
+                when Pathname                           then YAML.safe_load(subject.read)
+                when ActionDispatch::Http::UploadedFile then YAML.safe_load(subject.read)
+                else
+                  raise 'Argument not recognized'
+                end
       GeoLabels::Contact.delete_all
       GeoLabels::Label.delete_all
       GeoLabels::ContactLabel.delete_all
       labels_dict = persist_labels_tree yaml_h['labels']
       yaml_h['contacts'].each do |contact_attributes|
-        label_names = Array(contact_attributes.delete 'labels')
+        label_names = Array(contact_attributes.delete('labels'))
         contact = GeoLabels::Contact.new(contact_attributes)
-        contact.labels = label_names.map{labels_dict[_1]}.compact
+        contact.labels = label_names.map{ labels_dict[_1] }.compact
         contact.save
       end
       GeoLabels::Contact.count
@@ -29,13 +30,13 @@ module GeoLabels
 
     def self.labels_text_to_tree(tree_text)
       txt = tree_text.gsub("\n\u0001", "\n") # remove START OF HEADING TRASH
-      txt.gsub! /^(\s*)[\-\*] /, '\1  ' # remove list punctuations and interpret just the spaces
+      txt.gsub! /^(\s*)[-*] /, '\1  ' # remove list punctuations and interpret just the spaces
       lines = txt.split("\n")
       root_label, current_indentation = ImportLabel.new('root'), -1
       working_object = root_label
       lines.each do |line|
         line_indentation = (line.match(/\s+/).try(:[], 0).try(:size) || 0) / 2
-        #name = line[(2*line_indentation)..] # strip the leading spaces
+        # name = line[(2*line_indentation)..] # strip the leading spaces
         name = line.strip
         label = ImportLabel.new(name)
         if line_indentation > current_indentation # level deeper
@@ -55,13 +56,13 @@ module GeoLabels
 
     def self.persist_labels_tree(tree_or_text = nil)
       tree = case tree_or_text
-        when ImportLabel then tree_or_text
-        when String      then labels_text_to_tree(tree_or_text)
-        else
-          raise "Must provide a tree label object or tree text"
-      end
+             when ImportLabel then tree_or_text
+             when String      then labels_text_to_tree(tree_or_text)
+             else
+               raise 'Must provide a tree label object or tree text'
+             end
       record_lookup_dict = {}
-      persister = Proc.new do |items, parent|
+      persister = proc do |items, parent|
         items.each do |item|
           record = Label.create name: item.name, parent: parent
           record_lookup_dict[item.name] = record
@@ -73,11 +74,14 @@ module GeoLabels
     end
 
     class LabelList < Array
+
       attr_accessor :parent
     end
 
     class ImportLabel
-      attr_accessor :name, :children, :parent
+
+      attr_accessor :name, :parent
+
       def initialize(name)
         @name = name
       end
@@ -103,9 +107,9 @@ module GeoLabels
       end
 
       def inspect
-        #"#{name} => #{children.inspect}"
-        #children.any? ? "<#{name}> => #{children.inpsect}" : "#{name}"
-        base = "#{name}"
+        # "#{name} => #{children.inspect}"
+        # children.any? ? "<#{name}> => #{children.inpsect}" : "#{name}"
+        base = name.to_s
         base = "#{base} => #{children.inspect}" if children.any?
         base
       end

data/lib/geo_labels/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GeoLabels
-  VERSION = "0.2.0"
+  VERSION = '0.3.1'
 end

data/lib/geo_labels.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
 require 'geo_labels/version'
 require 'geo_labels/engine'
 require 'geo_labels/importer'
 require 'geo_labels/exporter'
+require 'fomantic-ui-sass'
 
 module GeoLabels
   # Your code goes here...

data/lib/tasks/geo_labels_tasks.rake

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # desc "Explaining what the task does"
 # task :geo_labels do
 #   # Task goes here