nanoc-filesystem-i18n 0.1.0.pre2 → 0.1.0.pre4

data/Rakefile

@@ -1,50 +1,21 @@
-require 'rubygems'
-require 'rake'
-require File.dirname(__FILE__) + '/lib/nanoc3/data_sources/filesystem_i18n/version'
+require 'bundler'
+Bundler::GemHelper.install_tasks
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = 'nanoc-filesystem-i18n'
-    gem.version = Nanoc3::DataSources::FilesystemI18n::Version
-    gem.summary = %Q{I18n filesystem based data source for nanoc}
-    gem.description = %Q{I18n filesystem based data source for nanoc. Compatible with nanoc 3 and default filesystem based data source.}
-    gem.email = 'yann.lugrin@sans-savoir.net'
-    gem.homepage = 'http://github.com/yannlugrin/nanoc-filesystem-i18n'
-    gem.authors = ['Yann Lugrin']
-    gem.add_dependency 'nanoc', '>= 3.1.2'
-    gem.add_dependency 'i18n', '>= 0'
-    gem.add_development_dependency 'minitest', '>= 0'
-    gem.add_development_dependency 'yard', '>= 0'
-    gem.files.exclude '.gitignore', '.document', 'nanoc-filesystem-i18n.gemspec'
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
+require 'nanoc3'
 
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
+require 'minitest/unit'
 
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |test|
-    test.libs << 'test'
-    test.pattern = 'test/**/test_*.rb'
-    test.verbose = true
-  end
-rescue LoadError
-  task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
-  end
-end
+desc 'Run all tests'
+task :test do
+  ENV['QUIET'] ||= 'true'
 
-task :test => :check_dependencies
+  $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + '/test'))
+
+  MiniTest::Unit.autorun
+
+  test_files = Dir['test/**/*_spec.rb'] + Dir['test/**/test_*.rb']
+  test_files.each { |f| require f }
+end
 
 task :default => :test
 

data/lib/nanoc3/data_sources/filesystem_i18n.rb

@@ -158,13 +158,17 @@ module Nanoc3::DataSources
         (is_locale ? I18n.available_locales : [I18n.default_locale]).map do |locale|
           I18n.locale = locale # Set current locale
 
-          # Read content and metadata (only if is localized, default is already
-          # loaded)
-          meta, content_or_filename = parse(content_filename, meta_filename, kind, (is_binary && klass == Nanoc3::Item)) if is_locale
-
-          # merge meta for current locale, default locale meta used by
-          # default is meta don't have key
+          # Process for localized files
           if is_locale
+            # Get filenames for localized content
+            meta_filename    = filename_for(base_filename, meta_ext)
+            content_filename = filename_for(base_filename, content_ext)
+
+            # Read content and metadata for localized content
+            meta, content_or_filename = parse(content_filename, meta_filename, kind, (is_binary && klass == Nanoc3::Item))
+
+            # merge meta for current locale, default locale meta used by
+            # default is meta don't have key
             meta_locale = meta.delete('locale') {|el| Hash.new }
             meta = (meta_locale[I18n.default_locale] || Hash.new).merge(meta)
             meta.merge!(meta_locale[locale.to_s] || Hash.new)

data/lib/nanoc3/data_sources/filesystem_i18n/version.rb

@@ -5,7 +5,7 @@ require 'nanoc3'
 module Nanoc3
   module DataSources
     class FilesystemI18n < Nanoc3::DataSource
-      Version = '0.1.0.pre2'
+      Version = '0.1.0.pre4'
     end
   end
 end

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: nanoc-filesystem-i18n
 version: !ruby/object:Gem::Version 
+  hash: -1876988169
   prerelease: true
   segments: 
   - 0
   - 1
   - 0
-  - pre2
-  version: 0.1.0.pre2
+  - pre4
+  version: 0.1.0.pre4
 platform: ruby
 authors: 
 - Yann Lugrin
@@ -15,16 +16,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-09 00:00:00 +02:00
+date: 2010-10-18 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: nanoc
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 3
         - 1
@@ -36,9 +39,11 @@ dependencies:
   name: i18n
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -48,9 +53,11 @@ dependencies:
   name: minitest
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -60,9 +67,11 @@ dependencies:
   name: yard
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -99,16 +108,20 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
+      hash: 25
       segments: 
       - 1
       - 3
@@ -117,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: I18n filesystem based data source for nanoc