polygallery 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2220d771dc5f8a3fd23774aa1634b548b19cf7f
-  data.tar.gz: 59130d77b7a9a7911128fab5b9a43cd0a170b744
+  metadata.gz: e0a3c6b4e971bb81a4dd78e1a5ec302567ed4cb8
+  data.tar.gz: ec32be1af52c2330bc71e19c5c7fefe1661b4e30
 SHA512:
-  metadata.gz: e0fca5ba2a6d89cd400816b01d69e27ce2b8511934094c2a1288051b9d02aa80b0b37329825bef633e5fd41c1c1bd9e88fe9d75d40e8317b29a463feefef8e34
-  data.tar.gz: eec43e1ed442f0790aa38e306797eef002dcba0b454b0accdeda9901bf453c8af681c068d6aa01769bbac7a31e9da09c66d34a559f5860161f8d2d6225ca54cb
+  metadata.gz: d1610028948fd06e4aef2f24ac1e827abe7d0a847d0f402b282ca59f308bf9d9ef947f60ea77a137a855a49d90f4b07cc29755d51fba5ca394412d2f59823d2c
+  data.tar.gz: 20abcb8fa59f46442c4ca5d998f917122d6f6b570d74bc9ff8dd870edbba9aabd804c5490c8f430d7ef4daadcb0d1163b5d68608db1060307e9c7034fadbb175

data/app/models/concerns/polygallery/acts_as_polyphoto.rb

@@ -114,6 +114,15 @@ module Polygallery
         self.class.init_attachment paperclip_settings
       end
 
+      def remote_url(style=nil)
+        host = ActionController::Base.asset_host
+        host = "http://#{host}" unless host.nil? || host =~ /^http/
+        path = photo.url(style)
+        url = (host||'') + (path||'')
+        url unless url.blank?
+      end
+      def thumb_url; remote_url(:thumb) end
+
     end
   end
 end

data/lib/polygallery/has_polygallery.rb

@@ -183,19 +183,13 @@ module Polygallery
         build_gallery_associations.map(&:build_first_photo)
       end
 
-      def first_photo
-        return unless self.class.has_polygallery?
-        first_p = nil
-        self.class.polygalleries.each do |pg|
-          settings_for_this_gallery = send :"#{pg.to_s}_settings"
-          ptos = send(settings_for_this_gallery[:association_names][:photos])
-                  .select{|p| p.photo.file? }
-          next if ptos.empty?
-          first_p = ptos.first.photo
-          break
-        end
-        first_p || Photo.new.photo
+      def first_polyphoto
+        return Photo.new unless gallery_associations.any?
+        fg = gallery_associations.to_a.find{|pg| pg.photos.any? }
+        return Photo.new if fg.nil?
+        fg.first_photo
       end
+      def first_photo; first_polyphoto.photo end
 
       def ensure_galleryable_set
         gallery_associations.each do |ga|
@@ -211,6 +205,10 @@ module Polygallery
       def prune_empty_photos
         gallery_associations.each(&:prune_empty_photos) end
 
+      def remote_urls_for_polyphotos(style=nil)
+        gallery_associations.map{|ga| ga.remote_urls(style) }.flatten end
+      def thumb_url; first_polyphoto.thumb_url end
+
     end
   end
 end

data/lib/polygallery/has_polyphotos.rb

@@ -165,6 +165,13 @@ module Polygallery
           end }
       end
 
+      def remote_urls(style=nil); photos.map{|p| p.remote_url style } || [] end
+      def thumb_url; first_photo.thumb_url end
+      def first_photo
+        # TODO: some kind of selection
+        photos.first || Photo.new
+      end
+
     end
   end
 end

data/lib/polygallery/version.rb

@@ -1,3 +1,3 @@
 module Polygallery
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: polygallery
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - MacKinley Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-18 00:00:00.000000000 Z
+date: 2015-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails