Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Integrated Action Service with the existing elements

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@660 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit bc8e41247b2bdc37da8be4e963caf99451418cd2 1 parent 45acc8c
@dhh dhh authored
View
19 actionservice/Rakefile
@@ -50,7 +50,7 @@ spec = Gem::Specification.new do |s|
s.author = "Leon Breedt"
s.email = "bitserf@gmail.com"
s.rubyforge_project = "actionservice"
- s.homepage = "http://rubyforge.org/projects/actionservice"
+ s.homepage = "http://www.rubyonrails.com"
s.add_dependency('actionpack', '>= 1.4.0')
s.add_dependency('activerecord', '>= 1.6.0')
@@ -73,13 +73,20 @@ Rake::GemPackageTask.new(spec) do |p|
end
-desc "Publish API docs to RubyForge"
-task :pdoc => [:rdoc] do
- FileUtils.mkdir_p 'html'
- FileUtils.mv 'doc', 'html/api'
- Rake::RubyForgePublisher.new('actionservice', 'ljb').upload
+# Publish beta gem
+desc "Publish the API documentation"
+task :pgem => [:package] do
+ Rake::SshFilePublisher.new("davidhh@comox.textdrive.com", "public_html/gems/gems", "pkg", "#{PKG_FILE_NAME}.gem").upload
+ `ssh davidhh@comox.textdrive.com './gemupdate.sh'`
end
+# Publish documentation
+desc "Publish the API documentation"
+task :pdoc => [:rdoc] do
+ Rake::SshDirPublisher.new("davidhh@comox.textdrive.com", "public_html/as", "doc").upload
+end
+
+
def each_source_file(*args)
prefix, includes, excludes, open_file = args
prefix ||= File.dirname(__FILE__)
View
3  railties/Rakefile
@@ -15,7 +15,7 @@ PKG_DESTINATION = ENV["RAILS_PKG_DESTINATION"] || "../#{PKG_NAME}"
BASE_DIRS = %w( app config/environments db doc log lib public script test vendor )
-APP_DIRS = %w( models controllers helpers views views/layouts )
+APP_DIRS = %w( apis models controllers helpers views views/layouts )
PUBLIC_DIRS = %w( images javascripts stylesheets _doc )
TEST_DIRS = %w( fixtures unit functional mocks mocks/development mocks/testing )
@@ -246,6 +246,7 @@ spec = Gem::Specification.new do |s|
s.add_dependency('activerecord', '>= 1.6.0')
s.add_dependency('actionpack', '>= 1.4.0')
s.add_dependency('actionmailer', '>= 0.6.1')
+ s.add_dependency('actionservice', '>= 0.4.0')
s.rdoc_options << '--exclude' << '.'
s.has_rdoc = false
View
11 railties/environments/shared.rb
@@ -14,6 +14,7 @@
app/models
app/controllers
app/helpers
+ app/apis
config
lib
vendor
@@ -23,6 +24,7 @@
vendor/activerecord/lib
vendor/actionpack/lib
vendor/actionmailer/lib
+ vendor/actionservice/lib
).map { |dir| "#{RAILS_ROOT}/#{dir}" }
# Prepend to $LOAD_PATH
@@ -34,6 +36,7 @@
require 'active_record'
require 'action_controller'
require 'action_mailer'
+require 'action_service'
# Environment-specific configuration.
@@ -54,12 +57,8 @@
)
end
-[ActiveRecord::Base, ActionController::Base, ActionMailer::Base].each do |klass|
- klass.logger ||= RAILS_DEFAULT_LOGGER
-end
-[ActionController::Base, ActionMailer::Base].each do |klass|
- klass.template_root ||= "#{RAILS_ROOT}/app/views/"
-end
+[ActiveRecord, ActionController, ActionMailer].each { |mod| mod::Base.logger ||= RAILS_DEFAULT_LOGGER }
+[ActionController, ActionMailer].each { |mod| mod::Base.template_root ||= "#{RAILS_ROOT}/app/views/" }
ActionController::Routing::Routes.reload
# Include your app's configuration here:
View
10 railties/environments/shared_for_gem.rb
@@ -14,6 +14,7 @@
app/models
app/controllers
app/helpers
+ app/apis
config
lib
vendor
@@ -29,6 +30,7 @@
require_gem 'activerecord'
require_gem 'actionpack'
require_gem 'actionmailer'
+require_gem 'actionservice'
require_gem 'rails'
@@ -50,12 +52,8 @@
)
end
-[ActiveRecord::Base, ActionController::Base, ActionMailer::Base].each do |klass|
- klass.logger ||= RAILS_DEFAULT_LOGGER
-end
-[ActionController::Base, ActionMailer::Base].each do |klass|
- klass.template_root ||= "#{RAILS_ROOT}/app/views/"
-end
+[ActiveRecord, ActionController, ActionMailer].each { |mod| mod::Base.logger ||= RAILS_DEFAULT_LOGGER }
+[ActionController, ActionMailer].each { |mod| mod::Base.template_root ||= "#{RAILS_ROOT}/app/views/" }
ActionController::Routing::Routes.reload
# Include your app's configuration here:
View
1  railties/lib/rails_generator/generators/applications/app/app_generator.rb
@@ -96,6 +96,7 @@ def add_options!(opt)
# Installation skeleton. Intermediate directories are automatically
# created so don't sweat their absence here.
BASEDIRS = %w(
+ app/apis
app/controllers
app/helpers
app/models
Please sign in to comment.
Something went wrong with that request. Please try again.