bookshop 0.0.2.1 → 0.0.3

data/.gitignore

@@ -1,3 +1,4 @@
 pkg/*
 *.gem
 .bundle
+TODOS

data/CHANGELOG

@@ -0,0 +1,20 @@
+0.0.3:
+    Core Changes
+				Added Java toolsets, including all necessary .jars for working with Docbook and
+						bookshop
+
+				Updated documentation to include information on how to setup java tools and Classpaths on various systems
+				
+				Added MIT-LICENSE
+				
+				Application Generator now has dynamically generated dates and content
+				
+				Added epub build command
+				
+				Added pdf build command
+				
+				Significant rework of Command Line Interface and 'help' dialogues
+				
+				
+		Bug Fixes
+				(none as this was a substantial rework)

data/MIT-LICENSE

@@ -0,0 +1,19 @@
+Copyright (C) 2010, 2011 by D.A. "Dave" Thompson
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/README.rdoc

@@ -1,10 +1,10 @@
-== Welcome to bookShop
+== Welcome to bookshop
 
-bookShop is an open-source ruby-based development framework for working with DocBook/XSL production flows. The framework is optimized to help developers quickly ramp-up, allowing them to more rapidly jump in and develop their DocBook-to-Output flows, by favoring convention over configuration, setting them up with best practices from the get-go.
+bookshop is an open-source ruby-based development framework for working with DocBook/XSL production flows. The framework is optimized to help developers quickly ramp-up, allowing them to more rapidly jump in and develop their DocBook-to-Output flows, by favoring convention over configuration, setting them up with best practices from the get-go.
 
-bookShop hopes to simplify the process by:
-* providing a Ruby Gem to make working with DocBook as easy as 'sudo gem install bookShop'
-* pulling all the DocBook tools together into one place
+bookshop hopes to simplify the process by:
+* providing a Ruby Gem to make working with DocBook as easy as 'sudo gem install bookshop'
+* pulling all the DocBook tools together into one place (DocBook DTD, XSL Stylesheets, XSLT Processor, XSL-FO Processor)
 * giving the developer a set of scripts to automate the redundant stuff
 * providing an architecture/structure that follows best-practices and simplification (DRY... Don't Repeat Yourself)
 * providing an extendable framework for other developers to add their own custom templates (and hopefully provide them for the community)
@@ -17,28 +17,43 @@ bookShop hopes to simplify the process by:
 * Rubygems v1.3.6 http://docs.rubygems.org/read/chapter/3
 * Java v1.6 http://www.java.com/
 
-=== Install bookShop
+=== Install bookshop
 
 <tt>$ sudo gem install bookshop</tt>
 
-=== Create a bookShop project
+=== Create a bookshop application
 
-<tt>$ bookshop new ~/Path/to/NewProject</tt>
+<tt>$ bookshop new ~/Path/to/NewApplication</tt>
 
-	This will create a new bookshop project in ~/Path/to/NewProject
+	This will create a new bookshop app in ~/Path/to/NewApplication
+
+=== Install the java tools. All of the java tools (.jars, etc) can be found in /tools/java/ in the new application.
+
+* For Mac you should copy the contents of /tools/java/ into your system /Library/Java/Extensions or your user ~/Library/Java/Extensions folder. This is the default location for the Java Classpath
+
+* For *nix systems, you can define your classpath by creating a CLASSPATH variable in your .bash_profile (or whatever shell/profile you are using) profile, so:
+
+	CLASSPATH="YOUR_APP_PATH/tools/java/"
+
+* For Windows systems you can either use Cygwin and follow the directions for *nix systems above, or edit your Classpath via the Control Panel
 
 == Getting Help
 
-* Checkout the wiki page which is in development currently for installation help and links to other
-		articles and help content. https://github.com/blueheadpublishing/bookshop/wiki
+* Checkout the wiki page which is in development currently for installation help and links to other articles and help content. https://github.com/blueheadpublishing/bookshop/wiki
 
-* bookShop comes with a built in help feature. Simply run 'bookshop --help' from the command line to get
-		list of possible commands to issue including possible options. You can also run 'bookshop COMMAND --help' 
-		(where COMMAND is the command you want) to get a list of possible options for that particular command
+* bookshop comes with a built in help feature. Simply run 'bookshop --help' from the command line to get list of possible commands to issue including possible options. You can also run 'bookshop COMMAND --help' (where COMMAND is the command you want) to get a list of possible options for that particular command
+
+== Thanks
+
+We would like to thank:
+
+* The Xerces Team
+* The DocBook Team
+* The Ruby/Rubygems Team
 
 == Description of Gem Contents
 
-The basic gem architecture:
+The basic bookshop gem architecture:
 
   |-- bin
   |-- lib
@@ -49,9 +64,9 @@ bin
 lib
 	bookshop gem library files
 
-== Description of bookShop Project contents
+== Description of bookshop app contents
 
-The default directory structure of a generated bookShop project:
+The default directory structure of a generated bookshop app:
 
 	|-- book
 	|-- builds
@@ -61,6 +76,9 @@ The default directory structure of a generated bookShop project:
 			`-- pdf
 	|-- stylesheets
 	|-- tools
+	|		|-- dtd
+	|		|-- xsl
+	|		`-- java
 
 book
   Holds all the manuscript DocBook code/files. This is where your master manuscript lives from which everything is built.
@@ -69,8 +87,7 @@ builds
   Holds all the output files built from the DocBook using their specific Stylesheets
 
 builds/epub
-	When building the epub, the generated output will reside here in an .epub file. 
-		You can rename the .epub extension to .zip then unzip the file to view the contents.
+	When building the epub, the generated output will reside here in an .epub file. You can rename the .epub extension to .zip then unzip the file to view the contents.
 
 builds/html
 	When building the html asset, the generated output will reside here.
@@ -85,5 +102,26 @@ stylesheets
 	Holds the XSL stylesheets for customizing your book output.
 	
 tools
-	Holds the dtd and DocBook-XSL specs which serve as the base for building formats. 
-		Customization should happen via the stylesheets in the "stylesheets" folder. Files here should remain unchanged.
+	Holds the DocBook DTD, DocBook-XSL specs and Java tools which serve as the base for building formats. Customization should not happen here, but rather with the stylesheets in the "stylesheets" folder. Files here should remain largely unchanged unless you know what you are doing.
+	
+== Copyright (MIT-LICENSE)
+
+Copyright (C) 2010, 2011 by D.A. "Dave" Thompson
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/bookshop.gemspec

@@ -5,10 +5,10 @@ Gem::Specification.new do |s|
   s.name        = "bookshop"
   s.version     = Bookshop::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ['D.a. Thompson']
+  s.authors     = ['D.A. "Dave" Thompson']
   s.email       = ['da@blueheadpublishing.com']
   s.homepage    = "http://rubygems.org/gems/bookshop"
-  s.summary     = "A framework for DocBook happiness and sustainable productivity."
+  s.summary     = "A framework for DocBook toolchain happiness and sustainable productivity."
   s.description = "bookShop is an open-source ruby-based development framework for working 
                     with DocBook/XSL tool-chain flows. The framework is optimized to help 
                     developers quickly ramp-up, allowing them to more rapidly jump in and 

data/lib/bookshop/commands/application.rb

@@ -10,7 +10,8 @@ else
   ARGV.shift
 end
 
-# require 'bookshop/generators'
-require 'bookshop/generators/bookshop/project/project_generator'
+require 'rubygems' if ARGV.include?("--dev")
 
-Bookshop::Generators::ProjectGenerator.start
+require 'bookshop/generators/bookshop/app/app_generator'
+
+Bookshop::Generators::AppGenerator.start

data/lib/bookshop/commands/build.rb

@@ -1,46 +1,54 @@
 require 'thor/group'
 
 module Bookshop
-  class Build
-    def build_pdf
-      puts "Deleting your old ebook"
-      File.delete("builds/pdf/book.pdf") if File::exists?( "builds/pdf/book.pdf" )
-      puts "File Deleted"
-      puts "Building new pdf at builds/pdf/book.pdf"
-      cmd = %x[java org.apache.fop.cli.Main -xml book/book.xml -xsl stylesheets/fo-stylesheet.xsl builds/pdf/book.pdf]
-    end
+  module Commands
+    class Build < Thor::Group
+      include Thor::Actions
+      
+      ARGV << '--help' if ARGV.empty?
 
-    def build_epub
-      puts "Deleting your old ebook"
-      File.delete("builds/epub/book.epub") if File::exists?( "builds/epub/book.epub" )
-      puts "File Deleted"
-      puts "Building new pdf at builds/epub/book.epub"
-      cmd = %x[docbook/templates/epub/bin/dbtoepub -v book/book.xml -o builds/epub/book.epub]
-    end
+      aliases = {
+        "p"  => "pdf"
+      }
 
-    if ARGV.empty?
-      puts ""
-      puts "tell me what to build (epub or pdf)"
-      puts ""
-    else
-      ARGV.each do |a|
-        if a == 'pdf'
-          build_pdf
-        elsif a == 'epub'
-          build_epub
-        end
-      end
-    end
-    # shift ARGV's so that value after build (pdf, etc) is then iterated over with options
-    # ARGV.shift
+      build = ARGV.shift
+      build = aliases[build] || build
 
-    # when pdf
+      # Define arguments and options
+      argument :type,                   :type => :string
 
-    # desc 'creates a pdf version'
-    # def create_epub
-      # exec 'java call'
+      # Define source root of application
+      def self.source_root
+        File.dirname(__FILE__)
+      end
+      
+      case build
+      when 'pdf'
+        puts "Deleting your old ebook"
+        File.delete("builds/pdf/book.pdf") if File::exists?( "builds/pdf/book.pdf" )
+        puts "File Deleted"
+        puts "Building new pdf at builds/pdf/book.pdf"
+        cmd = %x[java org.apache.fop.cli.Main -xml book/book.xml -xsl stylesheets/fo-stylesheet.xsl builds/pdf/book.pdf]
+      
+      when 'epub'
+        puts "Deleting your old ebook"
+        File.delete("builds/epub/book.epub") if File::exists?( "builds/epub/book.epub" )
+        puts "File Deleted"
+        puts "Building new pdf at builds/epub/book.epub"
+        cmd = %x[tools/xsl/epub/bin/dbtoepub -v book/book.xml -o builds/epub/book.epub]
+        
+      else
+        puts "Error: Command not recognized" unless %w(-h --help).include?(build)
+        puts <<-EOT
+      Usage: bookshop build [ARGS]
+
+      The most common build commands are:
+       pdf          Builds a new pdf at /builds/pdf/book.pdf
+       epub         Builds a new epub at /builds/epub/book.epub
 
-    # desc 'creates a pdf version'
-    # def create_epub
+      All commands can be run with -h for more information.
+        EOT
+      end
+    end
   end
 end

data/lib/bookshop/commands.rb

@@ -10,18 +10,17 @@ command = aliases[command] || command
 case command
 when 'build'
   require 'bookshop/commands/build'
-  Bookshop::Build.start
 
 when 'new'
-  puts "Can't initialize a new Rails application within the directory of another, please change to a non-Rails directory first.\n"
-  puts "Type 'rails' for help."
+  puts "Can't create a new Bookshop application within the directory of another, please change to a non-Bookshop directory first.\n"
+  puts "Type 'bookshop' for help."
 
 else
   puts "Error: Command not recognized" unless %w(-h --help).include?(command)
   puts <<-EOT
 Usage: bookshop COMMAND [ARGS]
 
-The most common rails commands are:
+The most common bookshop commands are:
  build       Builds a new book from your docbook based upon arguments passed (short-cut alias: "b")
  new         Create a new bookshop project. "bookshop new my_app" creates a
              new project called MyProject in "./my_project"

data/lib/bookshop/generators/bookshop/{project/project_generator.rb → app/app_generator.rb}

@@ -4,11 +4,11 @@ require 'thor/group'
 module Bookshop
   module Generators
 
-    class ProjectGenerator < Thor::Group
+    class AppGenerator < Thor::Group
       include Thor::Actions
 
       # Define arguments and options
-      argument :name,                   :type => :string
+      argument :app_path,                   :type => :string
                                         
 
       class_option :dtd,                :type => :string, :aliases => "-dtd",
@@ -24,18 +24,34 @@ module Bookshop
 
       # Create the project from templates
       def create_base_project
-        directory "templates", "#{name}"
+        directory "templates", "#{app_path}"
       end
 
       # Adds the dtd specified by user
       def add_dtd
         dtd = "#{options[:dtd]}"
-        directory "tools/dtd/#{options[:dtd]}", "#{name}/tools/dtd/#{options[:dtd]}"
+        directory "tools/dtd/#{options[:dtd]}", "#{app_path}/tools/dtd"
       end
 
       # Adds the XSL/version specified by user
       def add_xsl
-        directory "tools/xsl/#{options[:xsl]}", "#{name}/tools/xsl/#{options[:xsl]}"
+        directory "tools/xsl/#{options[:xsl]}", "#{app_path}/tools/xsl"
+      end
+
+      # Change the permissions so dbtoepub is executable 
+      def chmod_dbtoepub
+        chmod "#{app_path}/tools/xsl/epub/bin/dbtoepub", 0755
+      end
+      
+      # Adds the Java jars and dependencies
+      def add_java
+        directory "tools/java/", "#{app_path}/tools/java"
+      end
+      
+    protected
+
+      def self.banner
+        "bookshop new #{self.arguments.map(&:usage).join(' ')} [options]"
       end
 
     end

data/lib/bookshop/generators/bookshop/app/templates/README.rdoc

@@ -0,0 +1,84 @@
+== Welcome to bookShop
+
+bookShop is an open-source ruby-based development framework for working with DocBook/XSL production flows. The framework is optimized to help developers quickly ramp-up, allowing them to more rapidly jump in and develop their DocBook-to-Output flows, by favoring convention over configuration, setting them up with best practices from the get-go.
+
+bookShop hopes to simplify the process by:
+* providing a Ruby Gem to make working with DocBook as easy as 'sudo gem install bookShop'
+* pulling all the DocBook tools together into one place
+* giving the developer a set of scripts to automate the redundant stuff
+* providing an architecture/structure that follows best-practices and simplification (DRY... Don't Repeat Yourself)
+* providing an extendable framework for other developers to add their own custom templates (and hopefully provide them for the community)
+
+== Getting Started
+
+=== Make sure that you have installed the java tools in your Java Classpath. All of the java tools (.jars, etc) can be found in /tools/java/.
+
+* For Mac you should copy the contents of /tools/java/ into you system /Library/Java/Extensions or your user ~/Library/Java/Extensions folder. This is the default location for the Java Classpath
+
+* For *nix systems, you can define your classpath by creating a CLASSPATH variable in your .bash (or whatever shell you are using) profile, so:
+
+	CLASSPATH="APP_PATH/tools/java/"
+
+* For Windows systems you can either use Cygwin and follow the directions for *nix systems above, or edit your Classpath
+
+== Description of Contents
+
+The default directory structure of a generated bookShop project:
+
+	|-- book
+	|-- builds
+	|   |-- epub
+	|   |-- html
+	|   |-- mobi
+			`-- pdf
+	|-- stylesheets
+	|-- tools
+	|		|-- dtd
+	|		|-- xsl
+	|		`-- java
+
+book
+  Holds all the manuscript DocBook code/files. This is where your master manuscript lives from which everything is built.
+
+builds
+  Holds all the output files built from the DocBook using their specific Stylesheets
+
+builds/epub
+	When building the epub, the generated output will reside here in an .epub file. You can rename the .epub extension to .zip then unzip the file to view the contents.
+
+builds/html
+	When building the html asset, the generated output will reside here.
+	
+build/mobi
+	When building the mobi asset, the generated output will reside here as "book.mobi".
+
+build/pdf
+	When building the pdf book, the generated output will reside here as "book.pdf".
+
+stylesheets
+	Holds the XSL stylesheets for customizing your book output.
+	
+tools
+	Holds the DocBook DTD, DocBook-XSL specs and Java tools which serve as the base for building formats. Customization should not happen here, but rather with the stylesheets in the "stylesheets" folder. Files here should remain largely unchanged unless you know what you are doing.
+
+== Copyright (MIT-LICENSE)
+
+Copyright (C) 2010, 2011 by D.A. "Dave" Thompson
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/lib/bookshop/generators/bookshop/{project → app}/templates/book/book.xml.tt

@@ -1,16 +1,16 @@
 <?xml version="1.0"?>
-<!DOCTYPE book SYSTEM "../tools/dtd/<%= options[:dtd] %>/dtd/docbook.dtd"
+<!DOCTYPE book SYSTEM "../tools/dtd/dtd/docbook.dtd"
 [
 <!ENTITY ch01 			SYSTEM "ch01_put_short_title_here.xml">
 <!ENTITY dedication SYSTEM "dedication.xml">
 ]>
 
 <book id="oc">
-  <title>Put Your Title Here</title>
+  <title>Book Title</title>
 
   <bookinfo>
 
-    <subtitle>Put Your Subtitle Here</subtitle>
+    <subtitle>Subtitle</subtitle>
 
     <edition>First</edition>
     <isbn>0000000000000</isbn>
@@ -34,12 +34,11 @@
     </editor>
 
     <pagenums>98 (est.)</pagenums>
-    <pubdate>02/01/2011</pubdate>
+    <pubdate><%= Time.now.strftime('%m/%d/%Y') %></pubdate>
 
     <copyright>
-      <year>2010</year>
-      <year>2011</year>
-      <holder>D.a. Thompson, Inc.</holder>
+      <year><%= Time.now.strftime('%Y') %></year>
+      <holder>Your Name/Company Title</holder>
     </copyright>
 
     <legalnotice>
@@ -52,6 +51,18 @@
 		
 		<abstract>
       <para>This is where you put the abstract about your book.</para>
+
+			<mediaobject>
+			  <imageobject>
+			    <imagedata fileref="images/bluehead_logo.gif" format="GIF" width="144pt" depth="180pt"/>
+			  </imageobject>
+			  <textobject>
+			    <phrase>This is a shameless self-promotion for BlueHead Publishing.</phrase>
+			  </textobject>
+			  <caption>
+			    <para>Shameless Self-Promotion for BlueHead Publishing</para>
+			  </caption>
+			</mediaobject>
     </abstract>
 
 		<cover>

data/lib/bookshop/generators/bookshop/app/templates/book/ch01_put_short_title_here.xml

@@ -0,0 +1,28 @@
+<chapter id="oc.conversion" label="One">
+
+	<title>Chapter One Title</title>
+
+	<para>Your chapter paragraph. You can put anything that you want here.</para>
+		
+	<!-- ================================================================= -->
+  <!-- =========================  New Section  ========================= -->
+  <!-- ================================================================= -->
+	<sect1 id="book.ch01.sect1">
+
+		<title>Section Title</title>
+
+		<para>Your section paragraph. Why not include a link? <link xlink:href="https://rubygems.org/gems/bookshop">bookshop gem site</link>
+		</para>
+		<para>
+			Did you know that by using a Docbook tool-chain flow you can drastically simplify your publishing workload. Now instead of modifying four documents each time you have an edit, you can just edit the Docbook source and export it to all of your <quote>end formats</quote>. Doesn't that sounds great! This becomes especially useful as you begin to manage several editions and versions of a book. Can you <emphasis>imagine</emphasis> having to touch every single document for every single edit you need to make? That sounds exhausting to us at BlueHead.
+		</para>
+
+	</sect1>
+
+</chapter>
+
+<!--
+local variables: 
+sgml-parent-document: ("book.xml" "chapter")
+end:
+-->

data/lib/bookshop/generators/bookshop/app/templates/config/application.rb

@@ -0,0 +1,46 @@
+require File.expand_path('../boot', __FILE__)
+
+require 'bookshop'
+
+# If you have a Gemfile, require the gems listed there, including any gems
+# you've limited to :test, :development, or :production.
+Bundler.require(:default, Bookshop.env) if defined?(Bundler)
+
+module <%= app_const_base %>
+  class Application < Bookshop::Application
+    # Settings in config/environments/* take precedence over those specified here.
+    # Application configuration should go into files in config/initializers
+    # -- all .rb files in that directory are automatically loaded.
+
+    # Custom directories with classes and modules you want to be autoloadable.
+    # config.autoload_paths += %W(#{config.root}/extras)
+
+    # Only load the plugins named here, in the order given (default is alphabetical).
+    # :all can be used as a placeholder for all plugins not explicitly named.
+    # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
+
+    # Activate observers that should always be running.
+    # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
+
+    # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
+    # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
+    # config.time_zone = 'Central Time (US & Canada)'
+
+    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
+    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
+    # config.i18n.default_locale = :de
+
+    # JavaScript files you want as :defaults (application.js is always included).
+<% if options[:skip_prototype] -%>
+    config.action_view.javascript_expansions[:defaults] = %w()
+<% else -%>
+    # config.action_view.javascript_expansions[:defaults] = %w(jquery rails)
+<% end -%>
+
+    # Configure the default encoding used in templates for Ruby 1.9.
+    config.encoding = "utf-8"
+
+    # Configure sensitive parameters which will be filtered from the log file.
+    config.filter_parameters += [:password]
+  end
+end

data/lib/bookshop/generators/bookshop/app/templates/config/boot.rb

@@ -0,0 +1,13 @@
+require 'rubygems'
+
+# Set up gems listed in the Gemfile.
+gemfile = File.expand_path('../../Gemfile', __FILE__)
+begin
+  ENV['BUNDLE_GEMFILE'] = gemfile
+  require 'bundler'
+  Bundler.setup
+rescue Bundler::GemNotFound => e
+  STDERR.puts e.message
+  STDERR.puts "Try running `bundle install`."
+  exit!
+end if File.exist?(gemfile)

data/lib/bookshop/generators/bookshop/{project/templates/script/bookshop.rb → app/templates/script/bookshop}

@@ -1,4 +1,7 @@
 # This command will automatically be run when you run "bookshop" with Bookshop gem installed from the root of your application.
 
+APP_PATH = File.expand_path('../../config/application',  __FILE__)
+require File.expand_path('../../config/boot',  __FILE__)
 require 'bookshop/commands'
 
+

data/lib/bookshop/generators/bookshop/{project → app}/templates/stylesheets/custom-fo-stylesheet.xsl.tt

@@ -88,6 +88,4 @@
   </xsl:attribute-set>
 	-->
 
-	<xsl:include href="/sgml/book/mytitlepage.xsl"/> 
-
 </xsl:stylesheet>