bin/common.rb tasks/merb.thor/app_script.rb tasks/merb.thor/common.rb tasks/merb.thor/gem_ext.rb tasks/merb.thor/main.thor tasks/merb.thor/ops.rb tasks/merb.thor/utils.rb @@ -16,6 +16,9 @@ src/* .hgignore .hg/* .svn/* +gems/gems/* +gems/specifications/* +merb_profile_results config/database.yml pkg/* app/plugins .gitignore @@ -1 +1,2 @@ -Autotest.add_discovery { "merb" } \ No newline at end of file +Autotest.add_discovery { "merb" } +Autotest.add_discovery { "rspec" } autotest/discover.rb @@ -2,81 +2,84 @@ require 'autotest' class Autotest::Merb < Autotest - + # +model_tests_dir+:: the directory to find model-centric tests # +controller_tests_dir+:: the directory to find controller-centric tests # +view_tests_dir+:: the directory to find view-centric tests # +fixtures_dir+:: the directory to find fixtures in attr_accessor :model_tests_dir, :controller_tests_dir, :view_tests_dir, :fixtures_dir - + def initialize super - + initialize_test_layout - + # Ignore any happenings in these directories - add_exception %r%^\./(?:doc|log|public|tmp)% - + add_exception %r%^\./(?:doc|log|public|tmp|\.git|\.hg|\.svn|framework|gems|schema|\.DS_Store|autotest|bin|.*\.sqlite3)% + # Ignore SCM directories and custom Autotest mappings + %w[.svn .hg .git .autotest].each { |exception| add_exception(exception) } + + # Ignore any mappings that Autotest may have already set up clear_mappings - - # Any changes to a file in the root of the 'lib' directory will run any + + # Any changes to a file in the root of the 'lib' directory will run any # model test with a corresponding name. add_mapping %r%^lib\/.*\.rb% do |filename, _| files_matching Regexp.new(["^#{model_test_for(filename)}$"]) end - - # Any changes to a fixture will run corresponding view, controller and + + # Any changes to a fixture will run corresponding view, controller and # model tests add_mapping %r%^#{fixtures_dir}/(.*)s.yml% do |_, m| [ - model_test_for(m[1]), - controller_test_for(m[1]), + model_test_for(m[1]), + controller_test_for(m[1]), view_test_for(m[1]) ] end - - # Any change to a test or test will cause it to be run + + # Any change to a test will cause it to be run add_mapping %r%^test/(unit|models|integration|controllers|views|functional)/.*rb$% do |filename, _| filename end - + # Any change to a model will cause it's corresponding test to be run add_mapping %r%^app/models/(.*)\.rb$% do |_, m| model_test_for(m[1]) end - - # Any change to the global helper will result in all view and controller + + # Any change to the global helper will result in all view and controller # tests being run add_mapping %r%^app/helpers/global_helpers.rb% do files_matching %r%^test/(views|functional|controllers)/.*_test\.rb$% end - - # Any change to a helper will run it's corresponding view and controller - # tests, unless the helper is the global helper. Changes to the global + + # Any change to a helper will run it's corresponding view and controller + # tests, unless the helper is the global helper. Changes to the global # helper run all view and controller tests. add_mapping %r%^app/helpers/(.*)_helper(s)?.rb% do |_, m| if m[1] == "global" then files_matching %r%^test/(views|functional|controllers)/.*_test\.rb$% else [ - view_test_for(m[1]), + view_test_for(m[1]), controller_test_for(m[1]) ] end end - - # Changes to views result in their corresponding view and controller test + + # Changes to views result in their corresponding view and controller test # being run add_mapping %r%^app/views/(.*)/% do |_, m| [ - view_test_for(m[1]), + view_test_for(m[1]), controller_test_for(m[1]) ] end - - # Changes to a controller result in its corresponding test being run. If - # the controller is the exception or application controller, all + + # Changes to a controller result in its corresponding test being run. If + # the controller is the exception or application controller, all # controller tests are run. add_mapping %r%^app/controllers/(.*)\.rb$% do |_, m| if ["application", "exception"].include?(m[1]) @@ -91,16 +94,16 @@ class Autotest::Merb < Autotest files_matching %r%^test/(controllers|views|functional)/.*_test\.rb$% end - # If any of the major files governing the environment are altered, run + # If any of the major files governing the environment are altered, run # everything add_mapping %r%^test/test_helper.rb|config/(init|rack|environments/test.rb|database.yml)% do # FIX files_matching %r%^test/(unit|models|controllers|views|functional)/.*_test\.rb$% end end - + private - # Determines the paths we can expect tests or specs to reside, as well as + # Determines the paths we can expect tests or specs to reside, as well as # corresponding fixtures. def initialize_test_layout self.model_tests_dir = "test/unit" @@ -108,19 +111,19 @@ private self.view_tests_dir = "test/views" self.fixtures_dir = "test/fixtures" end - - # Given a filename and the test type, this method will return the + + # Given a filename and the test type, this method will return the # corresponding test's or spec's name. - # + # # ==== Arguments # +filename+<String>:: the file name of the model, view, or controller # +kind_of_test+<Symbol>:: the type of test we that we should run - # + # # ==== Returns # String:: the name of the corresponding test or spec - # + # # ==== Example - # + # # > test_for("user", :model) # => "user_test.rb" # > test_for("login", :controller) @@ -133,17 +136,17 @@ private name << "test" return name.join("_") + ".rb" end - + def model_test_for(filename) [model_tests_dir, test_for(filename, :model)].join("/") end - + def controller_test_for(filename) [controller_tests_dir, test_for(filename, :controller)].join("/") end - + def view_test_for(filename) [view_tests_dir, test_for(filename, :view)].join("/") end - -end \ No newline at end of file + +end autotest/merb.rb @@ -3,18 +3,18 @@ require 'autotest' class RspecCommandError < StandardError; end -# This class maps your application's structure so Autotest can understand what +# This class maps your application's structure so Autotest can understand what # specs to run when files change. # -# Fixtures are _not_ covered by this class. If you change a fixture file, you -# will have to run your spec suite manually, or, better yet, provide your own +# Fixtures are _not_ covered by this class. If you change a fixture file, you +# will have to run your spec suite manually, or, better yet, provide your own # Autotest map explaining how your fixtures are set up. class Autotest::MerbRspec < Autotest def initialize super # Ignore any happenings in these directories - add_exception %r%^\./(?:doc|log|public|tmp|\.git|\.hg|\.svn|framework|gems|schema|\.DS_Store|autotest|bin|.*\.sqlite3)% + add_exception %r%^\./(?:doc|log|public|tmp|\.git|\.hg|\.svn|framework|gems|schema|\.DS_Store|autotest|bin|.*\.sqlite3|.*\.thor)% # Ignore SCM directories and custom Autotest mappings %w[.svn .hg .git .autotest].each { |exception| add_exception(exception) } @@ -44,7 +44,7 @@ class Autotest::MerbRspec < Autotest # Any change to global_helpers will result in all view and controller # tests being run add_mapping %r%^app/helpers/global_helpers\.rb% do - files_matching %r%^spec/(views|controllers|helpers)/.*_spec\.rb$% + files_matching %r%^spec/(views|controllers|helpers|requests)/.*_spec\.rb$% end # Any change to a helper will cause its spec to be run @@ -75,7 +75,7 @@ class Autotest::MerbRspec < Autotest # If any of the major files governing the environment are altered, run # everything - add_mapping %r%^config/(init|rack|environments/test).*\.rb|database\.yml% do + add_mapping %r%^config/(init|rack|environments/test).*\.rb|database\.yml% do all_specs end end autotest/merb_rspec.rb @@ -1,25 +1,32 @@ -# For more information about each component, please read http://wiki.merbivore.com/faqs/merb_components -dependency "merb-action-args" -dependency "merb-assets" +# dependencies are generated using a strict version, don't forget to edit the dependency versions when upgrading. +merb_gems_version = "1.0.9" +dm_gems_version = "0.9.10" +do_gems_version = "0.9.11" + +dependency "merb-core", merb_gems_version +dependency "merb-action-args", merb_gems_version +dependency "merb-assets", merb_gems_version dependency "merb-cache" -dependency "merb-helpers" -dependency "merb-mailer" -dependency "merb-slices" -dependency "merb-auth-core" -dependency "merb-auth-more" -dependency "merb-auth-slice-password" -dependency "merb-param-protection" -dependency "merb-exceptions" - -dependency "dm-core" -dependency "dm-aggregates" -dependency "dm-migrations" -dependency "dm-timestamps" -dependency "dm-types" -dependency "dm-validations" +dependency "merb-helpers", merb_gems_version +dependency "merb-mailer", merb_gems_version +dependency "merb-slices", merb_gems_version +dependency "merb-auth-core", merb_gems_version +dependency "merb-auth-more", merb_gems_version +dependency "merb-auth-slice-password", merb_gems_version +dependency "merb-param-protection", merb_gems_version +dependency "merb-exceptions", merb_gems_version + +dependency "data_objects", do_gems_version +dependency "dm-core", dm_gems_version +dependency "dm-aggregates", dm_gems_version +dependency "dm-migrations", dm_gems_version +dependency "dm-timestamps", dm_gems_version +dependency "dm-types", dm_gems_version +dependency "dm-validations", dm_gems_version +dependency "dm-serializer", dm_gems_version dependency "dm-is-paginated" +dependency "merb_datamapper", merb_gems_version dependency "tzinfo" -gem "archive-tar-minitar" -require "archive/tar/minitar" \ No newline at end of file +dependency "archive-tar-minitar", :require_as => 'archive/tar/minitar' config/dependencies.rb @@ -3,7 +3,7 @@ Merb::Config.use { |c| c[:exception_details] = false c[:reload_classes] = false c[:log_level] = :error - + c[:log_file] = Merb.root / "log" / "production.log" # or redirect logger using IO handle # c[:log_stream] = STDOUT config/environments/production.rb @@ -1,3 +1,9 @@ +require 'config/dependencies.rb' + +use_orm :datamapper +use_test :rspec +use_template_engine :erb + # Make the app's "gems" directory a place where gems are loaded from Gem.clear_paths Gem.path.unshift(Merb.root / "gems") @@ -6,40 +12,27 @@ Gem.path.unshift(Merb.root / "gems") $LOAD_PATH.unshift(Merb.root / "lib") Merb::Config.use do |c| - + ### Sets up a custom session id key, if you want to piggyback sessions of other applications ### with the cookie session store. If not specified, defaults to '_session_id'. # c[:session_id_key] = '_session_id' - + c[:session_secret_key] = '95bf50e5bb36b2a455611792c271f2581e6b21db' c[:session_store] = 'datamapper' c[:use_mutex] = false c[:logfile] = Merb.log_path + "/merb.log" - -end - -### Merb doesn't come with database support by default. You need -### an ORM plugin. Install one, and uncomment one of the following lines, -### if you need a database. -### Uncomment for DataMapper ORM -require "dm-core" -use_orm :datamapper - -use_test :test_unit -# use_test :rspec - -require 'config/dependencies.rb' +end Merb::BootLoader.before_app_loads do Dir.glob("app/models/*/*.rb").each { |f| require f } Merb::Authentication.user_class = Feather::User - + Merb::Slices.config[:merb_auth] = { :layout => :admin, :login_field => :login } - + require "tzinfo" require "net/http" require "uri" @@ -57,7 +50,7 @@ end Merb::BootLoader.after_app_loads do Merb::Mailer.delivery_method = :sendmail - + Merb::Cache.setup do register(:feather, Merb::Cache::MemcachedStore, :namespace => "feather") end @@ -70,4 +63,4 @@ end # :store => "file", # :cache_directory => Merb.root_path("tmp/cache"), # :disable => "development" -# } \ No newline at end of file +# } config/init.rb @@ -1,4 +1,3 @@ - # use PathPrefix Middleware if :path_prefix is set in Merb::Config if prefix = ::Merb::Config[:path_prefix] use Merb::Rack::PathPrefix, prefix @@ -9,4 +8,4 @@ end use Merb::Rack::Static, Merb.dir_for(:public) # this is our main merb application -run Merb::Rack::Application.new \ No newline at end of file +run Merb::Rack::Application.new config/rack.rb @@ -10,7 +10,7 @@ # # match("/books/:book_id/:action"). # to(:controller => "books") -# +# # Or, use placeholders in the "to" results for more complicated routing, e.g.: # # match("/admin/:module/:controller/:action/:id"). @@ -34,10 +34,10 @@ Merb::Router.prepare do |router| rescue Exception => e Merb.logger.info("Error loading plugins: #{e.message}") end - + # Load all plugin routes Feather::Hooks::Routing.load_routes(router) - + slice(:merb_auth_slice_password, :name_prefix => nil, :path_prefix => "") # This deferred route allows permalinks to be handled, without a separate rack handler match(/.*/).defer_to do |request, params| @@ -45,7 +45,7 @@ Merb::Router.prepare do |router| {:controller => "feather/articles", :action => "show", :id => id} end end - + # Admin namespace namespace "feather/admin", :path => "admin", :name_prefix => "admin" do resource :configuration @@ -60,9 +60,9 @@ Merb::Router.prepare do |router| match("/:year").to(:controller => "feather/articles", :action => "index").name(:year) match("/:year/:month").to(:controller => "feather/articles", :action => "index").name(:month) match("/:year/:month/:day").to(:controller => "feather/articles", :action => "index").name(:day) - + # Default routes, and index - default_routes + default_routes match("/").to(:controller => 'feather/articles', :action =>'index') end config/router.rb @@ -5,10 +5,10 @@ module Merb return nil unless user user.id end - + def fetch_user(session_info) ::Feather::User.get(session_info) end - + end # Authentication -end \ No newline at end of file +end lib/merb_auth_setup.rb @@ -4,19 +4,19 @@ # # To change the parameter names for the password or login field you may set either of these two options # -# Merb::Plugins.config[:"merb-auth"][:login_param] = :email +# Merb::Plugins.config[:"merb-auth"][:login_param] = :email # Merb::Plugins.config[:"merb-auth"][:password_param] = :my_password_field_name begin - # Sets the default class ofr authentication. This is primarily used for + # Sets the default class ofr authentication. This is primarily used for # Plugins and the default strategies - Merb::Authentication.user_class = User - - + Merb::Authentication.user_class = User + + # Mixin the salted user mixin require 'merb-auth-more/mixins/salted_user' Merb::Authentication.user_class.class_eval{ include Merb::Authentication::Mixins::SaltedUser } - + # Setup the session serialization class Merb::Authentication @@ -28,16 +28,16 @@ begin user.nil? ? user : user.id end end - + rescue Merb.logger.error <<-TEXT - - You need to setup some kind of user class with merb-auth. + + You need to setup some kind of user class with merb-auth. Merb::Authentication.user_class = User - - If you want to fully customize your authentication you should use merb-core directly. - - See lib/authentication/setup.rb and strategies.rb to customize your setup + + If you want to fully customize your authentication you should use merb-core directly. + + See merb/merb-auth/setup.rb and strategies.rb to customize your setup TEXT end merb/merb-auth/setup.rb @@ -1,6 +1,6 @@ -# This file is specifically for you to define your strategies +# This file is specifically for you to define your strategies # -# You should declare you strategies directly and/or use +# You should declare you strategies directly and/or use # Merb::Authentication.activate!(:label_of_strategy) # # To load and set the order of strategy processing @@ -8,4 +8,4 @@ Merb::Slices::config[:"merb-auth-slice-password"][:no_default_strategies] = true Merb::Authentication.activate!(:default_password_form) -Merb::Authentication.activate!(:default_basic_auth) \ No newline at end of file +Merb::Authentication.activate!(:default_basic_auth) merb/merb-auth/strategies.rb @@ -1,9 +1,9 @@ module Merb module Session - - # The Merb::Session module gets mixed into Merb::SessionContainer to allow - # app-level functionality; it will be included and methods will be available + + # The Merb::Session module gets mixed into Merb::SessionContainer to allow + # app-level functionality; it will be included and methods will be available # through request.session as instance methods. - + end -end \ No newline at end of file +end merb/session/session.rb @@ -1,15 +1,15 @@ require File.join(File.dirname(__FILE__), "../..", 'spec_helper.rb') -module Admin +module Feather::Admin describe Articles do before(:each) do @article = mock(:article) @articles = [@article] end - + describe "/admin/articles" do it "should get all articles in descending created order" do - Article.should_receive(:all).with(:order => [:created_at.desc], :offset => 0, :limit => 10).and_return(@articles) + ::Feather::Article.should_receive(:all).with(:order => [:created_at.desc], :offset => 0, :limit => 10).and_return(@articles) controller = dispatch_to(Articles, :index) do |controller| controller.should_receive(:login_required).and_return(true) controller.should_receive(:display).with(@articles) @@ -21,7 +21,7 @@ module Admin describe "/admin/articles/1" do it "should display the article matching the id" do - Article.should_receive("[]").with("1").and_return(@article) + ::Feather::Article.should_receive("[]").with("1").and_return(@article) controller = dispatch_to(Articles, :show, :id => "1") do |controller| controller.should_receive(:login_required).and_return(true) controller.should_receive(:display).with(@article) spec/controllers/admin/articles_spec.rb @@ -1,6 +1,6 @@ require File.join(File.dirname(__FILE__), "../..", 'spec_helper.rb') -module Admin +module Feather::Admin describe Configurations do before(:each) do @configuration = mock(:configuration) @@ -8,7 +8,7 @@ module Admin describe "/admin/configurations" do it "should get current configuration" do - Configuration.stub!(:current).and_return(@configuration) + ::Feather::Configuration.stub!(:current).and_return(@configuration) controller = dispatch_to(Configurations, :show) do |controller| controller.should_receive(:login_required).and_return(true) controller.should_receive(:display).with(@configuration) spec/controllers/admin/configurations_spec.rb @@ -1,15 +1,15 @@ require File.join(File.dirname(__FILE__), "../..", 'spec_helper.rb') -module Admin - describe Dashboard do +module Feather::Admin + describe Dashboards do before(:each) do @activity = [mock(:activity)] end describe "/admin" do it "should request dashboard" do - Activity.should_receive(:all).with(:order => [:created_at.desc], :limit => 5).and_return(@activity) - controller = dispatch_to(Dashboard, :index) do |controller| + ::Feather::Activity.should_receive(:all).with(:order => [:created_at.desc], :limit => 5).and_return(@activity) + controller = dispatch_to(Dashboards, :index) do |controller| controller.should_receive(:login_required).and_return(true) controller.should_receive(:display).with(@activity) end spec/controllers/admin/dashboard_spec.rb @@ -1,15 +1,15 @@ require File.join(File.dirname(__FILE__), "../..", 'spec_helper.rb') -module Admin +module Feather::Admin describe Plugins do before(:each) do @plugin = mock(:plugin) @plugins = [@plugin] end - + describe "/admin/plugins" do it "should get all plugins" do - Plugin.should_receive(:all).and_return(@plugins) + ::Feather::Plugin.should_receive(:all).and_return(@plugins) controller = dispatch_to(Plugins, :index) do |controller| controller.should_receive(:login_required).and_return(true) controller.should_receive(:load_plugins).and_return(true) @@ -22,7 +22,7 @@ module Admin describe "/admin/plugins/1" do it "should display the plugin matching the id" do - Plugin.should_receive("[]").with("1").and_return(@plugin) + ::Feather::Plugin.should_receive("[]").with("1").and_return(@plugin) controller = dispatch_to(Plugins, :show, :id => "1") do |controller| controller.should_receive(:login_required).and_return(true) controller.should_receive(:load_plugins).and_return(true) spec/controllers/admin/plugins_spec.rb @@ -1,15 +1,15 @@ require File.join(File.dirname(__FILE__), "..", 'spec_helper.rb') -describe Articles do +describe Feather::Articles do before(:each) do @article = mock(:article) @articles = [@article] end - + describe "/" do it "should return recent articles" do - Article.should_receive(:find_recent).and_return @articles - controller = dispatch_to(Articles, :index) do |controller| + Feather::Article.should_receive(:find_recent).and_return @articles + controller = dispatch_to(Feather::Articles, :index) do |controller| controller.expire_all_pages controller.should_receive(:display).with(@articles) end spec/controllers/articles_spec.rb @@ -1,4 +1,4 @@ require File.join(File.dirname(__FILE__), "../..", 'spec_helper.rb') -describe Merb::Admin::ArticlesHelper do +describe Merb::Feather::Admin::ArticlesHelper do end spec/helpers/admin/articles_helper_spec.rb @@ -1,4 +1,4 @@ require File.join(File.dirname(__FILE__), "../..", 'spec_helper.rb') -describe Merb::Admin::ConfigurationsHelper do +describe Merb::Feather::Admin::ConfigurationsHelper do end spec/helpers/admin/configurations_helper_spec.rb @@ -1,4 +1,4 @@ require File.join(File.dirname(__FILE__), "../..", 'spec_helper.rb') -describe Merb::Admin::DashboardHelper do +describe Merb::Feather::Admin::DashboardHelper do end spec/helpers/admin/dashboard_helper_spec.rb @@ -1,4 +1,4 @@ require File.join(File.dirname(__FILE__), "../..", 'spec_helper.rb') -describe Merb::Admin::PluginsHelper do +describe Merb::Feather::Admin::PluginsHelper do end spec/helpers/admin/plugins_helper_spec.rb @@ -1,4 +1,4 @@ require File.join(File.dirname(__FILE__), "..", 'spec_helper.rb') -describe Merb::ArticlesHelper do +describe Merb::Feather::ArticlesHelper do end spec/helpers/articles_helper_spec.rb @@ -1,14 +1,14 @@ require File.join( File.dirname(__FILE__), "..", "spec_helper" ) -describe Article do +describe Feather::Article do before(:all) do @article = mock(:article) @articles = [@article] end - - describe Article do + + describe Feather::Article do it 'should create a new article' do - b = Article.new + b = Feather::Article.new b.user_id = 1 b.title = "hai" b.content = "bai" spec/models/article_spec.rb @@ -1,11 +1,22 @@ -$TESTING=true require 'rubygems' + +# Add the local gems dir if found within the app root; any dependencies loaded +# hereafter will try to load from the local gems before loading system gems. +if (local_gem_dir = File.join(File.dirname(__FILE__), '..', 'gems')) && $BUNDLE.nil? + $BUNDLE = true; Gem.clear_paths; Gem.path.unshift(local_gem_dir) +end + require 'merb-core' +require "spec" # Satisfies Autotest and anyone else not using the Rake tasks -Merb.start_environment :environment => (ENV['MERB_ENV'] || 'test'), :merb_root => File.join(File.dirname(__FILE__), ".." ) +Merb.start_environment(:testing => true, :adapter => 'runner', :environment => ENV['MERB_ENV'] || 'test') Spec::Runner.configure do |config| config.include(Merb::Test::ViewHelper) config.include(Merb::Test::RouteHelper) config.include(Merb::Test::ControllerHelper) + + config.before(:all) do + DataMapper.auto_migrate! if Merb.orm == :datamapper + end end spec/spec_helper.rb autotest/rspec.rb config/dependencies.yml tasks/merb.thor 305523dd0b660080b14e4933d9ea4afab590acd5 Alex Coles alex@alexcolesportfolio.com http://github.com/mleung/feather/commit/486e5c02dcae93c1b9485599b576620d1d0c0190 486e5c02dcae93c1b9485599b576620d1d0c0190 2009-03-13T10:59:31-07:00 2009-03-13T10:26:00-07:00 Upgrade to bring app in line with latest Merb 1.0.9 series * Remove dependencies.yml, update dependencies.rb to use strict versions (so its Merb bundler compatible). * Reorganize init.rb and spec_helper.rb. * Update thor scripts. * Update autotest config. * Cleanup whitespace. * Fix uninitialized constant errors in specs (don't actually fix the specs themselves -- they're quite broken). Signed-off-by: Alex Coles <alex@alexcolesportfolio.com> 9a510abfe7c1b493b25cbb920b52d70d591c2e79 Alex Coles alex@alexcolesportfolio.com