dhole 0.0.13 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d8e0e9a8352ec12b20b9e5627a6ac5b9af79f1c
-  data.tar.gz: ba83f7fa819f8e9ce74c939fb54f55ffbd62508d
+  metadata.gz: fad7982921bbd52b8f4aee1acabaa8dc5025100e
+  data.tar.gz: a906701d7c62cca0e2c216fbf9f17390576ec0d1
 SHA512:
-  metadata.gz: 02343b3b7ccfb477e323802aed90e6ed38435469cfe0eea26b842f629c7a6bc61b1b708f42bc6e21906fbca2f6c6b103c77fb9ade7e76686678ec44369052939
-  data.tar.gz: ad28c850b7509344ec1599e4ad80cbe45b0cb0bb7a3d75002bcddac8817dfdd2019e6ad4d9056a2102ff58542f76f59512cbe616544b00c19ec7b6de1e2fa94e
+  metadata.gz: 97461fe302094a913cf53bda2192e39a1560c44b7ee194cf3767ba94f360ac07a0f949e13a4ef2516775530de5090385760ebcd05ff394d0cdad74c18aaac133
+  data.tar.gz: 13ccc3876363e39f24960a35e703ca7ef5c2f8c088f9aa400a914197221878eddaa6c8de143712e5cc61022b3b63a268ac0ab47797ce484fddda5bf4fd594f27

data/lib/dhole/category.rb

@@ -8,16 +8,22 @@ module Dhole
       CategoryLink.where(cl_to: cat_title) || []
     end
     def member_page_titles
-      members.select{|cl| cl.cl_type == 'page'}.map {|cl| Page.find(cl.cl_from).page_title}
+      page_ids = members.select{|cl| cl.cl_type == 'page'}.map(&:cl_from)
+      Page.find(page_ids).map(&:page_title)
     end
     def member_file_titles
-      members.select{|cl| cl.cl_type == 'file'}.map {|cl| Image.find(cl.cl_from).img_name}
+      file_page_ids = members.select{|cl| cl.cl_type == 'file'}.map(&:cl_from)
+      Page.find(file_page_ids).map(&:page_title) # img_name == page_title
     end
+    # careful! mass instantiation!
     def member_pages
-      members.select{|cl| cl.cl_type == 'page'}.map {|cl| Page.find(cl.cl_from)}
+      page_ids = members.select{|cl| cl.cl_type == 'page'}.map(&:cl_from)
+      Page.find(page_ids)
     end
+    # careful! mass instantiation!
     def member_files
-      members.select{|cl| cl.cl_type == 'file'}.map {|cl| Image.find(cl.cl_from)}
+      file_titles = members_file_titles
+      Image.find(file_titles)
     end
     # return only members of specified type ('file','page', 'subcat')
     def members_by_type(mtype)

data/lib/dhole/page.rb

@@ -7,5 +7,9 @@ module Dhole
     has_many :imagelinks, class_name: 'ImageLink', foreign_key: 'il_from'
     #has_many :images, through: :imagelinks, class_name: 'Image'
     belongs_to :latest_revision, class_name: 'Revision', foreign_key: 'page_latest'
+    
+    def is_file?
+      page_namespace == 6
+    end
   end
 end

data/lib/dhole/version.rb

@@ -1,3 +1,3 @@
 module Dhole
-  VERSION = "0.0.13"
+  VERSION = "0.0.14"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dhole
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors:
 - Asaf Bartov