funktional 1.0.0 → 2.0.2

data/README.rdoc

@@ -3,13 +3,13 @@
 == A Rails testing framework with a railsy syntax
 
 == Install
-* Use braid to install, if you don't have it.
-      sudo gem install braid
-
-* Then
+* Via the gem
+      gem install funktional
 
+* With braid
       braid add git://github.com/brentgreeff/funktional.git -p
 
+
 * add a setup line to 'test/test_helper.rb'
 
       class ActiveSupport::TestCase

data/funktional.gemspec

@@ -2,27 +2,121 @@
 
 Gem::Specification.new do |s|
   s.name = %q{funktional}
-  s.version = "1.0.0"
-
+  s.version = "2.0.2"
+  
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brent Greeff and Felix Clack"]
   s.date = %q{2010-03-06}
   s.description = %q{Alternative test/unit framework}
-  s.email = %q{felixclack@gmail.com}
-  s.extra_rdoc_files = ["README.rdoc", "lib/funktional.rb", "lib/funktional/assertion.rb", "lib/funktional/assigned_assertion.rb", "lib/funktional/attribute_test_helper.rb", "lib/funktional/context.rb", "lib/funktional/context/assigned_should_block.rb", "lib/funktional/context/collector.rb", "lib/funktional/context/count_should_block.rb", "lib/funktional/context/delegating_should_block.rb", "lib/funktional/context/element_should_block.rb", "lib/funktional/context/flashed_should_block.rb", "lib/funktional/context/should_block.rb", "lib/funktional/context/should_create_block.rb", "lib/funktional/context/should_delete_block.rb", "lib/funktional/context/should_not_block.rb", "lib/funktional/context/should_not_create_block.rb", "lib/funktional/context/should_not_delete_block.rb", "lib/funktional/context/should_not_send_email_block.rb", "lib/funktional/context/stack_recorder.rb", "lib/funktional/email_assertion.rb", "lib/funktional/flashed_assertion.rb", "lib/funktional/model_assertions.rb", "lib/funktional/random_characters.rb", "lib/funktional/recursive_assertion.rb", "lib/funktional/route_checker.rb", "lib/funktional/setup.rb", "lib/funktional/test_class_methods.rb", "lib/funktional/test_instance_methods.rb", "tasks/should_b_tasks.rake"]
-  s.files = ["MIT-LICENSE", "Manifest", "README.rdoc", "Rakefile", "lib/funktional.rb", "lib/funktional/assertion.rb", "lib/funktional/assigned_assertion.rb", "lib/funktional/attribute_test_helper.rb", "lib/funktional/context.rb", "lib/funktional/context/assigned_should_block.rb", "lib/funktional/context/collector.rb", "lib/funktional/context/count_should_block.rb", "lib/funktional/context/delegating_should_block.rb", "lib/funktional/context/element_should_block.rb", "lib/funktional/context/flashed_should_block.rb", "lib/funktional/context/should_block.rb", "lib/funktional/context/should_create_block.rb", "lib/funktional/context/should_delete_block.rb", "lib/funktional/context/should_not_block.rb", "lib/funktional/context/should_not_create_block.rb", "lib/funktional/context/should_not_delete_block.rb", "lib/funktional/context/should_not_send_email_block.rb", "lib/funktional/context/stack_recorder.rb", "lib/funktional/email_assertion.rb", "lib/funktional/flashed_assertion.rb", "lib/funktional/model_assertions.rb", "lib/funktional/random_characters.rb", "lib/funktional/recursive_assertion.rb", "lib/funktional/route_checker.rb", "lib/funktional/setup.rb", "lib/funktional/test_class_methods.rb", "lib/funktional/test_instance_methods.rb", "tasks/should_b_tasks.rake", "test/fixtures/posts.yml", "test/fixtures/users.yml", "test/functional/users_controller_test.rb", "test/test-app/app/controllers/application_controller.rb", "test/test-app/app/controllers/users_controller.rb", "test/test-app/app/helpers/application_helper.rb", "test/test-app/app/models/post.rb", "test/test-app/app/models/user.rb", "test/test-app/app/views/users/edit.html.erb", "test/test-app/app/views/users/index.html.erb", "test/test-app/app/views/users/new.html.erb", "test/test-app/config/boot.rb", "test/test-app/config/database.yml", "test/test-app/config/environment.rb", "test/test-app/config/environments/test.rb", "test/test-app/config/initializers/funktional.rb", "test/test-app/config/initializers/new_rails_defaults.rb", "test/test-app/config/routes.rb", "test/test-app/db/migrate/001_create_users.rb", "test/test-app/db/migrate/002_create_posts.rb", "test/test-app/public/404.html", "test/test-app/public/422.html", "test/test-app/public/500.html", "test/test-app/script/console", "test/test-app/script/generate", "test/test_helper.rb", "test/unit/user_test.rb", "funktional.gemspec"]
+  s.email = %q{email@brentgreeff.com}
+  s.extra_rdoc_files = [
+    "README.rdoc",
+    "lib/funktional.rb",
+    "lib/funktional/assertion.rb",
+    "lib/funktional/assigned_assertion.rb",
+    "lib/funktional/attribute_test_helper.rb",
+    "lib/funktional/context.rb",
+    "lib/funktional/context/assigned_should_block.rb",
+    "lib/funktional/context/collector.rb",
+    "lib/funktional/context/count_should_block.rb",
+    "lib/funktional/context/delegating_should_block.rb",
+    "lib/funktional/context/element_should_block.rb",
+    "lib/funktional/context/flashed_should_block.rb",
+    "lib/funktional/context/should_block.rb",
+    "lib/funktional/context/should_create_block.rb",
+    "lib/funktional/context/should_delete_block.rb",
+    "lib/funktional/context/should_not_block.rb",
+    "lib/funktional/context/should_not_create_block.rb",
+    "lib/funktional/context/should_not_delete_block.rb",
+    "lib/funktional/context/should_not_send_email_block.rb",
+    "lib/funktional/context/stack_recorder.rb",
+    "lib/funktional/email_assertion.rb",
+    "lib/funktional/flashed_assertion.rb",
+    "lib/funktional/model_assertions.rb",
+    "lib/funktional/random_characters.rb",
+    "lib/funktional/recursive_assertion.rb",
+    "lib/funktional/route_checker.rb",
+    "lib/funktional/setup.rb",
+    "lib/funktional/test_class_methods.rb",
+    "lib/funktional/test_instance_methods.rb"
+  ]
+  s.files = [
+    "MIT-LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "lib/funktional.rb",
+    "lib/funktional/assertion.rb",
+    "lib/funktional/assigned_assertion.rb",
+    "lib/funktional/attribute_test_helper.rb",
+    "lib/funktional/context.rb",
+    "lib/funktional/context/assigned_should_block.rb",
+    "lib/funktional/context/collector.rb",
+    "lib/funktional/context/count_should_block.rb",
+    "lib/funktional/context/delegating_should_block.rb",
+    "lib/funktional/context/element_should_block.rb",
+    "lib/funktional/context/flashed_should_block.rb",
+    "lib/funktional/context/should_block.rb",
+    "lib/funktional/context/should_create_block.rb",
+    "lib/funktional/context/should_delete_block.rb",
+    "lib/funktional/context/should_not_block.rb",
+    "lib/funktional/context/should_not_create_block.rb",
+    "lib/funktional/context/should_not_delete_block.rb",
+    "lib/funktional/context/should_not_send_email_block.rb",
+    "lib/funktional/context/stack_recorder.rb",
+    "lib/funktional/email_assertion.rb",
+    "lib/funktional/flashed_assertion.rb",
+    "lib/funktional/model_assertions.rb",
+    "lib/funktional/random_characters.rb",
+    "lib/funktional/recursive_assertion.rb",
+    "lib/funktional/route_checker.rb",
+    "lib/funktional/setup.rb",
+    "lib/funktional/test_class_methods.rb",
+    "lib/funktional/test_instance_methods.rb",
+    "test/fixtures/posts.yml",
+    "test/fixtures/users.yml",
+    "test/functional/users_controller_test.rb",
+    "test/test-app/app/controllers/application_controller.rb",
+    "test/test-app/app/controllers/users_controller.rb",
+    "test/test-app/app/helpers/application_helper.rb",
+    "test/test-app/app/models/post.rb",
+    "test/test-app/app/models/user.rb",
+    "test/test-app/app/views/users/edit.html.erb",
+    "test/test-app/app/views/users/index.html.erb",
+    "test/test-app/app/views/users/new.html.erb",
+    "test/test-app/config/boot.rb",
+    "test/test-app/config/database.yml",
+    "test/test-app/config/environment.rb",
+    "test/test-app/config/environments/test.rb",
+    "test/test-app/config/initializers/funktional.rb",
+    "test/test-app/config/initializers/new_rails_defaults.rb",
+    "test/test-app/config/routes.rb",
+    "test/test-app/db/migrate/001_create_users.rb",
+    "test/test-app/db/migrate/002_create_posts.rb",
+    "test/test-app/public/404.html",
+    "test/test-app/public/422.html",
+    "test/test-app/public/500.html",
+    "test/test-app/script/console",
+    "test/test-app/script/generate",
+    "test/test_helper.rb",
+    "test/unit/user_test.rb",
+    "funktional.gemspec"
+  ]
   s.homepage = %q{http://github.com/brentgreeff/funktional}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Funktional", "--main", "README.rdoc"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{funktional}
   s.rubygems_version = %q{1.3.6}
   s.summary = %q{Alternative test/unit framework}
-  s.test_files = ["test/functional/users_controller_test.rb", "test/test_helper.rb", "test/unit/user_test.rb"]
-
+  s.test_files = [
+    "test/functional/users_controller_test.rb",
+    "test/test_helper.rb",
+    "test/unit/user_test.rb"
+  ]
+  
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
-
+    
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
     else
     end

data/lib/funktional/context/assigned_should_block.rb

@@ -12,7 +12,7 @@ module Funktional
           if result.nil?
             result = assigned(recorder.__target).send(meth, *args, &block)
           else
-            result.send(meth, *args)
+            result.send(meth, *args, &block)
           end
         end
       end

data/lib/funktional/recursive_assertion.rb

@@ -8,7 +8,11 @@ module Funktional
       @test.assert_respond_to @assigned, @method
     end
     
-    def should_be(expected_value)
+    def should_be(expected_value=nil, &block)
+      if block_given?
+        expected_value ||= block.bind(@test).call
+      end
+      
       value = @assigned.send @method
       @test.assert_equal expected_value, value
     end

data/lib/funktional/test_instance_methods.rb

@@ -88,7 +88,15 @@ module Funktional
     
     def should_redirect_to(uri)
       _wrap_assertion do
-        assert_response :redirect
+        actual_template = @response.rendered[:template].to_s
+        
+        if actual_template.blank?
+          msg = "redirected to [#{@response.redirected_to}]"
+        else
+          msg = "rendered template [#{actual_template}]"
+        end
+        
+        assert_response :redirect, msg
         assert_redirected_to uri
       end
     end

data/lib/funktional.rb

@@ -40,3 +40,8 @@ ActiveSupport::TestCase.send(:include, Funktional::AttributeTestHelper)
 
 ActiveSupport::TestCase.send(:include, Funktional::Setup)
 
+if RAILS_ENV.eql? 'test' or $0 == 'irb'
+  require 'funktional/random_characters'
+  Integer.send :include, Funktional::RandomCharacters
+end
+

data/test/functional/users_controller_test.rb

@@ -39,6 +39,8 @@ class UsersControllerTest < ActionController::TestCase
       should "still be able to assign variable in instance version" do
         assigned(User).should_be @user
       end
+      
+      assigned(User).name.should_be { @user.name }
     end
     
     context "updating the user" do
@@ -47,6 +49,12 @@ class UsersControllerTest < ActionController::TestCase
       should_not :create => User
       assigned(User).name.should_be "demo"
     end
+    
+    context "deleting the user" do
+      before { delete :destroy, :id => @user.to_param }
+
+      should :delete => User
+    end
   end
   
   private

data/test/test-app/app/controllers/users_controller.rb

@@ -30,4 +30,11 @@ class UsersController < ApplicationController
     
     redirect_to users_url
   end
+  
+  def destroy
+    @user = User.find(params[:id])
+    
+    @user.destroy
+    redirect_to users_url
+  end
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: funktional
 version: !ruby/object:Gem::Version 
+  hash: 11
   prerelease: false
   segments: 
-  - 1
+  - 2
   - 0
-  - 0
-  version: 1.0.0
+  - 2
+  version: 2.0.2
 platform: ruby
 authors: 
 - Brent Greeff and Felix Clack
@@ -19,7 +20,7 @@ default_executable:
 dependencies: []
 
 description: Alternative test/unit framework
-email: felixclack@gmail.com
+email: email@brentgreeff.com
 executables: []
 
 extensions: []
@@ -54,10 +55,8 @@ extra_rdoc_files:
 - lib/funktional/setup.rb
 - lib/funktional/test_class_methods.rb
 - lib/funktional/test_instance_methods.rb
-- tasks/should_b_tasks.rake
 files: 
 - MIT-LICENSE
-- Manifest
 - README.rdoc
 - Rakefile
 - lib/funktional.rb
@@ -88,7 +87,6 @@ files:
 - lib/funktional/setup.rb
 - lib/funktional/test_class_methods.rb
 - lib/funktional/test_instance_methods.rb
-- tasks/should_b_tasks.rake
 - test/fixtures/posts.yml
 - test/fixtures/users.yml
 - test/functional/users_controller_test.rb
@@ -132,16 +130,20 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 11
       segments: 
       - 1
       - 2
@@ -149,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: funktional
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Alternative test/unit framework

data/Manifest

@@ -1,60 +0,0 @@
-MIT-LICENSE
-Manifest
-README.rdoc
-Rakefile
-lib/funktional.rb
-lib/funktional/assertion.rb
-lib/funktional/assigned_assertion.rb
-lib/funktional/attribute_test_helper.rb
-lib/funktional/context.rb
-lib/funktional/context/assigned_should_block.rb
-lib/funktional/context/collector.rb
-lib/funktional/context/count_should_block.rb
-lib/funktional/context/delegating_should_block.rb
-lib/funktional/context/element_should_block.rb
-lib/funktional/context/flashed_should_block.rb
-lib/funktional/context/should_block.rb
-lib/funktional/context/should_create_block.rb
-lib/funktional/context/should_delete_block.rb
-lib/funktional/context/should_not_block.rb
-lib/funktional/context/should_not_create_block.rb
-lib/funktional/context/should_not_delete_block.rb
-lib/funktional/context/should_not_send_email_block.rb
-lib/funktional/context/stack_recorder.rb
-lib/funktional/email_assertion.rb
-lib/funktional/flashed_assertion.rb
-lib/funktional/model_assertions.rb
-lib/funktional/random_characters.rb
-lib/funktional/recursive_assertion.rb
-lib/funktional/route_checker.rb
-lib/funktional/setup.rb
-lib/funktional/test_class_methods.rb
-lib/funktional/test_instance_methods.rb
-tasks/should_b_tasks.rake
-test/fixtures/posts.yml
-test/fixtures/users.yml
-test/functional/users_controller_test.rb
-test/test-app/app/controllers/application_controller.rb
-test/test-app/app/controllers/users_controller.rb
-test/test-app/app/helpers/application_helper.rb
-test/test-app/app/models/post.rb
-test/test-app/app/models/user.rb
-test/test-app/app/views/users/edit.html.erb
-test/test-app/app/views/users/index.html.erb
-test/test-app/app/views/users/new.html.erb
-test/test-app/config/boot.rb
-test/test-app/config/database.yml
-test/test-app/config/environment.rb
-test/test-app/config/environments/test.rb
-test/test-app/config/initializers/funktional.rb
-test/test-app/config/initializers/new_rails_defaults.rb
-test/test-app/config/routes.rb
-test/test-app/db/migrate/001_create_users.rb
-test/test-app/db/migrate/002_create_posts.rb
-test/test-app/public/404.html
-test/test-app/public/422.html
-test/test-app/public/500.html
-test/test-app/script/console
-test/test-app/script/generate
-test/test_helper.rb
-test/unit/user_test.rb

data/tasks/should_b_tasks.rake

@@ -1,4 +0,0 @@
-# desc "Explaining what the task does"
-# task :should_b do
-#   # Task goes here
-# end