@@ -249,7 +249,7 @@ gem: cachetastic 1.7.4 * INCOMPATIBILITY NOTICE: Test::Unit::TestCase is no longer the default testing framework, RSpec is. If you wish to use Test::Unit::TestCase add the following config parameter to your config/app_config/default.yml file: mack::testing_framework: test_case -* INCOMPATIBILITY NOTICE: ENV["_mack_env"] and ENV["_mack_root"] are no longer supported, please use ENV["MACK_ENV"] and ENV["MACK_ROOT"], or just Mack.env and Mack.root +* INCOMPATIBILITY NOTICE: ENV["_mack_env"] and ENV["_mack_root"] are no longer supported, please use ENV['MACK_ENV'] and ENV['MACK_ROOT'], or just Mack.env and Mack.root * INCOMPATIBILITY NOTICE: MACK_DEFAULT_LOGGER constant is no longer available. Please use Mack.logger instead. * INCOMPATIBILITY NOTICE: The ApplicationHelper module is now deprecated. Please move view level helpers into Mack::ViewHelpers::* and controller helpers into Mack::ControllerHelpers::<controller_name> * thin.ru and thin.yml are no longer needed, you may delete them. CHANGELOG @@ -4,6 +4,6 @@ require 'rake' require 'rake/testtask' require 'rake/rdoctask' -require File.join("lib", "mack", "tasks", "rake_helpers.rb") -Dir.glob(File.join("tasks", "**/*.rake")).each {|r| load r} -Dir.glob(File.join("lib", "mack", "tasks", "**/*.rake")).each {|r| load r} \ No newline at end of file +require File.join('lib', 'mack', 'tasks', "rake_helpers.rb") +Dir.glob(File.join('tasks', "**/*.rake")).each {|r| load r} +Dir.glob(File.join('lib', 'mack', 'tasks', "**/*.rake")).each {|r| load r} \ No newline at end of file Rakefile @@ -1,5 +1,5 @@ if ARGV.include?("-e") - ENV["MACK_ENV"] = ARGV[ARGV.index("-e") + 1] unless ENV["MACK_ENV"] + ENV['MACK_ENV'] = ARGV[ARGV.index("-e") + 1] unless ENV['MACK_ENV'] end @mack_gem_version = nil bin/env_handler.rb @@ -10,7 +10,7 @@ require 'pp' require 'erb' require 'genosaurus' require 'mack-facets' -require File.join(File.dirname(__FILE__), "..", "lib", "mack", "generators", "mack_application_generator", "mack_application_generator") +require File.join(File.dirname(__FILE__), '..', 'lib', 'mack', "generators", "mack_application_generator", "mack_application_generator") app = ARGV[0] raise "You must specify a name for this application!" if app.nil? @@ -39,4 +39,4 @@ end opts.parse!(ARGV) -MackApplicationGenerator.run({"app" => app, "orm" => options.orm, "testing_framework" => options.testing_framework, "js_framework" => options.js_framework}) +MackApplicationGenerator.run({'app' => app, "orm" => options.orm, "testing_framework" => options.testing_framework, "js_framework" => options.js_framework}) bin/mack @@ -74,5 +74,5 @@ else end end - Mack::SimpleServer.run(:handler => handler, :port => port, :environment => ENV["MACK_ENV"]) + Mack::SimpleServer.run(:handler => handler, :port => port, :environment => ENV['MACK_ENV']) end \ No newline at end of file bin/mackery-server @@ -5,7 +5,7 @@ require 'optparse' automatic = false server = nil -env = "development" +env = 'development' daemonize = false pid = nil options = {:Port => 9292, :Host => "0.0.0.0", :AccessLog => []} @@ -125,7 +125,7 @@ end p server if $DEBUG case env -when "development" +when 'development' app = Rack::Builder.new { use Rack::CommonLogger, STDERR unless server.name =~ /CGI/ use Rack::ShowExceptions lib/gems/rack-0.4.0/bin/rackup @@ -52,7 +52,7 @@ table { width:100%%; } F = ::File def _call(env) - if env["PATH_INFO"].include? ".." + if env["PATH_INFO"].include? '..' body = "Forbidden\n" size = body.respond_to?(:bytesize) ? body.bytesize : body.size return [403, {"Content-Type" => "text/plain","Content-Length" => size.to_s}, [body]] lib/gems/rack-0.4.0/lib/rack/directory.rb @@ -22,7 +22,7 @@ module Rack F = ::File def _call(env) - if env["PATH_INFO"].include? ".." + if env["PATH_INFO"].include? '..' body = "Forbidden\n" size = body.respond_to?(:bytesize) ? body.bytesize : body.size return [403, {"Content-Type" => "text/plain","Content-Length" => size.to_s}, [body]] lib/gems/rack-0.4.0/lib/rack/file.rb @@ -10,9 +10,9 @@ module Rack # will serve all requests beginning with /media from the "media" folder # located in the current directory (ie media/*). # - # use Rack::Static, :urls => ["/css", "/images"], :root => "public" + # use Rack::Static, :urls => ["/css", "/images"], :root => 'public' # will serve all requests beginning with /css or /images from the folder - # "public" in the current directory (ie public/css/* and public/images/*) + # 'public' in the current directory (ie public/css/* and public/images/*) class Static lib/gems/rack-0.4.0/lib/rack/static.rb @@ -58,8 +58,8 @@ module Rant # :nodoc: end args.concat rcov_opts args << "-o" << @output_dir - if test(?d, "test") - @test_dirs << "test" + if test(?d, 'test') + @test_dirs << 'test' elsif test(?d, "tests") @test_dirs << "tests" end lib/gems/rcov-0.8.1.2.0/lib/rcov/rant.rb @@ -16,7 +16,7 @@ module Rcov # require 'rcov/rcovtask' # # Rcov::RcovTask.new do |t| - # t.libs << "test" + # t.libs << 'test' # t.test_files = FileList['test/test*.rb'] # t.verbose = true # end @@ -81,7 +81,7 @@ module Rcov # Create a testing task. def initialize(name=:rcov) @name = name - @libs = ["lib"] + @libs = ['lib'] @pattern = nil @test_files = nil @verbose = false lib/gems/rcov-0.8.1.2.0/lib/rcov/rcovtask.rb @@ -160,7 +160,7 @@ module Spec end def mock_framework_path(framework_name) - File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "plugins", "mock_frameworks", framework_name)) + File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..', 'plugins', "mock_frameworks", framework_name)) end end end lib/gems/rspec-1.1.11/lib/spec/example/configuration.rb @@ -1,4 +1,4 @@ -require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "lib", "spec", "mocks")) +require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'lib', "spec", "mocks")) require 'spec/mocks/framework' require 'spec/mocks/extensions' lib/gems/rspec-1.1.11/plugins/mock_frameworks/rspec.rb @@ -272,7 +272,7 @@ module Spec it "should run before(:all) block only once" do before_all_run_count_run_count = 0 example_group.before(:all) {before_all_run_count_run_count += 1} - example_group.it("test") {true} + example_group.it('test') {true} example_group.it("test2") {true} example_group.run before_all_run_count_run_count.should == 1 @@ -281,7 +281,7 @@ module Spec it "should run after(:all) block only once" do after_all_run_count = 0 example_group.after(:all) {after_all_run_count += 1} - example_group.it("test") {true} + example_group.it('test') {true} example_group.it("test2") {true} example_group.run after_all_run_count.should == 1 @@ -293,7 +293,7 @@ module Spec context_instance_value_out = "" example_group.before(:all) { @instance_var = context_instance_value_in } example_group.after(:all) { context_instance_value_out = @instance_var } - example_group.it("test") {true} + example_group.it('test') {true} example_group.run context_instance_value_in.should == context_instance_value_out end @@ -302,7 +302,7 @@ module Spec context_instance_value_in = "Hello there" context_instance_value_out = "" example_group.before(:all) { @instance_var = context_instance_value_in } - example_group.it("test") {context_instance_value_out = @instance_var} + example_group.it('test') {context_instance_value_out = @instance_var} example_group.run context_instance_value_in.should == context_instance_value_out end @@ -340,7 +340,7 @@ module Spec @special_example_group.append_before(:each) { fiddle << "special.append_before(:each, :type => :special)" } example_group = Class.new(@special_example_group).describe("I'm a special example_group") {} - example_group.it("test") {true} + example_group.it('test') {true} example_group.run fiddle.should == [ 'Example.prepend_before(:all)', @@ -408,7 +408,7 @@ module Spec example_group.include mod1, mod2 - example_group.it("test") do + example_group.it('test') do mod1_method mod2_method end @@ -516,7 +516,7 @@ module Spec it "should not run any example" do spec_ran = false - example_group.it("test") {spec_ran = true} + example_group.it('test') {spec_ran = true} example_group.run spec_ran.should be_false end @@ -541,7 +541,7 @@ module Spec error.message.should eql("before(:all) failure") end - example_group.it("test") {true} + example_group.it('test') {true} example_group.run end end lib/gems/rspec-1.1.11/spec/spec/example/example_group_spec.rb @@ -244,7 +244,7 @@ module Spec example_group.it_should_behave_like("shared example_group") example_group.include mod1 - example_group.it("test") do + example_group.it('test') do mod1_method mod2_method end lib/gems/rspec-1.1.11/spec/spec/example/shared_example_group_spec.rb @@ -1,7 +1,7 @@ steps_for :running_rspec do Given("the file $relative_path") do |relative_path| - @path = File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "resources", relative_path)) + @path = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', "resources", relative_path)) unless File.exist?(@path) raise "could not find file at #{@path}" end lib/gems/rspec-1.1.11/stories/resources/steps/running_rspec.rb @@ -13,9 +13,9 @@ run_once do fl = File.join_from_here('..') - require File.join(fl, "..", "..", "bin", "gem_load_path.rb") + require File.join(fl, '..', '..', "bin", "gem_load_path.rb") - require File.join(fl, "..", "mack.rb") + require File.join(fl, '..', "mack.rb") require File.join(fl, "testing", "helpers.rb") lib/mack/boot/console.rb @@ -6,10 +6,10 @@ run_once do init_message('core') # Require all the necessary files to make Mack actually work! - lib_dirs = ["assets", "errors", "core_extensions", "utils", "sessions", "runner_helpers", "routing", "view_helpers", "rendering", "controller", "tasks", "initialization/server", "generators", 'view'] - lib_dirs << "testing"# if Mack.env == "test" + lib_dirs = ["assets", "errors", "core_extensions", "utils", "sessions", "runner_helpers", "routing", "view_helpers", "rendering", "controller", 'tasks', "initialization/server", "generators", 'view'] + lib_dirs << "testing"# if Mack.env == 'test' lib_dirs.each do |dir| - dir_globs = Dir.glob(File.join_from_here("..", dir, "**/*.rb")) + dir_globs = Dir.glob(File.join_from_here('..', dir, "**/*.rb")) dir_globs.sort.each do |d| # puts File.expand_path(d) require File.expand_path(d) unless d.match(/console/) lib/mack/boot/core.rb @@ -12,7 +12,7 @@ run_once do # application load setup. def self.load ivar_cache do - require File.join_from_here("..", "..", "mack_app") + require File.join_from_here('..', '..', "mack_app") end end lib/mack/boot/environment.rb @@ -10,7 +10,7 @@ run_once do # gem 'logging' require 'logging' - require File.join_from_here("..", "utils", "ansi", "ansi_color.rb") + require File.join_from_here('..', "utils", "ansi", "ansi_color.rb") require File.join_from_here('logging', 'filter') require File.join_from_here('logging', 'basic_layout.rb') require File.join_from_here('logging', 'color_layout.rb') lib/mack/boot/logging.rb @@ -5,12 +5,12 @@ run_once do # Returns the root of the current Mack application def self.root - ENV["MACK_ROOT"] ||= FileUtils.pwd + ENV['MACK_ROOT'] ||= FileUtils.pwd end # Returns the environment of the current Mack application def self.env - ENV["MACK_ENV"] ||= "development" + ENV['MACK_ENV'] ||= 'development' end # Returns true/false based on whether the specified environment @@ -71,37 +71,41 @@ run_once do # <MACK_PROJECT_ROOT>/public def self.public(*files) - Mack::Paths.root("public", *files) + Mack::Paths.root('public', *files) end # <MACK_PROJECT_ROOT>/public/images def self.images(*files) - Mack::Paths.public("images", *files) + Mack::Paths.public('images', *files) end # <MACK_PROJECT_ROOT>/public/javascripts def self.javascripts(*files) - Mack::Paths.public("javascripts", *files) + Mack::Paths.public('javascripts', *files) end # <MACK_PROJECT_ROOT>/public/stylesheets def self.stylesheets(*files) - Mack::Paths.public("stylesheets", *files) + Mack::Paths.public('stylesheets', *files) end # <MACK_PROJECT_ROOT>/app def self.app(*files) - Mack::Paths.root("app", *files) + Mack::Paths.root('app', *files) + end + + def self.form_builders(*files) + Mack::Paths.app('form_builders') end # <MACK_PROJECT_ROOT>/log def self.log(*files) - Mack::Paths.root("log", *files) + Mack::Paths.root('log', *files) end # <MACK_PROJECT_ROOT>/test def self.test(*files) - Mack::Paths.root("test", *files) + Mack::Paths.root('test', *files) end # <MACK_PROJECT_ROOT>/tmp @@ -111,106 +115,106 @@ run_once do # <MACK_PROJECT_ROOT>/test/models def self.model_tests(*files) - Mack::Paths.test("models", *files) + Mack::Paths.test('models', *files) end # <MACK_PROJECT_ROOT>/test/controllers def self.controller_tests(*files) - Mack::Paths.test("controllers", *files) + Mack::Paths.test('controllers', *files) end def self.test_helpers(*files) - Mack::Paths.test("helpers", *files) + Mack::Paths.test('helpers', *files) end # <MACK_PROJECT_ROOT>/test/helpers/controllers def self.controller_helper_tests(*files) - Mack::Paths.test_helpers("controllers", *files) + Mack::Paths.test_helpers('controllers', *files) end # <MACK_PROJECT_ROOT>/test/helpers/views def self.view_helper_tests(*files) - Mack::Paths.test_helpers("views", *files) + Mack::Paths.test_helpers('views', *files) end # <MACK_PROJECT_ROOT>/app/views def self.views(*files) - Mack::Paths.app("views", *files) + Mack::Paths.app('views', *files) end # <MACK_PROJECT_ROOT>/app/views/layouts def self.layouts(*files) - Mack::Paths.views("layouts", *files) + Mack::Paths.views('layouts', *files) end # <MACK_PROJECT_ROOT>/app/controllers def self.controllers(*files) - Mack::Paths.app("controllers", *files) + Mack::Paths.app('controllers', *files) end # <MACK_PROJECT_ROOT>/app/models def self.models(*files) - Mack::Paths.app("models", *files) + Mack::Paths.app('models', *files) end # <MACK_PROJECT_ROOT>/app/helpers def self.helpers(*files) - Mack::Paths.app("helpers", *files) + Mack::Paths.app('helpers', *files) end # <MACK_PROJECT_ROOT>/app/helpers/controllers def self.controller_helpers(*files) - Mack::Paths.helpers("controllers", *files) + Mack::Paths.helpers('controllers', *files) end # <MACK_PROJECT_ROOT>/app/helpers/views def self.view_helpers(*files) - Mack::Paths.helpers("views", *files) + Mack::Paths.helpers('views', *files) end # <MACK_PROJECT_ROOT>/lib def self.lib(*files) - Mack::Paths.root("lib", *files) + Mack::Paths.root('lib', *files) end # <MACK_PROJECT_ROOT>/lib/tasks def self.tasks(*files) - Mack::Paths.lib("tasks", *files) + Mack::Paths.lib('tasks', *files) end # <MACK_PROJECT_ROOT>/db def self.db(*files) - Mack::Paths.root("db", *files) + Mack::Paths.root('db', *files) end # <MACK_PROJECT_ROOT>/db/migrations def self.migrations(*files) - Mack::Paths.db("migrations", *files) + Mack::Paths.db('migrations', *files) end # <MACK_PROJECT_ROOT>/config def self.config(*files) - Mack::Paths.root("config", *files) + Mack::Paths.root('config', *files) end # <MACK_PROJECT_ROOT>/config/configatron def self.configatron(*files) - Mack::Paths.config("configatron", *files) + Mack::Paths.config('configatron', *files) end # <MACK_PROJECT_ROOT>/config/initializers def self.initializers(*files) - Mack::Paths.config("initializers", *files) + Mack::Paths.config('initializers', *files) end # <MACK_PROJECT_ROOT>/vendor def self.vendor(*files) - Mack::Paths.root("vendor", *files) + Mack::Paths.root('vendor', *files) end # <MACK_PROJECT_ROOT>/vendor/plugins def self.plugins(*files) - Mack::Paths.vendor("plugins", *files) + Mack::Paths.vendor('plugins', *files) end # <MACK_PROJECT_ROOT>/tmp/portlet_package lib/mack/boot/paths.rb @@ -11,7 +11,7 @@ run_once do Mack.search_path(:plugins).each do |path| Dir.glob(File.join(path, '*')).each do |d| plugins << d - $: << File.join(d, "lib") # add the lib for this plugin to the global load path + $: << File.join(d, 'lib') # add the lib for this plugin to the global load path end end plugins.sort.each do |plug| @@ -20,7 +20,7 @@ run_once do rescue Exception => e puts e.message end - $:.delete(File.join(plug, "lib")) # remove the plugins lib directory from the global load path. + $:.delete(File.join(plug, 'lib')) # remove the plugins lib directory from the global load path. end end \ No newline at end of file lib/mack/boot/plugins.rb @@ -60,7 +60,7 @@ class ControllerGenerator < Genosaurus def add_actions @actions.each do |action| - template(action_template(action), File.join("app", "views", @name_plural, "#{action}.html.erb")) + template(action_template(action), File.join('app', 'views', @name_plural, "#{action}.html.erb")) end end lib/mack/generators/controller_generator/controller_generator.rb @@ -1,18 +1,18 @@ controller_template: type: file - template_path: <%= File.join(templates_directory_path, "app", "controllers", "controller.rb.template") %> - output_path: <%= File.join("app", "controllers", "#{@name_plural}_controller.rb") %> + template_path: <%= File.join(templates_directory_path, 'app', 'controllers', "controller.rb.template") %> + output_path: <%= File.join('app', 'controllers', "#{@name_plural}_controller.rb") %> views_migrations: type: directory - output_path: <%= File.join("app", "views", @name_plural) %> + output_path: <%= File.join('app', 'views', @name_plural) %> <% if configatron.mack.testing_framework.to_s == "test_case" -%> test_template: type: file - template_path: <%= File.join(templates_directory_path, "test", "controllers", "test_case.rb.template") %> - output_path: <%= File.join("test", "controllers", "#{@name_plural}_controller_test.rb") %> + template_path: <%= File.join(templates_directory_path, 'test', 'controllers', "test_case.rb.template") %> + output_path: <%= File.join('test', 'controllers', "#{@name_plural}_controller_test.rb") %> <% elsif configatron.mack.testing_framework.to_s == "rspec" -%> test_template: type: file - template_path: <%= File.join(templates_directory_path, "test", "controllers", "rspec.rb.template") %> - output_path: <%= File.join("test", "controllers", "#{@name_plural}_controller_spec.rb") %> + template_path: <%= File.join(templates_directory_path, 'test', 'controllers', "rspec.rb.template") %> + output_path: <%= File.join('test', 'controllers', "#{@name_plural}_controller_spec.rb") %> <% end -%> \ No newline at end of file lib/mack/generators/controller_generator/manifest.yml @@ -1,4 +1,4 @@ -require File.join(File.dirname(__FILE__), "..", "spec_helper.rb") +require File.join(File.dirname(__FILE__), '..', "spec_helper.rb") describe <%= @name_plural_camel %>Controller do <% @actions.each do |action| %> lib/mack/generators/controller_generator/templates/test/controllers/rspec.rb.template @@ -1,4 +1,4 @@ -require File.join(File.dirname(__FILE__), "..", "test_helper.rb") +require File.join(File.dirname(__FILE__), '..', "test_helper.rb") class <%= @name_plural_camel %>ControllerTest < Test::Unit::TestCase lib/mack/generators/controller_generator/templates/test/controllers/test_case.rb.template @@ -1,15 +1,15 @@ helper_template: type: file - template_path: <%= File.join(templates_directory_path, "app", "helpers", "controllers", "helper.rb.template") %> - output_path: <%= File.join("app", "helpers", "controllers", "#{@name_plural}_controller_helper.rb") %> + template_path: <%= File.join(templates_directory_path, 'app', 'helpers', 'controllers', "helper.rb.template") %> + output_path: <%= File.join('app', 'helpers', 'controllers', "#{@name_plural}_controller_helper.rb") %> <% if configatron.mack.testing_framework.to_s == "test_case" -%> helper_test_template: type: file - template_path: <%= File.join(templates_directory_path, "test", "helpers", "controllers", "test_case.rb.template") %> - output_path: <%= File.join("test", "helpers", "controllers", "#{@name_plural}_controller_helper_test.rb") %> + template_path: <%= File.join(templates_directory_path, 'test', 'helpers', 'controllers', "test_case.rb.template") %> + output_path: <%= File.join('test', 'helpers', 'controllers', "#{@name_plural}_controller_helper_test.rb") %> <% elsif configatron.mack.testing_framework.to_s == "rspec" -%> helper_test_template: type: file - template_path: <%= File.join(templates_directory_path, "test", "helpers", "controllers", "rspec.rb.template") %> - output_path: <%= File.join("test", "helpers", "controllers", "#{@name_plural}_controller_helper_spec.rb") %> + template_path: <%= File.join(templates_directory_path, 'test', 'helpers', 'controllers', "rspec.rb.template") %> + output_path: <%= File.join('test', 'helpers', 'controllers', "#{@name_plural}_controller_helper_spec.rb") %> <% end -%> \ No newline at end of file lib/mack/generators/controller_helper_generator/manifest.yml @@ -1,8 +1,8 @@ -require File.join(File.dirname(__FILE__), "..", "..", "version") +require File.join(File.dirname(__FILE__), '..', '..', "version") class MackApplicationGenerator < Genosaurus def app_name - @options["app"].underscore.downcase + @options['app'].underscore.downcase end def testing_framework lib/mack/generators/mack_application_generator/mack_application_generator.rb @@ -1,62 +1,62 @@ # Files: default_controller: type: file - template_path: <%= File.join(templates_directory_path, "app", "controllers", "default_controller.rb.template") %> - output_path: <%= File.join(app_name, "app", "controllers", "default_controller.rb") %> + template_path: <%= File.join(templates_directory_path, 'app', 'controllers', "default_controller.rb.template") %> + output_path: <%= File.join(app_name, 'app', 'controllers', "default_controller.rb") %> application_helper: type: file - template_path: <%= File.join(templates_directory_path, "app", "helpers", "views", "application_helper.rb.template") %> - output_path: <%= File.join(app_name, "app", "helpers", "views", "application_helper.rb") %> + template_path: <%= File.join(templates_directory_path, 'app', 'helpers', 'views', "application_helper.rb.template") %> + output_path: <%= File.join(app_name, 'app', 'helpers', 'views', "application_helper.rb") %> default_controller_helper: type: file - template_path: <%= File.join(templates_directory_path, "app", "helpers", "controllers", "default_controller_helper.rb.template") %> - output_path: <%= File.join(app_name, "app", "helpers", "controllers", "default_controller_helper.rb") %> + template_path: <%= File.join(templates_directory_path, 'app', 'helpers', 'controllers', "default_controller_helper.rb.template") %> + output_path: <%= File.join(app_name, 'app', 'helpers', 'controllers', "default_controller_helper.rb") %> index_view: type: file - template_path: <%= File.join(templates_directory_path, "app", "views", "default", "index.html.erb.template") %> - output_path: <%= File.join(app_name, "app", "views", "default", "index.html.erb") %> + template_path: <%= File.join(templates_directory_path, 'app', 'views', "default", "index.html.erb.template") %> + output_path: <%= File.join(app_name, 'app', 'views', "default", "index.html.erb") %> application_layout: type: file - template_path: <%= File.join(templates_directory_path, "app", "views", "layouts", "application.html.erb.template") %> - output_path: <%= File.join(app_name, "app", "views", "layouts", "application.html.erb") %> -<% ["default", "development", "production", "test"].each do |env| -%> + template_path: <%= File.join(templates_directory_path, 'app', 'views', 'layouts', "application.html.erb.template") %> + output_path: <%= File.join(app_name, 'app', 'views', 'layouts', "application.html.erb") %> +<% ["default", 'development', "production", 'test'].each do |env| -%> <%= env %>_yml: type: file - template_path: <%= File.join(templates_directory_path, "config", "configatron", "#{env}.rb.template") %> - output_path: <%= File.join(app_name, "config", "configatron", "#{env}.rb") %> + template_path: <%= File.join(templates_directory_path, 'config', 'configatron', "#{env}.rb.template") %> + output_path: <%= File.join(app_name, 'config', 'configatron', "#{env}.rb") %> <% end -%> database_yml: type: file - template_path: <%= File.join(templates_directory_path, "config", "database.yml.template") %> - output_path: <%= File.join(app_name, "config", "database.yml") %> + template_path: <%= File.join(templates_directory_path, 'config', "database.yml.template") %> + output_path: <%= File.join(app_name, 'config', 'database.yml') %> <% ["routes.rb"].each do |f| -%> <%= f %>_config_file: type: file - template_path: <%= File.join(templates_directory_path, "config", "#{f}.template") %> - output_path: <%= File.join(app_name, "config", f) %> + template_path: <%= File.join(templates_directory_path, 'config', "#{f}.template") %> + output_path: <%= File.join(app_name, 'config', f) %> <% end -%> <% [:gems, :inflections, :mime_types, :portlets].each do |f| -%> initializers_<%= f %>_rb: type: file - template_path: <%= File.join(templates_directory_path, "config", "initializers", "#{f}.rb.template") %> - output_path: <%= File.join(app_name, "config", "initializers", "#{f}.rb") %> + template_path: <%= File.join(templates_directory_path, 'config', 'initializers', "#{f}.rb.template") %> + output_path: <%= File.join(app_name, 'config', 'initializers', "#{f}.rb") %> <% end -%> favicon: type: file - template_path: <%= File.join(templates_directory_path, "public", "favicon.ico.template") %> - output_path: <%= File.join(app_name, "public", "favicon.ico") %> + template_path: <%= File.join(templates_directory_path, 'public', "favicon.ico.template") %> + output_path: <%= File.join(app_name, 'public', "favicon.ico") %> 404: type: file - template_path: <%= File.join(templates_directory_path, "public", "404.html.template") %> - output_path: <%= File.join(app_name, "public", "404.html") %> + template_path: <%= File.join(templates_directory_path, 'public', "404.html.template") %> + output_path: <%= File.join(app_name, 'public', "404.html") %> 500: type: file - template_path: <%= File.join(templates_directory_path, "public", "500.html.template") %> - output_path: <%= File.join(app_name, "public", "500.html") %> + template_path: <%= File.join(templates_directory_path, 'public', "500.html.template") %> + output_path: <%= File.join(app_name, 'public', "500.html") %> scaffold_css: type: file - template_path: <%= File.join(templates_directory_path, "public", "stylesheets", "scaffold.css.template") %> - output_path: <%= File.join(app_name, "public", "stylesheets", "scaffold.css") %> + template_path: <%= File.join(templates_directory_path, 'public', 'stylesheets', "scaffold.css.template") %> + output_path: <%= File.join(app_name, 'public', 'stylesheets', "scaffold.css") %> rakefile: type: file template_path: <%= File.join(templates_directory_path, "Rakefile.template") %> @@ -65,70 +65,73 @@ rakefile: # Directories: models: type: directory - output_path: <%= File.join(app_name, "app", "models") %> + output_path: <%= File.join(app_name, 'app', 'models') %> lib_tasks: type: directory - output_path: <%= File.join(app_name, "lib", "tasks") %> + output_path: <%= File.join(app_name, 'lib', 'tasks') %> db_migrations: type: directory - output_path: <%= File.join(app_name, "db", "migrations") %> -<% ["images", "javascripts"].each do |f| -%> + output_path: <%= File.join(app_name, 'db', 'migrations') %> +<% ['images', 'javascripts'].each do |f| -%> public_<%= f %>: type: directory - output_path: <%= File.join(app_name, "public", f) %> + output_path: <%= File.join(app_name, 'public', f) %> <% end -%> +form_builders: + type: directory + output_path: <%= File.join(app_name, 'app', "form_builders") %> # Test <% if testing_framework == "test_case" %> test_helper: type: file - template_path: <%= File.join(templates_directory_path, "test", "test_helper.rb.template") %> - output_path: <%= File.join(app_name, "test", "test_helper.rb") %> + template_path: <%= File.join(templates_directory_path, 'test', "test_helper.rb.template") %> + output_path: <%= File.join(app_name, 'test', "test_helper.rb") %> test_controllers: type: directory - output_path: <%= File.join(app_name, "test", "controllers") %> + output_path: <%= File.join(app_name, 'test', 'controllers') %> test_example: type: file - template_path: <%= File.join(templates_directory_path, "test", "controllers", "default_controller_test.rb.template") %> - output_path: <%= File.join(app_name, "test", "controllers", "default_controller_test.rb") %> + template_path: <%= File.join(templates_directory_path, 'test', 'controllers', "default_controller_test.rb.template") %> + output_path: <%= File.join(app_name, 'test', 'controllers', "default_controller_test.rb") %> test_models: type: directory - output_path: <%= File.join(app_name, "test", "models") %> + output_path: <%= File.join(app_name, 'test', 'models') %> helper_test_example: type: file - template_path: <%= File.join(templates_directory_path, "test", "helpers", "controllers", "default_controller_helper_test.rb.template") %> - output_path: <%= File.join(app_name, "test", "helpers", "controllers", "default_controller_helper_test.rb") %> + template_path: <%= File.join(templates_directory_path, 'test', 'helpers', 'controllers', "default_controller_helper_test.rb.template") %> + output_path: <%= File.join(app_name, 'test', 'helpers', 'controllers', "default_controller_helper_test.rb") %> app_helper_test_example: type: file - template_path: <%= File.join(templates_directory_path, "test", "helpers", "views", "application_helper_test.rb.template") %> - output_path: <%= File.join(app_name, "test", "helpers", "view", "application_helper_test.rb") %> + template_path: <%= File.join(templates_directory_path, 'test', 'helpers', 'views', "application_helper_test.rb.template") %> + output_path: <%= File.join(app_name, 'test', 'helpers', "view", "application_helper_test.rb") %> <% elsif testing_framework == "rspec" %> test_spec_helper: type: file - template_path: <%= File.join(templates_directory_path, "test", "spec_helper.rb.template") %> - output_path: <%= File.join(app_name, "test", "spec_helper.rb") %> + template_path: <%= File.join(templates_directory_path, 'test', "spec_helper.rb.template") %> + output_path: <%= File.join(app_name, 'test', "spec_helper.rb") %> test_spec_opts: type: file - template_path: <%= File.join(templates_directory_path, "test", "spec.opts.template") %> - output_path: <%= File.join(app_name, "test", "spec.opts") %> + template_path: <%= File.join(templates_directory_path, 'test', "spec.opts.template") %> + output_path: <%= File.join(app_name, 'test', "spec.opts") %> test_spec_example: type: file - template_path: <%= File.join(templates_directory_path, "test", "controllers", "default_controller_spec.rb.template") %> - output_path: <%= File.join(app_name, "test", "controllers", "default_controller_spec.rb") %> + template_path: <%= File.join(templates_directory_path, 'test', 'controllers', "default_controller_spec.rb.template") %> + output_path: <%= File.join(app_name, 'test', 'controllers', "default_controller_spec.rb") %> helper_test_spec_example: type: file - template_path: <%= File.join(templates_directory_path, "test", "helpers", "controllers", "default_controller_helper_spec.rb.template") %> - output_path: <%= File.join(app_name, "test", "helpers", "controllers", "default_controller_helper_spec.rb") %> + template_path: <%= File.join(templates_directory_path, 'test', 'helpers', 'controllers', "default_controller_helper_spec.rb.template") %> + output_path: <%= File.join(app_name, 'test', 'helpers', 'controllers', "default_controller_helper_spec.rb") %> app_helper_test_spec_example: type: file - template_path: <%= File.join(templates_directory_path, "test", "helpers", "views", "application_helper_spec.rb.template") %> - output_path: <%= File.join(app_name, "test", "helpers", "views", "application_helper_spec.rb") %> + template_path: <%= File.join(templates_directory_path, 'test', 'helpers', 'views', "application_helper_spec.rb.template") %> + output_path: <%= File.join(app_name, 'test', 'helpers', 'views', "application_helper_spec.rb") %> test_spec_models: type: directory - output_path: <%= File.join(app_name, "test", "models") %> + output_path: <%= File.join(app_name, 'test', 'models') %> <% end %> # Plugins vendor_plugins: type: directory - output_path: <%= File.join(app_name, "vendor", "plugins") %> \ No newline at end of file + output_path: <%= File.join(app_name, 'vendor', 'plugins') %> \ No newline at end of file lib/mack/generators/mack_application_generator/manifest.yml @@ -18,7 +18,7 @@ # configatron.default_time_limit # => 900 # configatron.api.timeout_limit # => 15 -configatron.mack.session_id = '_<%= @options["app"].downcase %>_session_id' +configatron.mack.session_id = '_<%= @options['app'].downcase %>_session_id' configatron.mack.testing_framework = '<%= @options["testing_framework"] %>' configatron.default_secret_key = '<%= String.randomize(80) %>' lib/mack/generators/mack_application_generator/templates/config/configatron/default.rb.template @@ -5,7 +5,7 @@ when "data_mapper" # development: # default: # adapter: mysql -# database: <%= @options["app"].downcase %>_development +# database: <%= @options['app'].downcase %>_development # host: localhost # username: root # password: @@ -13,7 +13,7 @@ when "data_mapper" # test: # default: # adapter: mysql -# database: <%= @options["app"].downcase %>_test +# database: <%= @options['app'].downcase %>_test # host: localhost # username: root # password: @@ -21,7 +21,7 @@ when "data_mapper" # production: # default: # adapter: mysql -# database: <%= @options["app"].downcase %>_production +# database: <%= @options['app'].downcase %>_production # host: localhost # username: root # password: @@ -29,7 +29,7 @@ when "data_mapper" # development: # default: # adapter: postgres -# database: <%= @options["app"].downcase %>_development +# database: <%= @options['app'].downcase %>_development # host: localhost # username: root # password: @@ -37,7 +37,7 @@ when "data_mapper" # test: # default: # adapter: postgres -# database: <%= @options["app"].downcase %>_test +# database: <%= @options['app'].downcase %>_test # host: localhost # username: root # password: @@ -45,7 +45,7 @@ when "data_mapper" # production: # default: # adapter: postgres -# database: <%= @options["app"].downcase %>_production +# database: <%= @options['app'].downcase %>_production # host: localhost # username: root # password: @@ -53,49 +53,49 @@ when "data_mapper" development: default: adapter: sqlite3 - database: <%%= Mack::Paths.db("<%= @options["app"].downcase %>_development.db") %> + database: <%%= Mack::Paths.db("<%= @options['app'].downcase %>_development.db") %> test: default: adapter: sqlite3 - database: <%%= Mack::Paths.db("<%= @options["app"].downcase %>_test.db") %> + database: <%%= Mack::Paths.db("<%= @options['app'].downcase %>_test.db") %> production: default: adapter: sqlite3 - database: <%%= Mack::Paths.db("<%= @options["app"].downcase %>_production.db") %> + database: <%%= Mack::Paths.db("<%= @options['app'].downcase %>_production.db") %> <% else -%> # development: # adapter: mysql -# database: <%= @options["app"].downcase %>_development +# database: <%= @options['app'].downcase %>_development # host: localhost # username: root # password: # # test: # adapter: mysql -# database: <%= @options["app"].downcase %>_test +# database: <%= @options['app'].downcase %>_test # host: localhost # username: root # password: # # production: # adapter: mysql -# database: <%= @options["app"].downcase %>_production +# database: <%= @options['app'].downcase %>_production # host: localhost # username: root # password: development: adapter: sqlite3 - database: <%%= Mack::Paths.db("<%= @options["app"].downcase %>_development.db") %> + database: <%%= Mack::Paths.db("<%= @options['app'].downcase %>_development.db") %> test: adapter: sqlite3 - database: <%%= Mack::Paths.db("<%= @options["app"].downcase %>_test.db") %> + database: <%%= Mack::Paths.db("<%= @options['app'].downcase %>_test.db") %> production: adapter: sqlite3 - database: <%%= Mack::Paths.db("<%= @options["app"].downcase %>_production.db") %> + database: <%%= Mack::Paths.db("<%= @options['app'].downcase %>_production.db") %> <% end -%> \ No newline at end of file lib/mack/generators/mack_application_generator/templates/config/database.yml.template @@ -1,4 +1,4 @@ -require File.join(File.dirname(__FILE__), "..", "spec_helper.rb") +require File.join(File.dirname(__FILE__), '..', "spec_helper.rb") describe DefaultController do lib/mack/generators/mack_application_generator/templates/test/controllers/default_controller_spec.rb.template @@ -1,5 +1,5 @@ # This is a sample TestCase file. You can safely delete this file -require File.join(File.dirname(__FILE__), "..", "test_helper.rb") +require File.join(File.dirname(__FILE__), '..', "test_helper.rb") class DefaultControllerTest < Test::Unit::TestCase lib/mack/generators/mack_application_generator/templates/test/controllers/default_controller_test.rb.template @@ -2,7 +2,7 @@ require 'rubygems' require 'pathname' require 'spec' -ENV["MACK_ENV"] = "test" -ENV["MACK_ROOT"] = File.join(File.dirname(__FILE__), "..") -load(File.join(File.dirname(__FILE__), "..", "Rakefile")) +ENV['MACK_ENV'] = 'test' +ENV['MACK_ROOT'] = File.join(File.dirname(__FILE__), '..') +load(File.join(File.dirname(__FILE__), '..', "Rakefile")) require 'mack' lib/mack/generators/mack_application_generator/templates/test/spec_helper.rb.template @@ -2,11 +2,11 @@ require 'rubygems' require "test/unit" require 'fileutils' -ENV["MACK_ENV"] = "test" -ENV["MACK_ROOT"] = File.join(File.dirname(__FILE__), "..") +ENV['MACK_ENV'] = 'test' +ENV['MACK_ROOT'] = File.join(File.dirname(__FILE__), '..') # load the mack framework: -load(File.join(File.dirname(__FILE__), "..", "Rakefile")) +load(File.join(File.dirname(__FILE__), '..', "Rakefile")) require 'mack' # place common methods, assertions, and other type things in this file so lib/mack/generators/mack_application_generator/templates/test/test_helper.rb.template @@ -1,4 +1,4 @@ -ENV["MACK_ENV"] = 'development' +ENV['MACK_ENV'] = 'development' require 'rubygems' load("Rakefile") require 'mack' lib/mack/generators/passenger_generator/templates/config.ru.template @@ -1,15 +1,15 @@ helper_template: type: file - template_path: <%= File.join(templates_directory_path, "app", "helpers", "views", "helper.rb.template") %> - output_path: <%= File.join("app", "helpers", "views", "#{@name_singular}_helper.rb") %> + template_path: <%= File.join(templates_directory_path, 'app', 'helpers', 'views', "helper.rb.template") %> + output_path: <%= File.join('app', 'helpers', 'views', "#{@name_singular}_helper.rb") %> <% if configatron.mack.testing_framework.to_s == "test_case" -%> helper_test_template: type: file - template_path: <%= File.join(templates_directory_path, "test", "helpers", "views", "test_case.rb.template") %> - output_path: <%= File.join("test", "helpers", "views", "#{@name_singular}_helper_test.rb") %> + template_path: <%= File.join(templates_directory_path, 'test', 'helpers', 'views', "test_case.rb.template") %> + output_path: <%= File.join('test', 'helpers', 'views', "#{@name_singular}_helper_test.rb") %> <% elsif configatron.mack.testing_framework.to_s == "rspec" -%> helper_test_template: type: file - template_path: <%= File.join(templates_directory_path, "test", "helpers", "views", "rspec.rb.template") %> - output_path: <%= File.join("test", "helpers", "views", "#{@name_singular}_helper_spec.rb") %> + template_path: <%= File.join(templates_directory_path, 'test', 'helpers', 'views', "rspec.rb.template") %> + output_path: <%= File.join('test', 'helpers', 'views', "#{@name_singular}_helper_spec.rb") %> <% end -%> \ No newline at end of file lib/mack/generators/view_helper_generator/manifest.yml @@ -1,4 +1,4 @@ -require File.join(File.dirname(__FILE__), "..", "view_template") +require File.join(File.dirname(__FILE__), '..', "view_template") require File.join(File.dirname(__FILE__), 'base') module Mack module Rendering # :nodoc: lib/mack/rendering/engine/builder.rb @@ -4,7 +4,7 @@ namespace :mack do desc "Convert application configuration yml file into Configatron file" task :configuration do - file = ENV['FILE'] || ENV['file'] || File.join(Mack.root, "config", "app_config") + file = ENV['FILE'] || ENV['file'] || File.join(Mack.root, 'config', "app_config") raise "Cannot find: #{file}" if !File.exists?(file) if File.directory?(file) Dir.glob(File.join(file, "**", "*.yml")).each do |f| @@ -23,11 +23,11 @@ namespace :mack do # desc "Renames thin.ru to rackup.ru and updates your thin.yml, if necessary." # task :rackup do # require 'fileutils' - # ru = File.join(Mack.root, "config", "thin.ru") + # ru = File.join(Mack.root, 'config', "thin.ru") # if File.exists?(ru) - # FileUtils.mv(ru, File.join(Mack.root, "config", "rackup.ru")) + # FileUtils.mv(ru, File.join(Mack.root, 'config', "rackup.ru")) # end - # thin_yml = File.join(Mack.root, "config", "thin.yml") + # thin_yml = File.join(Mack.root, 'config', "thin.yml") # if File.exists?(thin_yml) # contents = File.open(thin_yml).read # contents.gsub!("thin.ru", "rackup.ru") @@ -97,7 +97,7 @@ def cleanup_key(key) end end -def hash_to_configatron(hash, configs = [], current_config = "configatron") +def hash_to_configatron(hash, configs = [], current_config = 'configatron') hash.each_key do |key| if hash[key].is_a?Hash hash_to_configatron(hash[key], configs, (current_config + ".#{cleanup_key(key)}")) lib/mack/tasks/mack_update_tasks.rake @@ -1,6 +1,6 @@ rule /\#.*/ do |t| env = t.name.match(/\#.*/).to_s.gsub("#", "") - ENV["MACK_ENV"] = env + ENV['MACK_ENV'] = env name = t.name.gsub("##{env}", "") Rake::Task[name].invoke end lib/mack/tasks/rake_rules.rake @@ -12,7 +12,7 @@ namespace :test do desc "Run test code." Rake::TestTask.new(:test_case) do |t| require File.join_from_here('..', 'boot', 'configuration.rb') - t.libs << "test" + t.libs << 'test' t.pattern = configatron.mack.send("#{configatron.mack.testing_framework}_file_pattern") t.verbose = true end @@ -57,7 +57,7 @@ namespace :test do private def common_coverage - ENV["MACK_ENV"] = "test" + ENV['MACK_ENV'] = 'test' Rake::Task["mack:environment"].invoke Rake::Task["test:setup"].invoke lib/mack/tasks/test_tasks.rake @@ -1,7 +1,7 @@ require "test/unit" #-- -if Mack.env == "test" +if Mack.env == 'test' module Mack module RunnerHelpers # :nodoc: class Session lib/mack/testing/helpers.rb @@ -1,4 +1,4 @@ -require File.join(File.dirname(__FILE__), "helpers") +require File.join(File.dirname(__FILE__), 'helpers') require 'spec' module Spec # :nodoc: lib/mack/testing/rspec.rb @@ -28,7 +28,7 @@ else # Requires all rake tasks that ship with the Mack framework. [fl, Mack.search_path(:lib), Mack.search_path(:plugins)].flatten.each do |dir| begin - require File.join(dir, "tasks", "rake_helpers.rb") + require File.join(dir, 'tasks', "rake_helpers.rb") rescue Exception => e # raise e end lib/mack_tasks.rb @@ -1,4 +1,4 @@ -require File.join(File.dirname(__FILE__), "..", "lib", "mack", "version") +require File.join(File.dirname(__FILE__), '..', 'lib', 'mack', "version") class GemHelper # :nodoc: include Singleton @@ -9,8 +9,8 @@ class GemHelper # :nodoc: def initialize self.project = "magrathea" - self.package = "mack" - self.gem_name = "mack" + self.package = 'mack' + self.gem_name = 'mack' self.version = Mack::VERSION end tasks/gem_helper.rb @@ -49,7 +49,7 @@ namespace :gem do s.require_paths << 'lib' s.bindir = "bin" - s.executables << "mack" + s.executables << 'mack' s.executables << "mackery" s.executables << "mackery-console" s.executables << "mackery-server" @@ -62,7 +62,7 @@ namespace :gem do s.add_dependency("erubis") s.add_dependency("mack-more", gh.version) # s.add_dependency('gemfreezer') - # s.add_dependency("configatron", "2.1.5") + # s.add_dependency('configatron', "2.1.5") # s.add_dependency("logging", "0.9.4") # s.add_dependency("builder") # s.add_dependency("daemons", "1.0.10") tasks/mack_gem_tasks.rake @@ -2,5 +2,5 @@ require 'rake' require 'rake/testtask' require 'rake/rdoctask' -require File.join(File.dirname(__FILE__), "..", "..", "lib", "mack_tasks") -require(File.join(File.dirname(__FILE__), "..", "..", "lib", 'mack')) +require File.join(File.dirname(__FILE__), '..', '..', 'lib', "mack_tasks") +require(File.join(File.dirname(__FILE__), '..', '..', 'lib', 'mack')) test/fake_application/Rakefile @@ -1,4 +1,4 @@ -ENV["MACK_ENV"] = 'development' +ENV['MACK_ENV'] = 'development' require 'rubygems' load("Rakefile") require 'mack' test/fixtures/config.ru.fixture @@ -1,4 +1,4 @@ -require File.join(File.dirname(__FILE__), "..", "spec_helper.rb") +require File.join(File.dirname(__FILE__), '..', "spec_helper.rb") describe ZoosController do test/fixtures/zoos_controller_spec.rb.fixture @@ -1,4 +1,4 @@ -require File.join(File.dirname(__FILE__), "..", "spec_helper.rb") +require File.join(File.dirname(__FILE__), '..', "spec_helper.rb") describe ZoosController do test/fixtures/zoos_controller_spec_with_actions.rb.fixture @@ -1,4 +1,4 @@ -require File.join(File.dirname(__FILE__), "..", "test_helper.rb") +require File.join(File.dirname(__FILE__), '..', "test_helper.rb") class ZoosControllerTest < Test::Unit::TestCase test/fixtures/zoos_controller_test.rb.fixture @@ -1,4 +1,4 @@ -require File.join(File.dirname(__FILE__), "..", "test_helper.rb") +require File.join(File.dirname(__FILE__), '..', "test_helper.rb") class ZoosControllerTest < Test::Unit::TestCase test/fixtures/zoos_controller_test_with_actions.rb.fixture @@ -4,16 +4,16 @@ require 'spec' require 'rake' require 'fileutils' -ENV["MACK_ENV"] = "test" -ENV["MACK_ROOT"] = File.join(File.dirname(__FILE__), "fake_application") +ENV['MACK_ENV'] = 'test' +ENV['MACK_ROOT'] = File.join(File.dirname(__FILE__), "fake_application") if $genosaurus_output_directory.nil? - $genosaurus_output_directory = ENV["MACK_ROOT"] + $genosaurus_output_directory = ENV['MACK_ROOT'] puts "$genosaurus_output_directory: #{$genosaurus_output_directory}" end # load the mack framework: -require(File.join(File.dirname(__FILE__), "..", "lib", 'mack')) +require(File.join(File.dirname(__FILE__), '..', 'lib', 'mack')) #-------------- HELPER MODULES --------------------------# test/spec_helper.rb @@ -58,7 +58,7 @@ describe Mack::Assets::Manager do end end - describe "stylesheets" do + describe 'stylesheets' do before(:each) do assets_mgr.test do |a| a.add_css ['a', 'b'] test/unit/assets/assets_mgr_spec.rb @@ -4,7 +4,7 @@ require Pathname(__FILE__).dirname.expand_path.parent.parent + 'spec_helper' describe "File Upload Request" do it "should generate proper multipart content" do - post upload_file_url, :multipart => true, :file0 => file_for_upload(File.join(File.dirname(__FILE__), "images", "homer_brain.jpg")), :album => 'simpsons' + post upload_file_url, :multipart => true, :file0 => file_for_upload(File.join(File.dirname(__FILE__), 'images', "homer_brain.jpg")), :album => 'simpsons' assigns(:saved_file_name).should_not be_nil assigns(:saved_file_name).should == "homer_brain.jpg" assigns(:album).should_not be_nil @@ -12,7 +12,7 @@ describe "File Upload Request" do end it "should be able to upload multiple files" do - post upload_multiple_url, :multipart => true, :file0 => file_for_upload(File.join(File.dirname(__FILE__), "images", "homer_brain.jpg")), :file1 => file_for_upload(File.join(File.dirname(__FILE__), "images", "homer_brain2.jpg")) + post upload_multiple_url, :multipart => true, :file0 => file_for_upload(File.join(File.dirname(__FILE__), 'images', "homer_brain.jpg")), :file1 => file_for_upload(File.join(File.dirname(__FILE__), 'images', "homer_brain2.jpg")) assigns(:saved_file1).should_not be_nil assigns(:saved_file2).should_not be_nil assigns(:saved_file1).should == "homer_brain.jpg" @@ -20,7 +20,7 @@ describe "File Upload Request" do end it 'should work with nested hash parameters' do - post upload_file_url, :multipart => true, :file0 => file_for_upload(File.join(File.dirname(__FILE__), "images", "homer_brain.jpg")), :album => 'simpsons', :user => {:username => 'mark'} + post upload_file_url, :multipart => true, :file0 => file_for_upload(File.join(File.dirname(__FILE__), 'images', "homer_brain.jpg")), :album => 'simpsons', :user => {:username => 'mark'} assigns(:saved_file_name).should_not be_nil assigns(:saved_file_name).should == "homer_brain.jpg" assigns(:user).should_not be_nil test/unit/controller/file_upload_spec.rb @@ -6,14 +6,14 @@ describe Mack do describe "root" do it "should return the path to the application's root" do - Mack.root.should == ENV["MACK_ROOT"] + Mack.root.should == ENV['MACK_ROOT'] end it "should return pwd if a root isn't set" do r = Mack.root - ENV["MACK_ROOT"] = nil + ENV['MACK_ROOT'] = nil Mack.root.should == FileUtils.pwd - ENV["MACK_ROOT"] = r + ENV['MACK_ROOT'] = r end end @@ -21,13 +21,13 @@ describe Mack do describe "env" do it "should return the environment" do - Mack.env == "test" + Mack.env == 'test' end it "should return 'development' if env isn't set" do - ENV["MACK_ENV"] = nil - Mack.env.should == "development" - ENV["MACK_ENV"] = "test" + ENV['MACK_ENV'] = nil + Mack.env.should == 'development' + ENV['MACK_ENV'] = 'test' end end test/unit/initialize/configuration_spec.rb @@ -11,23 +11,23 @@ describe PluginGenerator do pg = PluginGenerator.new("name" => "bandit") File.exists?(bandit_dir).should_not == true File.exists?(File.join(bandit_dir, "init.rb")).should_not == true - File.exists?(File.join(bandit_dir, "lib")).should_not == true - File.exists?(File.join(bandit_dir, "lib", "bandit.rb")).should_not == true - File.exists?(File.join(bandit_dir, "lib", "tasks")).should_not == true + File.exists?(File.join(bandit_dir, 'lib')).should_not == true + File.exists?(File.join(bandit_dir, 'lib', "bandit.rb")).should_not == true + File.exists?(File.join(bandit_dir, 'lib', 'tasks')).should_not == true pg.generate File.exists?(bandit_dir).should == true File.exists?(File.join(bandit_dir, "init.rb")).should == true - File.exists?(File.join(bandit_dir, "lib")).should == true - File.exists?(File.join(bandit_dir, "lib", "bandit.rb")).should == true - File.exists?(File.join(bandit_dir, "lib", "tasks")).should == true - File.exists?(File.join(bandit_dir, "lib", "tasks", "bandit_tasks.rake")).should == true + File.exists?(File.join(bandit_dir, 'lib')).should == true + File.exists?(File.join(bandit_dir, 'lib', "bandit.rb")).should == true + File.exists?(File.join(bandit_dir, 'lib', 'tasks')).should == true + File.exists?(File.join(bandit_dir, 'lib', 'tasks', "bandit_tasks.rake")).should == true File.open(File.join(bandit_dir, "init.rb"), "r") do |f| f.read.should == "require 'bandit'\n" end - File.open(File.join(bandit_dir, "lib", "bandit.rb"), "r") do |f| + File.open(File.join(bandit_dir, 'lib', "bandit.rb"), "r") do |f| f.read.should == "# Do work here for bandit\n" end end test/unit/lib/utils/generators/plugin_generator_spec.rb @@ -3,18 +3,18 @@ require Pathname(__FILE__).dirname.expand_path.parent.parent.parent + 'spec_help describe Mack::Paths do - describe "public" do + describe 'public' do it "should give the path to the public directory" do - Mack::Paths.public.should == File.expand_path(File.join(Mack.root, "public")) + Mack::Paths.public.should == File.expand_path(File.join(Mack.root, 'public')) end it "should join the file name given with the public directory path" do - Mack::Paths.public("index.html").should == File.expand_path(File.join(Mack.root, "public", "index.html")) + Mack::Paths.public("index.html").should == File.expand_path(File.join(Mack.root, 'public', "index.html")) end it "should join the file names given with the public directory path" do - Mack::Paths.public("foo", "index.html").should == File.expand_path(File.join(Mack.root, "public", "foo", "index.html")) + Mack::Paths.public("foo", "index.html").should == File.expand_path(File.join(Mack.root, 'public', "foo", "index.html")) end end test/unit/lib/utils/paths_spec.rb 7bbc8ae8a23f514437b75908415dd6c093e2036c Mark Bates mark@mackframework.com http://github.com/markbates/mack/commit/f62d9a49cc422d3418cfe5886770b6691168fb34 f62d9a49cc422d3418cfe5886770b6691168fb34 2008-12-19T18:53:45-08:00 2008-12-19T18:53:45-08:00 Changed some double quotes to singe qoutes 3a8b08d6a3775ef5850482beac344535d96b213c Mark Bates mark@mackframework.com