apidae 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bed82e5136a7e205db9ee923ddc131aea476941b
-  data.tar.gz: e89e505fce362be0eb0c61f9e19ff51577f0c690
+  metadata.gz: a65b8e65f96393ad346b2e3e75c2d9b03fa36917
+  data.tar.gz: c294dbec3f0fb0ce086d219a64bf4d926d6be51e
 SHA512:
-  metadata.gz: aeb80b9297dcc4f466cc123cd17df110cab2f7c1e31476cbb55ee988f83b3cc4da2f13887aba342818ec267cc587700b212a88e8ba1e5cd0e41bf47a085cd02f
-  data.tar.gz: ffd85edb55dab227926912329fbb24bfdccd27f1daac42524245fd5c4f86e36ed584036e5b976d157b19471aab5233fea431e305930b4c118205d56a41c3af00
+  metadata.gz: 816137aec948bde71a5c5ebd274f630f45c72df31ec19c29c162076fa44949fb64388ae68c8be7aa38665eebef470624e58c76fff0713b736e495edcd77beb14
+  data.tar.gz: f7ee150be2b37199b8c21092f0c8760f642cb6dbfd680aaaf2e256f9f1135be7577b81ad3b80959bdbd59c72466bea52a6e6271ef9b2c00b3bca254650429681

data/app/controllers/apidae/objects_controller.rb

@@ -4,25 +4,25 @@ module Apidae
   class ObjectsController < ApplicationController
     before_action :set_object, only: [:show, :edit, :update, :destroy]
 
-    # GET /objects
     def index
-      @objects = Object.all.select(:apidae_id, :title, :apidae_type, :updated_at)
+      if params[:selection_id]
+        @selection = Selection.find(params[:selection_id])
+        @objects = @selection.objects.select(:apidae_id, :title, :apidae_type, :updated_at)
+      else
+        @objects = Object.all.select(:apidae_id, :title, :apidae_type, :updated_at)
+      end
     end
 
-    # GET /objects/1
     def show
     end
 
-    # GET /objects/new
     def new
       @object = Object.new
     end
 
-    # GET /objects/1/edit
     def edit
     end
 
-    # POST /objects
     def create
       @object = Object.new(object_params)
 
@@ -33,7 +33,6 @@ module Apidae
       end
     end
 
-    # PATCH/PUT /objects/1
     def update
       if @object.update(object_params)
         redirect_to @object, notice: 'Object was successfully updated.'
@@ -42,21 +41,18 @@ module Apidae
       end
     end
 
-    # DELETE /objects/1
     def destroy
       @object.destroy
       redirect_to objects_url, notice: 'Object was successfully destroyed.'
     end
 
     private
-      # Use callbacks to share common setup or constraints between actions.
       def set_object
         @object = Object.find(params[:id])
       end
 
-      # Only allow a trusted parameter "white list" through.
       def object_params
-        params.require(:object).permit(:address, :apidae_id, :apidae_type, :apidae_subtype, :title, :short_desc, :contact, :long_desc, :type_data, :latitude, :longitude, :openings, :rates, :reservation)
+        params.require(:object).permit!
       end
   end
 end

data/app/models/apidae/object.rb

@@ -7,11 +7,12 @@ module Apidae
     has_many :selections, class_name: 'Apidae::Selection', source: :apidae_selection, through: :apidae_selection_objects
 
     store_accessor :pictures_data, :pictures
-    store_accessor :type_data, :categories, :themes, :capacite, :classement
+    store_accessor :type_data, :categories, :themes, :capacite, :classement, :labels
     store_accessor :entity_data, :entity_id, :entity_name
     store_accessor :contact, :telephone, :email, :website
     store_accessor :address, :address_fields
-    store_accessor :openings, :description, :opening_periods
+    store_accessor :openings_data, :openings_desc, :openings
+    store_accessor :rates_data, :rates_desc, :rates
 
     ACT = 'ACTIVITE'
     COS = 'COMMERCE_ET_SERVICE'
@@ -70,9 +71,9 @@ module Apidae
       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.openings_data = parse_openings(object_data[:ouverture])
+      apidae_obj.rates_data = parse_rates(object_data[:descriptionTarif])
+      apidae_obj.reservation = parse_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])
@@ -140,23 +141,21 @@ module Apidae
       end
     end
 
-    def self.openings(openings_hash)
+    def self.parse_openings(openings_hash)
       if openings_hash && openings_hash[:periodeEnClair]
-        {description: openings_hash[:periodeEnClair][:libelleFr], opening_periods: openings_hash[:periodesOuvertures]}
+        {openings_desc: openings_hash[:periodeEnClair][:libelleFr], openings: openings_hash[:periodesOuvertures]}
       end
     end
 
-    def self.rates(rates_hash)
+    def self.parse_rates(rates_hash)
       if rates_hash
-        if rates_hash[:gratuit]
-          return 'gratuit'
-        elsif rates_hash[:tarifsEnClair]
-          rates_hash[:tarifsEnClair][:libelleFr]
-        end
+        desc = rates_hash[:gratuit] ? 'gratuit' : node_value(rates_hash, :tarifsEnClair)
+        values = rates_hash[:periodes].blank? ? [] : rates_hash[:periodes].map {|p| build_rate(p)}
+        {rates_desc: desc, rates: values}
       end
     end
 
-    def self.reservation(reservation_hash)
+    def self.parse_reservation(reservation_hash)
       if reservation_hash
         if reservation_hash[:complement]
           reservation_hash[:complement][:libelleFr]
@@ -184,6 +183,13 @@ module Apidae
       pictures.any? ? pictures[0]["url"] : "/#{Rails.application.config.apidae_pictures_path}/default/logo.png"
     end
 
+    def self.build_rate(rate_period)
+      {
+          id: rate_period[:identifiant], from: rate_period[:dateDebut], to: rate_period[:dateFin],
+          values: rate_period[:tarifs].blank? ? [] : rate_period[:tarifs].map {|t| {min: t[:minimum], max: t[:maximum], type: t[:type][:id], details: node_value(t, :precisionTarif)}}
+      }
+    end
+
     private
 
     def self.node_value(node, key)

data/app/views/apidae/objects/index.html.erb

@@ -1,7 +1,7 @@
 <%= render layout: "/layouts/#{Rails.application.config.apidae_layout}" do |styles| %>
     <div id="apidae_header" class="<%= styles[:header] %>">
       <%= link_to 'Retour', :back, class: styles[:back] %>
-      <h1 class="<%= styles[:h1] %>">Apidae - Objets touristiques</h1>
+      <h1 class="<%= styles[:h1] %>">Apidae - <%= @selection ? "Sélection \"#{@selection.label}\"" : "Tous les objets touristiques" %></h1>
     </div>
     <div id="apidae_dashboard" class="<%= styles[:wrapper] %>">
       <div id="apidae_imports_panel" class="<%= styles[:body] %>">

data/app/views/apidae/selections/index.html.erb

@@ -11,7 +11,7 @@
             <th>Label</th>
             <th>Reference</th>
             <th>Identifiant</th>
-            <th>Nombre d'objets</th>
+            <th>Objets</th>
           </tr>
           </thead>
           <tbody class="<%= styles[:table_body] %>">
@@ -20,7 +20,7 @@
                 <td><%= selection.label %></td>
                 <td><%= selection.reference %></td>
                 <td><%= selection.apidae_id %></td>
-                <td><%= selection.objects.count %></td>
+                <td><%= link_to selection.objects.count, selection_objects_path(selection) %></td>
               </tr>
           <% end %>
           <% if @selections.empty? %>

data/config/routes.rb

@@ -1,7 +1,9 @@
 Apidae::Engine.routes.draw do
 
   resources :objects, only: [:index], path: 'objets'
-  resources :selections, only: [:index]
+  resources :selections, only: [:index] do
+    resources :objects, only: [:index]
+  end
 
   match 'import/callback', via: :post, to: 'import#callback'
   match 'import/run', via: :post, to: 'import#run'

data/db/migrate/20180222104915_add_rates_data_to_apidae_objects.rb

@@ -0,0 +1,6 @@
+class AddRatesDataToApidaeObjects < ActiveRecord::Migration[5.1]
+  def change
+    add_column :apidae_objects, :rates_data, :jsonb
+    remove_column :apidae_objects, :rates
+  end
+end

data/db/migrate/20180222105302_rename_openings_to_openings_data.rb

@@ -0,0 +1,5 @@
+class RenameOpeningsToOpeningsData < ActiveRecord::Migration[5.1]
+  def change
+    rename_column :apidae_objects, :openings, :openings_data
+  end
+end

data/lib/apidae/engine.rb

@@ -3,5 +3,9 @@ require 'paperclip'
 module Apidae
   class Engine < Rails::Engine
     isolate_namespace Apidae
+    # Include all helpers from main app
+    config.to_prepare do
+      ApplicationController.helper(ActionView::Helpers::ApplicationHelper)
+    end
   end
 end

data/lib/apidae/version.rb

@@ -1,3 +1,3 @@
 module Apidae
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

data/test/dummy/db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20180218231319) do
+ActiveRecord::Schema.define(version: 20180222105302) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -62,8 +62,7 @@ ActiveRecord::Schema.define(version: 20180218231319) do
     t.jsonb "type_data"
     t.float "latitude"
     t.float "longitude"
-    t.jsonb "openings"
-    t.text "rates"
+    t.jsonb "openings_data"
     t.text "reservation"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
@@ -71,6 +70,7 @@ ActiveRecord::Schema.define(version: 20180218231319) do
     t.jsonb "pictures_data"
     t.jsonb "entity_data"
     t.jsonb "service_data"
+    t.jsonb "rates_data"
   end
 
   create_table "apidae_objects_selections", id: :serial, force: :cascade do |t|

data/test/dummy/log/development.log

@@ -283,3 +283,27 @@ Migrating to AddServiceDataToApidaeObjects (20180218231319)
    (0.1ms)  COMMIT
    (0.3ms)  SELECT pg_advisory_unlock(6140174353533887940)
    (0.3ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC
+   (0.4ms)  SELECT pg_try_advisory_lock(6140174353533887940)
+   (0.9ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC
+Migrating to AddRatesDataToApidaeObjects (20180222104915)
+   (12.2ms)  BEGIN
+   (18.3ms)  ALTER TABLE "apidae_objects" ADD "rates_data" jsonb
+   (3.4ms)  ALTER TABLE "apidae_objects" DROP "rates"
+  SQL (1.0ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1) RETURNING "version"  [["version", "20180222104915"]]
+   (1.3ms)  COMMIT
+Migrating to RenameOpeningsToOpeningsData (20180222105302)
+   (0.2ms)  BEGIN
+   (0.1ms)  ROLLBACK
+   (0.2ms)  SELECT pg_advisory_unlock(6140174353533887940)
+   (0.2ms)  SELECT pg_try_advisory_lock(6140174353533887940)
+   (0.5ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC
+Migrating to RenameOpeningsToOpeningsData (20180222105302)
+   (0.2ms)  BEGIN
+   (2.4ms)  ALTER TABLE "apidae_objects" RENAME COLUMN "openings" TO "openings_data"
+  SQL (0.3ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1) RETURNING "version"  [["version", "20180222105302"]]
+   (0.4ms)  COMMIT
+  ActiveRecord::InternalMetadata Load (0.4ms)  SELECT  "ar_internal_metadata".* FROM "ar_internal_metadata" WHERE "ar_internal_metadata"."key" = $1 LIMIT $2  [["key", "environment"], ["LIMIT", 1]]
+   (0.1ms)  BEGIN
+   (0.1ms)  COMMIT
+   (0.2ms)  SELECT pg_advisory_unlock(6140174353533887940)
+   (0.2ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apidae
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Jean-Baptiste Vilain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-19 00:00:00.000000000 Z
+date: 2018-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -125,6 +125,8 @@ files:
 - db/migrate/20180217222410_create_apidae_selection_objects.rb
 - db/migrate/20180218172704_change_text_columns_to_json.rb
 - db/migrate/20180218231319_add_service_data_to_apidae_objects.rb
+- db/migrate/20180222104915_add_rates_data_to_apidae_objects.rb
+- db/migrate/20180222105302_rename_openings_to_openings_data.rb
 - lib/apidae.rb
 - lib/apidae/engine.rb
 - lib/apidae/version.rb