selectivity-rails 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 495bf8efe829e4f9f4d7fcff2b132c9186c2d330
-  data.tar.gz: 31426ec6dd6631ec3d92a1093a8837a8208230cb
+  metadata.gz: b4461c4f15d732317f7c29bfe4a3d662145fee35
+  data.tar.gz: 4381055dc91b1f0d98e308dfe2caa4eaab938acd
 SHA512:
-  metadata.gz: 96437c933690e08709495fa26cf142ca770c7963cf9881dfc90c050362ae9e2109ea13bcdf87f68d3889bdd67f0f22c75b4aaedeea079888fc8febac8f47d3f3
-  data.tar.gz: 2d34448b26cd6ca4732b600698518be7bc333005e78712787926e8f9edd5d48d5bbcbe8c4a12855df5b2b77adeaa267b9a41195a513290be73105626debdb1f5
+  metadata.gz: e867c641b4750b28e8f06ed2ba3bf7ee0b7a3499d8f5fc56d716dbe97989fea3456b7aa930d694b6589bdce00bf49a843a358bd7ddbaffaf5fbdb4c2e46e41d2
+  data.tar.gz: 4738e0bafd7ce4343c6e8cc64876c85132e0b4a8502e060007e46b6d5337e551ce29ef0ab6de333c9e6ac3dbffe7d1b4f6552ac9b223b2c30da72e68d1508007

data/README.md

@@ -108,9 +108,10 @@ selectivity_select('Poland', from: '#country')
 To handle multiple select:
 
 ```ruby
-selectivity_select('Netherlands', from: '#countries')
-selectivity_select('Poland', from: '#countries')
+selectivity_select('Netherlands', 'Russia', from: '#countries')
+# or, by single value:
 selectivity_select('Russia', from: '#countries')
+
 selectivity_unselect('Russia', from: '#countries')
 ```
 

data/lib/selectivity/rails/version.rb

@@ -1,5 +1,5 @@
 module Selectivity
   module Rails
-    VERSION = '0.0.7'
+    VERSION = '0.0.8'
   end
 end

data/lib/selectivity/rspec.rb

@@ -2,39 +2,54 @@ module Selectivity
   module Rspec
     module FeatureHelpers
 
-      def selectivity_select(value, options = {})
-        fail('Selectivity input not set!') unless options.has_key?(:from)
+      def selectivity_select(value, *args)
+        options = args.extract_options!
 
-        from = options.delete(:from)
+        fail('Selectivity input not set!') unless options.has_key?(:from)
 
-        find(:div, from, options).click
+        from  = options.delete(:from)
+        input = find(:div, from, options)
+        items = multiselect?(input) ? args.unshift(value).uniq : [value]
 
-        within 'div.selectivity-dropdown' do
-          if (find(:xpath, "//div[@class='selectivity-result-item'][contains(text(), '#{value}')]")).visible?
-            page.evaluate_script("$('div.selectivity-result-item:contains(#{value})').trigger('click')")
-          end
+        items.each do |item|
+          select(input, item)
         end
       end
 
-      def selectivity_unselect(value, options = {})
+      def selectivity_unselect(value, *args)
+        options = args.extract_options!
+
         fail('Selectivity input not set!') unless options.has_key?(:from)
 
-        from              = options.delete(:from)
-        selectivity_input = find(:div, from, options)
+        from  = options.delete(:from)
+        input = find(:div, from, options)
+        items = multiselect?(input) ? args.unshift(value).uniq : [value]
 
-        if selectivity_multiselect?(selectivity_input)
-          unselect_multiple(selectivity_input, value)
-        else
-          unselect_single(selectivity_input)
+        items.each do |item|
+          if multiselect?(input)
+            unselect_multiple(input, item)
+          else
+            unselect_single(input)
+          end
         end
       end
 
       private
 
-      def selectivity_multiselect?(input)
+      def multiselect?(input)
         input.first('.selectivity-multiple-input-container').present?
       end
 
+      def select(input, item)
+        input.click
+
+        within 'div.selectivity-dropdown' do
+          if (find(:xpath, "//div[@class='selectivity-result-item'][contains(text(), '#{item}')]")).visible?
+            page.evaluate_script("$('div.selectivity-result-item:contains(#{item})').trigger('click')")
+          end
+        end
+      end
+
       def unselect_single(input)
         input.first('.selectivity-single-selected-item-remove').click
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: selectivity-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Konrad Jurkowski