sibu_apidae 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 118110c471c72dffa4fd984bc201c53679ab5a06
-  data.tar.gz: caecc0b682c36a2f615e3fd19fd136a8a9b78cc7
+  metadata.gz: 6636c3fe57cff4cb5f72c57bb5e19cbb75fc96fd
+  data.tar.gz: 66acecfc2f187acfd41963043d0ddff9665431fe
 SHA512:
-  metadata.gz: 0d9d546f3506e102b9e5932b5dfc206c740897fc1c68c30caed84bcda6a9db25457625779a67f41551954d52c3afa067af54120a313b44de06a310f7474b14d7
-  data.tar.gz: 90d5b52c05ba09d60a0713a152499e37b886a897150fbc411aa7082be26d3ea55eacb2ef4466530756ab527e2d0af2cbd75cdfeab0d365357dc9185ee4fe0c97
+  metadata.gz: a48d49ccaee693b05a3bc11d6f4010564e1276d6026aa7f3df261df5b9e4b0fd6c1ce582da921819fd0808d6504fef75f19920ba814d77f2ede7af0692b984b4
+  data.tar.gz: 69bb86d22b1e1141f3c4841e191323b8190705ede3ab37d0905f371ba088105b311c22ee4fb6f2d5f63c96663a7e268574949b3d9915eccadd1e3ff42902f49b

data/Gemfile.lock

@@ -1,55 +1,60 @@
 PATH
   remote: .
   specs:
-    sibu_apidae (0.1.0)
+    sibu_apidae (0.2.0)
       apidae
       sibu
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.1.6)
-      actionpack (= 5.1.6)
+    actioncable (5.2.0)
+      actionpack (= 5.2.0)
       nio4r (~> 2.0)
-      websocket-driver (~> 0.6.1)
-    actionmailer (5.1.6)
-      actionpack (= 5.1.6)
-      actionview (= 5.1.6)
-      activejob (= 5.1.6)
+      websocket-driver (>= 0.6.1)
+    actionmailer (5.2.0)
+      actionpack (= 5.2.0)
+      actionview (= 5.2.0)
+      activejob (= 5.2.0)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.1.6)
-      actionview (= 5.1.6)
-      activesupport (= 5.1.6)
+    actionpack (5.2.0)
+      actionview (= 5.2.0)
+      activesupport (= 5.2.0)
       rack (~> 2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.1.6)
-      activesupport (= 5.1.6)
+    actionview (5.2.0)
+      activesupport (= 5.2.0)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.1.6)
-      activesupport (= 5.1.6)
+    activejob (5.2.0)
+      activesupport (= 5.2.0)
       globalid (>= 0.3.6)
-    activemodel (5.1.6)
-      activesupport (= 5.1.6)
-    activerecord (5.1.6)
-      activemodel (= 5.1.6)
-      activesupport (= 5.1.6)
-      arel (~> 8.0)
-    activesupport (5.1.6)
+    activemodel (5.2.0)
+      activesupport (= 5.2.0)
+    activerecord (5.2.0)
+      activemodel (= 5.2.0)
+      activesupport (= 5.2.0)
+      arel (>= 9.0)
+    activestorage (5.2.0)
+      actionpack (= 5.2.0)
+      activerecord (= 5.2.0)
+      marcel (~> 0.3.1)
+    activesupport (5.2.0)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    apidae (0.4.5)
-      pg (~> 0.20)
-      rails (~> 5.1.4)
-      rubyzip (~> 1.0.0)
-    arel (8.0.0)
+    apidae (0.6.0)
+      jbuilder
+      pg (~> 0.2)
+      rails (~> 5.1)
+      rubyzip (~> 1.0)
+    arel (9.0.0)
     builder (3.2.3)
     concurrent-ruby (1.0.5)
     crass (1.0.4)
@@ -61,6 +66,9 @@ GEM
     i18n (1.1.0)
       concurrent-ruby (~> 1.0)
     image_processing (0.11.2)
+    jbuilder (2.7.0)
+      activesupport (>= 4.2.0)
+      multi_json (>= 1.2)
     jquery-rails (4.3.3)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
@@ -70,11 +78,15 @@ GEM
       nokogiri (>= 1.5.9)
     mail (2.7.0)
       mini_mime (>= 0.1.1)
+    marcel (0.3.2)
+      mimemagic (~> 0.3.2)
     method_source (0.9.0)
+    mimemagic (0.3.2)
     mini_magick (4.8.0)
     mini_mime (1.0.1)
     mini_portile2 (2.3.0)
     minitest (5.8.5)
+    multi_json (1.13.1)
     nio4r (2.3.1)
     nokogiri (1.8.4)
       mini_portile2 (~> 2.3.0)
@@ -82,26 +94,27 @@ GEM
     rack (2.0.5)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (5.1.6)
-      actioncable (= 5.1.6)
-      actionmailer (= 5.1.6)
-      actionpack (= 5.1.6)
-      actionview (= 5.1.6)
-      activejob (= 5.1.6)
-      activemodel (= 5.1.6)
-      activerecord (= 5.1.6)
-      activesupport (= 5.1.6)
+    rails (5.2.0)
+      actioncable (= 5.2.0)
+      actionmailer (= 5.2.0)
+      actionpack (= 5.2.0)
+      actionview (= 5.2.0)
+      activejob (= 5.2.0)
+      activemodel (= 5.2.0)
+      activerecord (= 5.2.0)
+      activestorage (= 5.2.0)
+      activesupport (= 5.2.0)
       bundler (>= 1.3.0)
-      railties (= 5.1.6)
+      railties (= 5.2.0)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.0.4)
       loofah (~> 2.2, >= 2.2.2)
-    railties (5.1.6)
-      actionpack (= 5.1.6)
-      activesupport (= 5.1.6)
+    railties (5.2.0)
+      actionpack (= 5.2.0)
+      activesupport (= 5.2.0)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
@@ -109,7 +122,7 @@ GEM
     rb-fsevent (0.10.3)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
-    rubyzip (1.0.0)
+    rubyzip (1.2.2)
     sass (3.5.7)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
@@ -143,7 +156,7 @@ GEM
     tilt (2.0.8)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    websocket-driver (0.6.5)
+    websocket-driver (0.7.0)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.3)
 

data/lib/sibu_apidae.rb

@@ -30,24 +30,46 @@ module SibuApidae
   end
 
   class Helper
-    def self.import_pages(site_id)
+
+    APIDAE_OBJ_SOURCE = 'Fiche Apidae'
+
+    def self.update_pages(site_id)
       conf = Rails.application.config.sibu_apidae
-      if conf && conf.key?(:obj_path) && conf.key?(:obj_sections) && conf.key?(:supported_types)
+      if is_valid?(conf)
+        Sibu::Page.where(site_id: site_id).select(:id, :site_id, :name, :path, :metadata).to_a
+            .select {|p| p.source == APIDAE_OBJ_SOURCE}.each do |p|
+          obj = Apidae::Obj.find_by_apidae_id(p.external_id)
+          if obj
+            p.update(name: obj.title, title: obj.title, description: obj.short_desc,
+                     path: conf[:obj_path].call(obj))
+          else
+            Rails.logger.info("Deleting page #{p.id} after object deletion (#{p.external_id})")
+            p.destroy
+          end
+        end
+
         Apidae::Obj.all.each do |obj|
           if conf[:supported_types].include?(obj.apidae_type)
-            obj_path = Rails.application.config.sibu_apidae[:obj_path].call(obj)
-            obj_page = Sibu::Page.where(site_id: site_id, path: obj_path).first
+            obj_page = Sibu::Page.where(site_id: site_id).select(:id, :metadata).to_a
+                .find {|p| p.source == APIDAE_OBJ_SOURCE && p.external_id == obj.apidae_id}
             unless obj_page
-              p = Sibu::Page.new(name: obj.title, site_id: site_id, path: obj_path, title: obj.title,
-                                 description: obj.short_desc)
-              p.sections = Rails.application.config.sibu_apidae[:obj_sections].call(obj)
+              p = Sibu::Page.new(name: obj.title, site_id: site_id, path: conf[:obj_path].call(obj), title: obj.title,
+                                 description: obj.short_desc, source: APIDAE_OBJ_SOURCE,
+                                 external_id: conf[:page_external_id].call(obj))
+              p.sections = conf[:obj_sections].call(obj)
               p.save!
             end
           end
         end
       else
-        puts "Please provide a valid configuration for the sibu_apidae gem (obj_path and obj_sections procs are required)"
+        Rails.logger.error "Please provide a valid configuration for the sibu_apidae gem " +
+                               "(:page_external_id, :obj_path, :obj_sections and :supported_types are required)"
       end
+      'SibuApidae pages update complete'
+    end
+
+    def self.is_valid?(conf)
+      conf && conf.key?(:obj_path) && conf.key?(:obj_sections) && conf.key?(:supported_types) && conf.key?(:page_external_id)
     end
   end
 end

data/lib/sibu_apidae/version.rb

@@ -1,3 +1,3 @@
 module SibuApidae
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/sibu_apidae.gemspec

@@ -27,5 +27,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest", "~> 5.0"
   spec.add_dependency "apidae"
-  spec.add_dependency "sibu"
+  spec.add_dependency "sibu", "~> 0.7.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sibu_apidae
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Jean-Baptiste Vilain
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-04 00:00:00.000000000 Z
+date: 2019-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -71,16 +71,16 @@ dependencies:
   name: sibu
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.2
 description: A set of utility classes for use with the Sibu and Apidae engines
 email:
 - jbvilain@gmail.com