ape 1.5.0 → 1.5.1

data/README

@@ -11,7 +11,7 @@ Copyright (c) 2006 Sun Microsystems, Inc. All rights reserved. See the included
 
 == Quick Start
 
-Install APE via RubyGems:
+=== Install APE via RubyGems:
 
  $ gem install ape
  
@@ -21,6 +21,16 @@ Now, you should have the ape_server command available in your $PATH. Start the s
  
 This will start the server in the foreground. You can access APE in your browser at http://localhost:4000
 
+=== Execute APE from the command line:
+
+If you've downloaded APE's source code you can execute it from the command line with ruby rake. From the root directory you can execute one of these three tasks:
+
+ $ rake ape:go:html['service document uri', 'username', 'password']
+ $ rake ape:go:text['service document uri', 'username', 'password']
+ $ rake ape:go:atom['service document uri', 'username', 'password']
+
+The username and password paramenters are not mandatory, and the format response depends of the executed task.
+
 == The Source
 
 To access the latest source code for APE, see the project site at https://rubyforge.org/projects/ape

data/lib/ape.rb

@@ -100,23 +100,20 @@ module Ape
     def check_manifest(validator)
       variables = {}
       manifest = validator.manifest
-      variables[:service_doc] = @service if (manifest.include?(:service_doc))
-      manifest.delete(:service_doc)
+      variables[:service_doc] = @service if (manifest.include?(:service_doc))      
       
       if (manifest.include?(:entry_collection))
         variables[:entry_collection] = ::Ape.conf[:REQUESTED_ENTRY_COLLECTION].nil? ? @entry_collections.first :
-          get_collection(@entry_collections, ::Ape.conf[:REQUESTED_ENTRY_COLLECTION])
-        manifest.delete(:entry_collection)
+          get_collection(@entry_collections, ::Ape.conf[:REQUESTED_ENTRY_COLLECTION])        
       end
       
       if (manifest.include?(:media_collection))
         variables[:media_collection] = ::Ape.conf[:REQUESTED_MEDIA_COLLECTION].nil? ? @media_collections.first :
-          get_collection(@media_collections, ::Ape.conf[:REQUESTED_MEDIA_COLLECTION])
-        manifest.delete(:media_collection)
+          get_collection(@media_collections, ::Ape.conf[:REQUESTED_MEDIA_COLLECTION])        
       end
       
-      manifest.each do |option|
-        if (option.instance_of?(Hash))
+      manifest.each do |option|        
+        if (option.instance_of?(Hash) && !variables.include?(option))
           all_collections = @entry_collections + @media_collections
           option.each do |key, value|
             unless (value.instance_of?(Hash))

data/lib/ape/version.rb

@@ -2,7 +2,7 @@ module Ape
   module VERSION
     MAJOR = 1
     MINOR = 5
-    TINY  = 0
+    TINY  = 1
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ape
 version: !ruby/object:Gem::Version 
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors: 
 - Tim Bray
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-01 00:00:00 +02:00
+date: 2008-07-04 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency