polygallery 0.1.4 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 748c58237c3287c39ed71c22b4d610f9930d16fe
-  data.tar.gz: 4679777b8785fb32c0e997c6083c441dffa80ba9
+  metadata.gz: d422469c1636c39daec91fdcc84c67df1972d4ea
+  data.tar.gz: 7a7322c270678788dab88181f1981423364d4540
 SHA512:
-  metadata.gz: 778e7320a67042cd19d166f52c824002790aa3141061609069af9d1f2970993d3cef86623640a1b611a98df0f6b67b7019e65f652742afb4db525c8a0e138cb1
-  data.tar.gz: c2d0c55787f5f5e3f2a60f83b28ab953d16e093cf89f743361f2e1da3074a6219c965e8d2e0c426b073877e06a3e2cb1d1ab546cfbbe106dfbccc6e08a667b39
+  metadata.gz: 11abda37d7563201ff480938f6b91737861edb72051fcc0489f2cd79f5b59cc77d8ca367a99d8b794d5246eb7339b29379937cb1f690e7f8a35c71ea44063108
+  data.tar.gz: da620e32ddb14c4225571e8c5d06d62f5d67ee9080fdcbed793d8952099269b62f7939f4bbdd97779c4083771712cfda1ae0dde028305e96086cf7ccc7c7b9fe

data/lib/polygallery/has_polygallery.rb

@@ -38,7 +38,7 @@ module Polygallery
         :validates => {},
         :paperclip => {
           :styles => {:medium => '300x300#', :thumb => '100x100#'},
-          :default_url => ActionController::Base.helpers.image_path('polygallery/thumbnail-missing.png')
+          :default_url => 'polygallery/thumbnail-missing.jpg'
         },
         :paperclip_validations => {
           :content_type => /\Aimage\/.*\Z/,
@@ -94,9 +94,9 @@ module Polygallery
             .select{|a| a.foreign_key == 'galleryable_id'}.map(&:name)
       end
 
-      def has_polygallery?(title=nil)
-        return polygalleries.any? if title.nil?
-        polygalleries.include?(title)
+      def has_polygallery?(gallery_title=nil)
+        return polygalleries.any? if gallery_title.nil?
+        polygalleries.include?(gallery_title)
       end
     end
 
@@ -109,9 +109,9 @@ module Polygallery
           .map(&:title)
       end
 
-      def has_polygallery?(title=nil)
-        return polygalleries.any? if title.nil?
-        polygalleries.include?(title)
+      def has_polygallery?(gallery_title=nil)
+        return polygalleries.any? if gallery_title.nil?
+        polygalleries.include?(gallery_title)
       end
 
       def build_galleries
@@ -120,17 +120,30 @@ module Polygallery
           gallery_association = send pg
           next if gallery_association.present?
           gallery_settings = send :"#{pg.to_s}_settings"
-          gallery_association ||= send :"build_#{pg.to_s}",
-                                       :polygallery_options => gallery_settings
+          gallery_association = send(:"#{pg.to_s}=", send(:"build_#{pg.to_s}",
+                                                          :polygallery_options => gallery_settings)) if gallery_association.nil?
           gallery_association.galleryable ||= self
         end
       end
 
       def build_first_photos
-        build_galleries(&:build_first_photo)
         return unless self.class.has_polygallery?
         self.class.polygalleries.each {|pg| send(pg).build_first_photo }
       end
+
+      def first_photo
+        return unless self.class.has_polygallery?
+        first_p = nil
+        self.class.polygalleries.each do |pg|
+          gallery_settings = send :"#{pg.to_s}_settings"
+          ptos = send(gallery_settings[:association_names][:photos])
+                  .select{|p| p.photo.file? }
+          next if ptos.empty?
+          first_p = ptos.first.photo
+          break
+        end
+        first_p || Photo.new.photo
+      end
     end
   end
 end

data/lib/polygallery/has_polyphotos.rb

@@ -3,11 +3,12 @@ module Polygallery
     extend ActiveSupport::Concern
 
     included do
-      attr_accessor :polygallery_options
     end
 
     module ClassMethods
       def has_polyphotos(title=nil, options={})
+        attr_accessor :polygallery_options
+
         defaults = self.polygallery_settings
         association_names = (options[:association_names].present? ? 
                              options : defaults)[:association_names]
@@ -46,7 +47,7 @@ module Polygallery
       # end
 
       def include_polygallery_settings(settings)
-        @polygallery_settings = settings
+        @polygallery_settings = self.polygallery_options = settings
         self.initialize_polygallery
       end
 

data/lib/polygallery/version.rb

@@ -1,3 +1,3 @@
 module Polygallery
-  VERSION = "0.1.4"
+  VERSION = "0.1.6"
 end