watirsome 0.1.2 → 0.1.3

data/CHANGELOG.md

@@ -1,11 +1,15 @@
+#### v0.1.3
+
+* Remove `Watirsome.region_matcher` so now any module may implement `initialize_region`.
+
 #### v0.1.2
 
-* Fix for checkboxes in previous version hasn't actually resolved issue. Now fixes
+* Fix for checkboxes in previous version hasn't actually resolved issue. Now fixed.
 
 #### v0.1.1
 
-* Fixed problem when plural form of `checkbox` was `checkboxs` instead of `checkboxes`
+* Fixed problem when plural form of `checkbox` was `checkboxs` instead of `checkboxes`.
 
 #### v0.1.0
 
-* Initial release
+* Initial release.

data/README.md

@@ -22,31 +22,35 @@ gem 'watirsome'
 ### Examples
 
 ```ruby
-class Page
+class LoginPage
   include Watirsome
-  
+
   text_field :username, label: 'Username'
   text_field :password, label: 'Password'
-  button :login, text: 'Login'
-  
+  button :submit_login, text: 'Login'
+
   def login(username, password)
     self.username = username
     self.password = password
-    login
+    submit_login
   end
 end
+
+browser = Watir::Browser.new
+page = LoginPage.new(browser)
+page.login('demo', 'demo')
 ```
 
 ### Accessors
 
-Watirsome provides you with accessors DSL to isolate elements from your methods. 
+Watirsome provides you with accessors DSL to isolate elements from your methods.
 
 All accessors are just proxied to Watir, thus you free to use all its power in your page objects.
 
 ```ruby
 class Page
   include Watirsome
-  
+
   # any method defined in Watir::Container are accessible
   body :body
   section :section, id: 'section_one'
@@ -61,16 +65,16 @@ You can use any kind of locators you use with Watir.
 ```ruby
 class Page
   include Watirsome
-  
+
   body :body
   section :one, id: 'section_one'
   element :svg, tag_name: 'svg'
-  button :login, class: 'submit', index: 1 
+  button :login, class: 'submit', index: 1
 end
 
 page = Page.new(@browser)
 page.body_element  # equals to @browser.body
-page.section_one   # equals to @browser.section(id: 'section')
+page.one_section   # equals to @browser.section(id: 'section_one')
 page.svg_element   # equals to @browser.element(tag_name: 'svg')
 page.login_button  # equals to @browser.button(class: 'submit', index: 1)
 ```
@@ -80,9 +84,9 @@ Watirsome also provides you with opportunity to locate elements by using any boo
 ```ruby
 class Page
   include Watirsome
-  
-  div :layer, class: 'layer', visible: true    
-  span :wrapper, class: 'span', exists: false  
+
+  div :layer, class: 'layer', visible: true
+  span :wrapper, class: 'span', exists: false
 end
 
 page = Page.new(@browser)
@@ -95,7 +99,7 @@ You can also use proc/lambda/block to locate element. Block is executed in the c
 ```ruby
 class Page
   include Watirsome
-  
+
   div :layer, class: 'layer'
   span :wrapper, -> { layer_div.span(class: 'span') }
 end
@@ -109,9 +113,9 @@ Moreover, you can pass arguments to blocks!
 ```ruby
 class Page
   include Watirsome
-  
+
   div :layer, class: 'layer'
-  a :link do |text| 
+  a :link do |text|
     layer_div.a(text: text)
   end
 end
@@ -248,7 +252,7 @@ page.country = 'Russia'  #=> selects option with "Russia" text
 
 ### Initializers
 
-Watirsome provides you with initializers DSL to dynamically modify your pages/regions behavior. 
+Watirsome provides you with initializers DSL to dynamically modify your pages/regions behavior.
 
 #### Page initializer
 
@@ -288,7 +292,7 @@ end
 class Page
   include Watirsome
   include HeaderRegion
-  
+
   def initialize_page
     extend FooterRegion
   end
@@ -299,13 +303,7 @@ Page.new(@browser)
 #=> 'Initialized footer!'
 ```
 
-Regions are being cached, so, once initialzed, they won't be executed if you call `Page#initialize_regions` again.
-
-Each module is first checked if its name matches the regular expression of region (to make sure we don't touch unrelated included modules). By default, regexp is `/^.+(Region)$/`, but you can change it by altering `Watirsome.region_matcher`.
-
-```ruby
-Watirsome.region_matcher = /^.+(Region|Helper)$/
-```
+Regions are being cached, so, once initialized, they won't be executed if you call `Page#initialize_regions` again.
 
 ### Limitations
 

data/lib/watirsome/initializers.rb

@@ -1,6 +1,6 @@
 module Watirsome
   module Initializers
-    
+
     #
     # Initializes page class.
     # Allows to define "#initialize_page" which will be called as page constructor.
@@ -25,12 +25,10 @@ module Watirsome
       # get included and extended modules
       modules = self.class.included_modules + (class << self; self end).included_modules
       modules.uniq!
-      # make sure only necessary modules are being called
-      regexp = Watirsome.region_matcher
-      modules.select! { |m| regexp === m.to_s }
+      # initialize each module
       modules.each do |m|
         # check that constructor is defined and we haven't called it before
-        if m.instance_methods.include?(:initialize_region) && !@initialized_regions.include?(m)
+        if !@initialized_regions.include?(m) && m.instance_methods.include?(:initialize_region)
           m.instance_method(:initialize_region).bind(self).call
           # cache region
           @initialized_regions << m

data/lib/watirsome/version.rb

@@ -1,3 +1,3 @@
 module Watirsome
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end # Watirsome

data/lib/watirsome.rb

@@ -1,9 +1,6 @@
 module Watirsome
   class << self
 
-    # @attr [Regexp] region_matcher
-    attr_accessor :region_matcher
-
     # @attr [Array<Symbol>] readable
     attr_accessor :readable
 
@@ -16,14 +13,6 @@ module Watirsome
     # @attr [Array<Symbol>] selectable
     attr_accessor :selectable
 
-    #
-    # Returns regular expression for region module names.
-    # @return [Regexp]
-    #
-    def region_matcher
-      @region_matcher ||= /^.+(Region)$/
-    end
-
     #
     # Returns array of readable elements.
     # @return [Array<Symbol>]
@@ -165,7 +154,7 @@ module Watirsome
 
   end # self
 
-  
+
   def self.included(kls)
     kls.extend         Watirsome::Accessors::ClassMethods
     kls.send :include, Watirsome::Accessors::InstanceMethods

data/spec/lib/watirsome/initializers_spec.rb

@@ -14,31 +14,22 @@ describe Watirsome::Initializers do
     it 'initializes page if there is constructor defined' do
       page.instance_variable_get(:@initialized).should == true
     end
-    
+
     it 'initalizes regions' do
       Page.any_instance.should_receive :initialize_regions
       Page.new(watir)
     end
   end
-  
+
   describe '#initialize_regions' do
     it 'initalizes included regions' do
       page.instance_variable_get(:@included_initialized).should == 1
     end
-    
+
     it 'initalizes extended regions' do
       page.instance_variable_get(:@extended_initialized).should == 1
     end
-    
-    it 'does not initalize modules with incorrect name' do
-      page.instance_variable_get(:@helper_initialized).should == nil
-    end
-    
-    it 'uses Watirsome.region_matcher to match module name' do
-      Watirsome.should_receive(:region_matcher).and_return ''
-      page
-    end
-    
+
     it 'caches initalized regions' do
       page.initialize_regions
       page.instance_variable_get(:@included_initialized).should == 1

data/spec/lib/watirsome_spec.rb

@@ -1,12 +1,6 @@
 require 'spec_helper'
 
 describe Watirsome do
-  describe '.region_matcher' do
-    it 'returns region matcher regexp' do
-      described_class.region_matcher.should be_a(Regexp)
-    end
-  end
-  
   %w(readable clickable settable selectable).each do |method|
     describe ".#{method}" do
       it 'returns array of accessors' do
@@ -92,7 +86,7 @@ describe Watirsome do
       -> { described_class.pluralize(:foo) }.should raise_error(Watirsome::Errors::CannotPluralizeError)
     end
   end
-  
+
   context 'when included' do
     include_context :page
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: watirsome
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-13 00:00:00.000000000 Z
+date: 2013-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: watir-webdriver
@@ -151,7 +151,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3290082201192832262
+      hash: 2091343636029663572
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -160,7 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3290082201192832262
+      hash: 2091343636029663572
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23