riot_rails 0.0.9.pre → 0.0.10.pre.2

data/.gitignore

@@ -1,3 +1,3 @@
-test/rails_root/log/*.log
+test/rails_root/log/*
 pkg/*
 

data/Rakefile

@@ -32,7 +32,7 @@ begin
     gem.email = "gus@gusg.us"
     gem.homepage = "http://github.com/thumblemonks/riot_rails"
     gem.authors = ["Justin 'Gus' Knowlden"]
-    gem.add_dependency("riot", ">= 0.10.13.pre")
+    gem.add_dependency("riot", ">= 0.10.13")
     gem.add_development_dependency("activerecord", ">= 3.0.0.pre")
     gem.add_development_dependency("actionpack", ">= 3.0.0.pre")
   end

data/VERSION

@@ -1 +1 @@
-0.0.9.pre
+0.0.10.pre.2

data/lib/riot/action_controller/situation_macros.rb

@@ -44,16 +44,16 @@ module RiotRails #:nodoc:
         parameters ||= {}
         @request.assign_parameters(@controller.class.name.underscore.sub(/_controller$/, ''), action.to_s, parameters)
 
-        # @request.session = ActionController::TestSession.new(session) unless session.nil?
-        # @request.session["flash"] = @request.flash.update(flash || {})
-        # @request.session["flash"].sweep
+        @request.session = ActionController::TestSession.new(session) unless session.nil?
+        @request.session["flash"] = @request.flash.update(flash || {})
+        @request.session["flash"].sweep
 
         @controller.request = @request
         @controller.params.merge!(parameters)
         build_request_uri(action, parameters)
         ::ActionController::Base.class_eval { include ::ActionController::Testing }
         @controller.process_with_new_base_test(@request, @response)
-        # @request.session.delete('flash') if @request.session['flash'].blank?
+        @request.session.delete('flash') if @request.session['flash'].blank?
         @response
       end
 
@@ -73,9 +73,6 @@ end # RiotRails
 
 Riot::Situation.instance_eval do
   include RiotRails::ActionController::HttpSupport
-
-  # Making routes work in the situation
-  Rails::Application.routes.named_routes.install(self)
-  include ActionController::UrlFor
+  include ::ActionController::UrlFor
   default_url_options[:host] = "test.host"
 end

data/riot_rails.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{riot_rails}
-  s.version = "0.0.9.pre"
+  s.version = "0.0.10.pre.2"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin 'Gus' Knowlden"]
-  s.date = %q{2010-02-20}
+  s.date = %q{2010-03-02}
   s.description = %q{Riot specific test support for Rails apps. Protest the slow app.}
   s.email = %q{gus@gusg.us}
   s.extra_rdoc_files = [
@@ -35,6 +35,7 @@ Gem::Specification.new do |s|
      "lib/riot/active_record/validation_macros.rb",
      "lib/riot/rails.rb",
      "lib/riot/rails_context.rb",
+     "log/test.log",
      "rails/init.rb",
      "riot_rails.gemspec",
      "test/action_controller/controller_context_test.rb",
@@ -54,6 +55,7 @@ Gem::Specification.new do |s|
      "test/active_record/validates_uniqueness_of_test.rb",
      "test/rails_context_test.rb",
      "test/rails_root/app/views/rendered_templates/foo_bar.html.erb",
+     "test/rails_root/config/database.yml",
      "test/rails_root/config/environment.rb",
      "test/rails_root/config/routes.rb",
      "test/rails_root/db/schema.rb",
@@ -62,7 +64,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/thumblemonks/riot_rails}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{Riot specific test support for Rails apps}
   s.test_files = [
     "test/action_controller/controller_context_test.rb",
@@ -92,16 +94,16 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<riot>, [">= 0.10.13.pre"])
+      s.add_runtime_dependency(%q<riot>, [">= 0.10.13"])
       s.add_development_dependency(%q<activerecord>, [">= 3.0.0.pre"])
       s.add_development_dependency(%q<actionpack>, [">= 3.0.0.pre"])
     else
-      s.add_dependency(%q<riot>, [">= 0.10.13.pre"])
+      s.add_dependency(%q<riot>, [">= 0.10.13"])
       s.add_dependency(%q<activerecord>, [">= 3.0.0.pre"])
       s.add_dependency(%q<actionpack>, [">= 3.0.0.pre"])
     end
   else
-    s.add_dependency(%q<riot>, [">= 0.10.13.pre"])
+    s.add_dependency(%q<riot>, [">= 0.10.13"])
     s.add_dependency(%q<activerecord>, [">= 3.0.0.pre"])
     s.add_dependency(%q<actionpack>, [">= 3.0.0.pre"])
   end

data/test/rails_root/config/database.yml

@@ -0,0 +1,4 @@
+test:
+  adapter: "sqlite3"
+  database: ":memory:"
+

data/test/rails_root/config/environment.rb

@@ -1,18 +1,20 @@
 ENV['RAILS_ENV'] = 'test'
 
+require 'sqlite3'
 require "active_record/railtie"
 require "action_controller/railtie"
 # require "action_mailer/railtie"
 # require "active_resource/railtie"
 
-module Rails
-  def self.root; File.expand_path(File.join(File.dirname(__FILE__), "..")); end
-end
-
 module RiotRails
-  class Application < Rails::Application; end
+  class Application < Rails::Application
+    config.root = File.expand_path(File.join(File.dirname(__FILE__), ".."))
+    config.action_controller.session = { :key => "_riotrails_session", :secret => ("i own you." * 3) }
+  end
 end
 
+RiotRails::Application.initialize!
+
 require File.join(Rails.root, "config", "routes.rb")
 
 # Logging stuff
@@ -36,11 +38,7 @@ def shhh(&block)
 end
 
 shhh do
-  require 'sqlite3'
-  ActiveRecord::Base.configurations = {"test" => { "adapter" => "sqlite3", "database" => ":memory:"}}
-  ActiveRecord::Base.establish_connection("test")
   load(File.join(Rails.root, "db", "schema.rb"))
 end
 
 ActiveRecord::Base.logger = Logger.new(NilIO.new)
-ActionController::Base.view_paths = [File.join(Rails.root, 'app', 'views')]

metadata

@@ -1,7 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: riot_rails
 version: !ruby/object:Gem::Version 
-  version: 0.0.9.pre
+  prerelease: true
+  segments: 
+  - 0
+  - 0
+  - 10
+  - pre
+  - 2
+  version: 0.0.10.pre.2
 platform: ruby
 authors: 
 - Justin 'Gus' Knowlden
@@ -9,39 +16,53 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-20 00:00:00 -06:00
+date: 2010-03-02 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: riot
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.10.13.pre
-    version: 
+        segments: 
+        - 0
+        - 10
+        - 13
+        version: 0.10.13
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: activerecord
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 3
+        - 0
+        - 0
+        - pre
         version: 3.0.0.pre
-    version: 
+  type: :development
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: actionpack
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 3
+        - 0
+        - 0
+        - pre
         version: 3.0.0.pre
-    version: 
+  type: :development
+  version_requirements: *id003
 description: Riot specific test support for Rails apps. Protest the slow app.
 email: gus@gusg.us
 executables: []
@@ -70,6 +91,7 @@ files:
 - lib/riot/active_record/validation_macros.rb
 - lib/riot/rails.rb
 - lib/riot/rails_context.rb
+- log/test.log
 - rails/init.rb
 - riot_rails.gemspec
 - test/action_controller/controller_context_test.rb
@@ -89,6 +111,7 @@ files:
 - test/active_record/validates_uniqueness_of_test.rb
 - test/rails_context_test.rb
 - test/rails_root/app/views/rendered_templates/foo_bar.html.erb
+- test/rails_root/config/database.yml
 - test/rails_root/config/environment.rb
 - test/rails_root/config/routes.rb
 - test/rails_root/db/schema.rb
@@ -106,18 +129,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
+      segments: 
+      - 1
+      - 3
+      - 1
       version: 1.3.1
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Riot specific test support for Rails apps