xml-sitemap 1.1.1 → 1.1.2

data/.travis.yml

@@ -0,0 +1,4 @@
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - ree

data/lib/xml-sitemap.rb

@@ -1,4 +1,5 @@
 require 'time'
+require 'date'
 require 'builder'
 
 require 'xml-sitemap/options'

data/lib/xml-sitemap/map.rb

@@ -4,9 +4,17 @@ module XmlSitemap
     
     def initialize(target, opts={})
       @target     = target.to_s.strip
-      @updated    = opts[:updated]  || Time.now.utc
+      @updated    = opts[:updated]  || Time.now
       @priority   = opts[:priority] || 0.5
       @changefreq = opts[:period]   || :weekly
+      
+      # allow only date or time object
+      unless @updated.kind_of?(Time) || @updated.kind_of?(Date)
+        raise ArgumentError, "Time or Date required for :updated!"
+      end
+      
+      # use full time and date only!
+      @updated = @updated.to_time if @updated.kind_of?(Date)
     end
   end
 

data/lib/xml-sitemap/version.rb

@@ -1,3 +1,3 @@
 module XmlSitemap
-  VERSION = '1.1.1'
+  VERSION = '1.1.2'
 end

data/spec/fixtures/encoded_map.xml

@@ -2,13 +2,13 @@
 <urlset xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
   <url>
     <loc>http://foobar.com/</loc>
-    <lastmod>2011-06-01T05:00:01Z</lastmod>
+    <lastmod>2011-06-01T00:00:01Z</lastmod>
     <changefreq>weekly</changefreq>
     <priority>1.0</priority>
   </url>
   <url>
     <loc>http://foobar.com/path?a=b&amp;c=d&amp;e=sample string</loc>
-    <lastmod>2011-06-01T05:00:01Z</lastmod>
+    <lastmod>2011-06-01T00:00:01Z</lastmod>
     <changefreq>weekly</changefreq>
     <priority>0.5</priority>
   </url>

data/spec/fixtures/sample_index.xml

@@ -2,10 +2,10 @@
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
   <sitemap>
     <loc>http://foobar.com/sitemap-0.xml</loc>
-    <lastmod>2011-06-01T05:00:01Z</lastmod>
+    <lastmod>2011-06-01T00:00:01Z</lastmod>
   </sitemap>
   <sitemap>
     <loc>http://foobar.com/sitemap-1.xml</loc>
-    <lastmod>2011-06-01T05:00:01Z</lastmod>
+    <lastmod>2011-06-01T00:00:01Z</lastmod>
   </sitemap>
 </urlset>

data/spec/fixtures/saved_map.xml

@@ -2,25 +2,25 @@
 <urlset xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
   <url>
     <loc>http://foobar.com/</loc>
-    <lastmod>2011-06-01T05:00:01Z</lastmod>
+    <lastmod>2011-06-01T00:00:01Z</lastmod>
     <changefreq>weekly</changefreq>
     <priority>1.0</priority>
   </url>
   <url>
     <loc>http://foobar.com/about</loc>
-    <lastmod>2011-06-01T05:00:01Z</lastmod>
+    <lastmod>2011-06-01T00:00:01Z</lastmod>
     <changefreq>weekly</changefreq>
     <priority>0.5</priority>
   </url>
   <url>
     <loc>http://foobar.com/terms</loc>
-    <lastmod>2011-06-01T05:00:01Z</lastmod>
+    <lastmod>2011-06-01T00:00:01Z</lastmod>
     <changefreq>weekly</changefreq>
     <priority>0.5</priority>
   </url>
   <url>
     <loc>http://foobar.com/privacy</loc>
-    <lastmod>2011-06-01T05:00:01Z</lastmod>
+    <lastmod>2011-06-01T00:00:01Z</lastmod>
     <changefreq>weekly</changefreq>
     <priority>0.5</priority>
   </url>

data/spec/index_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe XmlSitemap::Index do
   before :all do
-    @base_time = Time.mktime(2011, 6, 1, 0, 0, 1)
+    @base_time = Time.gm(2011, 6, 1, 0, 0, 1)
   end
   
   it 'should be valid if no sitemaps were supplied' do

data/spec/map_spec.rb

@@ -2,8 +2,8 @@ require 'spec_helper'
 
 describe XmlSitemap::Map do
   before :all do
-    @base_time = Time.mktime(2011, 6, 1, 0, 0, 1).utc
-    @extra_time = Time.mktime(2011, 7, 1, 0, 0, 1).utc
+    @base_time = Time.gm(2011, 6, 1, 0, 0, 1)
+    @extra_time = Time.gm(2011, 7, 1, 0, 0, 1)
   end
   
   it 'should not allow empty domains' do
@@ -49,7 +49,13 @@ describe XmlSitemap::Map do
   it 'should properly set entry time' do
     map = XmlSitemap::Map.new('foobar.com', :time => @base_time)
     map.add('hello').updated.should == @base_time
-    map.add('world', :updated => @extra_time).updated.should == Time.mktime(2011, 7, 1, 0, 0, 1)
+    map.add('world', :updated => @extra_time).updated.should == Time.gm(2011, 7, 1, 0, 0, 1)
+  end
+  
+  it 'should raise Argument error if no time or date were provided' do
+    map = XmlSitemap::Map.new('foobar.com', :time => @base_time)
+    proc { map.add('hello', :updated => 'invalid data') }.
+      should raise_error ArgumentError, "Time or Date required for :updated!"
   end
   
   it 'should have properly encoded entities' do

data/xml-sitemap.gemspec

@@ -9,17 +9,14 @@ Gem::Specification.new do |s|
   s.authors     = ["Dan Sosedoff"]
   s.email       = ["dan.sosedoff@gmail.com"]
   
-  s.add_development_dependency 'rake', '~> 0.8'
-  s.add_development_dependency 'rspec', '~> 2.6'
+  s.add_development_dependency 'rake',      '~> 0.8'
+  s.add_development_dependency 'rspec',     '~> 2.6'
   s.add_development_dependency 'simplecov', '~> 0.4'
   
-  s.add_runtime_dependency 'builder', '~> 2.1'
+  s.add_runtime_dependency      'builder',  '>= 2.0'
   
-  s.files = `git ls-files`.split("\n")
-  s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables = `git ls-files -- bin/*`.split("\n").map{|f| File.basename(f)}
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{|f| File.basename(f)}
   s.require_paths = ["lib"]
-  
-  s.platform = Gem::Platform::RUBY
-  s.required_rubygems_version = Gem::Requirement.new('>= 1.3.6') if s.respond_to? :required_rubygems_version=
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xml-sitemap
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-18 00:00:00.000000000Z
+date: 2011-08-25 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &71108270 !ruby/object:Gem::Requirement
+  requirement: &2165753020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '0.8'
   type: :development
   prerelease: false
-  version_requirements: *71108270
+  version_requirements: *2165753020
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &71107960 !ruby/object:Gem::Requirement
+  requirement: &2165752460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *71107960
+  version_requirements: *2165752460
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &71107640 !ruby/object:Gem::Requirement
+  requirement: &2165751940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,18 +43,18 @@ dependencies:
         version: '0.4'
   type: :development
   prerelease: false
-  version_requirements: *71107640
+  version_requirements: *2165751940
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &71107400 !ruby/object:Gem::Requirement
+  requirement: &2165751460 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *71107400
+  version_requirements: *2165751460
 description: Provides a wrapper to generate XML sitemaps and sitemap indexes.
 email:
 - dan.sosedoff@gmail.com
@@ -64,6 +64,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .travis.yml
 - Gemfile
 - README.md
 - Rakefile
@@ -98,11 +99,19 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.6
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Simple XML sitemap generator for Ruby/Rails applications.
-test_files: []
+test_files:
+- spec/fixtures/empty_index.xml
+- spec/fixtures/encoded_map.xml
+- spec/fixtures/sample_index.xml
+- spec/fixtures/saved_map.xml
+- spec/fixtures/simple_map.xml
+- spec/index_spec.rb
+- spec/map_spec.rb
+- spec/spec_helper.rb