ape 1.6.0 → 1.7.0

data/Rakefile

@@ -7,9 +7,14 @@ require 'rake/rdoctask'
 $:.unshift File.dirname(__FILE__) + '/lib'
 require 'ape'
 
-def spec
-  spec ||= Gem::Specification.new do |s|
-    s.platform = Gem::Platform::RUBY
+ape_dependencies = {
+  :sinatra => '>= 0.9.4',
+  :erubis => '>= 2.5.0',
+}
+
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |s|
     s.name = 'ape'
     s.version = Ape::VERSION::STRING
     s.authors = ['Tim Bray', 'David Calavera']
@@ -27,12 +32,15 @@ def spec
 
     s.rubyforge_project = 'ape'
 
-    s.add_dependency 'rake', '>= 0.8'
-    s.add_dependency 'mongrel', '>= 1.1.3'
-    s.add_dependency 'erubis', '>= 2.5.0'
-    s.add_dependency 'rubyforge', '>= 0.4'
-    s.add_dependency 'mocha', '>= 0.9.0'
+    ape_dependencies.each do |name, version|
+      s.add_dependency name.to_s, version
+    end
+    s.add_development_dependency :mocha, '>= 0.9.0'
   end
+
+  Jeweler::GemcutterTasks.new
+rescue LoadError
+  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
 end
 
 def install_gem(*args)
@@ -44,9 +52,8 @@ end
 desc 'Install the necessary dependencies'
 task :setup do
   installed = Gem::SourceIndex.from_installed_gems  
-  dependencies = spec.dependencies
-  dependencies.select { |dep|
-    installed.find_name(dep.name, dep.version_requirements).empty? }.each do |dep|
+  ape_dependencies.select { |name, version|
+    installed.find_name(name.to_s, version).empty? }.each do |dep|
       puts "Installing #{dep} ..."
       install_gem dep.name, "-v '#{dep.version_requirements.to_s}'"
     end

data/bin/ape_server

@@ -4,10 +4,9 @@
 $:.unshift File.dirname(__FILE__) + '/../lib'
 
 require 'rubygems'
-require 'mongrel'
 require 'optparse'
-require 'ape/server'
-require 'ape/samples'
+
+require File.dirname(__FILE__) + '/../sinatra/atom_exerciser'
 
 OPTIONS = {
   :host => '0.0.0.0',
@@ -25,4 +24,5 @@ parser = OptionParser.new do |opts|
   opts.parse!(ARGV)
 end
 
-Ape::Server.run(OPTIONS)
+::Ape.home = OPTIONS.delete(:home)
+AtomExerciser.run!(OPTIONS)

data/lib/ape/reporter.rb

@@ -4,8 +4,8 @@ module Ape
     require File.dirname(__FILE__) + '/util.rb'
     include Ape::Util
     
-    attr_accessor :header, :footer, :debug, :dialogs, :diarefs, :dianum, :server
-    
+    attr_accessor :header, :footer, :debug, :dialogs, :diarefs, :dianum, :server, :options
+
     def steps
       @steps ||= []
     end
@@ -13,8 +13,9 @@ module Ape
     def self.instance(key, opts = {})
       reporter = resolve_plugin(key, 'reporters', 'reporter')
       raise StandardError, "Unknown reporter: #{key}, outputs supported: #{supported_outputs}" unless reporter
-      reporter.debug = opts[:debug] || false
-      reporter.server = opts[:server] || false
+      reporter.debug = opts.delete(:debug) || false
+      reporter.server = opts.delete(:server) || false
+      reporter.options = opts
       reporter.dialogs = {}
       reporter.diarefs = {}
       reporter.dianum = 1

data/lib/ape/reporters/html_reporter.rb

@@ -4,7 +4,7 @@ module Ape
     
     def static_dir      
       dir = (server != true)?File.expand_path(File.dirname(__FILE__) + '/../../..') : ''
-      dir += "/web"
+      dir += options[:static_path] || "/web"
       dir
     end
     

data/lib/ape/validators/service_document_validator.rb

@@ -6,7 +6,7 @@ module Ape
     
     def validate(opts = {})
       init_service_document(opts[:uri])
-      init_service_collections(opts[:uri])
+      init_service_collections(opts[:uri]) if @service_document
     end
     
     def init_service_document(uri)
@@ -51,4 +51,4 @@ module Ape
       end
     end
   end
-end
+end

data/lib/ape/version.rb

@@ -1,7 +1,7 @@
 module Ape #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 1
-    MINOR = 6
+    MINOR = 7
     TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.')

data/web/index.html

@@ -40,7 +40,10 @@
   -->
   <hr/>
   <p>The Ape source code may be found at 
-  <a href="http://rubyforge.org/projects/ape">ape.rubyforge.org</a>.
+  <a href="http://github.com/calavera/Ape">github.com/calavera/Ape</a>. You can install a local
+  Ape and run it just fine; see
+  <a href="http://thinkincode.net/2008/2/22/the-ape-meets-ruby-gems">The Ape meets
+  RubyGems</a>
 
   <hr/>
   <p>Ape Logo by <a href="http://www.urbanhonking.com/ideasfordozens">Greg

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ape
 version: !ruby/object:Gem::Version 
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors: 
 - Tim Bray
@@ -11,27 +11,17 @@ bindir: bin
 cert_chain: []
 
 date: 2009-10-27 00:00:00 +01:00
-default_executable: 
+default_executable: ape_server
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rake
+  name: sinatra
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0.8"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: mongrel
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.1.3
+        version: 0.9.4
     version: 
 - !ruby/object:Gem::Dependency 
   name: erubis
@@ -43,19 +33,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 2.5.0
     version: 
-- !ruby/object:Gem::Dependency 
-  name: rubyforge
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0.4"
-    version: 
 - !ruby/object:Gem::Dependency 
   name: mocha
-  type: :runtime
+  type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -72,80 +52,78 @@ executables:
 extensions: []
 
 extra_rdoc_files: 
-- README
 - LICENSE
+- README
 files: 
-- lib/ape/server.rb
+- LICENSE
+- README
+- Rakefile
+- lib/ape.rb
+- lib/ape/atomURI.rb
+- lib/ape/auth/google_login_credentials.rb
+- lib/ape/auth/wsse_credentials.rb
+- lib/ape/authent.rb
+- lib/ape/categories.rb
+- lib/ape/coll_element.rb
 - lib/ape/collection.rb
-- lib/ape/print_writer.rb
-- lib/ape/samples.rb
+- lib/ape/crumbs.rb
+- lib/ape/entry.rb
+- lib/ape/escaper.rb
+- lib/ape/feed.rb
+- lib/ape/html.rb
+- lib/ape/invoker.rb
 - lib/ape/invokers/deleter.rb
 - lib/ape/invokers/getter.rb
 - lib/ape/invokers/poster.rb
 - lib/ape/invokers/putter.rb
+- lib/ape/names.rb
+- lib/ape/print_writer.rb
 - lib/ape/reporter.rb
-- lib/ape/escaper.rb
-- lib/ape/atomURI.rb
-- lib/ape/categories.rb
-- lib/ape/invoker.rb
-- lib/ape/validator_dsl.rb
-- lib/ape/version.rb
-- lib/ape/coll_element.rb
-- lib/ape/feed.rb
-- lib/ape/service.rb
-- lib/ape/auth/google_login_credentials.rb
-- lib/ape/auth/wsse_credentials.rb
-- lib/ape/authent.rb
-- lib/ape/entry.rb
-- lib/ape/handler.rb
-- lib/ape/reporters/html_template.eruby
-- lib/ape/reporters/html_reporter.rb
 - lib/ape/reporters/atom_reporter.rb
-- lib/ape/reporters/text_reporter.rb
 - lib/ape/reporters/atom_template.eruby
-- lib/ape/crumbs.rb
+- lib/ape/reporters/html_reporter.rb
+- lib/ape/reporters/html_template.eruby
+- lib/ape/reporters/text_reporter.rb
+- lib/ape/samples.rb
+- lib/ape/service.rb
 - lib/ape/util.rb
-- lib/ape/names.rb
 - lib/ape/validator.rb
+- lib/ape/validator_dsl.rb
 - lib/ape/validators/entry_posts_validator.rb
+- lib/ape/validators/media_linkage_validator.rb
 - lib/ape/validators/media_posts_validator.rb
-- lib/ape/validators/service_document_validator.rb
 - lib/ape/validators/sanitization_validator.rb
-- lib/ape/validators/media_linkage_validator.rb
-- lib/ape/validators/sorting_validator.rb
 - lib/ape/validators/schema_validator.rb
-- lib/ape/html.rb
-- lib/ape.rb
-- samples/service_schema.txt
+- lib/ape/validators/service_document_validator.rb
+- lib/ape/validators/sorting_validator.rb
+- lib/ape/version.rb
 - samples/atom_schema.txt
-- samples/unclean_xhtml_entry.eruby
 - samples/basic_entry.eruby
 - samples/categories_schema.txt
 - samples/mini_entry.eruby
+- samples/service_schema.txt
+- samples/unclean_xhtml_entry.eruby
 - test/test_helper.rb
-- test/unit/reporter_test.rb
-- test/unit/invoker_test.rb
 - test/unit/ape_test.rb
-- test/unit/samples_test.rb
-- test/unit/collection_test.rb
+- test/unit/authent_test.rb
 - test/unit/coll_element_test.rb
-- test/unit/validators_test.rb
+- test/unit/collection_test.rb
+- test/unit/invoker_test.rb
+- test/unit/reporter_test.rb
+- test/unit/samples_test.rb
 - test/unit/service_test.rb
-- test/unit/authent_test.rb
+- test/unit/validators_test.rb
 - web/ape.css
 - web/ape_logo.png
 - web/index.html
 - web/info.png
-- README
-- LICENSE
-- Rakefile
 has_rdoc: true
 homepage: http://ape.rubyforge.org
 licenses: []
 
 post_install_message: 
-rdoc_options: []
-
+rdoc_options: 
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -167,5 +145,14 @@ rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: The Atom Protocol Exerciser
-test_files: []
-
+test_files: 
+- test/test_helper.rb
+- test/unit/reporter_test.rb
+- test/unit/invoker_test.rb
+- test/unit/ape_test.rb
+- test/unit/samples_test.rb
+- test/unit/collection_test.rb
+- test/unit/coll_element_test.rb
+- test/unit/validators_test.rb
+- test/unit/service_test.rb
+- test/unit/authent_test.rb

data/lib/ape/handler.rb

@@ -1,39 +0,0 @@
-require 'rubygems'
-require 'mongrel'
-require 'ape'
-
-module Ape
-  
-  # Implements the APE application handler for processing
-  # and responding to requests. See process for more detail.
-  class Handler < Mongrel::HttpHandler
-    
-    # Called by Mongrel with Mongrel::HttpRequest and
-    # Mongrel::HttpResponse objects. Creates an Ape
-    # instance for the request and responds with its report.
-    def process(request, response)
-      cgi = Mongrel::CGIWrapper.new(request, response)
-
-      uri  = cgi['uri'].strip
-      user = cgi['username'].strip
-      pass = cgi['password'].strip
-
-      if uri.empty?
-        response.start(200, true) do |header, body|
-          header['Content-Type'] = 'text/plain'
-          body << 'URI argument is required'
-        end
-        return
-      end
-
-      format = request.params['HTTP_ACCEPT'] == 'text/plain' ? 'text' : 'html'
-      ape = Ape.new({ :crumbs => true, :output => format, :server => true })
-      (user && pass) ? ape.check(uri, user, pass) : ape.check(uri)
-
-      response.start(200, true) do |header, body|
-        header['Content-Type'] = 'text/html'
-        ape.report(body)
-      end
-    end
-  end
-end

data/lib/ape/server.rb

@@ -1,44 +0,0 @@
-require 'rubygems'
-require 'mongrel'
-require 'ape/handler'
-require 'ape/samples'
-
-module Ape
-  
-  # Manages and initializes the Mongrel handler. See run for more details.
-  class Server
-    
-    # Starts the Mongrel handler with options given in +options+ and
-    # maps the <b>/</b>, <b>/ape</b> and <b>/atompub/go</b> URIs to handlers.
-    #
-    # ==== Options
-    #  * :host - the IP address to bind to
-    #  * :port - the port number to listen on
-    #  * :directory - the ape home directory
-    def self.run(options)      
-      ::Ape.home = options[:home]
-      
-      mongrel = Mongrel::Configurator.new(:host => options[:host], :port => options[:port]) do
-        log "=> Booting mongrel"
-        begin
-          log "=> The ape starting on http://#{options[:host]}:#{options[:port]}"
-          listener do
-            redirect '/', '/web/index.html'
-            uri '/web', :handler => 
-              Mongrel::DirHandler.new(
-                File.expand_path(File.dirname(__FILE__) + '/../../web'), true)
-            uri '/atompub/go', :handler => Handler.new
-          end
-        rescue Errno::EADDRINUSE
-          log "ERROR: Address (#{options[:host]}:#{options[:port]}) is already in use"
-          exit 1
-        end
-        trap("INT") { stop }
-        trap("TERM") { stop }
-        log "=> Ctrl-C to shutdown"
-        run
-      end
-      mongrel.join
-    end
-  end
-end