apidae 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9dad5ac33a928dbc7b38f6082852b3fbc567f068
-  data.tar.gz: 1314db67b370e78f927c66efa0472fd2b0050b2a
+  metadata.gz: c68638a33f855dbe14caf23d4bb0fa842e8a0263
+  data.tar.gz: 05978a1df57ca66bd96f42d66b8141e8c5c096f9
 SHA512:
-  metadata.gz: d638d3691a2e55492b57ed553a83b4ed7e610cc8a5b77f936d4009f499a36512c72e47d3e3067810e94fadb25f12f8e639dbb1113d3bbd8cd345d38cbf139b00
-  data.tar.gz: 30131ad110b06adb93f6489ce4fdf2b82992247a8a382df17073d0788be656f448341ad048abbaeab177b2f348b7ab6598643d78d7da142896504de26290a116
+  metadata.gz: 071dc1136e326c7a3370055203ed04eae6954394a65d0f83194a3c9118199c51e4c17650acf0d09931ee43234175365af1cd58c10bec596a19e7b8c7acc19813
+  data.tar.gz: 6c82209df78847b4d22b5d42119cc7c664184ced8a067d7a24f6356cebbe7ee29a3b8213b9ecae14620d6e7e00784231a42d98607cf52a6a8e862c9060df936f

data/app/models/apidae/file_import.rb

@@ -0,0 +1,116 @@
+module Apidae
+  class FileImport < ActiveRecord::Base
+
+    STATUS_PENDING = 'pending'
+    STATUS_COMPLETE = 'complete'
+    STATUS_CANCELLED = 'cancelled'
+
+    MODIFIED_DIR = 'objets_modifies'
+    DELETED_FILE = 'objets_supprimes.json'
+    SELECTIONS_FILE = 'selections.json'
+
+    def self.import(dir)
+      puts 'Update results : '
+      puts import_updates(File.join(dir, MODIFIED_DIR))
+      puts '------'
+      puts 'Deletion results : '
+      puts import_deletions(File.join(dir, DELETED_FILE))
+      puts '------'
+      puts 'Selection results : '
+      puts import_selections(File.join(dir,SELECTIONS_FILE))
+      puts '------'
+    end
+
+    def self.import_updates(json_dir)
+      result = {success: false, created: 0, updated: 0}
+      if Dir.exist?(json_dir)
+        Dir.foreach(json_dir) do |f|
+          if f.end_with?('.json')
+            json_file = File.join(json_dir, f)
+            objects_json = File.read(json_file)
+            objects_hashes = JSON.parse(objects_json, symbolize_names: true)
+            objects_hashes.each do |object_data|
+              existing = Apidae::Object.find_by_apidae_id(object_data[:id])
+              if existing
+                Apidae::Object.update_object(existing, object_data)
+                result[:updated] += 1
+              else
+                Apidae::Object.add_object(object_data)
+                result[:created] += 1
+              end
+            end
+          end
+          result[:success] = true
+        end
+      end
+      result
+    end
+
+
+    def self.import_deletions(json_file)
+      result = {success: false, deleted: 0}
+      if File.exist?(json_file)
+        deleted_json = File.read(json_file)
+        deleted_ids = JSON.parse(deleted_json)
+        deleted_ids.each do |id|
+          obj = Apidae::Object.find_by_apidae_id(id)
+          if obj
+            obj.destroy!
+            result[:deleted] += 1
+          else
+            puts "skipping object deletion : #{id}"
+          end
+        end
+        result[:success] = true
+      end
+      result
+    end
+
+    def self.update_fields(json_dir)
+      result = false
+      if Dir.exist?(json_dir)
+        Dir.foreach(json_dir) do |f|
+          if f.end_with?('.json')
+            json_file = File.join(json_dir, f)
+            objects_json = File.read(json_file)
+            objects_hashes = JSON.parse(objects_json, symbolize_names: true)
+            objects_hashes.each do |object_data|
+              obj = Apidae::Object.find_by_apidae_id(object_data[:id])
+              if obj
+                yield(obj, object_data)
+                obj.save!
+              end
+            end
+          end
+          result = true
+        end
+        result
+      end
+    end
+
+    def self.load_pictures
+      Apidae::Object.all.each do |obj|
+        if obj.apidae_attached_files.blank? && obj.pictures.any?
+          obj.pictures.each do |pic|
+            begin
+              attached = Apidae::AttachedFile.new(apidae_object_id: id, name: pic[:name], picture: URI.parse(pic[:url]),
+                                          description: pic[:description], credits: pic[:credits])
+              attached.save
+            rescue OpenURI::HTTPError => e
+              puts "Could not retrieve attached picture for object #{title} - Error is #{e.message}"
+            end
+          end
+        end
+      end
+    end
+
+    def self.import_selections(json_file)
+      selections_json = File.read(json_file)
+      selections_hashes = JSON.parse(selections_json, symbolize_names: true)
+      selections_hashes.each do |selection_data|
+        Apidae::Selection.add_or_update(selection_data)
+      end
+      Apidae::Selection.all.collect {|sel| {id: sel.id, apidae_id: sel.apidae_id, reference: sel.reference, objects: sel.objects.count}}
+    end
+  end
+end

data/app/models/apidae/object.rb

@@ -12,115 +12,70 @@ module Apidae
     store :address, accessors: [:address_fields], coder: JSON
     store :openings, accessors: [:description, :opening_periods], coder: JSON
 
+    ACT = 'ACTIVITE'
+    COS = 'COMMERCE_ET_SERVICE'
+    DEG = 'DEGUSTATION'
+    DOS = 'DOMAINE_SKIABLE'
+    EQU = 'EQUIPEMENT'
+    FEM = 'FETE_ET_MANIFESTATION'
+    HCO = 'HEBERGEMENT_COLLECTIF'
+    HLO = 'HEBERGEMENT_LOCATIF'
+    HOT = 'HOTELLERIE'
+    HPA = 'HOTELLERIE_PLEIN_AIR'
+    PCU = 'PATRIMOINE_CULTUREL'
+    PNA = 'PATRIMOINE_NATUREL'
+    RES = 'RESTAURATION'
+    SPA = 'SEJOUR_PACKAGE'
+    STR = 'STRUCTURE'
+    TER = 'TERRITOIRE'
+
     TYPES_DATA = {
-        'ACTIVITE' => {node: :informationsActivite, subtype: :activiteType},
-        'COMMERCE_ET_SERVICE' => {node: :informationsCommerceEtService, subtype: :commerceEtServiceType},
-        'DEGUSTATION' => {node: :informationsDegustation, subtype: :degustationType},
-        'DOMAINE_SKIABLE' => {node: :informationsDomaineSkiable, subtype: :domaineSkiableType},
-        'EQUIPEMENT' => {node: :informationsEquipement, subtype: :equipementType},
-        'FETE_ET_MANIFESTATION' => {node: :informationsFeteEtManifestation, subtype: :feteEtManifestationType},
-        'HEBERGEMENT_COLLECTIF' => {node: :informationsHebergementCollectif, subtype: :hebergementCollectifType},
-        'HEBERGEMENT_LOCATIF' => {node: :informationsHebergementLocatif, subtype: :hebergementLocatifType},
-        'HOTELLERIE' => {node: :informationsHotellerie, subtype: :hotellerieType},
-        'HOTELLERIE_PLEIN_AIR' => {node: :informationsHotelleriePleinAir, subtype: :hotelleriePleinAirType},
-        'PATRIMOINE_CULTUREL' => {node: :informationsPatrimoineCulturel, subtype: :patrimoineCulturelType},
-        'PATRIMOINE_NATUREL' => {node: :informationsPatrimoineNaturel, subtype: :patrimoineNaturelType},
-        'RESTAURATION' => {node: :informationsRestauration, subtype: :restaurationType},
-        'SEJOUR_PACKAGE' => {node: :informationsSejourPackage, subtype: :sejourPackageType},
-        'STRUCTURE' => {node: :informationsStructure, subtype: :structureType},
-        'TERRITOIRE' => {node: :informationsTerritoire, subtype: :territoireType}
+        ACT => {node: :informationsActivite, subtype: :activiteType},
+        COS => {node: :informationsCommerceEtService, subtype: :commerceEtServiceType},
+        DEG => {node: :informationsDegustation, subtype: :degustationType},
+        DOS => {node: :informationsDomaineSkiable, subtype: :domaineSkiableType},
+        EQU => {node: :informationsEquipement, subtype: :equipementType},
+        FEM => {node: :informationsFeteEtManifestation, subtype: :feteEtManifestationType},
+        HCO => {node: :informationsHebergementCollectif, subtype: :hebergementCollectifType},
+        HLO => {node: :informationsHebergementLocatif, subtype: :hebergementLocatifType},
+        HOT => {node: :informationsHotellerie, subtype: :hotellerieType},
+        HPA => {node: :informationsHotelleriePleinAir, subtype: :hotelleriePleinAirType},
+        PCU => {node: :informationsPatrimoineCulturel, subtype: :patrimoineCulturelType},
+        PNA => {node: :informationsPatrimoineNaturel, subtype: :patrimoineNaturelType},
+        RES => {node: :informationsRestauration, subtype: :restaurationType},
+        SPA => {node: :informationsSejourPackage, subtype: :sejourPackageType},
+        STR => {node: :informationsStructure, subtype: :structureType},
+        TER => {node: :informationsTerritoire, subtype: :territoireType}
     }
 
     PHONE = 201
     EMAIL = 204
     WEBSITE = 205
 
-
-    def self.import_updates(json_dir)
-      result = false
-      if Dir.exist?(json_dir)
-        Dir.foreach(json_dir) do |f|
-          if f.end_with?('.json')
-            json_file = File.join(json_dir, f)
-            objects_json = File.read(json_file)
-            objects_hashes = JSON.parse(objects_json, symbolize_names: true)
-            objects_hashes.each do |object_data|
-              type_fields = TYPES_DATA[object_data[:type]]
-              apidae_obj = Apidae::Object.first_or_initialize(apidae_id: object_data[:id])
-              apidae_obj.apidae_type = object_data[:type]
-              apidae_obj.apidae_subtype = node_value(object_data[type_fields[:node]], object_data[type_fields[:subtype]])
-              apidae_obj.title = node_value(object_data, :nom)
-              apidae_obj.short_desc = node_value(object_data[:presentation], :descriptifCourt)
-              apidae_obj.long_desc = node_value(object_data[:presentation], :descriptifDetaille)
-              apidae_obj.contact = contact(object_data[:informations])
-              apidae_obj.address = address(object_data[:localisation][:adresse])
-              apidae_obj.town = town(object_data[:localisation][:adresse])
-              apidae_obj.latitude = latitude(object_data[:localisation])
-              apidae_obj.longitude = longitude(object_data[:localisation])
-              apidae_obj.openings = openings(object_data[:ouverture])
-              apidae_obj.rates = rates(object_data[:descriptionTarif])
-              apidae_obj.reservation = reservation(object_data[:reservation])
-              apidae_obj.type_data = object_data[type_fields[:node]]
-              apidae_obj.pictures_data = pictures_urls(object_data[:illustrations])
-              apidae_obj.entity_data = entity_fields(object_data[:informations])
-              apidae_obj.save!
-            end
-          end
-          result = true
-        end
-        result
-      end
-    end
-
-    def self.import_deletions(json_file)
-      result = false
-      if File.exist?(json_file)
-        deleted_json = File.read(json_file)
-        deleted_ids = JSON.parse(deleted_json)
-        deleted_ids.each do |id|
-          Apidae::Object.find_by_apidae_id(id).destroy
-        end
-        result = true
-      end
-      result
-    end
-
-    def self.update_fields(json_dir)
-      result = false
-      if Dir.exist?(json_dir)
-        Dir.foreach(json_dir) do |f|
-          if f.end_with?('.json')
-            json_file = File.join(json_dir, f)
-            objects_json = File.read(json_file)
-            objects_hashes = JSON.parse(objects_json, symbolize_names: true)
-            objects_hashes.each do |object_data|
-              obj = Apidae::Object.find_by_apidae_id(object_data[:id])
-              if obj
-                yield(obj, object_data)
-                obj.save!
-              end
-            end
-          end
-          result = true
-        end
-        result
-      end
-    end
-
-    def self.load_pictures
-      Object.all.each do |obj|
-        if obj.apidae_attached_files.blank? && obj.pictures.any?
-          obj.pictures.each do |pic|
-            begin
-              attached = AttachedFile.new(apidae_object_id: id, name: pic[:name], picture: URI.parse(pic[:url]),
-                                          description: pic[:description], credits: pic[:credits])
-              attached.save
-            rescue OpenURI::HTTPError => e
-              puts "Could not retrieve attached picture for object #{title} - Error is #{e.message}"
-            end
-          end
-        end
-      end
+    def self.add_object(object_data)
+      apidae_obj = Apidae::Object.new(apidae_id: object_data[:id])
+      update_object(apidae_obj, object_data)
+    end
+
+    def self.update_object(apidae_obj, object_data)
+      type_fields = TYPES_DATA[object_data[:type]]
+      apidae_obj.apidae_type = object_data[:type]
+      apidae_obj.apidae_subtype = node_value(object_data[type_fields[:node]], object_data[type_fields[:subtype]])
+      apidae_obj.title = node_value(object_data, :nom)
+      apidae_obj.short_desc = node_value(object_data[:presentation], :descriptifCourt)
+      apidae_obj.long_desc = node_value(object_data[:presentation], :descriptifDetaille)
+      apidae_obj.contact = contact(object_data[:informations])
+      apidae_obj.address = address(object_data[:localisation][:adresse])
+      apidae_obj.town = town(object_data[:localisation][:adresse])
+      apidae_obj.latitude = latitude(object_data[:localisation])
+      apidae_obj.longitude = longitude(object_data[:localisation])
+      apidae_obj.openings = openings(object_data[:ouverture])
+      apidae_obj.rates = rates(object_data[:descriptionTarif])
+      apidae_obj.reservation = reservation(object_data[:reservation])
+      apidae_obj.type_data = object_data[type_fields[:node]]
+      apidae_obj.pictures_data = pictures_urls(object_data[:illustrations])
+      apidae_obj.entity_data = entity_fields(object_data[:informations])
+      apidae_obj.save!
     end
 
     def self.pictures_urls(pictures_array)

data/app/models/apidae/selection.rb

@@ -5,28 +5,24 @@ module Apidae
     MAX_COUNT = 100
     MAX_LOOPS = 10
 
-    def self.import(json_file)
-      selections_json = File.read(json_file)
-      selections_hashes = JSON.parse(selections_json, symbolize_names: true)
-      selections_hashes.each do |selection_data|
-        apidae_sel = Apidae::Selection.first_or_initialize(apidae_id: selection_data[:id])
-        apidae_sel.label = selection_data[:nom]
-        apidae_sel.save!
+    def self.add_or_update(selection_data)
+      apidae_sel = Apidae::Selection.where(apidae_id: selection_data[:id]).first_or_initialize
+      apidae_sel.label = selection_data[:nom]
+      apidae_sel.save!
 
-        current_objs = apidae_sel.objects.collect {|obj| obj.apidae_id}
-        imported_objs = selection_data[:objetsTouristiques] || []
-        added = imported_objs - current_objs
-        removed = current_objs - imported_objs
+      current_objs = apidae_sel.objects.collect {|obj| obj.apidae_id}
+      imported_objs = selection_data[:objetsTouristiques].blank? ? [] : selection_data[:objetsTouristiques].collect {|obj| obj[:id]}
+      added = imported_objs - current_objs
+      removed = current_objs - imported_objs
 
-        added.each do |o|
-          apidae_object = Apidae::Object.find_by_apidae_id(o[:id])
-          apidae_sel.objects << apidae_object
-        end
+      added.each do |o|
+        apidae_object = Apidae::Object.find_by_apidae_id(o)
+        apidae_sel.objects << apidae_object if apidae_object
+      end
 
-        removed.each do |o|
-          apidae_object = Apidae::Object.find_by_apidae_id(o[:id])
-          apidae_sel.objects.delete(apidae_object)
-        end
+      removed.each do |o|
+        apidae_object = Apidae::Object.find_by_apidae_id(o)
+        apidae_sel.objects.delete(apidae_object) if apidae_object
       end
     end
 

data/db/migrate/20170730102424_create_apidae_file_imports.rb

@@ -0,0 +1,13 @@
+class CreateApidaeFileImports < ActiveRecord::Migration
+  def change
+    create_table :apidae_file_imports do |t|
+      t.string :status
+      t.string :remote_file
+      t.integer :created
+      t.integer :updated
+      t.integer :deleted
+
+      t.timestamps null: false
+    end
+  end
+end

data/lib/apidae/version.rb

@@ -1,3 +1,3 @@
 module Apidae
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/test/models/apidae/file_import_test.rb

@@ -0,0 +1,9 @@
+require 'test_helper'
+
+module Apidae
+  class FileImportTest < ActiveSupport::TestCase
+    # test "the truth" do
+    #   assert true
+    # end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apidae
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Jean-Baptiste Vilain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-20 00:00:00.000000000 Z
+date: 2017-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -71,6 +71,7 @@ files:
 - app/helpers/apidae/objects_helper.rb
 - app/helpers/apidae/selections_helper.rb
 - app/models/apidae/attached_file.rb
+- app/models/apidae/file_import.rb
 - app/models/apidae/object.rb
 - app/models/apidae/selection.rb
 - app/models/apidae/town.rb
@@ -95,6 +96,7 @@ files:
 - db/migrate/20170513121215_create_apidae_attached_files.rb
 - db/migrate/20170513205932_rename_objects_selections_table.rb
 - db/migrate/20170720161134_add_entity_data_to_objects.rb
+- db/migrate/20170730102424_create_apidae_file_imports.rb
 - lib/apidae.rb
 - lib/apidae/engine.rb
 - lib/apidae/version.rb
@@ -146,6 +148,7 @@ files:
 - test/fixtures/apidae/towns.yml
 - test/integration/navigation_test.rb
 - test/models/apidae/attached_file_test.rb
+- test/models/apidae/file_import_test.rb
 - test/models/apidae/object_test.rb
 - test/models/apidae/selection_test.rb
 - test/models/apidae/town_test.rb
@@ -222,6 +225,7 @@ test_files:
 - test/fixtures/apidae/towns.yml
 - test/integration/navigation_test.rb
 - test/models/apidae/attached_file_test.rb
+- test/models/apidae/file_import_test.rb
 - test/models/apidae/object_test.rb
 - test/models/apidae/selection_test.rb
 - test/models/apidae/town_test.rb