saki 0.0.1 → 0.0.2

data/Rakefile

@@ -6,7 +6,7 @@ begin
   Jeweler::Tasks.new do |gem|
     gem.name = "saki"
     gem.summary = %Q{Allows terse acceptance testing}
-    gem.description = %Q{Cucumber scenarios are lond and confusing sometimes.  Release yourself from the tyranny of client-centered specing!}
+    gem.description = %Q{Cucumber scenarios are long and confusing sometimes.  Release yourself from the tyranny of client-centered specing!}
     gem.email = "nate@ludicast.com"
     gem.homepage = "http://github.com/ludicast/saki"
     gem.authors = ["Nate Kidwell"]

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/lib/saki.rb

@@ -8,10 +8,16 @@ module Saki
 
     def add_opts(link, opts)
       if opts[:parent]
-        "/#{opts[:parent].class.to_s.tableize}/#{opts[:parent].id}" + link
-      else
-        link
+        link = "/#{opts[:parent].class.to_s.tableize}/#{opts[:parent].id}" + link
+      end
+      if opts[:format]
+        link = link + ".#{opts[:format]}"
       end
+      link
+    end
+
+    def has_link(href)
+      page.should have_xpath("//a[@href='#{href}']")
     end
 
     def has_link_for(model, opts = {})
@@ -21,7 +27,7 @@ module Saki
 
     def has_link_for_editing(model, opts = {})
       href = add_opts "/#{model.class.to_s.tableize}/#{model.id}/edit", opts
-      page.should have_xpath("//a[@href='#{href}']")
+      has_link href
     end
 
     def has_link_for_deleting(model, opts = {})
@@ -31,14 +37,24 @@ module Saki
 
     def has_link_for_creating(model_type, opts = {})
       href = add_opts "/#{model_type.to_s.tableize}/new", opts
-      page.should have_xpath("//a[@href='#{href}']")
+      has_link href
     end
 
     def has_link_for_indexing(model_type, opts = {})
       href = add_opts "/#{model_type.to_s.tableize}", opts
-      page.should have_xpath("//a[@href='#{href}']")
+      has_link href
     end  
 
+    def should_be_on(page_name)
+      current_path = URI.parse(current_url).path
+      if page_name.is_a? String
+        current_path.should == page_name
+      else
+        current_path.should match(page_name)
+      end
+    end    
+
+
     module ClassMethods
       def with_existing resource, &block
         context "with exisiting #{resource}" do

data/saki.gemspec

@@ -5,12 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{saki}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nate Kidwell"]
   s.date = %q{2010-08-30}
-  s.description = %q{Cucumber scenarios are lond and confusing sometimes.  Release yourself from the tyranny of client-centered specing!}
+  s.description = %q{Cucumber scenarios are long and confusing sometimes.  Release yourself from the tyranny of client-centered specing!}
   s.email = %q{nate@ludicast.com}
   s.extra_rdoc_files = [
     "LICENSE",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: saki
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Nate Kidwell
@@ -32,7 +32,7 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id001
-description: Cucumber scenarios are lond and confusing sometimes.  Release yourself from the tyranny of client-centered specing!
+description: Cucumber scenarios are long and confusing sometimes.  Release yourself from the tyranny of client-centered specing!
 email: nate@ludicast.com
 executables: []