massive_sitemap 2.0.0 → 2.1.0

data/README.md

@@ -8,14 +8,31 @@ It implements various generation stategies, e.g. to split large Sitemaps into mu
 
 ## Usage
 
-A simple usecase which fits most of the standard scenarios:
+A simple usecase which fits most of the standard scenarios. This example adds `http://test.com/about` to the sitemap.
 
 
 ```ruby
 require 'massive_sitemap'
 
-index_url = MassiveSitemap.generate(:url => 'test.de/') do
-  add "dummy"
+index_url = MassiveSitemap.generate(:url => 'test.com') do
+  add "/about"
+end
+MassiveSitemap.ping(index_url)
+
+```
+
+### Using Rails  (ActiveRecord)
+
+This exmaple itterates of the `User` resource and adds each with a `change_frequency`, `last_modified` and `priority` to the sitemap. In case there are more than 50.000 users, the sitemap will be auto-split in multiple files. See
+
+
+```ruby
+require 'massive_sitemap'
+
+index_url = MassiveSitemap.generate(:url => 'test.com') do
+  User.all do |user|
+    add "/users/#{user.id}", :change_frequency => 'weekly', :last_modified => user.updated_at, :priority => 0.9
+  end
 end
 MassiveSitemap.ping(index_url)
 

data/VERSION

@@ -1 +1 @@
-2.0.0
+2.1.0

data/lib/massive_sitemap/ping.rb

@@ -5,22 +5,30 @@ require 'open-uri'
 
 # Ping Search Engines to pull the latest update
 module MassiveSitemap
+  extend self
+
   ENGINES_URLS = {
     :google => 'http://www.google.com/webmasters/tools/ping?sitemap=%s',
     :bing   => 'http://www.bing.com/webmaster/ping.aspx?siteMap=%s',
     :ask    => 'http://submissions.ask.com/ping?sitemap=%s',
+    :yandex => 'http://webmaster.yandex.ru/wmconsole/sitemap_list.xml?host=%s',
   }
 
-  def ping(url, engines = ENGINES_URLS.keys)
+  DEFAULT_ENGINES = [:google, :bing, :yandex] #ask seems to be down, so disable for now by default
+
+  def ping(url, engines = DEFAULT_ENGINES)
     url =  verify_and_escape(url)
 
     Array(engines).each do |engine|
       if engine_url = ENGINES_URLS[engine]
-        open(engine_url % url)
+        begin
+          open(engine_url % url)
+        rescue => e
+          log_error(engine, e)
+        end
       end
     end
   end
-  module_function :ping
 
   private
   def verify_and_escape(url)
@@ -28,5 +36,8 @@ module MassiveSitemap
     raise URI::InvalidURIError, url if path.to_s.empty?
     CGI::escape("#{schema || 'http://'}#{host}#{path}")
   end
-  module_function :verify_and_escape
+
+  def log_error(engine, error)
+    $stderr.puts "Error pinging #{engine} #{error.message}"
+  end
 end

data/spec/massive_sitemap_spec.rb

@@ -80,6 +80,13 @@ describe MassiveSitemap do
         output.should include("<loc>http://test.de/track/name</loc>")
       end
 
+      it 'adds url with no tryiling root for domain' do
+        MassiveSitemap.generate(:url => 'test.de') do
+          add "/track/name"
+        end
+        output.should include("<loc>http://test.de/track/name</loc>")
+      end
+
       it "to fail for existing file" do
         File.open(filename, 'w') {}
         expect do
@@ -170,7 +177,7 @@ describe MassiveSitemap do
     PINGS = [
       "http://www.google.com/webmasters/tools/ping?sitemap=http%3A%2F%2Ftest.de%2Fsitemap_index.xml",
       "http://www.bing.com/webmaster/ping.aspx?siteMap=http%3A%2F%2Ftest.de%2Fsitemap_index.xml",
-      "http://submissions.ask.com/ping?sitemap=http%3A%2F%2Ftest.de%2Fsitemap_index.xml",
+      "http://webmaster.yandex.ru/wmconsole/sitemap_list.xml?host=http%3A%2F%2Ftest.de%2Fsitemap_index.xml",
     ]
 
     it 'calls all engines' do

data/spec/ping_spec.rb

@@ -5,21 +5,21 @@ describe MassiveSitemap do
     let(:url) { "http://www.example.com" }
 
     describe "verify_and_escape" do
-      it { MassiveSitemap.verify_and_escape("example.com/test").should == "http%3A%2F%2Fexample.com%2Ftest" }
-      it { MassiveSitemap.verify_and_escape("http://example.com/test").should == "http%3A%2F%2Fexample.com%2Ftest" }
-      it { MassiveSitemap.verify_and_escape("https://example.com/test").should == "https%3A%2F%2Fexample.com%2Ftest" }
+      it { MassiveSitemap.send(:verify_and_escape, "example.com/test").should == "http%3A%2F%2Fexample.com%2Ftest" }
+      it { MassiveSitemap.send(:verify_and_escape, "http://example.com/test").should == "http%3A%2F%2Fexample.com%2Ftest" }
+      it { MassiveSitemap.send(:verify_and_escape, "https://example.com/test").should == "https%3A%2F%2Fexample.com%2Ftest" }
 
       it "raise if invalid url" do
         expect do
-          MassiveSitemap.verify_and_escape("example.com/")
+          MassiveSitemap.send(:verify_and_escape, "example.com/")
         end.to raise_error URI::InvalidURIError
       end
     end
 
     describe "ping" do
-      it "calles google and ask" do
-        MassiveSitemap.should_receive(:open).twice()
-        MassiveSitemap.ping(url, [:google, :ask])
+      it "calles google and yandex" do
+        MassiveSitemap.should_receive(:open).twice
+        MassiveSitemap.ping(url, [:google, :yandex])
       end
 
       it "doesn't fail for unknown engines" do
@@ -27,6 +27,15 @@ describe MassiveSitemap do
           MassiveSitemap.ping(url, :unknown)
         end.to_not raise_error
       end
+
+      it "doesn't fail when it can't talk to an engine" do
+        MassiveSitemap.should_receive(:open).twice.and_raise(StandardError)
+        MassiveSitemap.stub(:log_error) # supress error output
+
+        expect do
+          MassiveSitemap.ping(url, [:google, :ask])
+        end.to_not raise_error
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: massive_sitemap
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-07 00:00:00.000000000Z
+date: 2012-07-15 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70173617207480 !ruby/object:Gem::Requirement
+  requirement: &70119062645900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70173617207480
+  version_requirements: *70119062645900
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70173617207000 !ruby/object:Gem::Requirement
+  requirement: &70119062645420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70173617207000
+  version_requirements: *70119062645420
 description: MassiveSitemap - build huge sitemaps painfree. Differential updates keeps
   generation time short and reduces load on DB. It's heavealy inspired by BigSitemaps
   and offers compatiable API