apidae 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ebf98cf5fe002225d6e5ae04b67f4ee810afd28
-  data.tar.gz: 2a4064146401f9e4780fea21d308b55fe6686a54
+  metadata.gz: 3b4943d71597ce361d404c235d5630f23748f5ca
+  data.tar.gz: a595282b4f3f3eecba84976962ccb141131d3bad
 SHA512:
-  metadata.gz: a61050c9244d67578ed7ff5dfef54b847940336939f20e2c2fad395c49ed7d53e67b8c4ffec03f04864fea320551adb879f2ca492e9011bd57cb4ec6e552d597
-  data.tar.gz: 43be5cefdec139fa193e84a589ebfb0f709081b5ecb7166066620bf06190736ca582e719dbbb6ab882443be1e88571d7b3433b8076fb993315e7348c66df902b
+  metadata.gz: 63f5f3b555d2232c104ba8bc8445e41edb3a491b21cdb5206ea3f01d62282cc3a1667c86314e990b199a50abc406c349a6d3f2d1ec6bbd0e50d573edb5118003
+  data.tar.gz: 0ced446f112cd964e50d80e8877464935b4c5e0b23f22aca087239f72abb6558f1710129c2fea9a528ec8dd1e4db0a7971a69380d73df334b96529bffc1420bb

data/Rakefile

@@ -26,9 +26,6 @@ Bundler::GemHelper.install_tasks
 
 # Note : where should engine-related test dependencies go ?
 require 'rake/testtask'
-require 'paperclip/schema'
-
-include Paperclip::Schema
 
 Rake::TestTask.new(:test) do |t|
   t.libs << 'lib'

data/app/models/apidae/file_import.rb

@@ -117,21 +117,21 @@ module Apidae
       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
-              logger.error "Could not retrieve attached picture for object #{title} - Error is #{e.message}"
-            end
-          end
-        end
-      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
+    #           logger.error "Could not retrieve attached picture for object #{title} - Error is #{e.message}"
+    #         end
+    #       end
+    #     end
+    #   end
+    # end
 
     def self.import_selections(json_file, result)
       selections_json = File.read(json_file)

data/app/models/apidae/object.rb

@@ -2,7 +2,7 @@ module Apidae
   class Object < ActiveRecord::Base
 
     belongs_to :town, class_name: 'Apidae::Town', foreign_key: :town_insee_code, primary_key: :insee_code
-    has_many :attached_files, class_name: 'Apidae::AttachedFile'
+    # has_many :attached_files, class_name: 'Apidae::AttachedFile'
     has_many :apidae_selection_objects, class_name: 'Apidae::SelectionObject', foreign_key: :apidae_object_id
     has_many :selections, class_name: 'Apidae::Selection', source: :apidae_selection, through: :apidae_selection_objects
 
@@ -197,12 +197,12 @@ module Apidae
             capacity: data_hash[:capacite],
             classification: nodes_ids(data_hash[:classement], data_hash[:classementPrefectoral], data_hash[:classification]) +
                                       lists_ids(data_hash[:classementsGuides]) + lists_ids(data_hash[:classements]),
-            labels: lists_ids(data_hash[:labels], prestations_hash[:labelsTourismeHandicap], data_hash[:aopAocIgps]) +
+            labels: lists_ids(data_hash[:labels], prestations_hash[:labelsTourismeHandicap]) +
                 (node_id(data_hash, :typeLabel) ? [node_id(data_hash, :typeLabel)] : []),
             chains: lists_ids(data_hash[:chaines]) + nodes_ids(data_hash[:chaineEtLabel]),
             area: apidae_obj.apidae_type == DOS ? data_hash.except(:classification) : nil,
             track: apidae_obj.apidae_type == EQU ? data_hash[:itineraire] : nil,
-            products: lists_ids(data_hash[:typesProduit]),
+            products: lists_ids(data_hash[:typesProduit], data_hash[:aopAocIgps]),
             audience: lists_ids(prestations_hash[:typesClientele]),
             animals: prestations_hash[:animauxAcceptes] == 'ACCEPTES',
             extra: node_value(prestations_hash, :complementAccueil),

data/db/migrate/20180521211735_destroy_attached_files.rb

@@ -0,0 +1,5 @@
+class DestroyAttachedFiles < ActiveRecord::Migration[5.1]
+  def change
+    drop_table :apidae_attached_files
+  end
+end

data/lib/apidae/engine.rb

@@ -1,5 +1,3 @@
-require 'paperclip'
-
 module Apidae
   class Engine < Rails::Engine
     isolate_namespace Apidae

data/lib/apidae/version.rb

@@ -1,3 +1,3 @@
 module Apidae
-  VERSION = "0.4.3"
+  VERSION = "0.4.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apidae
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Jean-Baptiste Vilain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-20 00:00:00.000000000 Z
+date: 2018-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -24,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 5.1.4
-- !ruby/object:Gem::Dependency
-  name: paperclip
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -92,7 +78,6 @@ files:
 - app/helpers/apidae/objects_helper.rb
 - app/helpers/apidae/selections_helper.rb
 - app/models/apidae/application_record.rb
-- app/models/apidae/attached_file.rb
 - app/models/apidae/export.rb
 - app/models/apidae/file_import.rb
 - app/models/apidae/object.rb
@@ -144,6 +129,7 @@ files:
 - db/migrate/20180418141305_remove_desc_columns_from_apidae_objects.rb
 - db/migrate/20180424141656_add_meta_data_to_apidae_references.rb
 - db/migrate/20180519170210_remove_insee_code_unicity.rb
+- db/migrate/20180521211735_destroy_attached_files.rb
 - lib/apidae.rb
 - lib/apidae/engine.rb
 - lib/apidae/version.rb
@@ -198,7 +184,6 @@ files:
 - test/dummy/public/422.html
 - test/dummy/public/500.html
 - test/dummy/public/favicon.ico
-- test/fixtures/apidae/attached_files.yml
 - test/fixtures/apidae/exports.yml
 - test/fixtures/apidae/objects.yml
 - test/fixtures/apidae/references.yml
@@ -206,7 +191,6 @@ files:
 - test/fixtures/apidae/selections.yml
 - test/fixtures/apidae/towns.yml
 - test/integration/navigation_test.rb
-- test/models/apidae/attached_file_test.rb
 - test/models/apidae/export_test.rb
 - test/models/apidae/file_import_test.rb
 - test/models/apidae/object_test.rb
@@ -285,14 +269,12 @@ test_files:
 - test/models/apidae/file_import_test.rb
 - test/models/apidae/export_test.rb
 - test/models/apidae/reference_test.rb
-- test/models/apidae/attached_file_test.rb
 - test/models/apidae/town_test.rb
 - test/fixtures/apidae/selection_objects.yml
 - test/fixtures/apidae/towns.yml
 - test/fixtures/apidae/references.yml
 - test/fixtures/apidae/objects.yml
 - test/fixtures/apidae/selections.yml
-- test/fixtures/apidae/attached_files.yml
 - test/fixtures/apidae/exports.yml
 - test/test_helper.rb
 - test/apidae_test.rb

data/app/models/apidae/attached_file.rb

@@ -1,31 +0,0 @@
-module Apidae
-  class AttachedFile < ActiveRecord::Base
-    belongs_to :apidae_object, :class_name => 'Apidae::Object'
-
-    has_attached_file :picture,
-                      {
-                          :styles => {
-                              :xlarge => ['1600x1200>', :jpg],
-                              :large => ['1280x960>', :jpg],
-                              :medium => ['800x600>', :jpg],
-                              :small => ['320x240', :jpg],
-                              :thumb => ['200x200>', :png]
-                          },
-                          :default_url => "/#{Rails.application.config.apidae_pictures_path}/default/logo.png",
-                          :path => "public/#{Rails.application.config.apidae_pictures_path}/:apidae_type/:apidae_id/:basename.:extension",
-                          :url => "/#{Rails.application.config.apidae_pictures_path}/:apidae_type/:apidae_id/:basename.:extension"
-                      }
-
-    validates_attachment :picture, content_type: { content_type: /\Aimage\/.*\Z/ }
-
-    private
-
-    Paperclip.interpolates :apidae_type do |attachment, style|
-      attachment.instance.apidae_object.apidae_type.downcase
-    end
-
-    Paperclip.interpolates :apidae_id do |attachment, style|
-      attachment.instance.apidae_object.apidae_id
-    end
-  end
-end

data/test/fixtures/apidae/attached_files.yml

@@ -1,9 +0,0 @@
-# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
-
-one:
-  data: MyText
-  apidae_object_id: 1
-
-two:
-  data: MyText
-  apidae_object_id: 1

data/test/models/apidae/attached_file_test.rb

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