smurf 1.0.4.rails3.beta2 → 1.0.4.rails3.beta3

data/Gemfile

@@ -1,4 +1,4 @@
-gem "rails", "3.0.0.beta2"
+gem "rails", "3.0.0.beta3"
 
 group :test do
   gem "ruby-debug"

data/VERSION

@@ -1 +1 @@
-1.0.4.rails3.beta2
+1.0.4.rails3.beta3

data/lib/smurf.rb

@@ -1,5 +1,6 @@
 require 'smurf/javascript'
 require 'smurf/stylesheet'
+require 'smurf/noop'
 
 module ActionView::Helpers::AssetTagHelper
 private

data/smurf.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{smurf}
-  s.version = "1.0.4.rails3.beta2"
+  s.version = "1.0.4.rails3.beta3"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin 'Gus' Knowlden"]

data/test/integration_test.rb

@@ -7,17 +7,7 @@ context "link tags when caching on" do
     stylesheet_link_tag('foo', 'bar', '/javascripts/projwcss/jscss', :cache => 'cache/actual-plus')
   end
 
-  should_have_same_contents('javascripts/cache/expected.js', 'javascripts/cache/actual.js')
-  should_have_same_contents('stylesheets/cache/expected-basic.css', 'stylesheets/cache/actual-basic.css')
-  should_have_same_contents('stylesheets/cache/expected-plus.css', 'stylesheets/cache/actual-plus.css')
+  should_have_same_contents('/javascripts/cache/expected.js', '/javascripts/cache/actual.js')
+  should_have_same_contents('/stylesheets/cache/expected-basic.css', '/stylesheets/cache/actual-basic.css')
+  should_have_same_contents('/stylesheets/cache/expected-plus.css', '/stylesheets/cache/actual-plus.css')
 end # link tags when caching on
-
-# context "link tags when caching on" do
-#   setup do
-#     javascript_include_tag('testing', "cache" => 'cache/actual')
-#     stylesheet_link_tag('foo', 'bar', "cache" => 'cache/actual')
-#   end
-# 
-#   should_have_same_contents('javascripts/cache/expected.js', 'javascripts/cache/actual.js')
-#   should_have_same_contents('stylesheets/cache/expected.css', 'stylesheets/cache/actual.css')
-# end # link tags when caching on

data/test/rails/config/application.rb

@@ -9,17 +9,9 @@ Bundler.require :default, Rails.env
 
 module Smurf
   class Application < Rails::Application
-    # Settings in config/environments/* take precedence over those specified here.
-    # Application configuration should go into files in config/initializers
-    # -- all .rb files in that directory are automatically loaded.
-
-    # Add additional load paths for your own custom dirs
-    # config.load_paths += %W( #{config.root}/... )
-
     config.session_store :cookie_store, {:key => "_smurf_session"}
-    config.cookie_secret = '731d6426b731d6426b731d6426b731d6426b731d6426b731d6426b731d6426b'
+    config.secret_token = "i own you." * 3
     
-    # Configure sensitive parameters which will be filtered from the log file.
-    config.filter_parameters << :password
+    config.root = File.expand_path(File.join(File.dirname(__FILE__), ".."))
   end
 end

data/test/rails/config/environments/test.rb

@@ -4,6 +4,4 @@ Smurf::Application.configure do
 
   config.action_controller.consider_all_requests_local = true
   config.action_controller.perform_caching             = true # THIS IS IMPORTANT FOR THE TESTS
-
-  config.action_mailer.delivery_method = :test
 end

data/test/test_helper.rb

@@ -1,7 +1,7 @@
 ENV["RAILS_ENV"] = "test"
 require ::File.expand_path('../rails/config/environment',  __FILE__)
 
-Rails.public_path = Rails.root + "test" + "rails" + "public"
+# Rails.public_path = Rails.root + "test" + "rails" + "public"
 require 'riot'
 require 'ostruct'
 
@@ -35,14 +35,14 @@ class Riot::Situation
   def config
     OpenStruct.new({
       :assets_dir => Rails.public_path,
-      :javascripts_dir => Rails.public_path + "javascripts",
-      :stylesheets_dir => Rails.public_path + "stylesheets",
+      :javascripts_dir => Rails.public_path + "/javascripts",
+      :stylesheets_dir => Rails.public_path + "/stylesheets",
       :perform_caching => true
     })
   end
 end
 
 at_exit do
-  artifacts = Dir.glob(File.join(AssetFile.base_path, '**', 'cache', 'actual-*.*'))
+  artifacts = Dir.glob(File.join(AssetFile.base_path, '**', 'cache', 'actual*.*'))
   FileUtils.rm(artifacts)
 end

metadata

@@ -7,8 +7,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 4
   - rails3
-  - beta2
-  version: 1.0.4.rails3.beta2
+  - beta3
+  version: 1.0.4.rails3.beta3
 platform: ruby
 authors: 
 - Justin 'Gus' Knowlden