fiveruns_tuneup_merb 0.5.0 → 0.5.1

data/Rakefile

@@ -1,16 +1,14 @@
 require 'rubygems'
 require 'rake/gempackagetask'
-require 'spec/rake/spectask'
 require 'merb-core/version'
 require 'merb-core/tasks/merb_rake_helper'
-require 'merb-core/test/tasks/spectasks'
 
 NAME = "fiveruns_tuneup_merb"
 AUTHOR = "FiveRuns Development Team"
 EMAIL = "dev@fiveruns.com"
 HOMEPAGE = "http://tuneup.fiveruns.com/"
 SUMMARY = "Merb Slice that provides the FiveRuns TuneUp Panel (http://tuneup.fiveruns.com)"
-GEM_VERSION = "0.5.0"
+GEM_VERSION = "0.5.1"
 
 spec = Gem::Specification.new do |s|
   s.rubyforge_project = 'fiveruns_tuneup_merb'

data/lib/fiveruns_tuneup_merb.rb

@@ -3,7 +3,7 @@ if defined?(Merb::Plugins)
   $:.unshift File.dirname(__FILE__)
   
   load_dependency 'merb-slices'
-  Merb::Plugins.add_rakefiles "fiveruns_tuneup_merb/merbtasks", "fiveruns_tuneup_merb/slicetasks", "fiveruns_tuneup_merb/spectasks"
+  Merb::Plugins.add_rakefiles "fiveruns_tuneup_merb/merbtasks", "fiveruns_tuneup_merb/slicetasks"
   
   require 'fiveruns_tuneup_core'
   require File.dirname(__FILE__) / 'fiveruns_tuneup_merb' / 'instrumentation'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fiveruns_tuneup_merb
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors: 
 - FiveRuns Development Team
@@ -52,12 +52,7 @@ files:
 - lib/fiveruns_tuneup_merb/instrumentation.rb
 - lib/fiveruns_tuneup_merb/merbtasks.rb
 - lib/fiveruns_tuneup_merb/slicetasks.rb
-- lib/fiveruns_tuneup_merb/spectasks.rb
 - lib/fiveruns_tuneup_merb.rb
-- spec/controllers
-- spec/controllers/main_spec.rb
-- spec/fiveruns_tuneup_merb_spec.rb
-- spec/spec_helper.rb
 - app/controllers
 - app/controllers/application.rb
 - app/controllers/runs.rb

data/lib/fiveruns_tuneup_merb/spectasks.rb

@@ -1,65 +0,0 @@
-namespace :slices do
-  namespace :fiveruns_tuneup_merb do
-      
-    desc "Run slice specs within the host application context"
-    task :spec => [ "spec:explain", "spec:default" ]
-    
-    namespace :spec do
-      
-      slice_root = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
-      
-      task :explain do
-        puts "\nNote: By running FiverunsTuneupMerb specs inside the application context any\n" +
-             "overrides could break existing specs. This isn't always a problem,\n" +
-             "especially in the case of views. Use these spec tasks to check how\n" +
-             "well your application conforms to the original slice implementation."
-      end
-      
-      Spec::Rake::SpecTask.new('default') do |t|
-        t.spec_opts = ["--format", "specdoc", "--colour"]
-        t.spec_files = Dir["#{slice_root}/spec/**/*_spec.rb"].sort
-      end
-
-      desc "Run all model specs, run a spec for a specific Model with MODEL=MyModel"
-      Spec::Rake::SpecTask.new('model') do |t|
-        t.spec_opts = ["--format", "specdoc", "--colour"]
-        if(ENV['MODEL'])
-          t.spec_files = Dir["#{slice_root}/spec/models/**/#{ENV['MODEL']}_spec.rb"].sort
-        else
-          t.spec_files = Dir["#{slice_root}/spec/models/**/*_spec.rb"].sort
-        end
-      end
-
-      desc "Run all controller specs, run a spec for a specific Controller with CONTROLLER=MyController"
-      Spec::Rake::SpecTask.new('controller') do |t|
-        t.spec_opts = ["--format", "specdoc", "--colour"]
-        if(ENV['CONTROLLER'])
-          t.spec_files = Dir["#{slice_root}/spec/controllers/**/#{ENV['CONTROLLER']}_spec.rb"].sort
-        else    
-          t.spec_files = Dir["#{slice_root}/spec/controllers/**/*_spec.rb"].sort
-        end
-      end
-
-      desc "Run all view specs, run specs for a specific controller (and view) with CONTROLLER=MyController (VIEW=MyView)"
-      Spec::Rake::SpecTask.new('view') do |t|
-        t.spec_opts = ["--format", "specdoc", "--colour"]
-        if(ENV['CONTROLLER'] and ENV['VIEW'])
-          t.spec_files = Dir["#{slice_root}/spec/views/**/#{ENV['CONTROLLER']}/#{ENV['VIEW']}*_spec.rb"].sort
-        elsif(ENV['CONTROLLER'])
-          t.spec_files = Dir["#{slice_root}/spec/views/**/#{ENV['CONTROLLER']}/*_spec.rb"].sort
-        else
-          t.spec_files = Dir["#{slice_root}/spec/views/**/*_spec.rb"].sort
-        end
-      end
-
-      desc "Run all specs and output the result in html"
-      Spec::Rake::SpecTask.new('html') do |t|
-        t.spec_opts = ["--format", "html"]
-        t.libs = ['lib', 'server/lib' ]
-        t.spec_files = Dir["#{slice_root}/spec/**/*_spec.rb"].sort
-      end
-      
-    end
-    
-  end
-end

data/spec/controllers/main_spec.rb

@@ -1,61 +0,0 @@
-require File.dirname(__FILE__) + '/../spec_helper'
-
-describe "FiverunsTuneupMerb::Main (controller)" do
-  
-  # Feel free to remove the specs below
-  
-  before :all do
-    Merb::Router.prepare { |r| r.add_slice(:FiverunsTuneupMerb) } if standalone?
-  end
-  
-  after :all do
-    Merb::Router.reset! if standalone?
-  end
-  
-  it "should have access to the slice module" do
-    controller = dispatch_to(FiverunsTuneupMerb::Main, :index)
-    controller.slice.should == FiverunsTuneupMerb
-    controller.slice.should == FiverunsTuneupMerb::Main.slice
-  end
-  
-  it "should have an index action" do
-    controller = dispatch_to(FiverunsTuneupMerb::Main, :index)
-    controller.status.should == 200
-    controller.body.should contain('FiverunsTuneupMerb')
-  end
-  
-  it "should work with the default route" do
-    controller = get("/fiveruns_tuneup_merb/main/index")
-    controller.should be_kind_of(FiverunsTuneupMerb::Main)
-    controller.action_name.should == 'index'
-  end
-  
-  it "should work with the example named route" do
-    controller = get("/fiveruns_tuneup_merb/index.html")
-    controller.should be_kind_of(FiverunsTuneupMerb::Main)
-    controller.action_name.should == 'index'
-  end
-  
-  it "should have routes in FiverunsTuneupMerb.routes" do
-    FiverunsTuneupMerb.routes.should_not be_empty
-  end
-  
-  it "should have a slice_url helper method for slice-specific routes" do
-    controller = dispatch_to(FiverunsTuneupMerb::Main, 'index')
-    controller.slice_url(:action => 'show', :format => 'html').should == "/fiveruns_tuneup_merb/main/show.html"
-    controller.slice_url(:fiveruns_tuneup_merb_index, :format => 'html').should == "/fiveruns_tuneup_merb/index.html"
-  end
-  
-  it "should have helper methods for dealing with public paths" do
-    controller = dispatch_to(FiverunsTuneupMerb::Main, :index)
-    controller.public_path_for(:image).should == "/slices/fiveruns_tuneup_merb/images"
-    controller.public_path_for(:javascript).should == "/slices/fiveruns_tuneup_merb/javascripts"
-    controller.public_path_for(:stylesheet).should == "/slices/fiveruns_tuneup_merb/stylesheets"
-  end
-  
-  it "should have a slice-specific _template_root" do
-    FiverunsTuneupMerb::Main._template_root.should == FiverunsTuneupMerb.dir_for(:view)
-    FiverunsTuneupMerb::Main._template_root.should == FiverunsTuneupMerb::Application._template_root
-  end
-
-end

data/spec/fiveruns_tuneup_merb_spec.rb

@@ -1,130 +0,0 @@
-require File.dirname(__FILE__) + '/spec_helper'
-
-describe "FiverunsTuneupMerb (module)" do
-  
-  it "should have proper specs"
-  
-  # Feel free to remove the specs below
-  
-  before :all do
-    Merb::Router.prepare { |r| r.add_slice(:FiverunsTuneupMerb) } if standalone?
-  end
-  
-  after :all do
-    Merb::Router.reset! if standalone?
-  end
-  
-  it "should be registered in Merb::Slices.slices" do
-    Merb::Slices.slices.should include(FiverunsTuneupMerb)
-  end
-  
-  it "should be registered in Merb::Slices.paths" do
-    Merb::Slices.paths[FiverunsTuneupMerb.name].should == current_slice_root
-  end
-  
-  it "should have an :identifier property" do
-    FiverunsTuneupMerb.identifier.should == "fiveruns_tuneup_merb"
-  end
-  
-  it "should have an :identifier_sym property" do
-    FiverunsTuneupMerb.identifier_sym.should == :fiveruns_tuneup_merb
-  end
-  
-  it "should have a :root property" do
-    FiverunsTuneupMerb.root.should == Merb::Slices.paths[FiverunsTuneupMerb.name]
-    FiverunsTuneupMerb.root_path('app').should == current_slice_root / 'app'
-  end
-  
-  it "should have a :file property" do
-    FiverunsTuneupMerb.file.should == current_slice_root / 'lib' / 'fiveruns_tuneup_merb.rb'
-  end
-  
-  it "should have metadata properties" do
-    FiverunsTuneupMerb.description.should == "FiverunsTuneupMerb is a chunky Merb slice!"
-    FiverunsTuneupMerb.version.should == "0.0.1"
-    FiverunsTuneupMerb.author.should == "YOUR NAME"
-  end
-  
-  it "should have :routes and :named_routes properties" do
-    FiverunsTuneupMerb.routes.should_not be_empty
-    FiverunsTuneupMerb.named_routes[:fiveruns_tuneup_merb_index].should be_kind_of(Merb::Router::Route)
-  end
-
-  it "should have an url helper method for slice-specific routes" do
-    FiverunsTuneupMerb.url(:controller => 'main', :action => 'show', :format => 'html').should == "/fiveruns_tuneup_merb/main/show.html"
-    FiverunsTuneupMerb.url(:fiveruns_tuneup_merb_index, :format => 'html').should == "/fiveruns_tuneup_merb/index.html"
-  end
-  
-  it "should have a config property (Hash)" do
-    FiverunsTuneupMerb.config.should be_kind_of(Hash)
-  end
-  
-  it "should have bracket accessors as shortcuts to the config" do
-    FiverunsTuneupMerb[:foo] = 'bar'
-    FiverunsTuneupMerb[:foo].should == 'bar'
-    FiverunsTuneupMerb[:foo].should == FiverunsTuneupMerb.config[:foo]
-  end
-  
-  it "should have a :layout config option set" do
-    FiverunsTuneupMerb.config[:layout].should == :fiveruns_tuneup_merb
-  end
-  
-  it "should have a dir_for method" do
-    app_path = FiverunsTuneupMerb.dir_for(:application)
-    app_path.should == current_slice_root / 'app'
-    [:view, :model, :controller, :helper, :mailer, :part].each do |type|
-      FiverunsTuneupMerb.dir_for(type).should == app_path / "#{type}s"
-    end
-    public_path = FiverunsTuneupMerb.dir_for(:public)
-    public_path.should == current_slice_root / 'public'
-    [:stylesheet, :javascript, :image].each do |type|
-      FiverunsTuneupMerb.dir_for(type).should == public_path / "#{type}s"
-    end
-  end
-  
-  it "should have a app_dir_for method" do
-    root_path = FiverunsTuneupMerb.app_dir_for(:root)
-    root_path.should == Merb.root / 'slices' / 'fiveruns_tuneup_merb'
-    app_path = FiverunsTuneupMerb.app_dir_for(:application)
-    app_path.should == root_path / 'app'
-    [:view, :model, :controller, :helper, :mailer, :part].each do |type|
-      FiverunsTuneupMerb.app_dir_for(type).should == app_path / "#{type}s"
-    end
-    public_path = FiverunsTuneupMerb.app_dir_for(:public)
-    public_path.should == Merb.dir_for(:public) / 'slices' / 'fiveruns_tuneup_merb'
-    [:stylesheet, :javascript, :image].each do |type|
-      FiverunsTuneupMerb.app_dir_for(type).should == public_path / "#{type}s"
-    end
-  end
-  
-  it "should have a public_dir_for method" do
-    public_path = FiverunsTuneupMerb.public_dir_for(:public)
-    public_path.should == '/slices' / 'fiveruns_tuneup_merb'
-    [:stylesheet, :javascript, :image].each do |type|
-      FiverunsTuneupMerb.public_dir_for(type).should == public_path / "#{type}s"
-    end
-  end
-  
-  it "should have a public_path_for method" do
-    public_path = FiverunsTuneupMerb.public_dir_for(:public)
-    FiverunsTuneupMerb.public_path_for("path", "to", "file").should == public_path / "path" / "to" / "file"
-    [:stylesheet, :javascript, :image].each do |type|
-      FiverunsTuneupMerb.public_path_for(type, "path", "to", "file").should == public_path / "#{type}s" / "path" / "to" / "file"
-    end
-  end
-  
-  it "should have a app_path_for method" do
-    FiverunsTuneupMerb.app_path_for("path", "to", "file").should == FiverunsTuneupMerb.app_dir_for(:root) / "path" / "to" / "file"
-    FiverunsTuneupMerb.app_path_for(:controller, "path", "to", "file").should == FiverunsTuneupMerb.app_dir_for(:controller) / "path" / "to" / "file"
-  end
-  
-  it "should have a slice_path_for method" do
-    FiverunsTuneupMerb.slice_path_for("path", "to", "file").should == FiverunsTuneupMerb.dir_for(:root) / "path" / "to" / "file"
-    FiverunsTuneupMerb.slice_path_for(:controller, "path", "to", "file").should == FiverunsTuneupMerb.dir_for(:controller) / "path" / "to" / "file"
-  end
-  
-  it "should keep a list of path component types to use when copying files" do
-    (FiverunsTuneupMerb.mirrored_components & FiverunsTuneupMerb.slice_paths.keys).length.should == FiverunsTuneupMerb.mirrored_components.length
-  end
-  
-end

data/spec/spec_helper.rb

@@ -1,44 +0,0 @@
-require 'rubygems'
-require 'merb-core'
-require 'merb-slices'
-require 'spec'
-
-# Add fiveruns_tuneup_merb.rb to the search path
-Merb::Plugins.config[:merb_slices][:auto_register] = true
-Merb::Plugins.config[:merb_slices][:search_path]   = File.join(File.dirname(__FILE__), '..', 'lib', 'fiveruns_tuneup_merb.rb')
-
-# Using Merb.root below makes sure that the correct root is set for
-# - testing standalone, without being installed as a gem and no host application
-# - testing from within the host application; its root will be used
-Merb.start_environment(
-  :testing => true, 
-  :adapter => 'runner', 
-  :environment => ENV['MERB_ENV'] || 'test',
-  :merb_root => Merb.root,
-  :session_store => 'memory'
-)
-
-module Merb
-  module Test
-    module SliceHelper
-      
-      # The absolute path to the current slice
-      def current_slice_root
-        @current_slice_root ||= File.expand_path(File.join(File.dirname(__FILE__), '..'))
-      end
-      
-      # Whether the specs are being run from a host application or standalone
-      def standalone?
-        Merb.root == ::FiverunsTuneupMerb.root
-      end
-      
-    end
-  end
-end
-
-Spec::Runner.configure do |config|
-  config.include(Merb::Test::ViewHelper)
-  config.include(Merb::Test::RouteHelper)
-  config.include(Merb::Test::ControllerHelper)
-  config.include(Merb::Test::SliceHelper)
-end