geo_labels 0.3.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d8a1e97c9ef4f47446cd94e6077b844c2a8bd7db58f28163330c0f6188592d1
-  data.tar.gz: a6378b02037f5f5b39fa10bdb6e761f487889a15b03f3c33bb40bc015bd19153
+  metadata.gz: 30768188b560ce1db38ddd61a8f06c37eb44334bba0ea8309efbf1f0b6b809fe
+  data.tar.gz: b295252da7f1b305a7a7029884b3e50c6c239ba54b3914727b51469d38021f4f
 SHA512:
-  metadata.gz: d78074f90bdace9bdb52da398d2f9a3bf057b6ef243e9eb4fdafc4397e2a62ad751bafeb605ba96a8900bdbfa7e20dbbbd953099793944550de3b5b8fa50b62c
-  data.tar.gz: 994ea71eecb76637ad3711b3afbf7e2c166ed6c189e2e89664f8f76a2578995574926e729adb3a0885d80e0e75eb05327e6bf4e441d506d0282011dfb6217d15
+  metadata.gz: d145b7d63a43d47d771b1a76c06b17afa032d035d385bc64f89fb0d565b1809b3021f6d970fb018e1ba9983c8a270443d41b5600261046cb612a6cb2e14ef209
+  data.tar.gz: fe7b5b251a2a7e51f76f4a39a0aafa8ac308f830c0ad63544cb7fad9d469a96162ea212c07cc41bdc3f48c3dcde8c49d744656a7c20420c33188c6267a33d34f

data/CHANGELOG.md

@@ -1,6 +1,35 @@
 CHANGELOG of geo\_labels
 ============================
 
+2023-12-23 v0.4.3
+-------------------------
+* Optimize nested label representation to sort of N+1 query strategy
+* Show labels on main query result page of contacts
+
+2023-10-25 v0.4.2
+-------------------------
+* Truncate label names to prevent ugly outputting
+
+2023-10-25 v0.4.1
+-------------------------
+* Add CSV import options
+* Add authorization options
+* Allow unsecure access by explicit authorization in `app/models/ability.rb`
+  <code>
+    can :manage, GeoLabels::Engine
+    can :manage, GeoLabels::Contact
+    can :manage, GeoLabels::Label
+  </code>
+
+2023-10-24 v0.4.0
+-------------------------
+* Set default map zoom level to 13
+* Add CSV export option
+
+2023-09-07 v0.3.3
+-------------------------
+* OpenStreetMap gives coordinates in the url after double click. Support copy paste of that format
+
 2023-09-07 v0.3.2
 -------------------------
 * Add manual Google maps copy-paste string input option for complex locations

data/README.md

@@ -35,6 +35,7 @@ In your `config/routes.rb` file add:
 ```
 
 ### Add the authorizations
+Authorization is handled by [cancan](https://github.com/CanCanCommunity/cancancan).
 In your `app/models/ability.rb` file add the authorizations.
 This is a custom operation that you have to adjust to your needs.
 To allow all users full controll to the contracts add:

data/app/assets/javascripts/geo_labels/application.coffee

@@ -7,7 +7,7 @@ window.initMap = ->
   if map_canvas = document.getElementById('map-canvas')
     window.google_map = new google.maps.Map map_canvas,
       center: map_points[0]
-      zoom: 9
+      zoom: 13
 
     map_points.forEach (map_point) ->
       marker = new google.maps.Marker

data/app/controllers/geo_labels/application_controller.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 module GeoLabels
   class ApplicationController < ::ApplicationController
+    before_action :authorize_engine!
 
     helper_method :query
 
@@ -13,5 +14,9 @@ module GeoLabels
     def query
       params[:q]
     end
+
+    def authorize_engine!
+      authorize! :read, GeoLabels::Engine
+    end
   end
 end

data/app/controllers/geo_labels/contacts_controller.rb

@@ -9,7 +9,7 @@ module GeoLabels
       authorize! :index, record_class
       @q = record_class.ransack query
       @q.sorts = 'name asc' if @q.sorts.empty?
-      @records = @q.result.page(params[:page]).per(100)
+      @records = @q.result.includes(:labels).page(params[:page]).per(100)
       respond_with(@records)
     end
 

data/app/controllers/geo_labels/dashboard_controller.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module GeoLabels
   class DashboardController < ApplicationController
 
@@ -9,27 +10,48 @@ module GeoLabels
       # fomantic-ui uses comma separated id values
       label_ids = label_ids.to_s.split(',') unless label_ids.is_a?(Array)
       states_array = (params[:states].presence || 'approved').split(',')
-      @contacts = Contact.geocoded.for_label_ids(label_ids, predication: params[:predication], states: states_array)
+      @contacts = Contact.geocoded.includes(:labels).for_label_ids(label_ids, predication: params[:predication], states: states_array)
     end
 
+    def about; end
+
+    # SHOW action for the view to call the export_file action
     def export
-      # SHOW action for the view to call the export_file action
+      authorize! :read, GeoLabels::Contact
+      authorize! :read, GeoLabels::Label
     end
 
     def export_file
+      authorize! :read, GeoLabels::Contact
+      authorize! :read, GeoLabels::Label
+
       timestamp = Time.now.utc.iso8601.first(19).gsub(/-|:/, '')
-      send_data GeoLabels::Exporter.export_str,
-                filename: "GeoLabels-export-#{timestamp}.yml",
-                type: :text,
-                disposition: :attachment
+      respond_to do |format|
+        format.yaml do
+          send_data GeoLabels::Exporter.export_str,
+                    filename: "GeoLabels-export-#{timestamp}.yml",
+                    type: :text,
+                    disposition: :attachment
+        end
+        format.csv do
+          send_data GeoLabels::Contact.to_csv,
+                    filename: "GeoLabels-export-#{timestamp}.csv",
+                    type: :text,
+                    disposition: :attachment
+        end
+      end
     end
 
     def import
-      # SHOW action for the view to call the import_file action
+      authorize! :update, GeoLabels::Contact
+      authorize! :update, GeoLabels::Label
     end
 
     def import_file
-      Importer.import params[:file]
+      authorize! :update, GeoLabels::Contact
+      authorize! :update, GeoLabels::Label
+
+      GeoLabels::Importer.import params[:file]
       redirect_to root_path, notice: 'File imported'
     rescue => e
       redirect_to import_path, alert: e.message

data/app/helpers/geo_labels/application_helper.rb

@@ -13,6 +13,7 @@ module GeoLabels
           label_name = link_to(item[:name], label_path(item[:id]))
           edit_link  = table_edit_link(item, geo_labels.edit_label_path(item[:id]))
           add_child_link = link_to(tag.i(class: 'plus icon'), geo_labels.new_label_path(parent_id: item[:id]))
+          add_child_link = edit_link = '' unless can? :edit, GeoLabels::Label
           output += "#{lead_space}#{tag.li(label_name + add_child_link + edit_link)}\n".html_safe
           next unless item[:children].present?
 

data/app/models/geo_labels/contact.rb

@@ -7,7 +7,7 @@ module GeoLabels
     include RatingsSupport
 
     RANSACKABLE_ATTRIBUTES = %w[
-      city country created_at department description
+      city country created_at department url description
       id latitude longitude name state street
       subsection updated_at
     ].freeze
@@ -42,6 +42,20 @@ module GeoLabels
       end
     end
 
+    def self.to_csv
+      require 'csv'
+      contacts = includes(:labels).all
+      additional_attributes = %w[description state street subsection city department country url latitude longitude]
+      CSV.generate do |csv|
+        csv << %w[name labels] + additional_attributes
+        contacts.each do |contact|
+          csv << [contact.name, contact.labels.map(&:name).compact.sort.join('|')] +
+            contact.attributes.fetch_values(*additional_attributes)
+        end
+      end
+    end
+
+
     def label_ids=(array_or_string)
       super array_or_string.is_a?(Array) ? array_or_string : array_or_string.split(',')
     end
@@ -98,7 +112,7 @@ module GeoLabels
 
     def lat_lng=(value)
       case value
-      when String then self.latitude, self.longitude = value.split(/,\s?/)
+      when String then self.latitude, self.longitude = value.sub('/', ',').split(/,\s?/)
       when Array then self.latitude, self.longitude = value
       end
     end

data/app/models/geo_labels/contact_label.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module GeoLabels
   class ContactLabel < ApplicationRecord
 

data/app/models/geo_labels/label.rb

@@ -9,6 +9,7 @@ module GeoLabels
 
     acts_as_nested_set
 
+    normalizes :name, with: ->(name) { name.strip }
     validates :name, presence: true
 
     def self.descendants_for_ids(ids)
@@ -20,9 +21,22 @@ module GeoLabels
       descendants_scope
     end
 
+    def self.each_h_with_level(&blk)
+      returner = proc do |label, level|
+        blk.call(label, level)
+        label[:children].try :each do |child|
+          returner.call(child, level + 1)
+        end
+      end
+      Exporter.labels_tree_h.each do |label| # {name: 'Food', id: 3, children: [{name: 'Italian'...}]}
+        returner.call(label, 0)
+      end
+    end
+
     def associated_contacts
       ids = ContactLabel.joins(:label).merge(self_and_descendants).pluck(:contact_id).uniq
       Contact.order(:name).find(ids)
     end
+
   end
 end

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

@@ -36,9 +36,12 @@
         .menu
           - GeoLabels::Contact::STATE_OPTIONS.each do |option|
             .item data-value=option = option
+    .field
+      label= at :url
+      = f.text_field :url
     .field
       label= at :description
-      = f.text_field :description
+      = f.text_area :description, rows: 3
     .field
       .ui.compact.accordion
         .title
@@ -53,7 +56,11 @@
       i.dropdown.icon
       .default.text= GeoLabels::Label.model_name.human_plural
       .menu
-        - nested_set_options(GeoLabels::Label) {|i| "#{'-' * i.level} #{i.name}" }.each do |(label_name, label_id)|
+        - GeoLabels::Label.each_h_with_level do |label_h, level|
+          .item data-value=label_h[:id]
+            => '-' * level
+            = label_h[:name]
+        /- nested_set_options(GeoLabels::Label) {|i| "#{'-' * i.level} #{i.name}" }.each do |(label_name, label_id)|
           .item data-value=label_id
             = label_name
   .ui.bottom.attached.segment

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

@@ -11,6 +11,7 @@
             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= GeoLabels::Label.model_name.human_plural
             th.collapsing.column-filter.actions
               = search_result_info @records
           = search_row class: 'ui mini form' do
@@ -18,6 +19,7 @@
             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
             th.collapsing.column-filter.actions
               button.ui.mini.primary.icon.button
                 i.filter.icon
@@ -32,6 +34,10 @@
               td= record.city
               td= record.department
               td= record.country
+              td
+                .ui.horizontal.divided.list
+                  - record.labels.each do |label|
+                    = link_to label.name, label, class: 'item'
               td.collapsing.actions
                 = table_show_link record
                 = table_edit_link record

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

@@ -27,9 +27,13 @@
             = 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 :url
+        td
+          a href=@record.url target='_blank' = @record.url
       tr
         td= at :description
-        td= @record.description
+        td== @record.description
       - if @record.geocoded?
         tr
           td Location

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

@@ -0,0 +1,3 @@
+.ui.container
+  = page_title t('geo_labels.about.title')
+  .ui.segment== t('geo_labels.about.content')

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

@@ -1,4 +1,8 @@
-.ui.grid.container
+.ui.container
   = page_title t('geo_labels.export')
-  .ui.segment
-    p= link_to t('geo_labels.export'), geo_labels.export_file_path, class: 'ui primary button'
+  .ui.top.attached.segment
+    = link_to t('geo_labels.export_yml.title'), geo_labels.export_file_path(format: :yml), class: 'ui primary button'
+    .ui.basic.left.pointing.label= t 'geo_labels.export_yml.explanation'
+  .ui.bottom.attached.segment
+    = link_to t('geo_labels.export_csv.title'), geo_labels.export_file_path(format: :csv), class: 'ui primary button'
+    .ui.basic.left.pointing.label= t 'geo_labels.export_csv.explanation'

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

@@ -11,7 +11,11 @@
             .default.text= GeoLabels::Label.model_name.human_plural
             .menu
               /- ISO3166::Country.all.each do |country|
-              - nested_set_options(GeoLabels::Label) {|i| "#{'-' * i.level} #{i.name}" }.each do |(label_name, label_id)|
+              - GeoLabels::Label.each_h_with_level do |label_h, level|
+                .item data-value=label_h[:id]
+                  => '-' * level
+                  = label_h[:name]
+              /- nested_set_options(GeoLabels::Label) {|i| "#{'-' * i.level} #{i.name}" }.each do |(label_name, label_id)|
                 .item data-value=label_id
                   = label_name
         .four.wide.field
@@ -47,6 +51,9 @@
         .ui.item
           = link_to contact.name, contact
           = address_tag contact.address, title: contact.description
+          - contact.labels.sort_by(&:name).each do |label|
+            span.ui.label= label.name
+
   .ui.bottom.attached.tab.segment data-tab='map'
     #map-canvas
   /.ui.horizontal.divider= GeoLabels::Contact.model_name.human_plural

data/app/views/geo_labels/menu/_navigation.html.slim

@@ -0,0 +1,23 @@
+.ui.inverted.menu.fixed
+  = link_to main_app.root_path, class: 'header item'
+    = Rails.application.config.x.geo_labels.link_home_content.call.to_s.html_safe
+  = link_to geo_labels.root_path, class: 'header item'
+    .ui.icon
+      i.map.icon
+      = Rails.application.config.x.geo_labels.application_title.call.to_s.html_safe
+  - if can? :read, GeoLabels::Contact
+    = link_to GeoLabels::Contact.model_name.human_plural, [GeoLabels::Contact], class: ['item', active_class('geo_labels/contacts')]
+  - if can? :read, GeoLabels::Label
+    = link_to GeoLabels::Label.model_name.human_plural, [GeoLabels::Label], class: ['item', active_class('geo_labels/labels')]
+  .right.menu
+    .ui.dropdown.item
+      span= current_user.try(:nickname) || current_user.try(:email) || 'Menu'
+      i.dropdown.icon
+      .menu
+        = render 'geo_labels/menu/right_menu_general'
+        - if current_user.present?
+          = link_to main_app.destroy_user_session_path, method: :delete, class: 'item'
+            i.sign.out.icon
+            span.text= t 'user.sign_out'
+        - else
+          = link_to t('devise.sessions.new.sign_in'), main_app.new_user_session_path, class: 'item'

data/app/views/geo_labels/menu/_right_menu_general.html.slim

@@ -0,0 +1,11 @@
+= link_to geo_labels.about_path, class: 'item'
+  i.question.circle.outline.icon
+  span.text= t 'geo_labels.about.title'
+- if can? :read, GeoLabels::Contact and can? :read, GeoLabels::Label
+  = link_to geo_labels.export_path, class: 'item'
+    i.file.export.icon
+    span.text= t('geo_labels.export')
+- if can? :update, GeoLabels::Contact and can? :update, GeoLabels::Label
+  = link_to geo_labels.import_path, class: 'item'
+    i.file.import.icon
+    span.text= t('geo_labels.import')

data/app/views/geo_labels/users/_abilities.html.slim

@@ -0,0 +1,20 @@
+.ui.top.attached.block.header= Rails.application.config.x.geo_labels.application_title.call
+table.roles.ui.bottom.attached.compact.celled.table
+  thead
+    /th= HawkEye::Analysis.model_name.human
+    th
+    th read
+    th manage
+  tbody
+    tr
+      td Engine
+      td= dunlop_ability :read, 'engine', 'geo_labels'
+      td= dunlop_ability :manage, 'engine', 'geo_labels'
+    tr
+      td= GeoLabels::Contact.model_name.human
+      td= dunlop_class_ability :read, GeoLabels::Contact
+      td= dunlop_class_ability :manage, GeoLabels::Contact
+    tr
+      td= GeoLabels::Label.model_name.human
+      td= dunlop_class_ability :read, GeoLabels::Label
+      td= dunlop_class_ability :manage, GeoLabels::Label

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

@@ -15,7 +15,7 @@ html lang="en"
       window.geo_labels = #{{paths: GeoLabels::Engine.client_paths}.to_json.html_safe};
     = content_for :head
   body
-    header= render 'navigation'
+    header= render 'geo_labels/menu/navigation'
       span= Rails.env
     main role="main"
       = render 'messages'

data/config/locales/geo_labels.en.yml

@@ -1,6 +1,23 @@
 en:
+  activerecord:
+    models:
+      geo_labels/contact: Contact
+      geo_labels/label: Label
+      plural:
+        geo_labels/contact: Contacts
+        geo_labels/label: Labels
+    attributes:
+      geo_labels/contact:
+        url: 'URL'
+
   geo_labels:
     export: Export
+    export_yml:
+      title: 'Export backup file (yaml)'
+      explanation: 'This export can be used to change and rebuild the data'
+    export_csv:
+      title: 'Export CSV'
+      explanation: 'This file is for spreadsheet views'
     import: Import
     tree_title: Tree
     select_labels_text:  Select %{models} and search...

data/config/locales/geo_labels.es.yml

@@ -6,9 +6,19 @@ es:
       plural:
         geo_labels/contact: Contactos
         geo_labels/label: Etiquetas
+    attributes:
+      geo_labels/contact:
+        url: 'URL'
+
 
   geo_labels:
     export: Exportar
+    export_yml:
+      title: 'Exportar archivo de restaurar (yaml)'
+      explanation: 'Ese archivo se puede utilizar en rehacer el sistema'
+    export_csv:
+      title: 'Exportar CSV'
+      explanation: 'Ese archivo es para ver los datos en hoja de cálculo'
     import: Importar
     tree_title: Árbol
     select_labels_text:  Seleccionar %{models} y busca...
@@ -20,3 +30,13 @@ es:
         Pues en Google maps se puede copiar y pegar<br>
         coordinatos manuál. Ejemplo&colon;<br>
           <code>4.973122, -75.623981</code>
+    about:
+      title: 'Sobre GEO'
+      content: >
+        <p>El sistema para manegar listas de contactos y poner etiquetas para buscarlos tiene
+        algunas opciones</p>
+
+        <h3>Manegar etiquetas</h3>
+        <p>Las etiquetas son flexibles en como estructurar los contactos. Etiquetas pueden tener
+        una jerarquia.
+        </p>

data/config/routes.rb

@@ -7,6 +7,8 @@ GeoLabels::Engine.routes.draw do
     get :export_file
     get :import
     post :import_file
+
+    get :about
   end
 
   scope 'ratings', controller: :ratings do

data/db/migrate/20231206183544_add_url_to_geo_labels_contacts.rb

@@ -0,0 +1,5 @@
+class AddUrlToGeoLabelsContacts < ActiveRecord::Migration[7.1]
+  def change
+    add_column :geo_labels_contacts, :url, :string
+  end
+end

data/lib/geo_labels/exporter.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
+
 require 'yaml'
 module GeoLabels
+  # Yaml exporter of the engine
   class Exporter
 
     def self.export_h
@@ -20,7 +22,7 @@ module GeoLabels
       output = ''
       tree_formatter = proc do |items, lead_space|
         items.each do |item|
-          output += "#{lead_space}#{item[:name]}\n"
+          output = "#{output}#{lead_space}#{item[:name]}\n"
           tree_formatter.call(item[:children], "#{lead_space}  ") if item[:children].present?
         end
       end
@@ -33,7 +35,7 @@ module GeoLabels
       GeoLabels::Contact.includes(:labels).map do |contact|
         contact
           .attributes
-          .slice(*%w[name street subsection city department country state description latitude longitude])
+          .slice(*%w[name street subsection city department country state url description latitude longitude])
           .merge('labels' => contact.labels.map(&:name))
           .select { |_, v| v.present? }
           .transform_values do |value|
@@ -58,5 +60,6 @@ module GeoLabels
       end
       tree[nil][:children]
     end
+
   end
 end

data/lib/geo_labels/importer/csv_data.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+require 'csv'
+
+module GeoLabels
+  module Importer
+    class CsvData
+      attr_reader :new_contacts
+      ROW_ATTRIBUTES = %w[name description state street subsection city department country url latitude longitude]
+
+      def import(data)
+        @new_contacts = []
+
+        counter = 2 # start counting from 1 and skip the header. Works with Apple -> Numbers application
+        CSV.parse(data, headers: true).each do |row|
+          name = row['name']
+          raise "Row #{counter} has no name" unless name.present?
+
+          label_names = row['labels'].to_s.strip.split('|').map(&:strip).select(&:present?)
+          raise "Row #{counter} (#{name}) has no labels" unless label_names.any?
+          labels = label_names.map do |label_name|
+            labels_h[label_name] or raise "Row #{counter} has a label: '#{label_name}' that is not yet in the system. Please add before using it in an import"
+          end
+
+          contact = Contact.new(row.to_h.slice(*ROW_ATTRIBUTES))
+          contact.labels = labels
+          raise "Row #{counter} creates an invalid contact. Errors: #{contact.errors.full_messages.to_sentence}" unless contact.valid?
+          new_contacts.push contact
+          counter += 1
+        end
+
+        Contact.delete_all
+        ContactLabel.delete_all
+        new_contacts.each do |contact|
+          contact.save!
+        end
+      end
+
+      def labels_h
+        @labels_h ||= Label.all.map{ |l| [l.name, l] }.to_h
+      end
+    end
+  end
+end

data/lib/geo_labels/importer/yaml_data.rb

@@ -0,0 +1,116 @@
+# frozen_string_literal: true
+
+module GeoLabels
+  module Importer
+    class YamlData
+      def self.import(yaml_h)
+        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'))
+          contact = GeoLabels::Contact.new(contact_attributes)
+          contact.labels = label_names.map{ labels_dict[_1] }.compact
+          contact.save
+        end
+        GeoLabels::Contact.count
+      end
+
+      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
+        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.strip
+          label = ImportLabel.new(name)
+          if line_indentation > current_indentation # level deeper
+            working_object = working_object.add_child(label)
+          elsif line_indentation < current_indentation
+            (current_indentation - line_indentation).times do
+              working_object = working_object.parent unless working_object.parent.is_root?
+            end
+            working_object = working_object.add_sibling(label)
+          else
+            working_object = working_object.add_sibling label
+          end
+          current_indentation = line_indentation
+        end
+        root_label
+      end
+
+      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
+        record_lookup_dict = {}
+        persister = proc do |items, parent|
+          items.each do |item|
+            record = Label.create name: item.name, parent: parent
+            record_lookup_dict[item.name] = record
+            persister.call item.children, record if item.children.present?
+          end
+        end
+        persister.call(tree.children, nil)
+        record_lookup_dict
+      end
+
+      class LabelList < Array
+        attr_accessor :parent
+      end
+
+      class ImportLabel
+        attr_accessor :name, :parent
+
+        def initialize(name)
+          @name = name
+        end
+
+        def is_root?
+          name == 'root'
+        end
+
+        def children
+          @children ||= LabelList.new
+        end
+
+        def add_sibling(label)
+          label.parent = parent
+          parent.children.push label
+          label
+        end
+
+        def add_child(label)
+          children.push label
+          label.parent = self
+          label
+        end
+
+        def inspect
+          # "#{name} => #{children.inspect}"
+          # children.any? ? "<#{name}> => #{children.inpsect}" : "#{name}"
+          base = name.to_s
+          base = "#{base} => #{children.inspect}" if children.any?
+          base
+        end
+
+        def to_h
+          if is_root?
+            {labels: children.map(&:to_h)}
+          else
+            r = {name: name}
+            r[:children] = children.map(&:to_h) if children.any?
+            r
+          end
+        end
+      end
+    end
+  end
+end

data/lib/geo_labels/importer.rb

@@ -1,128 +1,49 @@
 # 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.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'))
-        contact = GeoLabels::Contact.new(contact_attributes)
-        contact.labels = label_names.map{ labels_dict[_1] }.compact
-        contact.save
-      end
-      GeoLabels::Contact.count
-    end
+      type, data = get_type_and_data(subject)
 
-    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
-      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.strip
-        label = ImportLabel.new(name)
-        if line_indentation > current_indentation # level deeper
-          working_object = working_object.add_child(label)
-        elsif line_indentation < current_indentation
-          (current_indentation - line_indentation).times do
-            working_object = working_object.parent unless working_object.parent.is_root?
-          end
-          working_object = working_object.add_sibling(label)
-        else
-          working_object = working_object.add_sibling label
-        end
-        current_indentation = line_indentation
+      if type == :yml
+        GeoLabels::Importer::YamlData.import(YAML.safe_load(data))
+      elsif type == :csv
+        GeoLabels::Importer::CsvData.new.import(data)
+      else
+        raise 'Argument not recognized'
       end
-      root_label
     end
 
-    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
-      record_lookup_dict = {}
-      persister = proc do |items, parent|
-        items.each do |item|
-          record = Label.create name: item.name, parent: parent
-          record_lookup_dict[item.name] = record
-          persister.call item.children, record if item.children.present?
+    def self.get_type_and_data(subject)
+      case subject
+      when String
+        if subject.start_with?('/') or subject.start_with?('./') # is a path spec
+          return recognize_path(subject), File.read(subject)
+        else
+          if subject.start_with? "---\n" or subject.start_with?("labels: |\n")
+            return [:yml, subject]
+          elsif subject.start_with?('name,labels,')
+            return [:csv, subject]
+          else
+            raise 'The import string could not be recognized as either YAML or CSV'
+          end
         end
+      when File
+        return recognize_path(subject.path), subject.read
+      when Pathname
+        return recognize_path(subject.to_s), subject.read
+      when ActionDispatch::Http::UploadedFile, Rack::Test::UploadedFile
+        return recognize_path(subject.original_filename), subject.read
+      else
+        raise 'Format of import not recognized'
       end
-      persister.call(tree.children, nil)
-      record_lookup_dict
-    end
-
-    class LabelList < Array
-
-      attr_accessor :parent
     end
 
-    class ImportLabel
-
-      attr_accessor :name, :parent
-
-      def initialize(name)
-        @name = name
-      end
+    def self.recognize_path(path)
+      return :yml if path.end_with?('.yml')
+      return :csv if path.end_with?('.csv')
 
-      def is_root?
-        name == 'root'
-      end
-
-      def children
-        @children ||= LabelList.new
-      end
-
-      def add_sibling(label)
-        label.parent = parent
-        parent.children.push label
-        label
-      end
-
-      def add_child(label)
-        children.push label
-        label.parent = self
-        label
-      end
-
-      def inspect
-        # "#{name} => #{children.inspect}"
-        # children.any? ? "<#{name}> => #{children.inpsect}" : "#{name}"
-        base = name.to_s
-        base = "#{base} => #{children.inspect}" if children.any?
-        base
-      end
-
-      def to_h
-        if is_root?
-          {labels: children.map(&:to_h)}
-        else
-          r = {name: name}
-          r[:children] = children.map(&:to_h) if children.any?
-          r
-        end
-      end
+      raise 'Imported path is neither YAML or CSV file'
     end
   end
 end

data/lib/geo_labels/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GeoLabels
-  VERSION = '0.3.2'
+  VERSION = '0.4.3'
 end

data/lib/geo_labels.rb

@@ -2,6 +2,8 @@
 require 'geo_labels/version'
 require 'geo_labels/engine'
 require 'geo_labels/importer'
+require 'geo_labels/importer/csv_data'
+require 'geo_labels/importer/yaml_data'
 require 'geo_labels/exporter'
 require 'fomantic-ui-sass'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geo_labels
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Benjamin ter Kuile
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-07 00:00:00.000000000 Z
+date: 2023-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_nested_set
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: ransack
   requirement: !ruby/object:Gem::Requirement
@@ -228,12 +228,12 @@ files:
 - app/views/geo_labels/application/_button-edit-record.html.slim
 - app/views/geo_labels/application/_button-new-record.html.slim
 - app/views/geo_labels/application/_messages.html.slim
-- app/views/geo_labels/application/_navigation.html.slim
 - app/views/geo_labels/contacts/_form.html.slim
 - app/views/geo_labels/contacts/edit.html.slim
 - app/views/geo_labels/contacts/index.html.slim
 - app/views/geo_labels/contacts/new.html.slim
 - app/views/geo_labels/contacts/show.html.slim
+- app/views/geo_labels/dashboard/about.html.slim
 - app/views/geo_labels/dashboard/export.html.slim
 - app/views/geo_labels/dashboard/import.html.slim
 - app/views/geo_labels/dashboard/main.html.slim
@@ -242,6 +242,9 @@ files:
 - app/views/geo_labels/labels/index.html.slim
 - app/views/geo_labels/labels/new.html.slim
 - app/views/geo_labels/labels/show.html.slim
+- app/views/geo_labels/menu/_navigation.html.slim
+- app/views/geo_labels/menu/_right_menu_general.html.slim
+- app/views/geo_labels/users/_abilities.html.slim
 - app/views/layouts/geo_labels/application.html.slim
 - config/environment.rb
 - config/initializers/human_plural.rb
@@ -254,10 +257,13 @@ files:
 - db/migrate/20230602182522_geo_labels_contacts_complex_name_to_name.rb
 - db/migrate/20230726154822_add_state_to_geo_labels_contacts.rb
 - db/migrate/20230801145902_add_food_rating_to_geo_labels_contacts.rb
+- db/migrate/20231206183544_add_url_to_geo_labels_contacts.rb
 - lib/geo_labels.rb
 - lib/geo_labels/engine.rb
 - lib/geo_labels/exporter.rb
 - lib/geo_labels/importer.rb
+- lib/geo_labels/importer/csv_data.rb
+- lib/geo_labels/importer/yaml_data.rb
 - lib/geo_labels/version.rb
 - lib/tasks/geo_labels_tasks.rake
 homepage: https://gitlab.com/benja-2/geo_labels
@@ -282,7 +288,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: Rails mountable engine to label search locations

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

@@ -1,29 +0,0 @@
-.ui.inverted.menu.fixed
-  = link_to main_app.root_path, class: 'header item'
-    = Rails.application.config.x.geo_labels.link_home_content.call.to_s.html_safe
-  = link_to geo_labels.root_path, class: 'header item'
-    .ui.icon
-      i.map.icon
-      = Rails.application.config.x.geo_labels.application_title.call.to_s.html_safe
-  - if current_user.present?
-    - if can? :read, GeoLabels::Contact
-      = link_to GeoLabels::Contact.model_name.human_plural, [GeoLabels::Contact], class: ['item', active_class('geo_labels/contacts')]
-    - if can? :read, GeoLabels::Label
-      = link_to GeoLabels::Label.model_name.human_plural, [GeoLabels::Label], class: ['item', active_class('geo_labels/labels')]
-  .right.menu
-    - if current_user.present?
-      .ui.dropdown.item
-        span= current_user.respond_to?(:nickname) ? current_user.nickname : current_user.email
-        i.dropdown.icon
-        .menu
-          = link_to geo_labels.export_path, class: 'item'
-            i.file.export.icon
-            span.text= t('geo_labels.export')
-          = link_to geo_labels.import_path, class: 'item'
-            i.file.import.icon
-            span.text= t('geo_labels.import')
-          = link_to main_app.destroy_user_session_path, method: :delete, class: 'item'
-            i.sign.out.icon
-            span.text= t 'user.sign_out'
-    - else
-      = link_to t('devise.sessions.new.sign_in'), main_app.new_user_session_path, class: 'item'