sandwich 0.0.3 → 0.0.4

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/lib/sandwich/cucumber/debug_steps.rb

@@ -1,20 +1,20 @@
 require 'pp'
 
-Then Sandwich.regexps[:show_source] do
+Then /^show me the source$/ do
   puts page.body
 end
 
-Then Sandwich.regexps[:show_all] do |targets|
+Then /^show me all (.+)$/ do |targets|
   targets.split(/,/).map do |target| 
-    target.strip.singularize.classify.constantize.all.map { |item| pp item }
+    target.strip.underscore.singularize.classify.constantize.all.map { |item| pp item }
   end
 end
 
-Then Sandwich.regexps[:show_source_snippet] do |selector|
+Then /^show me the source for #{q}$/ do |selector|
   puts locate(selector).html
 end
 
-Then Sandwich.regexps[:show_page_text] do
+Then /^show me the page text$/ do
   IO.popen("html2text", "w+") do |io| 
     io.puts response.body
     io.close_write

data/lib/sandwich/cucumber/model_steps.rb

@@ -2,33 +2,51 @@ require 'sandwich/ext/string'
 require 'sandwich/cucumber/world'
 require 'sandwich/regexps'
 
-Given Sandwich.regexps[:model] do |total, what|
+Given /^(an?|the|\d+) (.+) exists?$/ do |total, what|
   class_for(what).tap do |model|
     total.times { model.make }
   end
 end
 
-Given Sandwich.regexps[:no_model] do |what|
-  class_for(what).delete_all
+Transform /(an?|\d+) (.+) #{q}$/ do |total, what, value|
+  model = class_for(what)
+  r     = total.times.map { model.make(model.default_attribute => value) }
+  
+  r.length == 1 ? r.first : r
 end
 
-Given Sandwich.regexps[:model_with_attribute] do |total, what, attr, value|
-  class_for(what).tap do |model|
-    total.times { model.make(attr => value) }
-  end
+Transform /the (.+) (?:with|in) (.+) #{q}$/ do |what, attr, value|
+  class_for(what).find(:first, :conditions => {attr => value})
+end
+
+Transform /the (.+) #{q}$/ do |what, value|
+  klass = class_for(what)
+  klass.find(:first, :conditions => {klass.default_attribute => value})
+end
+
+Given /^(.+) belonging to (.+)$/ do |child, parent|
+  child.send("#{parent.class.name.underscore}=", parent)
+end
+
+Given /^(.+) has (.+)$/ do |parent, child|
+  parent.send(child.class.name.underscore.pluralize) << child
+end
+
+Given /^no (.+) exists?$/ do |what|
+  class_for(what).delete_all
 end
 
-Given Sandwich.regexps[:no_model_with_attribute] do |what, attr, value|
+Given /^no (.+) (?:with|in) (.+) #{q} exists?$/ do |what, attr, value|
   class_for(what).delete_all
 end
 
-Given Sandwich.regexps[:model_with_attributes] do |total, what, table|
+Given /^(an?|the|\d+) (.+) with the following attributes:$/ do |total, what, table|
   class_for(what).tap do |model|
     total.times { model.make(Hash[*table.raw.map { |k, v| [k.underscore, v] }.flatten]) }
   end
 end
 
-Given Sandwich.regexps[:models_with_attributes] do |what, table|
+Given /^the following (.+):$/ do |what, table|
   class_for(what.singularize).tap do |model|
     table.hashes.each do |h|
       model.make(Hash[*h.each_pair.map { |(k, v)| [k.underscore, v] }.flatten])

data/lib/sandwich/cucumber/table_steps.rb

@@ -1,13 +1,13 @@
 require 'sandwich/regexps'
 
-When Sandwich.regexps[:fill_within_table] do |column, ordinal, path, value|
-  within(selector_for(path)) do
-    _, column_index = all("th").each_with_index.find { |e, i| e.text == column }
-    locate(:xpath, "//tr[#{ordinal.to_i}]/td[#{column_index + 1}]/input").set(value)
-  end
+When /^I fill in the #{q} row, #{q} column in (.+?) with #{q}$/ do |row, column, path, value|
+  selector = xpath(selector_for(path))
+  _, column_index = page.all(:xpath, "#{selector}//th").each_with_index.find { |e, i| e.text == column }
+  _, row_index    = page.all(:xpath, "#{selector}//tr").each_with_index.find { |e, i| e.text.include?(row) }
+  page.locate(:xpath, "((#{selector}//tr)[#{row_index + 1}]/td)[#{column_index + 1}]/input").set(value)
 end
 
-Then Sandwich.regexps[:find_within_row] do |value, ordinal, path|
+Then /^I should see #{q} in the (\w+) data row of (.+)$/ do |value, ordinal, path|
   within(selector_for(path)) do
     page.should have_xpath("//tr[#{ordinal.to_i}]/td", :text => value)
   end

data/lib/sandwich/cucumber/web_steps.rb

@@ -0,0 +1,5 @@
+require 'sandwich/regexps'
+
+Then /^I should see "([^\"]*)" within (.+)$/ do |text, selector|
+  page.should have_xpath(xpath(selector_for(selector)), :text => text)
+end

data/lib/sandwich/cucumber/world.rb

@@ -3,6 +3,14 @@ module Sandwich
     def class_for(name)
       name.underscore.classify.constantize
     end
+
+    def xpath(selector)
+      if Capybara.default_selector.to_sym == :css
+        Capybara::XPath.from_css(selector)
+      else
+        selector
+      end
+    end
   end
 end
 

data/lib/sandwich/ext/active_record.rb

@@ -1,3 +1,4 @@
 ActiveRecord::Base.class_eval do 
+  extend  Sandwich::Base::ClassMethods
   include Sandwich::Amounts
 end

data/lib/sandwich/ext/object.rb

@@ -0,0 +1,9 @@
+module Sandwich
+  module Object
+    QUOTED_VALUE = '"([^\"]*)"' 
+
+    def q() QUOTED_VALUE end
+
+    ::Object.send(:include, self)
+  end
+end

data/lib/sandwich/helpers/base.rb

@@ -0,0 +1,13 @@
+module Sandwich
+  module Base
+    module ClassMethods
+      def default_attribute(name = nil)
+        if name
+          @default_attribute = name
+        else
+          @default_attribute
+        end
+      end
+    end
+  end
+end

data/sandwich.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sandwich}
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Leal"]
-  s.date = %q{2010-04-14}
+  s.date = %q{2010-04-18}
   s.description = %q{Yup, cucumber helpers}
   s.email = %q{david@thedigitalants.com}
   s.extra_rdoc_files = [
@@ -27,12 +27,14 @@ Gem::Specification.new do |s|
      "lib/sandwich/cucumber/debug_steps.rb",
      "lib/sandwich/cucumber/model_steps.rb",
      "lib/sandwich/cucumber/table_steps.rb",
+     "lib/sandwich/cucumber/web_steps.rb",
      "lib/sandwich/cucumber/world.rb",
      "lib/sandwich/ext/active_record.rb",
      "lib/sandwich/ext/capybara.rb",
+     "lib/sandwich/ext/object.rb",
      "lib/sandwich/ext/string.rb",
      "lib/sandwich/helpers/amounts.rb",
-     "lib/sandwich/regexps.rb",
+     "lib/sandwich/helpers/base.rb",
      "sandwich.gemspec",
      "spec/sandwich_spec.rb",
      "spec/spec.opts",

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - David Leal
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-14 00:00:00 +01:00
+date: 2010-04-18 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -99,12 +99,14 @@ files:
 - lib/sandwich/cucumber/debug_steps.rb
 - lib/sandwich/cucumber/model_steps.rb
 - lib/sandwich/cucumber/table_steps.rb
+- lib/sandwich/cucumber/web_steps.rb
 - lib/sandwich/cucumber/world.rb
 - lib/sandwich/ext/active_record.rb
 - lib/sandwich/ext/capybara.rb
+- lib/sandwich/ext/object.rb
 - lib/sandwich/ext/string.rb
 - lib/sandwich/helpers/amounts.rb
-- lib/sandwich/regexps.rb
+- lib/sandwich/helpers/base.rb
 - sandwich.gemspec
 - spec/sandwich_spec.rb
 - spec/spec.opts

data/lib/sandwich/regexps.rb

@@ -1,27 +0,0 @@
-module Sandwich
-  def self.regexps
-    # TODO extract (a|the|etc) to its own thing, so that it can be overridden
-
-    @regexps ||= {}.tap do |rx|
-      rx[:model]                   = /^(an?|the|\d+) (.+) exists?$/
-      rx[:no_model]                = /^no (.+) exists?$/
-      rx[:model_with_attribute]    = /^(an?|the|\d+) (.+) (?:with|in) (.+) #{quoted_value} exists?$/
-      rx[:no_model_with_attribute] = /^no (.+) (?:with|in) (.+) #{quoted_value} exists?$/
-      rx[:model_with_attributes]   = /^(an?|the|\d+) (.+) exists with the following attributes:$/
-      rx[:models_with_attributes]  = /^the following (.+) exist:$/
-      rx[:show_source]             = /^show me the source$/
-      rx[:show_all]                = /^show me all (.+)$/
-      rx[:show_source_snippet]     = /^show me the source for #{quoted_value}$/
-      rx[:show_page_text]          = /^show me the page text$/
-      rx[:look_at]                 = /^I look at (.+)$/
-      rx[:fill_within_table]       = /^I fill in the #{quoted_value} cell for the (\w+) row of (.+?) with #{quoted_value}$/
-      rx[:find_within_row]         = /^I should see #{quoted_value} in the (\w+) data row of (.+)$/
-    end
-  end
-
-  private
-  
-  def self.quoted_value
-    '"([^\"]*)"'
-  end
-end