adva-core 0.0.5 → 0.0.6

data/lib/adva/generators/templates/app/Gemfile

@@ -0,0 +1,24 @@
+source :rubygems
+
+gem  'adva-core'
+gem  'adva-blog'
+gem  'adva-cache'
+gem  'adva-categories'
+gem  'adva-static'
+gem  'adva-user'
+gem  'adva-markup'
+
+group :test do
+  gem 'sqlite3-ruby', '1.2.5'
+  gem 'cucumber', '0.9.4'
+  gem 'cucumber-rails', '0.3.2'
+  gem 'webrat', '0.7.2'
+  gem 'thor'
+  gem 'ruby-debug'
+  gem 'mocha'
+  gem 'fakefs', :require => 'fakefs/safe'
+  gem 'test_declarative'
+  gem 'database_cleaner', '0.5.2'
+  gem 'launchy'
+  gem 'factory_girl', '1.3.2'
+end

data/lib/adva/generators/templates/app/app_template.rb

@@ -1,3 +1,3 @@
 copy_file config[:source].join('lib/bundler/repository.rb'), "#{app_path}/lib/bundler/repository.rb"
-copy_file config[:source].join('Gemfile'), "#{app_path}/Gemfile"
-remove_file 'public/index.html'
+copy_file config[:source].join('adva-core/lib/adva/generators/templates/app/Gemfile'), "#{app_path}/Gemfile"
+remove_file 'public/index.html'

data/lib/adva/registry.rb

@@ -6,15 +6,15 @@ module Adva
       def instance
         @@instance ||= new
       end
-    
+
       def get(*args)
         instance.get(*args)
       end
-    
+
       def set(*args)
         instance.set(*args)
       end
-    
+
       def clear
         instance.clear
       end
@@ -40,18 +40,18 @@ module Adva
     end
 
     def get(*keys)
-      keys.map { |key| key.to_sym }.inject(self) do |result, key| 
+      keys.map { |key| key.to_sym }.inject(self) do |result, key|
         return nil unless result.has_key?(key)
         result[key]
       end
     end
-  
+
     protected
-    
+
       def merge!(other)
         other.each { |key, value| self[key] = value }
       end
-  
+
       def to_registry(hash)
         hash.inject(Registry.new) do |registry, (key, value)|
           registry[key.to_sym] = value.is_a?(Hash) ? to_registry(value) : value
@@ -59,4 +59,4 @@ module Adva
         end
       end
   end
-end
+end

data/lib/adva_core/version.rb

@@ -1,3 +1,3 @@
 module AdvaCore
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/lib/testing/assertions.rb

@@ -1,8 +1,6 @@
-def assert_email_sent(attributes)
-  emails = ::ActionMailer::Base.deliveries
-  assert !emails.empty?, "No emails were sent"
-  matching_emails = emails.select do |email|
-    attributes.all? do |name, value| 
+def emails_for_assertion(attributes)
+  ::ActionMailer::Base.deliveries.select do |email|
+    attributes.all? do |name, value|
       case name
       when 'body'
         value.split(',').map(&:strip).all? { |value| email.body.include?(value) }
@@ -11,9 +9,23 @@ def assert_email_sent(attributes)
       end
     end
   end
-  assert !matching_emails.empty?, begin
+end
+
+def assert_email_sent(attributes)
+  emails = ::ActionMailer::Base.deliveries
+  assert !emails.empty?, "No emails were sent"
+  assert !emails_for_assertion(attributes).empty?, begin
     msg = ["None of the #{emails.size} emails matched #{attributes.inspect}.\nInstead, there are the following emails:"]
     msg += emails.map { |email| attributes.keys.map { |key| [key, email.send(key)] }.map { |key, value| "#{key}: #{value}" }.join(',') }
     msg.join("\n")
   end
-end
+end
+
+def assert_no_email_sent(attributes = {})
+  if attributes.empty?
+    assert ::ActionMailer::Base.deliveries.empty?
+  else
+    assert emails_for_assertion(attributes).empty?, "Expected none of the emails to match #{attributes.inspect}, but one did."
+  end
+end
+

data/lib/testing/step_definitions/common_steps.rb

@@ -114,9 +114,9 @@ Then /^I should (not )?see a ([a-z ]+ )?row (?:of the ([a-z ]+) table )?where "(
   xpath_result = body.xpath("//#{table_xpath}/descendant::td[@headers='#{header_id}'][normalize-space(text())='#{cell_content}']/#{tr_xpath}/@id")
 
   if optional_not.present?
-    assert xpath_result.empty?, 'should not find a row'
+    assert xpath_result.empty?, "Expected not find a row where #{header.inspect} is #{cell_content}."
   else
-    assert xpath_result.any?, 'should find at least one row'
+    assert xpath_result.any?, "Expected to find at least one row where #{header.inspect} is #{cell_content}."
   end
 end
 
@@ -258,6 +258,10 @@ Then /^the following emails should have been sent:$/ do |expected_emails|
   end
 end
 
+Then /^no emails should have been sent$/ do
+  assert_no_email_sent
+end
+
 Then /^"([^"]*)" should be filled in with "([^"]*)"$/ do |field, value|
   field = webrat.field_labeled(field)
   assert_equal value, field.value

data/lib/testing/step_definitions/webrat_steps.rb

@@ -44,7 +44,7 @@ end
 #     | Note           | Nice guy   |
 #     | Wants Email?   |            |
 #
-When /^(?:|I )fill in the following:$/ do |fields|
+When /^(?:|I )fill in the following:?$/ do |fields|
   fields.rows_hash.each do |name, value|
     step = case webrat.field_labeled(name)
     when Webrat::TextField, Webrat::TextareaField, Webrat::PasswordField

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: adva-core
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Ingo Weiss
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-18 00:00:00 +01:00
+date: 2011-01-14 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -139,12 +139,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 51
+        hash: 47
         segments: 
         - 0
         - 0
-        - 22
-        version: 0.0.22
+        - 24
+        version: 0.0.24
   type: :runtime
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
@@ -187,12 +187,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 3
         segments: 
         - 0
         - 0
-        - 12
-        version: 0.0.12
+        - 14
+        version: 0.0.14
   type: :runtime
   version_requirements: *id011
 - !ruby/object:Gem::Dependency 
@@ -362,6 +362,7 @@ files:
 - lib/adva/generators/templates/engine/redirects.rb.erb
 - lib/adva/generators/templates/engine/Gemfile.erb
 - lib/adva/generators/templates/engine/all.rb
+- lib/adva/generators/templates/app/Gemfile
 - lib/adva/generators/templates/app/app_template.rb
 - lib/adva/generators/engine.rb
 - lib/adva/responder/redirect.rb