fluent 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: efc9320b50a769998f510a4de15c2085c5b07749
-  data.tar.gz: 734f69efd530e24aab3655d31ce298fb18f7fec9
+  metadata.gz: c79d7d2f797b81cc077bf208424734358ae32312
+  data.tar.gz: 68eaac53b4e08133dcaf1eb46afd5064d065765c
 SHA512:
-  metadata.gz: d144f54060f678b79b12cfcfb5060a8bda85bac9ab82ce0551ada1dcb5149e22f3c478f5a58ec9e6aaf6c4ce86d88f763ac0d29078cc7610e6a259fb7d1b4fbb
-  data.tar.gz: 38e00c369bdc2c9844c753e0d27addc90ed8cf220038e5d70d52577b7df709a3184c44b560fa05ab52536df331d79140deda35a02ea4510aebb0d7ff24e1f261
+  metadata.gz: 0a46811e408cf068b8147d2106301b2d5dad61d343adf4e425d63201b35e3a6e4f1309222bb858c62266fb8dcfeb053f4c48fc705058505e37e61ed445a85cc1
+  data.tar.gz: 51d97e5c42f6eed673a7557c7fc33c3b53c03d57e8c6fe90736724ef6b16fa1f87555dc96e0bff28ec8561de68c4455580b780c4ac698553440bd16ba7392c71

data/HISTORY.md

@@ -1,6 +1,17 @@
 Change Log and History
 ======================
 
+Version 0.7.3 / 2013-12-18
+--------------------------
+
+A few small changes and one big change. As for the small changes:
+
+* Select lists or any elements that have selectable items no longer rely on xpath, but instead on native option objects.
+
+* The get_cookie_value platform method now returns nil for both Mechanize and Watir. This means that if you look for a key name in a cookie and that key name is not found, a nil is returned.
+
+The larger change involves adding a new context factory method called on_set(). This new factory method allows you to set the context of a given definition so that it can be reused even if other definitions have already been used. A call to the on_new() factory method will always clear out the context.
+
 Version 0.7.2 / 2013-12-12
 --------------------------
 

data/README.md

@@ -37,4 +37,8 @@ Contributing
 6. Push to the branch.
 7. Create a new [pull request](https://help.github.com/articles/using-pull-requests).
 
-Do note that pull requests are very welcome and are considered better than bug reports. Please create a topic branch for every separate change that you make. When you make commits, do not change the rakefile, version or history information.
+A few notes:
+
+* Pull requests are very welcome and are considered better than bug reports. Please create a feature branch for every separate change that you make. When you make commits, do not change the rakefile, version or history information.
+
+* If you are contributing changes, make sure you do so on the `develop` branch. So if you fork, make sure you also check out the `develop' branch and make your feature branches off of that.

data/lib/fluent/factory.rb

@@ -19,6 +19,11 @@ module Fluent
         return @active
       end
       
+      if @context.kind_of?(definition)
+        block.call @context if block
+        return @context
+      end
+      
       @active = definition.new(@driver, visit)
       block.call @active if block
       
@@ -38,7 +43,11 @@ module Fluent
     # @return [Object] instance of the definition
     def on_new(definition, visit=false, &block)
       definition = get_object_for(definition) if definition.is_a? String
-
+      
+      if @context.kind_of?(definition)
+        @context = nil
+      end
+      
       @active = definition.new(@driver, visit)
       block.call @active if block
 
@@ -56,6 +65,21 @@ module Fluent
 
     alias_method :on_visit, :on_view
 
+    # Creates a definition context for actions. If an existing context
+    # exists, that context will be re-used. This also sets a context that 
+    # will be used for that definition even if the active definition
+    # changes.
+    #
+    # @param definition [Class] the name of a definition class
+    # @param visit [Boolean] true if the context needs to be called into view
+    # @param block [Proc] logic to execute within the context of the definition
+    # @return [Object] instance of the definition
+    def on_set(definition, visit=false, &block)
+      on(definition, visit, &block)
+      @context = @active
+      @active
+    end
+    
     def get_object_for(definition)
       definition.split('::').inject(Object) do |obj, name|
         obj.const_get(name)

data/lib/fluent/platform_mechanize/platform_object.rb

@@ -20,12 +20,14 @@ module Fluent
         end
         
         def get_cookie_value(name)
-          for cookie in driver.cookie_jar.cookies 
+          for cookie in driver.cookie_jar.cookies
             if cookie.name == name
               return cookie.value
             end
           end
+          nil
         end
+
       end
     end
   end

data/lib/fluent/platform_watir/platform_object.rb

@@ -21,6 +21,7 @@ module Fluent
               return cookie[:value]
             end
           end
+          nil
         end
         
         def url

data/lib/fluent/platform_watir/platform_web_elements/select_list.rb

@@ -34,7 +34,7 @@ module Fluent
         #
         # @return [Object] Fluent::WebElements::Option
         def [](index)
-          ::Fluent::WebElements::Option.new(options[index], :platform => :watir_webdriver)
+          options[index]
         end
         
         # Provides an array of Option objects that are contained within
@@ -42,12 +42,7 @@ module Fluent
         #
         # @return [Array] Fluent::WebElements::Option objects
         def options
-          elements = []
-          options = web_element.wd.find_elements(:xpath, option_xpath)
-          options.each do |option|
-            elements << ::Fluent::WebElements::Option.new(option, :platform => :watir_webdriver)
-          end
-          elements
+          web_element.options.map { |option| ::Fluent::WebElements::Option.new(option, :platform => :watir_webdriver) }
         end
         
       end

data/lib/fluent/version.rb

@@ -1,3 +1,3 @@
 module Fluent
-  VERSION = '0.7.2'
+  VERSION = '0.7.3'
 end

data/lib/fluent/web_elements/select_list.rb

@@ -7,10 +7,6 @@ module Fluent
         include_platform_specifics_for platform
       end
 
-      def option_xpath
-        './/child::option'
-      end
-      
       def include_platform_specifics_for(platform)
         super
         if platform[:platform] == :watir_webdriver

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - Jeff Nyman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-12 00:00:00.000000000 Z
+date: 2013-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler