masque 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d94d73faef46aff07f7a2da237b065c72293322f
-  data.tar.gz: 825bdbe2e9a5f26f18f7c83c79563b9c1a3f088f
+  metadata.gz: 78ca3efe302a644a8728c77802763f2fb24fa90b
+  data.tar.gz: 662934731060be4956413195243147d778abb658
 SHA512:
-  metadata.gz: 0c79c8ea8cebe79ddf79b4034ac69f98bb6a1e59094bc6717eeebbe04281e86173ad06e027af1c1733b6c2013a3f413816164c795562f0231e8ae0924736b829
-  data.tar.gz: 06feb166ae7e01f3594de4ee25f987b9fe830d879fb5888dea4e0573823b23b56705667eb99bf7ecf464c6703a5ebc4602e076bc0d86e601974b3396ea5493ab
+  metadata.gz: 70079bd19309f0e4fa5ec95d83ccde5c713b86f56b919072bdf84c58e88c20197210d7aa4b83bbb7cf748bd5cb977cdfcc0fba672e8a7509128e189bffda8341
+  data.tar.gz: 0594fd76d97cb9a1f8b392eaf1dde8b25daf4e3cef4961b55a5b5dd4ba11fb2e3aa335c37e4055aed788772b2d51b43fd37cea6091e645ecddeedd582000990b

data/lib/masque.rb

@@ -7,7 +7,7 @@ require "masque/version"
 require "masque/dsl"
 
 class Masque
-  attr_reader :options, :agent
+  attr_reader :options, :agent, :compat_mode
 
   def self.run(options = {}, &block)
     new(options).run(&block)
@@ -16,6 +16,18 @@ class Masque
   def initialize(options = {})
     @options = options
     @driver = options[:driver] || :webkit
+
+    case options[:capybara_compat]
+    when "2.1"
+      compat_capybara_21!
+    when "2.0"
+      compat_capybara_20!
+    when "1.x"
+      compat_capybara_1x!
+    else # default compat mode is 1.x (currently. IMO this is most useful for crawler, but any use case can be changed this decision)
+      compat_capybara_1x!
+    end
+
     @agent = Class.new do
       include Masque::DSL
 
@@ -53,7 +65,20 @@ class Masque
     @agent.instance_eval(&block)
   end
 
+  def compat_capybara_21!
+    # https://github.com/jnicklas/capybara/blob/2.1.0/lib/capybara.rb#L323
+    @compat_mode = "2.1"
+    Capybara.configure do |config|
+      config.ignore_hidden_elements = true
+      config.match = :smart
+      config.exact = false
+      config.visible_text_only = false
+    end
+  end
+
   def compat_capybara_20!
+    # http://www.elabs.se/blog/60-introducing-capybara-2-1
+    @compat_mode = "2.0"
     Capybara.configure do |config|
       config.match = :one
       config.exact_options = true
@@ -63,6 +88,8 @@ class Masque
   end
 
   def compat_capybara_1x!
+    # http://www.elabs.se/blog/60-introducing-capybara-2-1
+    @compat_mode = "1.x"
     Capybara.configure do |config|
       config.match = :prefer_exact
       config.ignore_hidden_elements = false

data/lib/masque/version.rb

@@ -1,3 +1,3 @@
 class Masque
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/spec/masque_spec.rb

@@ -3,11 +3,40 @@
 require "spec_helper"
 
 describe Masque do
-  it ".new" do
-    opts = {:display => 50, :driver => :webkit}
-    masque = Masque.new(opts)
-    masque.options.should == opts
-    masque.respond_to?(:run).should be_true
+  describe ".new" do
+    it do
+      opts = {:display => 50, :driver => :webkit}
+      masque = Masque.new(opts)
+      masque.options.should == opts
+      masque.respond_to?(:run).should be_true
+    end
+
+    describe "compat_mode" do
+      subject { Masque.new(:capybara_compat => ver).compat_mode }
+
+      context "2.1" do
+        let(:method) { :compat_capybara_21! }
+        let(:ver) { "2.1" }
+        it { should == ver }
+      end
+
+      context "2.0" do
+        let(:method) { :compat_capybara_20! }
+        let(:ver) { "2.0" }
+        it { should == ver }
+      end
+
+      context "1.x" do
+        let(:method) { :compat_capybara_1x! }
+        let(:ver) { "1.x" }
+        it { should == ver }
+      end
+    end
+
+    it "default compat mode is 1.x" do
+      Masque.any_instance.should_receive(:compat_capybara_1x!)
+      Masque.new
+    end
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: masque
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - uu59