selenium-more 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63ae75641b9efc300ba56fb3d72cecd2068d0ec6
-  data.tar.gz: 2eaeed4faf822998b045979f90b6b59d2faebffa
+  metadata.gz: 430e38cc3db22c67bb1f5a90da710a3ddc8912df
+  data.tar.gz: a070b39f1307a447122ff77e23543a1eac61c393
 SHA512:
-  metadata.gz: 966d307b497a283fa7f241b7ae90d196f8548c4fe6f2ff50e938c4e723739fefec4faa164589609b21f01f0bca559926f517b91027acab1535b95cbe75d71cb3
-  data.tar.gz: fc643f7b390e63f4715ec0cfe14ce68cc5a269c67b688b6db0a7fa97f34d0894074d9a398d0a20343be5f94717fdcb679a3d3bcd6cf272400a3841fbf8fd20c4
+  metadata.gz: 90a0592166dfa8f6850894987faef78c8ec5322b694ea40fb3549cfd155e7fcb5357dfedb625ecf0ba5557c1004d49db81559dd9278584be580aa64343051062
+  data.tar.gz: 80464f2ff87df53202486101b6a79ba672e3e8c01d1f50d7438cda9d2a4b59687856f3286c928be434a6407723666c599a79842b6378b96fea31c576d42571c3

data/.travis.yml

@@ -2,3 +2,4 @@
 rvm:
   - 2.0.0
   - 2.1.0
+  - 2.1.1

data/CHANGELOG.md

@@ -0,0 +1,6 @@
+# 0.0.2
+* ADD
+ * hook to instance
+# 0.0.1
+* ADD
+ * hook to class

data/README.md

@@ -5,7 +5,7 @@ Selenium WebDriver utilities.
 ## Features
 
 * hook interface to selenium-webdriver
-* utilities for test
+* utilities for test (not yet)
  * session management
  * implicit and explicit wait
  * retry
@@ -35,8 +35,8 @@ Sample Code:
 class Selenium::WebDriver::Driver
   include Selenium::More::Hooks
 
-  hook :get, before: ->(driver)      { puts driver.current_url }
-             after:  ->(driver, ret) { puts driver.currnent_url }
+  hook :get, before: ->(driver, url)      { puts driver.current_url }
+             after:  ->(driver, ret, url) { puts driver.current_url }
 end
 
 driver = Selenium::WebDriver.for :phantomjs
@@ -50,6 +50,20 @@ about:blank
 http://example.com/
 ```
 
+You can also add hook to each instance of ::Selenium::WebDriver::Driver. It results the same with above.
+
+```ruby
+class Selenium::WebDriver::Driver
+  include Selenium::More::Hooks
+end
+
+driver = Selenium::WebDriver.for :phantomjs
+driver.hook :get, before: ->(driver, url)      { puts driver.current_url }
+                  after:  ->(driver, ret, url) { puts driver.current_url }
+
+driver.get "http://example.com/"
+```
+
 ### session management
 
 T.B.D.

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/lib/selenium/more/hooks.rb

@@ -6,22 +6,35 @@ module Selenium::More
       base.extend(ClassMethods)
     end
 
-    module ClassMethods
-      def hook(method, opts)
-        if instance_methods.include?(method.to_sym)
-          mod = Module.new do
-            define_method method do |*args|
-              opts[:before].call(self)     if opts[:before]
-              ret = super(*args)
-              opts[:after].call(self, ret) if opts[:after]
+    def self.module_to_prepend(method_name, before: nil, after: nil)
+      raise ArgumentError, "at least one of before or after is needed" unless before || after
+
+      Module.new do
+        define_method method_name do |*args|
+          before.call(self, *args)     if before
+          ret = super(*args)
+          after.call(self, ret, *args) if after
 
-              ret
-            end
-          end
+          ret
+        end
+      end
+    end
 
-          prepend(mod)
+    def hook(method_name, opts)
+      if respond_to?(method_name.to_sym)
+        # when ruby < 2.1.0, prepend is private method
+        self.singleton_class.__send__(:prepend, Hooks.module_to_prepend(method_name, opts))
+      else
+        raise NoMethodError, "no #{method_name} to hook"
+      end
+    end
+
+    module ClassMethods
+      def hook(method_name, opts)
+        if instance_methods.include?(method_name.to_sym)
+          prepend Hooks.module_to_prepend(method_name, opts)
         else
-          raise NoMethodError, "no #{method} to hook"
+          raise NoMethodError, "no #{method_name} to hook"
         end
       end
     end

data/selenium-more.gemspec

@@ -28,11 +28,11 @@ _DESCRIPTION_
   spec.add_development_dependency "rake"
 
   # test
-  spec.add_runtime_dependency "rspec", "~> 3.0.0.beta"
+  spec.add_development_dependency "rspec", "~> 3.0.0.beta"
 
   # to run selenium-standalone-server
-  spec.add_runtime_dependency "selenium-connect"
+  spec.add_development_dependency "selenium-connect"
 
   # auto test
-  spec.add_runtime_dependency "guard-rspec"
+  spec.add_development_dependency "guard-rspec"
 end

data/spec/lib/selenium/more/hooks_spec.rb

@@ -3,16 +3,21 @@ require "spec_helper"
 require "selenium/more/hooks"
 
 describe Selenium::WebDriver::Driver, "with", Selenium::More::Hooks do
+  let(:base_class) do
+    Class.new(described_class) do
+      include Selenium::More::Hooks
+
+      def spy
+        @spy ||= []
+      end
+      attr_writer :spy
+    end
+  end
+
   context ".hook" do
     context "of before and after" do
       let(:klass) do
-        Class.new(described_class) do
-          include Selenium::More::Hooks
-
-          def spy
-            @spy ||= []
-          end
-
+        Class.new(base_class) do
           hook :current_url, before: ->(driver)      { driver.spy << "before_hook1" },
                              after:  ->(driver, ret) { driver.spy << "after_hook1" }
           hook :current_url, before: ->(driver)      { driver.spy << "before_hook2" },
@@ -32,13 +37,23 @@ describe Selenium::WebDriver::Driver, "with", Selenium::More::Hooks do
       end
     end
 
-    context "of after" do
+    context "of before" do
       let(:klass) do
-        Class.new(described_class) do
-          include Selenium::More::Hooks
+        Class.new(base_class) do
+          hook :get, before:  ->(driver, url) { driver.spy = url }
+        end
+      end
 
-          attr_accessor :spy
+      let(:driver) { klass.for :remote, desired_capabilities: :htmlunit }
 
+      it "passes args to before hook" do
+        expect { driver.get "about:blank" }.to change { driver.spy }.to("about:blank")
+      end
+    end
+
+    context "of after" do
+      let(:klass) do
+        Class.new(base_class) do
           hook :current_url, after:  ->(driver, ret) { driver.spy = ret }
         end
       end
@@ -54,13 +69,62 @@ describe Selenium::WebDriver::Driver, "with", Selenium::More::Hooks do
     context "when no method is available" do
       it "raise NoMethodError" do
         expect {
-          Class.new(described_class) do
-            include Selenium::More::Hooks
-
+          Class.new(base_class) do
             hook :hoge, before: ->(driver) { driver }
           end
         }.to raise_exception(NoMethodError, "no hoge to hook")
       end
     end
   end
+
+  context "#hook" do
+    context "of before and after" do
+      let(:klass) { base_class }
+
+      let(:driver) do
+        driver = klass.for :remote, desired_capabilities: :htmlunit
+        driver.hook :current_url, before: ->(driver)      { driver.spy << "before_hook1" },
+        after:  ->(driver, ret) { driver.spy << "after_hook1" }
+        driver.hook :current_url, before: ->(driver)      { driver.spy << "before_hook2" },
+        after:  ->(driver, ret) { driver.spy << "after_hook2" }
+        driver
+      end
+
+      it "is called before and after in order" do
+        expect { driver.current_url }.to change { driver.spy }.to(%w[ before_hook2 before_hook1 after_hook1 after_hook2 ])
+      end
+    end
+
+    context "when no method is available" do
+      let(:klass) { base_class }
+
+      let(:driver) { base_class.for :remote, desired_capabilities: :htmlunit }
+
+      it "raise NoMethodError" do
+        expect {
+          driver.hook :hoge, before: ->(driver) { driver }
+        }.to raise_exception(NoMethodError, "no hoge to hook")
+      end
+    end
+  end
+
+  context "convination with .hook and #hook" do
+    let(:klass) do
+      Class.new(base_class) do
+        hook :current_url, before: ->(driver)      { driver.spy << "before_hook1" },
+                           after:  ->(driver, ret) { driver.spy << "after_hook1" }
+      end
+    end
+
+    let(:driver) do
+      driver = klass.for :remote, desired_capabilities: :htmlunit
+      driver.hook :current_url, before: ->(driver)      { driver.spy << "before_hook2" },
+      after:  ->(driver, ret) { driver.spy << "after_hook2" }
+      driver
+    end
+
+    it "is called before and after in order" do
+      expect { driver.current_url }.to change { driver.spy }.to(%w[ before_hook2 before_hook1 after_hook1 after_hook2 ])
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: selenium-more
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - okitan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-02 00:00:00.000000000 Z
+date: 2014-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
@@ -59,7 +59,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.0.beta
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -73,7 +73,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -87,7 +87,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -108,6 +108,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - Guardfile
 - LICENSE.txt