polygallery 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49a28708abb8cca57bc55038fc319c6c282028cc
-  data.tar.gz: 7a743956ff2b910dae1c4bab9b569b4a6a9fa5e9
+  metadata.gz: d5677a62369074c87bcb244a40524461ef19e0ff
+  data.tar.gz: cc56143ab682bc3d307573f4484c0b88e897370a
 SHA512:
-  metadata.gz: f5372a9227768bb0c008a246487cd33cb0937a09826c6fa743acd0d76317605a3f64a82ebe2bc25e95aca814b0d0fe87205767cb7a9f69c38d4192a425ee4b07
-  data.tar.gz: 1a8a04395a265f4ba928cb833beafd2c8571ea5f9586b897e06810ba870a24238d181c3aca952eeab809b9994cfbf5904c9df921b9b305bb38268146f87ddf11
+  metadata.gz: fa6d708ebf3b9be3852540dd193952016f102e56c88c423735fa770dbfd3c6b6ee52a5d7fc8e718dcfc274427fcea75f7324d6b6e796dd1968a3feef3d877c30
+  data.tar.gz: c1f82b8cf65bed7f766f1c9db488eae729c21fd25f8bb6ecdc2fecf00f191b49d4542bd95fd08c45005927773c0c18df5fb67eb7f9b107270a0fb42208b81cea

data/lib/polygallery/capybara_helpers.rb

@@ -1,22 +1,51 @@
 require 'polygallery/factories'
 module Polygallery
   module CapybaraHelpers
-    def add_photo_to_form(attrs=nil, table_id='photos')
+    def select_polyphoto_tr(i=0, table_id='photos')
+      all(".polygallery-cocoon-table##{table_id} tbody tr").to_a[i] end
+    
+    def add_photo_to_form(table_id='photos', attrs=nil)
+      unless table_id.is_a? String
+        attrs = table_id; table_id = 'photos' end
       attrs ||= build :polygallery_photo
-      tr_selector = ".polygallery-cocoon-table##{table_id} tr"
-      last_tr = all(tr_selector).last
-      if last_tr.find('input[id$="_photo"]').value.present?
+      tr_selector = ".polygallery-cocoon-table##{table_id} tbody tr"
+      trs = all(tr_selector); last_tr = trs.last
+      unless trs.length == 1 && last_tr.find('input[id$="_photo"]').value.blank?
         page.execute_script <<-SCRIPT
-          $('.btn.add_fields[data-association-insertion-node="##{table_id} .photo-receptacle"]').click();
+          $('.add_fields[data-association-insertion-node="##{table_id} .photo-receptacle"]').click();
         SCRIPT
         last_tr = all(tr_selector).last
       end
       within last_tr do
-        random_photo = get_random_photo
-        find('input[id$="_photo"]').set random_photo
+        find('input[id$="_photo"]').set get_random_photo
         find('input[id$="_caption"]').set(attrs.caption)
         yield if block_given?
       end
     end
+
+    def change_photo_in_form(photo_index=0, table_id='photos', file_to_use=nil)
+      if photo_index.is_a? File
+        file_to_use = photo_index; photo_index = 0 end
+      if table_id.is_a? File
+        file_to_use = table_id; table_id = 'photos' end
+      if photo_index.is_a? String
+        table_id = photo_index; photo_index = 0 end
+      file_to_use ||= get_random_photo
+      within select_polyphoto_tr(photo_index, table_id) do |tr|
+        file_input = find('input[id$="_photo"]')
+        file_input.set file_to_use
+        yield(tr) if block_given?
+      end
+    end
+
+    def remove_photo_from_form(photo_index=0, table_id='photos')
+      if photo_index.is_a? String
+        table_id = photo_index; photo_index = 0 end
+      tr_selector = ".polygallery-cocoon-table##{table_id} tbody tr:nth-child(#{photo_index + 1})"
+      page.execute_script <<-SCRIPT
+        $('#{tr_selector} .remove_fields').click();
+      SCRIPT
+    end
+
   end
 end

data/lib/polygallery/has_polygallery.rb

@@ -182,13 +182,14 @@ module Polygallery
         build_gallery_associations.map(&:build_first_photo)
       end
 
-      def first_polyphoto
+      def first_polyphoto(ga_name=nil)
         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
+        ga = if ga_name.present? then send(ga_name)
+             else gallery_associations.to_a.find{|pg| pg.photos.any? } end
+        return Photo.new if ga.nil?
+        ga.first_photo
       end
-      def first_photo; first_polyphoto.photo end
+      def first_photo(ga_name=nil); first_polyphoto(ga_name).photo end
 
       def ensure_galleryable_set
         gallery_associations.each do |ga|

data/lib/polygallery/has_polyphotos.rb

@@ -110,8 +110,6 @@ module Polygallery
       end
 
       def build_polygallery_photos
-        # puts "BUILDING PHOTOS for #{title}"
-        # puts "PHOTO ATTRS: #{self.photos_attributes.inspect}"
         # Convert attributes to array if in hash form
         # self.photos_attributes = 
         #   self.photos_attributes.map{|_, v| v
@@ -128,7 +126,7 @@ module Polygallery
 
         attrs_for_photos.each_with_index do |attrs_for_photo, index|
           attrs_for_photo[:polygallery_options] = self.polygallery_settings
-          should_destroy = attrs_for_photo.delete(:_destroy) == 'true'
+          should_destroy = %w(true 1).include? attrs_for_photo.delete(:_destroy)
           if attrs_for_photo.key? :id
             existing_id = attrs_for_photo.delete(:id).to_i
             existing_photo = self.polygallery_photos_class.find existing_id
@@ -138,15 +136,9 @@ module Polygallery
             else
               # puts 'Updating an existing photo'
               existing_photo.update_attributes attrs_for_photo end
-          # elsif attrs_for_photo.key? :built
-          #   puts 'Photo already built'
           else
             # puts 'Building a new photo'
-            # puts attrs_for_photo.inspect
-            # built_photo = 
             self.polygallery_photos.build attrs_for_photo
-            # set_nest built_photo
-            # self.polygallery_photos_attributes[index][:built] = true
           end
         end
         self.photos_built = true

data/lib/polygallery/version.rb

@@ -1,3 +1,3 @@
 module Polygallery
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

metadata

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