webgen 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a1b98190c63a1f48d1d1dccd972540408c621f0
-  data.tar.gz: 5b512539e92608915846a6ed88c42f4aca49fcf1
+  metadata.gz: 4549cd7e320897cf555980fefa9d6f11a29c7d73
+  data.tar.gz: 1e5fcd72bc28df47eb681939fe34c562f11fb09e
 SHA512:
-  metadata.gz: a588782682753d0dab0ef0870202c1900c31de91968eedf05b3697d822614ca6a37ed5b689d6461f23d709cfd39c6ab065955499d73f650ef4b8b7ac596637c4
-  data.tar.gz: bb345850ff9514ef556e17f5b49e10a096451196419e0b351d1f36db462c0b4f505f591e913f7c2636a8073ded7c9cad07c93d13ac47ed58ad07dfc4e7e81c0b
+  metadata.gz: 8b30674ab19c718895f896a880b2a3d1c3d1416ab2234b9ccff7abced4cac9ae8aba8d63a8737f60da328e7eedbaa743d5196ca3a5c4e248bfa457bb535b6e09
+  data.tar.gz: 8241e6eecf941a6232d7a0744d4ced310c63d42a11ddecb769ff59488c06512930784e92068ced694a52955fb9a75032a7bdfd5993d9d9a86a593a35a2456cad

data/README.md

@@ -10,12 +10,10 @@ extensions.
 
 The author of webgen is Thomas Leitner -- he is reachable at <mailto:t_leitner@gmx.at>.
 
-You can discuss webgen or find help on the [webgen-users] mailing list
-which is mirrored to the [webgen-users Google group].
+You can discuss webgen or find help on the [webgen-users Google group].
 
 Or you can join the IRC channel [#webgen] on Freenode.
 
-[webgen-users]: http://rubyforge.org/pipermail/webgen-users/
 [webgen-users Google group]: https://groups.google.com/forum/?fromgroups#!forum/webgen-users
 [#webgen]: irc://chat.freenode.net/#webgen
 

data/Rakefile

@@ -5,11 +5,6 @@ require 'rubygems/package_task'
 require 'rdoc/task'
 require 'rdoc/rdoc'
 
-begin
-  require 'rubyforge'
-rescue LoadError
-end
-
 require 'fileutils'
 require 'rake/clean'
 require 'rake/testtask'
@@ -99,7 +94,7 @@ EOF
 
 Thanks for choosing webgen! Here are some places to get you started:
 * The webgen User Documentation at <http://webgen.gettalong.org/documentation/>
-* The mailing list archive at <http://rubyforge.org/pipermail/webgen-users/>
+* The mailing list archive at <https://groups.google.com/forum/?fromgroups#!forum/webgen-users>
 * The webgen Wiki at <http://github.com/gettalong/webgen/wiki>
 
 Have a look at <http://webgen.gettalong.org/news.html> for a list of changes!
@@ -118,7 +113,6 @@ EOF
     s.add_development_dependency('rake', '>= 0.8.3')
     s.add_development_dependency('minitest', '~> 5.0')
     s.add_development_dependency('diff-lcs', '~> 1.0')
-    s.add_development_dependency('rubyforge', '~> 2.0')
     s.add_development_dependency('maruku', '~> 0.7')
     s.add_development_dependency('RedCloth', '~> 4.1')
     s.add_development_dependency('haml', '~> 4.0')
@@ -146,7 +140,6 @@ EOF
     s.author = 'Thomas Leitner'
     s.email = 't_leitner@gmx.at'
     s.homepage = "http://webgen.gettalong.org"
-    s.rubyforge_project = 'webgen'
   end
 
   Gem::PackageTask.new(spec) do |pkg|
@@ -155,46 +148,14 @@ EOF
   end
 
   desc 'Release webgen version ' + Webgen::VERSION
-  task :release => [:clobber, :package, :publish_files, :post_news]
-
-  if defined? RubyForge
-    desc "Upload the release to Rubyforge"
-    task :publish_files => [:package] do
-      print 'Uploading files to Rubyforge...'
-      $stdout.flush
-
-      rf = RubyForge.new
-      rf.configure
-      rf.login
-
-      rf.userconfig["release_notes"] = ""
-      rf.userconfig["release_changes"] = ""
-      rf.userconfig["preformatted"] = false
-
-      files = %w[.gem .tgz .zip].collect {|ext| "pkg/webgen-#{Webgen::VERSION}" + ext}
+  task :release => [:clobber, :package, :publish_files]
 
-      rf.add_release('webgen', 'webgen', Webgen::VERSION, *files)
-
-      sh "gem push pkg/webgen-#{Webgen::VERSION}.gem"
-
-      puts 'done'
-    end
-
-    desc 'Post announcement to rubyforge.'
-    task :post_news do
-      print 'Posting announcement to Rubyforge ...'
-      $stdout.flush
-      rf = RubyForge.new
-      rf.configure
-      rf.login
-
-      text = "Have a look at http://webgen.gettalong.org/news.html for the release details!"
-      rf.post_news('webgen', "webgen #{Webgen::VERSION} released", text)
-      puts "done"
-    end
+  desc "Upload the release to rubygems.org"
+  task :publish_files => [:package] do
+    sh "gem push pkg/webgen-#{Webgen::VERSION}.gem"
+    puts 'done'
   end
 
-
   desc "Run the tests one by one to check for missing deps"
   task :test_isolated do
     files = Dir['test/webgen/**/test_*']

data/VERSION

@@ -1 +1 @@
-1.2.1
+1.3.0

data/lib/webgen/node_finder.rb

@@ -274,7 +274,12 @@ module Webgen
           l
         end
       end.uniq
-      result.nodes.keep_if {|n| langs.any? {|l| n.lang == l}}
+      fallback = langs.delete('fallback')
+      result.nodes.keep_if do |n|
+        langs.any? {|l| n.lang == l} ||
+          (fallback && n.lang == @website.config['website.lang'] &&
+           !n.tree.translations(n).any? {|tn| langs.any? {|l| tn.lang == l}})
+      end
     end
 
     def filter_ancestors(result, ref_node, enabled)

data/lib/webgen/path_handler.rb

@@ -393,7 +393,6 @@ module Webgen
         vpath = path.dup
         (mi ||= {})['version'] ||= name
         vpath.meta_info.merge!(mi)
-        vpath.meta_info['dest_path'] ||= '<parent><basename>(-<version>)(.<lang>)<ext>'
         @website.logger.debug do
           "Creating node version '#{vpath['version']}' from path <#{vpath}> with #{handler} handler"
         end

data/lib/webgen/path_handler/base.rb

@@ -38,7 +38,7 @@ module Webgen
         # URL.
         def url
           node_url = Webgen::Path.url(dest_path, false)
-          node_url.absolute? ? node_url : File.join(tree.website.config['website.base_url'], dest_path)
+          node_url.absolute? ? node_url.to_s : File.join(tree.website.config['website.base_url'], dest_path)
         end
 
         # Does exactly the same as Webgen::Node#route_to but also automatically adds the necessary
@@ -53,7 +53,7 @@ module Webgen
         # depending on the configuration option 'website.link_to_current_page'.
         def link_to(*args, &block)
           result = super
-          if !tree.website.config['website.link_to_current_page']
+          if !tree.website.config['website.link_to_current_page'] && args.first == self
             result.sub!(/<a/, '<span').sub!(/<\/a>/, '</span>').
               gsub!(/ (?:href|hreflang)=".*"/, '')
           end
@@ -161,6 +161,7 @@ module Webgen
       # exists, the language part is forced to be in the destination path and the resulting
       # destination path is returned.
       def dest_path(parent, path)
+        path.meta_info['dest_path'] ||= '<parent><basename>(-<version>)(.<lang>)<ext>'
         dpath = construct_dest_path(parent, path, false)
         if (node = node_exists?(path, dpath)) && node.lang != path.meta_info['lang']
           dpath = construct_dest_path(parent, path, true)

data/lib/webgen/path_handler/virtual.rb

@@ -47,6 +47,7 @@ module Webgen
             else
               entry_path[:virtual] = true
               entry_path['handler'] = 'virtual'
+              entry_path['node_class'] ||= Webgen::PathHandler::Base::Node.to_s
               @website.ext.path_handler.create_secondary_nodes(entry_path)
             end
           end

data/lib/webgen/version.rb

@@ -3,6 +3,6 @@
 module Webgen
 
   # The version of webgen.
-  VERSION = '1.2.1'
+  VERSION = '1.3.0'
 
 end

data/test/webgen/path_handler/test_base.rb

@@ -56,8 +56,6 @@ class TestPathHandlerBase < Minitest::Test
     config['website.lang'] = 'en'
     node = Webgen::Node.new(@website.tree.dummy_root, '/', '/', {:test => :value})
 
-    assert_raises(Webgen::NodeCreationError) { @obj.dest_path(node, Webgen::Path.new('/test')) }
-
     check_dest_path = lambda do |path, mi, expected, parent = node|
       assert_equal(expected, @obj.dest_path(parent, Webgen::Path.new(path, mi)))
     end
@@ -156,10 +154,12 @@ class TestPathHandlerBase < Minitest::Test
     @website.config = {'website.base_url' => 'http://example.com/sub', 'website.link_to_current_page' => true}
 
     assert_equal('http://example.com/sub/somename.html', child_de.url)
+    assert_kind_of(String, child_de.url)
 
     assert_equal('<a href="somename.html" hreflang="de">Somename</a>', node.link_to(child_de))
     @website.config['website.link_to_current_page'] = false
-    assert_equal('<span>Somename</span>', node.link_to(child_de))
+    assert_equal('<a href="somename.html" hreflang="de">Somename</a>', node.link_to(child_de))
+    assert_equal('<span>Somename</span>', child_de.link_to(child_de))
   end
 
 end

data/test/webgen/path_handler/test_virtual.rb

@@ -87,6 +87,7 @@ EOF
     refute_nil(node_en)
     refute_nil(@root.tree['/dirnew/dirnew/dirnew/'])
 
+    assert_equal(Webgen::PathHandler::Base::Node, node_de.class)
     assert_equal('new title', node_en['title'])
     assert_equal(@time.tv_usec, node_en['modified_at'].tv_usec)
     assert(node_en['no_output'])

data/test/webgen/test_node_finder.rb

@@ -123,12 +123,17 @@ class TestNodeFinder < Minitest::Test
                @nf.find({:absolute_levels => [0,1], :levels => 2}, tree['/dir/']))
 
     # test filter: langs
+    @config['website.lang'] = 'en'
     check.call(%w[/file.en.html /other.en.html /dir2/index.en.html],
                @nf.find({:lang => 'en', :flatten => true}, tree['/dir/']))
     check.call(%w[/file.en.html /file.de.html /other.en.html /german.de.html /dir2/index.en.html /dir2/index.de.html],
                @nf.find({:lang => ['en', 'de'], :flatten => true}, tree['/dir/']))
     check.call(%w[/file.en.html /other.en.html /dir2/index.en.html],
                @nf.find({:lang => 'node', :flatten => true}, tree['/file.en.html']))
+    check.call(%w[/file.en.html /other.en.html /dir2/index.en.html],
+               @nf.find({:lang => ['en', 'fallback'], :flatten => true}, tree['/file.en.html']))
+    check.call(%w[/file.de.html /other.en.html /german.de.html /dir2/index.de.html],
+               @nf.find({:lang => ['de', 'fallback'], :flatten => true}, tree['/file.en.html']))
 
     # test filter: ancestors
     check.call(%w[/ /dir/ /dir/dir/ /dir/dir/file.html],

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webgen
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Thomas Leitner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-16 00:00:00.000000000 Z
+date: 2014-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cmdparse
@@ -100,20 +100,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: rubyforge
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: maruku
   requirement: !ruby/object:Gem::Requirement
@@ -490,7 +476,7 @@ post_install_message: |2+
 
   Thanks for choosing webgen! Here are some places to get you started:
   * The webgen User Documentation at <http://webgen.gettalong.org/documentation/>
-  * The mailing list archive at <http://rubyforge.org/pipermail/webgen-users/>
+  * The mailing list archive at <https://groups.google.com/forum/?fromgroups#!forum/webgen-users>
   * The webgen Wiki at <http://github.com/gettalong/webgen/wiki>
 
   Have a look at <http://webgen.gettalong.org/news.html> for a list of changes!
@@ -514,7 +500,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: webgen
+rubyforge_project: 
 rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4