imagegallery2017 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29107fdce25855a5f8ce1db51c16cbe85a3e2ebc
-  data.tar.gz: 585b92d6c8352b86a906d54c70e7309236910384
+  metadata.gz: 2108584d86763b92dac96ed5d2b165f708841ee1
+  data.tar.gz: 14f78f70f69a6e386abeb4b9cd837bf7f0a3ba1c
 SHA512:
-  metadata.gz: dd20eca9e762dc3d524a980834bcec486ea365d3e84d6361f2531ece1de5e06101409c19e83842d3dbbff1de1d212edde1d72113287808ea754b6f4eccd79b3a
-  data.tar.gz: a235bbbf12e296b916e52f4832d4a5e9cfb733ab93508d43b7c65bf71687f2d5446aa23505a1c026ca9fb311eabdadd2e22f9c797ff1032ac2d534f0af52e84b
+  metadata.gz: 2ae8ecd7704d76519c95eabf28e8a60fea097e18afee5834da4debbbd8c9ae8f584844353cfd414d84a3388d1fe70fc1164f3de5d2d2da1c526898f84ae43d85
+  data.tar.gz: bff5db9776767490798040abe916d0ffe19b104225fbd7b03f139071e8f260f79e660ae598dd84fdb4a5a901212da1a7817ce9425eb85eac6f48e1ecf5d50ed2

data/lib/imagegallery2017.rb

@@ -20,9 +20,10 @@ class ImageGallery2017
 
     def initialize(rsc, filepath: '.', xslfile: '../xsl/index.xslt',  
           schema: 'images[title, folder]/image(original, desktop, preview, ' + 
-                  'folder, imgcount, title)', folder: nil)
+                  'folder, imgcount, title)', folder: nil, log: nil)
 
       @rsc, @wwwpath, @xslfile = [rsc, File.join(filepath, 'www'), xslfile]
+      @log = log
 
       a = [@wwwpath, 'images']
       a << folder if folder
@@ -45,11 +46,14 @@ class ImageGallery2017
         self.save dxfilepath
 
       end
+      @log.info 'Gallery/initialize: self.summary' + self.summary.inspect if @log
 
     end
 
     def add_image(uploaded=nil)
 
+      @log.info 'Gallery/add_image: active' if @log
+      
       filename = uploaded[:filename]    
       file = File.join(@imagespath, filename)    
       File.write file, uploaded[:tempfile].read
@@ -62,13 +66,23 @@ class ImageGallery2017
 
       self.create(h)
       self.save
-
+      @log.info 'Gallery/add_image: saved' if @log
+      
+      return preview_file
     end
 
     def render()
 
+      @log.info 'Gallery/render: active' if @log
+      @log.info 'Gallery/render: self.to_xml' + self.to_xml if @log
+      
       doc   = Nokogiri::XML(self.to_xml)
-      xslt  = Nokogiri::XSLT(File.read(File.join(@wwwpath, @xslt)))
+      
+      if @log then
+        @log.info "Gallery/render: self.summary: %s" % [self.summary.inspect]
+      end
+      
+      xslt  = Nokogiri::XSLT(File.read(File.join(@imagespath, self.summary[:xslt])))
       xslt.transform(doc).to_s
 
     end
@@ -77,16 +91,18 @@ class ImageGallery2017
 
   class IndexGallery < Gallery
 
-    def initialize(rsc, filepath: '.')
+    def initialize(rsc, filepath: '.', log: nil)
 
       FileUtils.mkdir_p File.join(filepath, 'www','images')
       FileUtils.mkdir_p File.join(filepath, 'www','xsl')
-      super(rsc, filepath: filepath)
+      super(rsc, filepath: filepath, log: log)
 
     end
 
     def render()
       
+      @log.info 'IndexGallery/render: active' if @log
+      
       File.write File.join(@wwwpath, 'index.html'), super()
 
     end
@@ -95,19 +111,24 @@ class ImageGallery2017
 
   attr_reader :index, :gallery
 
-  def initialize(rsc, basepath='.')
+  def initialize(rsc, basepath='.', log: nil)
 
-    @basepath, @rsc = basepath, rsc
-    @index = IndexGallery.new rsc, filepath: @basepath
+    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
     
     # load all the folders
     
+    log.info 'ImageGallery/initialize: loading galleries' if log
     @index.all.each do |x|
 
       if x.folder.length > 0 then
-        @gallery[x.folder] = Gallery.new @rsc, 
-            filepath: basepath, folder: x.folder
+        @gallery[x.folder] = Gallery.new rsc, 
+            filepath: basepath, folder: x.folder, log: log
+        log.info 'ImageGallery/initialize: loaded ' + x.folder if log
       end
       
     end
@@ -116,7 +137,50 @@ class ImageGallery2017
 
   def add_image(upload_obj, folder=nil)
     
-    (folder ? @gallery[folder] : @index).add_image upload_obj
+    @log.info 'ImageGallery/add_image: active' if @log
+    
+    if folder then 
+      
+      g = @gallery[folder]
+      preview_file = g.add_image upload_obj
+      
+      rx = @index.find_by_folder folder
+      rx.preview = preview_file
+      rx.imgcount = g.all.length
+      
+      @index.save
+      
+    else
+      @index.add_image upload_obj
+    end
+    
+    @index.render
+    
+  end
+  
+  def browse(folder)
+    (folder ? @gallery[folder] : @index).render
+  end
+  
+  def delete_image(id, folder=nil)
+    
+    if folder then 
+      
+      g = @gallery[folder]
+      g.delete_image id
+      preview_file = g.all.any? ? g.all.first.preview : @default_folder
+      
+      rx = @index.find_by_folder folder
+      rx.preview = preview_file
+      rx.imgcount = g.all.length
+      
+      @index.save
+      
+    else
+      @index.delete_image id
+    end
+    
+    @iondex.render
     
   end
 
@@ -131,8 +195,18 @@ class ImageGallery2017
     fg.save
     
     @gallery[folder] = fg    
-    @index.create preview: '../svg/folder.svg', folder: folder, title: title
+    @index.create preview: @default_folder, folder: folder, title: title
     @index.save
 
   end
+  
+  def delete_folder(folder)    
+
+    @gallery.delete folder
+    
+    rx = @index.find_by_folder folder
+    rx.delete
+    @index.save
+
+  end  
 end

data.tar.gz.sig

@@ -1,3 +1 @@
-cl���h:���30�2��g�F���$��+��2��7���M���j�/���ƪ�'D,qjvO�&�L�Mo���{�p::O�$"R[�$�b�S�!�Ū۝�9��~غ����4
-�{�^�Sڇ�g'���6$��vÞ��_G�踰�
-l��U���h�N��	=�v�W��V�Iĺ;l����Y6b$wP;?���,�	����v�2�r����_-)�X�[q
+���>�+����`b�snF�{w���L��'*a݄�=���8�(���*�<u�A�&Q����-�q���'߿�p��6?�p�L*T4�	yxX<�lM����s/[M�)�iUx��9������Ȧ��h�;�1�|8�3�h������"�%Ô�΅��6b�����,��@d�

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: imagegallery2017
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   VTkGIYZRz9NszbK5QM45fZIG1TtUO/QILU1lyb56RusdsPUAQy5qdHcWSkqbU1i4
   pVP5LTt/M0l+og==
   -----END CERTIFICATE-----
-date: 2017-11-28 00:00:00.000000000 Z
+date: 2017-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynarex