Skip to content

Commit

Permalink
changed the requires to hopefully be more compatible; added the license
Browse files Browse the repository at this point in the history
  • Loading branch information
romaimperator committed Jan 16, 2011
1 parent f827fe1 commit e193b57
Show file tree
Hide file tree
Showing 9 changed files with 38 additions and 19 deletions.
22 changes: 22 additions & 0 deletions COPYRIGHT
@@ -0,0 +1,22 @@
Copyright (c) 2010, Daniel Fox
All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:

1. Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
15 changes: 6 additions & 9 deletions SPUploader.rb
@@ -1,12 +1,9 @@
require 'SPUploader/Site'
require 'SPUploader/Generator'
require 'SPUploader/SavedGenerator'
require 'SPUploader/Page'
require 'SPUploader/PageTemplate'
require 'SPUploader/RootTemplate'
require 'SPUploader/SftpUploader'
require 'SPUploader/SSVGenerator'
require 'SPUploader/TemplatedPage'
$LOAD_PATH << './SPUploader'
require 'Site'
#require 'SftpUploader' # Unsure if this needs to be required or not since it
# worked without it. It must be included somewhere else
# already.
require 'SSVGenerator'

# This file just loads all of the needed class files for the user at once so
# he/she only needs a single require statement.
2 changes: 1 addition & 1 deletion SPUploader/Page.rb
@@ -1,4 +1,4 @@
require 'SPUploader/Generator'
require File.dirname(__FILE__) + '/Generator'

# This is the base class for the page types. It handles parsing of the files,
# the tags, storing the values for the tags, incorporates the merging,
Expand Down
2 changes: 1 addition & 1 deletion SPUploader/PageTemplate.rb
@@ -1,4 +1,4 @@
require 'SPUploader/Page'
require File.dirname(__FILE__) + '/Page'

# This class represents all templates for the pages. There is a special version,
# RootTemplate, is the root of the template tree. This only exists so that
Expand Down
2 changes: 1 addition & 1 deletion SPUploader/RootTemplate.rb
@@ -1,4 +1,4 @@
require 'SPUploader/PageTemplate'
require File.dirname(__FILE__) + '/PageTemplate'

# This class provides an abstraction for the end user of how a root template is
# represented. A PageTemplate is only a root because the parent template
Expand Down
2 changes: 1 addition & 1 deletion SPUploader/SSVGenerator.rb
@@ -1,4 +1,4 @@
require 'SPUploader/SavedGenerator'
require File.dirname(__FILE__) + '/SavedGenerator'

# This is both an example generator class and a useful generator to use. Rather
# than using commas, this uses semicolon separated values so that commas can
Expand Down
2 changes: 1 addition & 1 deletion SPUploader/SavedGenerator.rb
@@ -1,4 +1,4 @@
require 'SPUploader/Generator'
require File.dirname(__FILE__) + '/Generator'

# This is a high-level generator class to be used for any generator that only
# needs to be generated once but used in multiple pages and/or tags.
Expand Down
6 changes: 3 additions & 3 deletions SPUploader/Site.rb
@@ -1,6 +1,6 @@
require 'SPUploader/PageTemplate'
require 'SPUploader/TemplatedPage'
require 'SPUploader/RootTemplate'
require File.dirname(__FILE__) + '/PageTemplate'
require File.dirname(__FILE__) + '/TemplatedPage'
require File.dirname(__FILE__) + '/RootTemplate'

# This class is a wrapper for all of the templating stuff. It is designed to
# provide a more simple way to interact with the templating system than using
Expand Down
4 changes: 2 additions & 2 deletions SPUploader/TemplatedPage.rb
@@ -1,5 +1,5 @@
require 'SPUploader/Page'
require 'SPUploader/SftpUploader'
require File.dirname(__FILE__) + '/Page'
require File.dirname(__FILE__) + '/SftpUploader'

# This class is the leaf node of a template tree. Each page on the site will
# require one of these. The page has the functionality to upload the rendered
Expand Down

0 comments on commit e193b57

Please sign in to comment.