sitemap_generator 2.0.1.pre2 → 2.0.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ./
   specs:
-    sitemap_generator (2.0.1.pre1)
+    sitemap_generator (2.0.0)
 
 GEM
   remote: http://rubygems.org/

data/README.md

@@ -26,8 +26,6 @@ Does your website use SitemapGenerator to generate Sitemaps?  Where would you be
 Changelog
 -------
 
-- v2.0.1.pre2: Fix uploading to the (bucket) root on a remote server
-- v2.0.1.pre1: Support read-only filesystems like Heroku by supporting uploading to remote server
 - v2.0.1: Minor improvements to verbose handling; prevent missing Timeout issue
 - **v2.0.0: Introducing a new simpler API, Sitemap Groups, Sitemap Namers and more!**
 - v1.5.0: New options `include_root`, `include_index`; Major testing & refactoring

data/VERSION

@@ -1 +1 @@
-2.0.1.pre2
+2.0.1

data/lib/sitemap_generator.rb

@@ -4,15 +4,12 @@ require 'sitemap_generator/link_set'
 require 'sitemap_generator/templates'
 require 'sitemap_generator/utilities'
 require 'sitemap_generator/application'
-require 'sitemap_generator/adapters'
 require 'sitemap_generator/sitemap_location'
 require 'active_support/core_ext/numeric'
 
 module SitemapGenerator
   autoload(:Interpreter, 'sitemap_generator/interpreter')
-  autoload(:FileAdapter, 'sitemap_generator/adapters/file_adapter')
-  autoload(:WaveAdapter, 'sitemap_generator/adapters/wave_adapter')
-  
+
   SitemapError = Class.new(StandardError)
   SitemapFullError = Class.new(SitemapError)
   SitemapFinalizedError = Class.new(SitemapError)

data/lib/sitemap_generator/builder/sitemap_file.rb

@@ -93,7 +93,22 @@ module SitemapGenerator
       def finalize!
         raise SitemapGenerator::SitemapFinalizedError if finalized?
 
-        @location.write(@xml_wrapper_start + @xml_content + @xml_wrapper_end)
+        # Ensure that the directory exists
+        dir = @location.directory
+        if !File.exists?(dir)
+          FileUtils.mkdir_p(dir)
+        elsif !File.directory?(dir)
+          raise SitemapError.new("#{dir} should be a directory!")
+        end
+
+        # Write out the file
+        open(@location.path, 'wb') do |file|
+          gz = Zlib::GzipWriter.new(file)
+          gz.write @xml_wrapper_start
+          gz.write @xml_content
+          gz.write @xml_wrapper_end
+          gz.close
+        end
 
         # Increment the namer (SitemapFile only)
         @location.namer.next if @location.namer

data/lib/sitemap_generator/link_set.rb

@@ -8,7 +8,7 @@ module SitemapGenerator
     @@new_location_opts = [:filename, :sitemaps_path, :sitemaps_namer]
 
     attr_reader :default_host, :sitemaps_path, :filename
-    attr_accessor :verbose, :yahoo_app_id, :include_root, :include_index, :sitemaps_host, :adapter
+    attr_accessor :verbose, :yahoo_app_id, :include_root, :include_index, :sitemaps_host
 
     # Add links to the link set by evaluating the block.  The block should
     # contains calls to sitemap methods like:
@@ -47,9 +47,6 @@ module SitemapGenerator
     # Constructor
     #
     # == Options:
-    # * <tt>:adapter</tt> - subclass of SitemapGenerator::Adapter used for persisting the
-    #   sitemaps.  Default adapter is a SitemapGenerator::FileAdapter
-    #
     # * <tt>:default_host</tt> - host including protocol to use in all sitemap links
     #   e.g. http://en.google.ca
     #
@@ -397,8 +394,7 @@ module SitemapGenerator
           :host => sitemaps_host,
           :namer => sitemaps_namer,
           :public_path => public_path,
-          :sitemaps_path => @sitemaps_path,
-          :adapter => @adapter
+          :sitemaps_path => @sitemaps_path
         )
       end
 
@@ -408,8 +404,7 @@ module SitemapGenerator
           :host => sitemaps_host,
           :namer => sitemap_index_namer,
           :public_path => public_path,
-          :sitemaps_path => @sitemaps_path,
-          :adapter => @adapter
+          :sitemaps_path => @sitemaps_path
         )
       end
 

data/lib/sitemap_generator/sitemap_location.rb

@@ -1,7 +1,7 @@
 module SitemapGenerator
   class SitemapLocation < Hash
 
-    [:host, :adapter].each do |method|
+    [:host].each do |method|
       define_method(method) do
         raise SitemapGenerator::SitemapError, "No value set for #{method}" unless self[method]
         self[method]
@@ -18,20 +18,18 @@ module SitemapGenerator
     # files this generates names like <tt>sitemap1.xml.gz</tt>, <tt>sitemap2.xml.gz</tt> and so on,
     #
     # === Options
-    # * <tt>adapter</tt> - SitemapGenerator::Adapter subclass
-    # * <tt>filename</tt> - full name of the file e.g. <tt>'sitemap1.xml.gz'<tt>
-    # * <tt>host</tt> - host name for URLs.  The full URL to the file is then constructed from
-    #   the <tt>host</tt>, <tt>sitemaps_path</tt> and <tt>filename</tt>
-    # * <tt>namer</tt> - a SitemapGenerator::SitemapNamer instance.  Can be passed instead of +filename+.
     # * <tt>public_path</tt> - path to the "public" directory, or the directory you want to
     #   write sitemaps in.  Default is a directory <tt>public/</tt>
     #   in the current working directory, or relative to the Rails root
     #   directory if running under Rails.
     # * <tt>sitemaps_path</tt> - gives the path relative to the <tt>public_path</tt> in which to
     #   write sitemaps e.g. <tt>sitemaps/</tt>.
+    # * <tt>host</tt> - host name for URLs.  The full URL to the file is then constructed from
+    #   the <tt>host</tt>, <tt>sitemaps_path</tt> and <tt>filename</tt>
+    # * <tt>filename</tt> - full name of the file e.g. <tt>'sitemap1.xml.gz'<tt>
+    # * <tt>namer</tt> - a SitemapGenerator::SitemapNamer instance.  Can be passed instead of +filename+.
     def initialize(opts={})
-      SitemapGenerator::Utilities.assert_valid_keys(opts, [:adapter, :public_path, :sitemaps_path, :host, :filename, :namer])
-      opts[:adapter] ||= SitemapGenerator::FileAdapter.new
+      SitemapGenerator::Utilities.assert_valid_keys(opts, [:public_path, :sitemaps_path, :host, :filename, :namer])
       opts[:public_path] ||= SitemapGenerator.app.root + 'public/'
       opts[:namer] = SitemapGenerator::SitemapNamer.new(:sitemap) if !opts[:filename] && !opts[:namer]
       self.merge!(opts)
@@ -94,10 +92,6 @@ module SitemapGenerator
       end
       super(key, value)
     end
-
-    def write(data)
-      adapter.write(self, data)
-    end
   end
 
   class SitemapIndexLocation < SitemapLocation

metadata

@@ -1,15 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sitemap_generator
 version: !ruby/object:Gem::Version 
-  hash: 1923832037
-  prerelease: 6
+  hash: 13
+  prerelease: 
   segments: 
   - 2
   - 0
   - 1
-  - pre
-  - 2
-  version: 2.0.1.pre2
+  version: 2.0.1
 platform: ruby
 authors: 
 - Karl Varga
@@ -18,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-03 00:00:00 -07:00
+date: 2011-06-01 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -121,9 +119,6 @@ files:
 - Rakefile
 - VERSION
 - lib/sitemap_generator.rb
-- lib/sitemap_generator/adapters.rb
-- lib/sitemap_generator/adapters/file_adapter.rb
-- lib/sitemap_generator/adapters/wave_adapter.rb
 - lib/sitemap_generator/application.rb
 - lib/sitemap_generator/builder.rb
 - lib/sitemap_generator/builder/sitemap_file.rb
@@ -163,14 +158,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: 

data/lib/sitemap_generator/adapters/file_adapter.rb

@@ -1,21 +0,0 @@
-module SitemapGenerator
-  class FileAdapter
-    def write(location, raw_data)
-      # Ensure that the directory exists
-      dir = location.directory
-      if !File.exists?(dir)
-        FileUtils.mkdir_p(dir)
-      elsif !File.directory?(dir)
-        raise SitemapError.new("#{dir} should be a directory!")
-      end
-
-      gzip(open(location.path, 'wb'), raw_data)
-    end
-
-    def gzip(stream, data)
-      gz = Zlib::GzipWriter.new(stream)
-      gz.write data
-      gz.close
-    end
-  end
-end

data/lib/sitemap_generator/adapters/wave_adapter.rb

@@ -1,17 +0,0 @@
-require 'carrierwave'
-
-module SitemapGenerator
-  class WaveAdapter < ::CarrierWave::Uploader::Base
-    attr_accessor :store_dir
-
-    # Call with a SitemapLocation and string data
-    def write(location, raw_data)
-      SitemapGenerator::FileAdapter.new.write(location, raw_data)
-      directory = File.dirname(location.path_in_public)
-      if directory != '.'
-        self.store_dir = directory
-      end
-      store!(open(location.path, 'rb'))
-    end
-  end
-end