imagegallery2017 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4f6eaf29544bea0a19fad3e4289c680a9556ba8
-  data.tar.gz: afa56843be642957c4775ee369d1051a43cbb741
+  metadata.gz: 29107fdce25855a5f8ce1db51c16cbe85a3e2ebc
+  data.tar.gz: 585b92d6c8352b86a906d54c70e7309236910384
 SHA512:
-  metadata.gz: 8d890f4c1176c02d3cd46e31a86d71ba13aa2149df54491b9f2bf8bdf9934b63b7527250d254e6687f34ac38c7b14cd745b616b39967e6b549de4677b5240ddf
-  data.tar.gz: dd3a59a562781cd798fa07cdd24f679d5ec254dab69e1c1579fb48abd62eac64e53e1d93daa8cde275cd7b9f8547617731bf905ebd883f34c970fbc9a46e82b3
+  metadata.gz: dd20eca9e762dc3d524a980834bcec486ea365d3e84d6361f2531ece1de5e06101409c19e83842d3dbbff1de1d212edde1d72113287808ea754b6f4eccd79b3a
+  data.tar.gz: a235bbbf12e296b916e52f4832d4a5e9cfb733ab93508d43b7c65bf71687f2d5446aa23505a1c026ca9fb311eabdadd2e22f9c797ff1032ac2d534f0af52e84b

data/lib/imagegallery2017.rb

@@ -18,47 +18,37 @@ class ImageGallery2017
 
     attr_reader :folder
 
-    def initialize(rsc, filepath: '.', xslfile: 'index.xslt',  
-          schema: nil, title: nil)
+    def initialize(rsc, filepath: '.', xslfile: '../xsl/index.xslt',  
+          schema: 'images[title, folder]/image(original, desktop, preview, ' + 
+                  'folder, imgcount, title)', folder: nil)
 
-      @rsc = rsc
-      @wwwpath = File.join(filepath, 'www')
-      @xslfile = xslfile
-
-      @folder = ''
+      @rsc, @wwwpath, @xslfile = [rsc, File.join(filepath, 'www'), xslfile]
 
       a = [@wwwpath, 'images']
-
-      if title then
-
-        @folder = title.downcase.gsub(/\W/,'-').gsub(/-{2,}/,'-')\
-          .gsub(/^-|-$/,'')
-
-        a << @folder
-
-      end
+      a << folder if folder
       
       @imagespath = File.join(*a)
 
       FileUtils.mkdir_p @imagespath
 
       dxfilepath = File.join(@imagespath, 'dynarex.xml')
-
-      if schema then
+      
+      if File.exists? dxfilepath then
+        super(dxfilepath)
+      else
 
         super(schema)
         self.order = :descending
-        self.title = title || 'Image gallery'
-        self.summary[:folder] = @folder
+        self.title = 'Image gallery'
+        self.xslt = xslfile
+
         self.save dxfilepath
 
-      else
-        super(dxfilepath)
       end
 
     end
 
-    def add_entry(uploaded=nil)
+    def add_image(uploaded=nil)
 
       filename = uploaded[:filename]    
       file = File.join(@imagespath, filename)    
@@ -72,12 +62,13 @@ class ImageGallery2017
 
       self.create(h)
       self.save
+
     end
 
     def render()
 
       doc   = Nokogiri::XML(self.to_xml)
-      xslt  = Nokogiri::XSLT(File.read(File.join(@wwwpath, @xslfile)))
+      xslt  = Nokogiri::XSLT(File.read(File.join(@wwwpath, @xslt)))
       xslt.transform(doc).to_s
 
     end
@@ -90,15 +81,10 @@ class ImageGallery2017
 
       FileUtils.mkdir_p File.join(filepath, 'www','images')
       FileUtils.mkdir_p File.join(filepath, 'www','xsl')
-      super(rsc, filepath: filepath, schema: 'images[title, folder]/image' + 
-        '(original, desktop, preview, path, imgcount, title)')
+      super(rsc, filepath: filepath)
 
     end
 
-    def modify_entry(id)
-      #self.find_by_id()
-    end
-
     def render()
       
       File.write File.join(@wwwpath, 'index.html'), super()
@@ -114,21 +100,38 @@ class ImageGallery2017
     @basepath, @rsc = basepath, rsc
     @index = IndexGallery.new rsc, filepath: @basepath
     @gallery = {}
+    
+    # load all the folders
+    
+    @index.all.each do |x|
+
+      if x.folder.length > 0 then
+        @gallery[x.folder] = Gallery.new @rsc, 
+            filepath: basepath, folder: x.folder
+      end
+      
+    end
 
   end
 
-  def add_entry(params)
-    @index.add_entry params
+  def add_image(upload_obj, folder=nil)
+    
+    (folder ? @gallery[folder] : @index).add_image upload_obj
+    
   end
 
   def create_folder(title)    
 
-    fg = Gallery.new @rsc, schema: 'images[title, folder]/image(original, ' +
-      'desktop, preview, title)', filepath: @basepath, title: title, 
-       xslfile: 'images.xsl'
+    folder = title.downcase.gsub(/\W/,'-').gsub(/-{2,}/,'-').gsub(/^-|-$/,'')
 
-    @gallery[fg.folder] = fg    
-    @index.create preview: '../svg/folder.svg', path: fg.folder, title: title
+    fg = Gallery.new @rsc, filepath: @basepath, xslfile: '../xsl/images.xsl', 
+        folder: folder
+    fg.title = title
+    fg.summary[:folder] = folder
+    fg.save
+    
+    @gallery[folder] = fg    
+    @index.create preview: '../svg/folder.svg', folder: folder, title: title
     @index.save
 
   end

data.tar.gz.sig

@@ -1,2 +1,3 @@
-��G�x�M����8�.�c�< ��,
-i��dz�a
�k�����j6'b��>%�9�d���3��=`~�z9<×�1\P���VMM����=�?|����O� �4ldb62ֳ�U!�������Ѧ�;�%}i�1{Av��������Qm�|��U�ߍp	�������l0�����UӁ��J�Ȑ@]:8#��p���dT�5{�:�i]�!z�
I��t��D5�ϓ6
+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

metadata

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