pagemodels 0.1.8 → 0.2.0

data/README.txt

@@ -24,11 +24,11 @@ Then I should see at least 3 commits
 ~~~~~~~~~~~~~~~~~~~~~~
 # my_cucumber_steps.rb
 When /I look at the commit history/ do
-  page.navigate_to_commits
+  navigate_to_commits
 end
 
 Then /I should see at least (\d+) commits/ do |count|
-  page.verify_commit_count(count)
+  verify_commit_count(count)
 end
 
 

data/examples/rails_and_cucumber/features/step_definitions/financial_reporting_steps.rb

@@ -6,9 +6,9 @@ Given /^the following transactions:$/ do |table|
 end
 
 Then /^I should only see the following transactions:$/ do |table|
-  page_model.verify_transactions(table.hashes)
+  verify_transactions(table.hashes)
 end
 
 Then /^I should not see any transactions$/ do
-  page_model.verify_no_transactions
+  verify_no_transactions
 end

data/examples/rspec_and_capybara/Gemfile

@@ -1,6 +1,7 @@
 source 'http://rubygems.org'
 
 gem 'rspec', '>= 2.5.0'
-gem 'capybara'
+gem 'capybara', '~> 1.1.0'
+gem 'poltergeist'
 gem 'launchy'
 gem 'pagemodels', :path => File.join(File.dirname(__FILE__), "..", "..")

data/examples/rspec_and_capybara/spec/google_search_spec.rb

@@ -2,14 +2,14 @@ require File.expand_path(File.dirname(__FILE__) + "/spec_helper")
 
 describe "Searching Google" do
   it "should show results for Ruby Page Models" do
-    open_page(GoogleSearchPage.new)
-    page_model.search_for("Ruby Page Models")
+    open_page(GoogleSearchPage)
+    search_for("Ruby Page Models")
 
     should_see_page(GoogleResultsPage.new("Ruby Page Models"))
-    page_model.verify_more_than_one_page_of_results
-    page_model.verify_special_results_option("Images")
-    page_model.verify_special_results_option("News")
+    verify_more_than_one_page_of_results
+    verify_special_results_option("Images")
+    verify_special_results_option("News")
     
-    page_model.verify_top_result("http://www.github.com/rickgrundy/pagemodels")
+    verify_top_result("http://www.github.com/rickgrundy/pagemodels")
   end
 end

data/examples/rspec_and_capybara/spec/spec_helper.rb

@@ -1,9 +1,10 @@
 require 'capybara/rspec'
+require 'capybara/poltergeist'
 require 'pagemodels'
 
 Dir.glob(File.join(File.dirname(__FILE__), "pagemodels", "**", "*.rb")).each { |f| require f }
 
-Capybara.default_driver = :selenium
+Capybara.default_driver = :poltergeist
 
 PageModels.configure do |config|
   config.driver = :capybara

data/lib/page_models/base.rb

@@ -6,6 +6,7 @@ module PageModels
       else
         goto(full_url)
       end
+      verify!
     end
     
     def method_missing(name, *args, &block)

data/lib/page_models/core.rb

@@ -7,7 +7,7 @@ module PageModels
   
   def self.create(page, args)
     args = args.scan(/"([^"]+)"/).map(&:first)
-    page_model_class_name = page.gsub(/(?:^|[^\w])([a-z])/) { $1.upcase }
+    page_model_class_name = page.gsub(/(?:^|[^\w])(\w)/) { $1.upcase }
     Kernel.const_get(page_model_class_name).new(*args)
   rescue NameError => e
     if e.instance_of?(NameError) # Could be a NoMethodError

data/lib/page_models/integration/capybara.rb

@@ -1,5 +1,6 @@
 module PageModels  
   class Base
+    # Capybara's select method is far more likely than Kernel#select.
     def select(*args)
       config.driver.select(*args)
     end

data/lib/page_models/integration/cucumber.rb

@@ -1,20 +1,18 @@
 Given /^I (?:open|visit|go to) the (.+\s?page)(.*)$/ do |page_name, args|
-  self.page = PageModels.create(page_name, args)
-  self.page_model = self.page
-  self.page.open!
-  self.page.verify!
+  $page_model = PageModels.create(page_name, args)
+  $page_model.open!
+  $page_model.verify!
 end
 
 Given /^I (?:try to|attempt to|fail to) (?:open|visit|go to) the (.+\s?page)(.*)$/ do |page_name, args|
-  self.page = PageModels.create(page_name, args)
-  self.page_model = self.page
-  self.page.open!
+  $page_model = PageModels.create(page_name, args)
+  $page_model.open!
 end
 
 Then /^I should (?:see|be on) the (.+\s?page)(.*)$/ do |page_name, args|
-  self.page = PageModels.create(page_name, args)
-  self.page_model = self.page  
-  self.page.verify!
+  $page_model = PageModels.create(page_name, args)
+  $page_model = self.page  
+  $page_model.verify!
 end
 
 at_exit do
@@ -23,8 +21,14 @@ at_exit do
 end
 
 module PageModels
-  module CucumberIntegration
-    attr_accessor :page, :page_model
+  module PageModelMethodDelegation
+    def method_missing(name, *args, &block)
+      if $page_model && $page_model.respond_to?(name)
+        $page_model.send(name, *args, &block) 
+      else
+        super(name, *args, &block)
+      end
+    end
   end
 end
-World(PageModels::CucumberIntegration)
+World(PageModels::PageModelMethodDelegation)

data/lib/page_models/integration/rspec.rb

@@ -2,18 +2,30 @@ PageModels::Base.send(:include, RSpec::Matchers)
 
 module PageModels
   module RSpecIntegration
-    attr_accessor :page_model
-
     def open_page(page_model)
-      self.page_model = page_model
+      page_model = page_model.new if page_model.is_a? Class
+      $page_model = page_model
       page_model.open!
     end
     
     def should_see_page(page_model)
-      self.page_model = page_model
+      page_model = page_model.new if page_model.is_a? Class      
+      $page_model = page_model
       page_model.verify!
     end
+    
+  end
+  
+  module PageModelMethodDelegation
+    def method_missing(name, *args, &block)
+      if $page_model && $page_model.respond_to?(name)
+        $page_model.send(name, *args, &block) 
+      else
+        super(name, *args, &block)
+      end
+    end
   end
 end
 
 Object.send(:include, PageModels::RSpecIntegration)
+RSpec.configure { |c| c.include PageModels::PageModelMethodDelegation }

data/lib/page_models/version.rb

@@ -1,3 +1,3 @@
 module PageModels
-  VERSION = "0.1.8"
+  VERSION = "0.2.0"
 end

data/pagemodels.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-  
+
+  s.add_development_dependency 'rake', '>= 10.0.0'  
   s.add_development_dependency 'rspec', '>= 2.5.0'
 end

data/spec/page_models/core_spec.rb

@@ -7,6 +7,10 @@ class MyTestPage < PageModels::Base
   end
 end
 
+class My123Page < MyTestPage; end
+
+class MyHTMLPage < MyTestPage; end
+
 describe PageModels do
   describe "creating instances from cucumber (or similar) text" do
     it "should create an instance with no args" do
@@ -22,5 +26,15 @@ describe PageModels do
     it "should raise a helpful error when the class does not exist" do
       lambda { page_model = PageModels.create("not real page", "") }.should raise_error(PageModels::MissingPageModelError)
     end
+    
+    it "should support numbers in page names" do
+      page_model = PageModels.create("my 123 page", "")
+      page_model.args.should == []
+    end
+    
+    it "should allow uppercase in page names" do
+      page_model = PageModels.create("My HTML page", "")
+      page_model.args.should == []
+    end
   end
 end

metadata

@@ -1,39 +1,55 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: pagemodels
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.2.0
   prerelease: 
-  version: 0.1.8
 platform: ruby
-authors: 
+authors:
 - Rick Grundy
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-03-20 00:00:00 +08:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: rspec
+date: 2013-01-17 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 10.0.0
+  type: :development
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 10.0.0
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.5.0
   type: :development
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.5.0
 description: See http://www.github.com/rickgrundy/pagemodels
-email: 
+email:
 - rick@rickgrundy.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - README.txt
@@ -85,35 +101,32 @@ files:
 - spec/page_models/configuration_spec.rb
 - spec/page_models/core_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://www.github.com/rickgrundy/pagemodels
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: pagemodels
-rubygems_version: 1.5.0
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Page models for your browser driving acceptance tests with optional integration for RSpec, Cucumber, and Rails.
-test_files: 
+summary: Page models for your browser driving acceptance tests with optional integration
+  for RSpec, Cucumber, and Rails.
+test_files:
 - spec/page_models/base_spec.rb
 - spec/page_models/configuration_spec.rb
 - spec/page_models/core_spec.rb