polygallery 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5677a62369074c87bcb244a40524461ef19e0ff
-  data.tar.gz: cc56143ab682bc3d307573f4484c0b88e897370a
+  metadata.gz: 74d1166bebf3c13f615c587b375d373d4cafde1c
+  data.tar.gz: de5dc955a7c4adcc1a21adc0a22ae5b0acfd964f
 SHA512:
-  metadata.gz: fa6d708ebf3b9be3852540dd193952016f102e56c88c423735fa770dbfd3c6b6ee52a5d7fc8e718dcfc274427fcea75f7324d6b6e796dd1968a3feef3d877c30
-  data.tar.gz: c1f82b8cf65bed7f766f1c9db488eae729c21fd25f8bb6ecdc2fecf00f191b49d4542bd95fd08c45005927773c0c18df5fb67eb7f9b107270a0fb42208b81cea
+  metadata.gz: a99f2e27857b890a161b0eb7184e2519a37573826691e54658507f7aa0aebbd3e138acb351b071c770f1072cc90ae683b9414315a7fec1764bf0e9e6e1b13808
+  data.tar.gz: ce8354f4fdc4cf7e4825c4fd158542f0f55e6f04cf231382f5429c45821092f7445918201f4f0083eeb9095ff10145f2f900a6dd972e5b235fd99762e098961f

data/lib/polygallery/capybara_helpers.rb

@@ -1,20 +1,27 @@
 require 'polygallery/factories'
 module Polygallery
   module CapybaraHelpers
+    def polyphoto_tr_selector(table_id='photos')
+      ".polygallery-cocoon-table##{table_id} tbody tr" end
+    def polyphoto_trs(table_id='photos')
+      all polyphoto_tr_selector(table_id) end
     def select_polyphoto_tr(i=0, table_id='photos')
-      all(".polygallery-cocoon-table##{table_id} tbody tr").to_a[i] end
+      if i.is_a? String
+        table_id = i; i = 0 end
+      polyphoto_trs(table_id).to_a[i]
+    end
+    def add_polyphoto_btn_selector(table_id='photos')
+      '.add_fields[data-association-insertion-node="#' << table_id <<
+      ' .photo-receptacle"]' end
     
-    def add_photo_to_form(table_id='photos', attrs=nil)
+    def add_polyphoto_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} tbody tr"
-      trs = all(tr_selector); last_tr = trs.last
+      trs = polyphoto_trs(table_id); last_tr = trs.last
       unless trs.length == 1 && last_tr.find('input[id$="_photo"]').value.blank?
-        page.execute_script <<-SCRIPT
-          $('.add_fields[data-association-insertion-node="##{table_id} .photo-receptacle"]').click();
-        SCRIPT
-        last_tr = all(tr_selector).last
+        page.execute_script "$('#{add_polyphoto_btn_selector table_id}').click();"
+        last_tr = polyphoto_trs(table_id).last
       end
       within last_tr do
         find('input[id$="_photo"]').set get_random_photo
@@ -23,7 +30,7 @@ module Polygallery
       end
     end
 
-    def change_photo_in_form(photo_index=0, table_id='photos', file_to_use=nil)
+    def change_polyphoto_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
@@ -31,20 +38,22 @@ module Polygallery
       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?
+      within select_polyphoto_tr(photo_index, table_id) do
+        find('input[id$="_photo"]').set file_to_use
+        yield if block_given?
       end
     end
 
-    def remove_photo_from_form(photo_index=0, table_id='photos')
+    def remove_polyphoto_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})"
+      tr_selector = polyphoto_tr_selector(table_id) + ':visible'
       page.execute_script <<-SCRIPT
-        $('#{tr_selector} .remove_fields').click();
+      setTimeout(function(){
+        $($('#{tr_selector}')[#{photo_index}]).find('.remove_fields').click();
+      }, 1);
       SCRIPT
+      sleep 0.005
     end
 
   end

data/lib/polygallery/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: polygallery
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - MacKinley Smith
@@ -342,7 +342,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Polymorphic galleries made simple.