capypage 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b717e84fbf9f76e8d43a8b41f3683e1482671223
-  data.tar.gz: 7edaa7338fc2b340efc67ae11bf6469b3c736ac8
+  metadata.gz: 96110541df63f4da958f3ddf40536698c5caacf5
+  data.tar.gz: 4e391dc4caa8a645b27d8b3bf06862ee89a11bf1
 SHA512:
-  metadata.gz: 822e035dc034763bba5f31f9828be52bdf306e129be24e2ac76ebadef91745028a5ea63560e9a53907f262e6237c757cfbbe7c2847ea63ba54584c7cd0643fa4
-  data.tar.gz: 754512501b25f384ce835088f9ebdfb0740c392ed63a1eeed3ed62a9eaeef757a5a0438b0fdbd3127b9f9aeb7941bc517ae9afb2faf8b55301874d74c79db82c
+  metadata.gz: 729bb5196fccfeef8cd5d26fa702b309ac78d618ff343f2d44cbdbc2df0b906862d4b4bbc6035402b0a036b8fed486975789146d6136a6114be74099b0fd26ce
+  data.tar.gz: b5717656b31945289c049c5c048b21db2e732892a0c25af8b1653a302e5d6c9044c0cf237e09e0c86b395c761ca7f67947a3e541c8c5b7600f0e8c1ddf7e2917

data/lib/capypage.rb

@@ -6,6 +6,7 @@ require 'capybara'
 
 require 'capypage/version'
 require 'capypage/page'
+require 'capypage/element_proxy'
 require 'capypage/element'
 require 'capypage/elements'
 require 'capypage/section'

data/lib/capypage/element.rb

@@ -3,43 +3,41 @@ require 'active_support/core_ext/object/blank'
 
 module Capypage
   class Element
-    attr_accessor :selector, :finder_options, :base_element
+    include Capypage::ElementProxy
+
+    attr_reader :selector, :finder_options, :base_element
 
     def initialize(selector, options = {}, &block)
-      options.reverse_merge! :match => :first
-      @finder_options = options.clone
+      @finder_options = options.reverse_merge :match => :first
       @selector = selector
       @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, options.reverse_merge!(:match => :first, :base_element => base)) }
+      define_singleton_method(name) { Element.new(selector, options.merge(:base_element => base)) }
     end
 
     def elements(name, selector, options = {}, &block)
       base = self
-      define_singleton_method(name) { Elements.new(selector, options.reverse_merge!(:base_element => base), &block) }
+      define_singleton_method(name) { Elements.new(selector, options.merge(:base_element => base), &block) }
     end
 
     def present?
-      base_element.has_selector? element_selector, capybara_finder_options
+      base_element.has_selector? selector, capybara_finder_options
     end
 
     def visible?(options = {})
-      return capybara_element(options).visible?
+      capybara_element(options).visible?
     rescue Capybara::ElementNotFound
       false
     end
 
     protected
     def capybara_element(options = {})
-      base_element.find(element_selector, capybara_finder_options(options))
-    end
-
-    def element_selector
-      selector
+      base_element.find(selector, capybara_finder_options(options))
     end
 
     def capybara_finder_options(options = {})
@@ -48,11 +46,6 @@ module Capypage
       options.reverse_merge finder_options_without_base
     end
 
-    def self.capybara_element_methods
-      Capybara::Node::Element.instance_methods - Object.methods - [:visible?]
-    end
-
-    delegate *capybara_element_methods,
-             :to => :capybara_element
+    include Capypage::ElementProxy
   end
 end

data/lib/capypage/element_proxy.rb

@@ -0,0 +1,19 @@
+require 'active_support/concern'
+
+module Capypage
+  module ElementProxy
+    extend ActiveSupport::Concern
+
+    included do
+      delegate *capybara_element_methods,
+               :to => :capybara_element
+    end
+
+    module ClassMethods
+      def capybara_element_methods
+        Capybara::Node::Element.instance_methods - Object.methods - instance_methods
+      end
+    end
+
+  end
+end

data/lib/capypage/elements.rb

@@ -1,30 +1,40 @@
 module Capypage
-  class Elements < Element
+  class Elements
     include Enumerable
-    attr_accessor :child_dsl_block
+    include Capypage::ElementProxy
+
+    attr_reader :child_dsl_block, :child_selector, :base_element
 
     delegate :each, :size, :[],
              :to => :all
 
-    def initialize(parent_selector, children_selector, options = {}, &block)
-      parent_selector_options = options.merge :base_element => Element.new(parent_selector, options)
+    def initialize(parent_selector, child_selector, options = {}, &block)
+      @base_element = Element.new(parent_selector, options)
+      @child_selector = child_selector
 
-      super(children_selector, parent_selector_options)
       @child_dsl_block = block
     end
 
     def find_by_text(text, options = {})
-      Element.new(selector, finder_options.merge(options).merge(:text => text), &child_dsl_block)
+      Element.new(child_selector, options.merge(finder_options(:text => text)), &child_dsl_block)
     end
 
     def find_by_index(index)
-      Element.new("#{element_selector}:nth-child(#{index + 1})", finder_options, &child_dsl_block)
+      Element.new("#{child_selector}:nth-child(#{index + 1})", finder_options, &child_dsl_block)
+    end
+
+    protected
+    def capybara_element
+      base_element
     end
 
     private
     def all(options = {})
-      base_element.all(element_selector, capybara_finder_options(options))
+      base_element.all(child_selector, options)
     end
 
+    def finder_options(options = {})
+      options.merge(:base_element => base_element)
+    end
   end
 end

data/lib/capypage/page.rb

@@ -5,7 +5,7 @@ module Capypage
   class Page
     include Capybara::DSL
     class_attribute :url
-    attr_accessor :prefix, :finder_options
+    attr_reader :finder_options
 
     def initialize(prefix = nil, options = {})
       @finder_options = options.merge(:base_element => prefix ? Element.new(prefix, :base_element => Capybara.current_session) : Capybara.current_session)

data/lib/capypage/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capypage
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Selvakumar Natesan
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-21 00:00:00.000000000 Z
+date: 2013-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -97,7 +97,6 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- TODO.md
 - capypage.gemspec
 - examples/simple/Gemfile
 - examples/simple/README.md
@@ -105,6 +104,7 @@ files:
 - examples/simple/spec/spec_helper.rb
 - lib/capypage.rb
 - lib/capypage/element.rb
+- lib/capypage/element_proxy.rb
 - lib/capypage/elements.rb
 - lib/capypage/page.rb
 - lib/capypage/section.rb

data/TODO.md

@@ -1 +0,0 @@
-* Break Element, Elements inheritance and extract common parts to a module