merb.thor
@@ -1,2 +1 @@
-Autotest.add_discovery { "merb" }
-Autotest.add_discovery { "rspec" }
\ No newline at end of file
+Autotest.add_discovery { "merb" }
\ No newline at end of file
autotest/discover.rb
@@ -15,10 +15,7 @@ class Autotest::Merb < Autotest
initialize_test_layout
# Ignore any happenings in these directories
- 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) }
-
+ add_exception %r%^\./(?:doc|log|public|tmp)%
# Ignore any mappings that Autotest may have already set up
clear_mappings
@@ -39,7 +36,7 @@ class Autotest::Merb < Autotest
]
end
- # Any change to a test will cause it to be run
+ # Any change to a test or test will cause it to be run
add_mapping %r%^test/(unit|models|integration|controllers|views|functional)/.*rb$% do |filename, _|
filename
end
autotest/merb.rb
@@ -14,7 +14,7 @@ class Autotest::MerbRspec < Autotest
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|.*\.thor)%
+ 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) }
@@ -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|requests)/.*_spec\.rb$%
+ files_matching %r%^spec/(views|controllers|helpers)/.*_spec\.rb$%
end
# Any change to a helper will cause its spec to be run
autotest/merb_rspec.rb
@@ -1,8 +1,9 @@
# Go to http://wiki.merbivore.com/pages/init-rb
-require 'config/dependencies.rb'
-
-use_orm :datamapper
+# Specify a specific version of a dependency
+# dependency "RedCloth", "> 3.0"
+
+# use_orm :none
use_test :rspec
use_template_engine :erb
@@ -11,7 +12,7 @@ Merb::Config.use do |c|
c[:session_store] = 'cookie' # can also be 'memory', 'memcache', 'container', 'datamapper
# cookie session store configuration
- c[:session_secret_key] = '26a1ff33f3e5fdd059196b21747a0a358665b4a5' # required for cookie session store
+ c[:session_secret_key] = 'ff0bc97fd0e7d3a1e9f62389270643c91d0991ec' # required for cookie session store
# c[:session_id_key] = '_session_id' # cookie session id key, defaults to "_session_id"
end
@@ -21,4 +22,4 @@ end
Merb::BootLoader.after_app_loads do
# This will get executed after your app's classes have been loaded.
-end
+end
\ No newline at end of file
config/init.rb
@@ -29,9 +29,6 @@ Merb.logger.info("Compiling routes...")
Merb::Router.prepare do
# RESTful routes
# resources :posts
-
- # Adds the required routes for merb-auth using the password slice
- slice(:merb_auth_slice_password, :name_prefix => nil, :path_prefix => "")
# This is the default route for /:controller/:action/:id
# This is fine for most cases. If you're heavily using resource-based
config/router.rb
@@ -28,7 +28,7 @@
<div id='footer'>
<div class='wrap_to_center'>
<p>
- © 2008, Merb Team | Merb is released under the <a href="http://www.opensource.org/licenses/mit-license.php">MIT License</a>
+ © 2008, Ezra Zygmuntowicz | Merb is released under the <a href="http://www.opensource.org/licenses/mit-license.php">MIT License</a>
</p>
</div>
</div>
doc/rdoc/generators/template/merb/index.html.erb
README
app/models/user.rb
config/database.yml
config/dependencies.rb
merb/merb-auth/setup.rb
merb/merb-auth/strategies.rb
merb/session/session.rb
public/javascripts/jquery.js
tasks/doc.thor
tasks/merb.thor
3a71918c25ae70d7ab0a44045a88fc717522c56c
Hampton Catlin
hcatlin@greed-2.local
http://github.com/hassox/wikimedia-mobile/commit/d6b07abdc9583b0da9bd10d040b16b5ae977ead7
d6b07abdc9583b0da9bd10d040b16b5ae977ead7
2008-11-22T13:45:45-08:00
2008-11-22T13:45:45-08:00
simplifying things
3439b4c0c9c42092e121d4f94f5c7f7426f3a40f
Hampton Catlin
hcatlin@greed-2.local