polygallery 0.4.2 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 043301917311e5a6546a1909618f0adb41d12af7
-  data.tar.gz: e7d585974f2e09ba86f96910334658751dac6bfe
+  metadata.gz: 15e72642e0f8c0612f6f1bb63e143a82d7dd4a01
+  data.tar.gz: caa241c4e009957b8e25ba9a8f0c7aeed7fdbcdb
 SHA512:
-  metadata.gz: e854e143b5e818d3d03f2e12e6e2376e409a54cb64883f8b5250b32f4cd032ed9092289f8ac9e210fde8e70f01b49fd6636fb02ce31edc771f6f1bd5b00dfafa
-  data.tar.gz: 59a620bbeb5f094b540a2ffed20e3f7bb4d32f02728cefb7ba5b1ad8525c8721bc87a2d033799b1dea3222aa2b63d1a8f44afea5a9ced1b69906308096d20b45
+  metadata.gz: 8c6fefcd47df94447684084c53dd205d86f1876183015f98765d4a4c18d27ae541f87c62c51ed25d5d8044c6feb291dd3724c385924406533d3f4ec7e554c718
+  data.tar.gz: 178ce2a28fedabfffe6de98bd9668f52299a9ec8fd9d9d8f46164c42942ceca071f65d058315273c971debae5f9482d218a99179fb5b8b88462e75299f28d07d

data/lib/polygallery/acts_as_polyphoto.rb

@@ -10,6 +10,7 @@ module Polygallery
 
         attr_accessor :photo_to_upload, :polygallery_options,
                       :polyphoto_initialized
+        attr_reader   :photo_remote_url
         
         init_attachment settings[:paperclip]
         init_associations settings
@@ -116,7 +117,7 @@ module Polygallery
         # could find a better way, though...
         #
         # This part runs the second try.
-        if photo_updated_at_changed? && gallery.present? &&
+        if (new_record? || photo_updated_at_changed?) && gallery.present? &&
             photo_to_upload.present? && File.exists?(photo_to_upload)
           # puts 'Running the swaparoo!'
           File.open(photo_to_upload, 'rb') {|h| self.photo = h }
@@ -149,6 +150,16 @@ module Polygallery
       end
       def thumb_url; remote_url(:thumb) end
 
+      def process_remote_uri(uri)
+        require 'open-uri'
+        require 'open_uri_redirections'
+        open(uri, allow_redirections: :safe) {|r| r.base_uri.to_s }
+      end
+      def photo_remote_url=(url_value)
+        self.photo = URI.parse process_remote_uri(url_value)
+        @photo_remote_url = url_value
+      end
+
     end
   end
 end

data/lib/polygallery/factories/polygallery/photos.rb

@@ -7,7 +7,8 @@ FactoryGirl.define do
 
   factory :polygallery_photo, :class => Polygallery::Photo do
     caption { [nil, MFaker::BaconIpsum.paragraph].sample }
-    photo { File.new get_random_photo }
-    # photo_to_upload { get_random_photo }
+    # photo   {
+    #   File.new(get_random_photo) if photo_to_upload.nil? && photo_remote_url.nil? }
+    photo_to_upload { get_random_photo if photo.nil? && photo_remote_url.nil? }
   end
 end

data/lib/polygallery/factories.rb

@@ -1,9 +1,10 @@
 MFaker = defined?(Faker) ? Faker : FFaker
 
-require 'polygallery/factories/polygallery/galleries'
-require 'polygallery/factories/polygallery/photos'
-
 def get_random_photo
   photos_dir = Rails.root.join 'spec', 'upload_files'
+  raise "No test files found at #{photos_dir}." unless File.exists? photos_dir
   Dir.glob(photos_dir.join('*.{jpg,png,gif}')).sample
 end
+
+require 'polygallery/factories/polygallery/galleries'
+require 'polygallery/factories/polygallery/photos'

data/lib/polygallery/strong_params_helper.rb

@@ -7,8 +7,8 @@ module Polygallery
                                      :_destroy, polyphoto_params(photos_title) ] }
     end
     def self.polyphoto_params(title=:photos)
-      {:"#{title}_attributes" => [:id, :photo, :title, :caption, :gallery_title,
-                                  :gallery_id,
+      {:"#{title}_attributes" => [:id, :photo, :photo_remote_url, :photo_to_upload,
+                                  :title, :caption, :gallery_title, :gallery_id,
                                   :galleryable_id, :galleryable_type, :_destroy] }
     end
     def polygallery_params(title=:gallery, photos_title=:photos)

data/lib/polygallery/version.rb

@@ -1,3 +1,3 @@
 module Polygallery
-  VERSION = '0.4.2'
+  VERSION = '0.4.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: polygallery
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.4
 platform: ruby
 authors:
 - MacKinley Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-20 00:00:00.000000000 Z
+date: 2015-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -178,6 +178,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: zeus
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: paperclip
   requirement: !ruby/object:Gem::Requirement