polygallery 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa8cf686b91461b641c623f287b714d88228c213
-  data.tar.gz: e14a13e661db654aa21cc12265f7983ccdd53d4a
+  metadata.gz: 40b6058f68d72353fc34e17997936f3b1096063f
+  data.tar.gz: df9ed80c23c5ef9ef3bde7a272485e91c4390ca8
 SHA512:
-  metadata.gz: 5af1d4642df622bd9901edfaa9b22ea5c24d334ee2f6e416954d9c4cdd7de7af580a3a713e199e620d6fb3cd7a389a91edfb7c3b6b396d2dd21eb60075bb61f6
-  data.tar.gz: 7d4e6bca81fad31a6da6a7e7a0a8a5624611893fe67d392bc1b4dfe87cc43703e95962197778ce87a4192880c0e6ad50046039d87d2e929e2952cb6f983abe16
+  metadata.gz: 1cfb242774808827303b01187ab2daab6cc620f3d3b20ff5482a22729a2486f60412ef60a1a45d85212724791e58d533ab35ec833c8bb3dfcebe0f5538a7b735
+  data.tar.gz: 659c46c8f5bd5e817da3c11439b15afbf4e9a251670e0ecb7ae0529309ef3ed5c8b79e98d4cb820912a2309f30c41d280cda77a3002f7b08c971e00878d5b950

data/app/models/polygallery/gallery.rb

@@ -21,7 +21,22 @@ module Polygallery
     has_polyphotos
 
     def settings
-      self.galleryable.send("#{title}_settings".to_sym)
+      if galleryable.present?
+        galleryable.send("#{title}_settings".to_sym)
+      elsif galleryable_id.present? && galleryable_type.present?
+        puts 'Galleryable can\'t be loaded'
+        klass = Object.const_get(galleryable_type)
+        if klass.exists? :id => galleryable_id
+          puts 'Galleryable found!  Attempting to load now.'
+          klass.find(galleryable_id).send("#{title}_settings".to_sym)
+        else
+          puts 'Galleryable still not found.'
+          DEFAULTS
+        end
+      else
+        puts 'WARNING: Galleryable not found!  Using default paperclip settings...'
+        DEFAULTS
+      end
     end
 
   end

data/lib/polygallery/has_polygallery.rb

@@ -8,6 +8,10 @@ module Polygallery
 
     module ClassMethods
       def has_polygallery(title='gallery', options={})
+        if title.is_a? Hash
+          options = title
+          title = 'gallery'
+        end
         defaults = Gallery::DEFAULTS
         settings = defaults.deep_merge(options)
         has_one title.to_sym, -> { where(:title => title.to_s) }, settings[:association]

data/lib/polygallery/version.rb

@@ -1,3 +1,3 @@
 module Polygallery
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/test/dummy/app/controllers/home_controller.rb

@@ -2,7 +2,6 @@ class HomeController < ApplicationController
 
   def index
     @event = Event.new
-    raise 'BOOM'
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: polygallery
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - MacKinley Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-26 00:00:00.000000000 Z
+date: 2014-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails