imagegallery2017 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ab408894462fbbdd9d836b085f1d79c498e1a94
-  data.tar.gz: 053c02070fa9e5853bc950cd6b64cbca45a54970
+  metadata.gz: a062fc4248eeaaa7026a450acad059e6cf3a7327
+  data.tar.gz: f3a0620c2a4a8f0745f3622dd2dcfd1f1383f92e
 SHA512:
-  metadata.gz: c8765572e827c133510f0dce60361e0faacc886d8f502059c8addc4c89172033de84cb11abaf52d15e19b22ec6f9acf179e55f28f3881a41f248300b5774d095
-  data.tar.gz: 04f7d88b87bce7768826d354b8f7fc96a8ce0ccba1ed6550f7ecced6c77f13191f4568b23995bf56a9b54f55b14fec6c601dc35e3632d1fb107fb41fc97561b2
+  metadata.gz: f6c9337fb4da073f94e925d522cfad2e96082d309cfa4a2c886a32c491dd467cf588c13d7b4d8335af9558aa54ec9dc0fdf41d7ef172cd542d909673e7d8b2da
+  data.tar.gz: 34bc563328a9515a10633ae0c0eb649ab6ccbe5ba4a9f6fff205687ecc027e54f6e776bfbf2642ce061127b56742ced71b7049586d8c324c31769b09b7b3409b

checksums.yaml.gz.sig

@@ -1,4 +1 @@
-u.1�v0��薄�(��
-�o�P?�
-�(��:ܜ0�h߬�u׉Dz�WP���H~���������Y�дc��
-�5��
+�"
A]|�����i���2{l�#�V��ܦ��q�L�e�F���2#7��o[s��pN9�H����

data/lib/imagegallery2017.rb

@@ -29,7 +29,8 @@ class ImageGallery2017
       a << folder if folder
       
       @imagespath = File.join(*a)
-
+      
+      @log.info 'Gallery/initialize: imagespath: ' + @imagespath.inspect if @log
       FileUtils.mkdir_p @imagespath
 
       dxfilepath = File.join(@imagespath, 'dynarex.xml')
@@ -40,13 +41,17 @@ class ImageGallery2017
 
         super(schema)
         self.order = :descending
+        self.default_key = 'uid'
         self.title = 'Image gallery'
         self.xslt = xslfile
 
         self.save dxfilepath
 
       end
-      @log.info 'Gallery/initialize: self.summary' + self.summary.inspect if @log
+      
+      if @log then
+        @log.info 'Gallery/initialize: self.summary' + self.summary.inspect 
+      end
 
     end
 
@@ -86,7 +91,8 @@ class ImageGallery2017
         @log.info "Gallery/render: self.summary: %s" % [self.summary.inspect]
       end
       
-      xslt  = Nokogiri::XSLT(File.read(File.join(@imagespath, self.summary[:xslt])))
+      xslt  = Nokogiri::XSLT(File.read(File.join(@imagespath, 
+                                                 self.summary[:xslt])))
       xslt.transform(doc).to_s
 
     end
@@ -115,14 +121,15 @@ class ImageGallery2017
 
   attr_reader :index, :gallery
 
-  def initialize(rsc, basepath='.', log: nil)
+  def initialize(rsc, basepath='.', log: nil, imgxsl: '../../xsl/images.xsl', 
+                 default_folder: '../../svg/folder.svg')
 
     log.info 'ImageGallery/initialize: active' if log
     @basepath = basepath
     @index = IndexGallery.new rsc, filepath: @basepath, log: log
     @gallery = {}
-    @default_folder = '../svg/folder.svg'
-    @log = log
+
+    @default_folder, @log, @imgxsl = default_folder, log, imgxsl
     
     # load all the folders
     
@@ -141,7 +148,7 @@ class ImageGallery2017
 
   def add_image(upload_obj, folder=nil)
     
-    @log.info 'ImageGallery/add_image: activel;folder' + folder.to_s if @log
+    @log.info 'ImageGallery/add_image: active; folder: ' + folder.to_s if @log
     
     if folder then 
       
@@ -190,18 +197,27 @@ class ImageGallery2017
 
   def create_folder(title)    
 
-    folder = title.downcase.gsub(/\W/,'-').gsub(/-{2,}/,'-').gsub(/^-|-$/,'')
 
-    fg = Gallery.new @rsc, filepath: @basepath, xslfile: '../xsl/images.xsl', 
-        folder: folder
+    folder = title.downcase.gsub(/\W/,'-').gsub(/-{2,}/,'-').gsub(/^-|-$/,'')
+    
+    if @log then
+      @log.info "ImageGallery/create_folder: title: %s basepath: %s" % 
+          [title, @basepath.inspect]
+    end
+    fg = Gallery.new @rsc, filepath: @basepath, xslfile: @imgxsl, 
+        folder: folder, log: @log
     fg.title = title
     fg.summary[:folder] = folder
     fg.save
     
-    @gallery[folder] = fg    
+    @log.info 'ImageGallery/create_folder: saved' if @log
+    
+    @gallery[folder] = fg
+    @log.info 'ImageGallery/create_folder: folder: ' + folder.inspect if @log    
     @index.create preview: @default_folder, folder: folder, title: title
     @index.save
-
+    @index.render
+    
   end
   
   def delete_folder(folder)    
@@ -211,6 +227,7 @@ class ImageGallery2017
     rx = @index.find_by_folder folder
     rx.delete
     @index.save
-
+    @index.render
+    
   end  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: imagegallery2017
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - James Robertson