capypage 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 30a731012359de239cdb2f372f74ec752a45f69d
-  data.tar.gz: f76f9ceb5a7944cc056ba70bc7e760939c92ea7b
+  metadata.gz: b717e84fbf9f76e8d43a8b41f3683e1482671223
+  data.tar.gz: 7edaa7338fc2b340efc67ae11bf6469b3c736ac8
 SHA512:
-  metadata.gz: 0e9b7ff32666ee568658ac47ddfd75d4e252e8a79368626671d867f84fb0feca2915ddf0a7ca5cd6572f8d636f99a6575fa9e9588ae69f637090d556bf7f447e
-  data.tar.gz: a125616381900fc577e7d612a492790cc6a57a4b85e24efd442a9729d37bfec1d4557b2757e85b8a990ba1cb86c82ec686fa8f72e5357654b047c5eb20e21407
+  metadata.gz: 822e035dc034763bba5f31f9828be52bdf306e129be24e2ac76ebadef91745028a5ea63560e9a53907f262e6237c757cfbbe7c2847ea63ba54584c7cd0643fa4
+  data.tar.gz: 754512501b25f384ce835088f9ebdfb0740c392ed63a1eeed3ed62a9eaeef757a5a0438b0fdbd3127b9f9aeb7941bc517ae9afb2faf8b55301874d74c79db82c

data/CHANGELOG.md

@@ -1,7 +1,14 @@
+v 0.2.1
+
+* Only page takes a prefix now
+* Cleaned up section implementation
+
+
 v 0.2.0
 
 * Not backward compatible - breaks the elements api in page to have better assertions on the elements level
 
+
 v 0.1.1
 
 * Added tests

data/TODO.md

@@ -1 +1 @@
-* Get rid of prefix in favour of base_element
+* Break Element, Elements inheritance and extract common parts to a module

data/lib/capypage/element.rb

@@ -3,25 +3,24 @@ require 'active_support/core_ext/object/blank'
 
 module Capypage
   class Element
-    attr_accessor :selector, :prefix, :finder_options, :base_element
+    attr_accessor :selector, :finder_options, :base_element
 
-    def initialize(selector, prefix = nil, options = {}, &block)
+    def initialize(selector, options = {}, &block)
       options.reverse_merge! :match => :first
       @finder_options = options.clone
       @selector = selector
-      @prefix = prefix
-      @base_element = finder_options[:base_element] || capybara_page
+      @base_element = finder_options[:base_element]
       block.call(self) if block.present?
     end
 
     def element(name, selector, options = {})
       base = self
-      define_singleton_method(name) { Element.new(selector, prefix, options.reverse_merge!(:match => :first, :base_element => base)) }
+      define_singleton_method(name) { Element.new(selector, options.reverse_merge!(:match => :first, :base_element => base)) }
     end
 
     def elements(name, selector, options = {}, &block)
       base = self
-      define_singleton_method(name) { Elements.new(selector, prefix, options.reverse_merge!(:base_element => base), &block) }
+      define_singleton_method(name) { Elements.new(selector, options.reverse_merge!(:base_element => base), &block) }
     end
 
     def present?
@@ -40,11 +39,7 @@ module Capypage
     end
 
     def element_selector
-      [prefix, selector].compact.join(" ")
-    end
-
-    def capybara_page
-      Capybara.current_session
+      selector
     end
 
     def capybara_finder_options(options = {})

data/lib/capypage/elements.rb

@@ -6,19 +6,19 @@ module Capypage
     delegate :each, :size, :[],
              :to => :all
 
-    def initialize(parent_selector, children_selector, prefix = nil, options = {}, &block)
-      parent_selector_options = options.merge :base_element => Element.new(parent_selector, prefix, options)
+    def initialize(parent_selector, children_selector, options = {}, &block)
+      parent_selector_options = options.merge :base_element => Element.new(parent_selector, options)
 
-      super(children_selector, prefix, parent_selector_options)
+      super(children_selector, parent_selector_options)
       @child_dsl_block = block
     end
 
     def find_by_text(text, options = {})
-      Element.new(selector, prefix, finder_options.merge(options).merge(:text => text), &child_dsl_block)
+      Element.new(selector, finder_options.merge(options).merge(:text => text), &child_dsl_block)
     end
 
     def find_by_index(index)
-      Element.new("#{element_selector}:nth-child(#{index + 1})", prefix, finder_options, &child_dsl_block)
+      Element.new("#{element_selector}:nth-child(#{index + 1})", finder_options, &child_dsl_block)
     end
 
     private

data/lib/capypage/page.rb

@@ -8,8 +8,7 @@ module Capypage
     attr_accessor :prefix, :finder_options
 
     def initialize(prefix = nil, options = {})
-      @prefix = prefix
-      @finder_options = options
+      @finder_options = options.merge(:base_element => prefix ? Element.new(prefix, :base_element => Capybara.current_session) : Capybara.current_session)
     end
 
     class <<self
@@ -18,18 +17,15 @@ module Capypage
       end
 
       def element(name, selector, options = {})
-        options.reverse_merge! :match => :first
-        define_method(name) { Element.new(selector, prefix, options) }
+        define_method(name) { Element.new(selector, finder_options.reverse_merge(options)) }
       end
 
       def elements(name, parent_selector, children_selector, options = {}, &block)
-        define_method(name) { Elements.new(parent_selector, children_selector, prefix, options, &block) }
+        define_method(name) { Elements.new(parent_selector, children_selector, finder_options.reverse_merge(options), &block) }
       end
 
       def section(name, section, selector, options = {})
-        define_method name do
-          section.new(selector, options)
-        end
+        define_method(name) { section.new(selector, options) }
       end
     end
 

data/lib/capypage/section.rb

@@ -1,5 +1,4 @@
 module Capypage
   class Section < Page
-    alias_method :selector, :prefix
   end
-end
+end

data/lib/capypage/version.rb

@@ -1,3 +1,3 @@
 module Capypage
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

data/spec/sample_page.html

@@ -24,5 +24,9 @@
         </li>
     </ul>
 </div>
+<div class="popup">
+  <div class="title">Popup Title</div>
+  <div class="details">Popup Details</div>
+</div>
 </body>
 </html>

data/spec/section_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe Capypage::Section do
+  let(:page) { SamplePage.new }
+
+  it 'should give the reference to the section' do
+    popup = page.popup
+
+    expect(popup.title).to have_text('Popup Title')
+  end  
+end

data/spec/spec_helper.rb

@@ -5,6 +5,10 @@ Capybara.app = lambda { |_|
   [200, { 'Content-Type' => 'application/html' }, File.read(File.join(File.dirname(__FILE__), 'sample_page.html'))]
 }
 
+class PopupSection < Capypage::Section
+  element :title, '.title'
+end
+
 class SamplePage < Capypage::Page
   set_url '/'
 
@@ -16,4 +20,6 @@ class SamplePage < Capypage::Page
     row.element :title, '.title'
     row.element :details, '.details'
   end
+
+  section :popup, PopupSection, '.popup'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capypage
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Selvakumar Natesan
@@ -113,6 +113,7 @@ files:
 - spec/elements_spec.rb
 - spec/page_spec.rb
 - spec/sample_page.html
+- spec/section_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/TWChennai/capypage
 licenses:
@@ -143,4 +144,5 @@ test_files:
 - spec/elements_spec.rb
 - spec/page_spec.rb
 - spec/sample_page.html
+- spec/section_spec.rb
 - spec/spec_helper.rb