nanoc 4.0.1 → 4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4aaeac805ae4631f3075442c8fa2382ae42085a
-  data.tar.gz: d7b42a8044e1ff67765bb93383e1951963cc2593
+  metadata.gz: 05cbb3c65c3fe6c353d2d11794737aa8e40c6453
+  data.tar.gz: 9649942612852ad74fb7af3d48bea7ad8caa765b
 SHA512:
-  metadata.gz: eb371cfa1c4843698736980aac9b42a914732bc8e04c6af2e022548aa220c9071ff05223b47e83cf547af07d586ceffb264648aa6deec7fe232fcc852939c9c7
-  data.tar.gz: 4e55855d72a97dfc6bc7eaeb620e6139e9a5254ca68ab727a61244e7883f7bebd506ceb39addba87a078c47c439dcc510581cd5f5262235e3c0834876ffd4407
+  metadata.gz: fae5f389d009fbf804397c22a2c09780a5ad81f6c44f7497dae35378303b95e66dbead03eb528021ded34dc0f7e6db465a90febc9c6601234bbc6a34a953925b
+  data.tar.gz: 43800887e36a8fd1fae20786e061157a8c318235c4399c655cdd67415ff1ceea4ad7dffb75751addebebc55dc23f2422f3fa02f335f6a3b9cc9680229412046c

data/Gemfile

@@ -23,11 +23,7 @@ gem 'maruku'
 gem 'mime-types'
 gem 'minitest', '~> 5.0'
 gem 'mocha'
-if RUBY_VERSION >= '2.0.0'
-  gem 'mustache', '~> 1.0'
-else
-  gem 'mustache', '~> 0.99'
-end
+gem 'mustache', '~> 1.0'
 gem 'nokogiri', '~> 1.6'
 gem 'pandoc-ruby'
 gem 'pry'
@@ -43,7 +39,7 @@ gem 'rouge'
 gem 'rspec'
 gem 'rubocop'
 gem 'rubypants'
-gem 'sass', '~> 3.2.2'
+gem 'sass'
 gem 'simplecov', require: false
 gem 'slim'
 gem 'typogruby'

data/NEWS.md

@@ -1,5 +1,17 @@
 # Nanoc news
 
+## 4.0.2 (2015-11-30)
+
+Fixes:
+
+* Properly set required Ruby version to 2.1 in the gem specification (#747)
+* Fixed issue with CLI commands not being loaded as UTF-8 (#742)
+* Added missing `#identifier=` method to items and layouts during preprocessing (#750)
+
+Enhancements:
+
+* Let attempts to fetch an item rep by number, rather than symbol, fail with a meaningful error (#749)
+
 ## 4.0.1 (2015-11-28)
 
 Fixes:

data/lib/nanoc/base/views/item_rep_collection_view.rb

@@ -47,8 +47,15 @@ module Nanoc
     #
     # @return [Nanoc::ItemRepView] if an item rep with the given name was found
     def [](rep_name)
-      res = @item_reps.find { |ir| ir.name == rep_name }
-      res && Nanoc::ItemRepView.new(res)
+      case rep_name
+      when Symbol
+        res = @item_reps.find { |ir| ir.name == rep_name }
+        res && Nanoc::ItemRepView.new(res)
+      when Fixnum
+        raise ArgumentError, "expected ItemRepCollectionView#[] to be called with a symbol (you likely want `.reps[:default]` rather than `.reps[#{rep_name}]`)"
+      else
+        raise ArgumentError, 'expected ItemRepCollectionView#[] to be called with a symbol'
+      end
     end
 
     # Return the item rep with the given name, or raises an exception if there

data/lib/nanoc/base/views/mixins/mutable_document_view_mixin.rb

@@ -32,6 +32,13 @@ module Nanoc
       unwrap.attributes[key] = value
     end
 
+    # Sets the identifier to the given argument.
+    #
+    # @param [String, Nanoc::Identifier] arg
+    def identifier=(arg)
+      unwrap.identifier = Nanoc::Identifier.from(arg)
+    end
+
     # Updates the attributes based on the given hash.
     #
     # @param [Hash] hash

data/lib/nanoc/cli.rb

@@ -152,7 +152,7 @@ module Nanoc::CLI
   # @return [Cri::Command] The loaded command
   def self.load_command_at(filename, command_name = nil)
     # Load
-    code = File.read(filename)
+    code = File.read(filename, encoding: 'UTF-8')
     cmd = Cri::Command.define(code, filename)
 
     # Set name

data/lib/nanoc/version.rb

@@ -1,4 +1,4 @@
 module Nanoc
   # The current Nanoc version.
-  VERSION = '4.0.1'
+  VERSION = '4.0.2'
 end

data/nanoc.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.rdoc_options     = ['--main', 'README.md']
   s.extra_rdoc_files = ['ChangeLog', 'LICENSE', 'README.md', 'NEWS.md']
 
-  s.required_ruby_version = '>= 2.2.0'
+  s.required_ruby_version = '>= 2.1.0'
 
   s.add_runtime_dependency('cri', '~> 2.3')
 

data/test/cli/test_cli.rb

@@ -125,6 +125,13 @@ EOS
     end
   end
 
+  def test_load_command_at_with_non_utf8_encoding
+    Encoding.default_external = Encoding::US_ASCII
+    Nanoc::CLI.load_command_at(root_dir + '/lib/nanoc/cli/commands/create-site.rb')
+  ensure
+    Encoding.default_external = Encoding::UTF_8
+  end
+
   def test_after_setup
     $after_setup_success = false
     Nanoc::CLI.after_setup do

data/test/filters/test_sass.rb

@@ -1,4 +1,14 @@
 class Nanoc::Filters::SassTest < Nanoc::TestCase
+  def setup
+    super
+
+    if_have 'sass' do
+      unless ::Sass.load_paths.include?('.')
+        ::Sass.load_paths << '.'
+      end
+    end
+  end
+
   def test_filter
     if_have 'sass' do
       # Get filter

data/test/helper.rb

@@ -262,6 +262,10 @@ EOS
   def skip_unless_symlinks_supported
     skip 'Symlinks are not supported by Ruby on Windows' unless symlinks_supported?
   end
+
+  def root_dir
+    File.absolute_path(File.dirname(__FILE__) + '/..')
+  end
 end
 
 class Nanoc::TestCase < Minitest::Test

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.0.2
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-28 00:00:00.000000000 Z
+date: 2015-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri
@@ -61,7 +61,6 @@ files:
 - CONTRIBUTING.md
 - ChangeLog
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - NEWS.md
 - README.md
@@ -345,7 +344,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.0
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/Gemfile.lock

@@ -1,339 +0,0 @@
-PATH
-  remote: .
-  specs:
-    nanoc (4.0.1)
-      cri (~> 2.3)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    CFPropertyList (2.3.2)
-    RedCloth (4.2.9)
-    addressable (2.3.8)
-    adsf (1.2.0)
-      rack (>= 1.0.0)
-    ast (2.1.0)
-    astrolabe (1.3.1)
-      parser (~> 2.2)
-    bluecloth (2.2.0)
-    builder (3.2.2)
-    chunky_png (1.3.5)
-    coderay (1.1.0)
-    coffee-script (2.4.1)
-      coffee-script-source
-      execjs
-    coffee-script-source (1.10.0)
-    colored (1.2)
-    commonjs (0.2.7)
-    compass (0.12.7)
-      chunky_png (~> 1.2)
-      fssm (>= 0.2.7)
-      sass (~> 3.2.19)
-    coveralls (0.8.9)
-      json (~> 1.8)
-      rest-client (>= 1.6.8, < 2)
-      simplecov (~> 0.10.0)
-      term-ansicolor (~> 1.3)
-      thor (~> 0.19.1)
-      tins (~> 1.6.0)
-    crack (0.4.2)
-      safe_yaml (~> 1.0.0)
-    cri (2.7.0)
-      colored (~> 1.2)
-    diff-lcs (1.2.5)
-    docile (1.1.5)
-    domain_name (0.5.25)
-      unf (>= 0.0.5, < 1.0.0)
-    erubis (2.7.0)
-    excon (0.45.4)
-    execjs (2.6.0)
-    ffi (1.9.10)
-    fission (0.5.0)
-      CFPropertyList (~> 2.2)
-    fog (1.36.0)
-      fog-aliyun (>= 0.1.0)
-      fog-atmos
-      fog-aws (>= 0.6.0)
-      fog-brightbox (~> 0.4)
-      fog-core (~> 1.32)
-      fog-dynect (~> 0.0.2)
-      fog-ecloud (~> 0.1)
-      fog-google (<= 0.1.0)
-      fog-json
-      fog-local
-      fog-powerdns (>= 0.1.1)
-      fog-profitbricks
-      fog-radosgw (>= 0.0.2)
-      fog-riakcs
-      fog-sakuracloud (>= 0.0.4)
-      fog-serverlove
-      fog-softlayer
-      fog-storm_on_demand
-      fog-terremark
-      fog-vmfusion
-      fog-voxel
-      fog-xenserver
-      fog-xml (~> 0.1.1)
-      ipaddress (~> 0.5)
-      nokogiri (~> 1.5, >= 1.5.11)
-    fog-aliyun (0.1.0)
-      fog-core (~> 1.27)
-      fog-json (~> 1.0)
-      ipaddress (~> 0.8)
-      xml-simple (~> 1.1)
-    fog-atmos (0.1.0)
-      fog-core
-      fog-xml
-    fog-aws (0.7.6)
-      fog-core (~> 1.27)
-      fog-json (~> 1.0)
-      fog-xml (~> 0.1)
-      ipaddress (~> 0.8)
-    fog-brightbox (0.9.0)
-      fog-core (~> 1.22)
-      fog-json
-      inflecto (~> 0.0.2)
-    fog-core (1.35.0)
-      builder
-      excon (~> 0.45)
-      formatador (~> 0.2)
-    fog-dynect (0.0.2)
-      fog-core
-      fog-json
-      fog-xml
-    fog-ecloud (0.3.0)
-      fog-core
-      fog-xml
-    fog-google (0.1.0)
-      fog-core
-      fog-json
-      fog-xml
-    fog-json (1.0.2)
-      fog-core (~> 1.0)
-      multi_json (~> 1.10)
-    fog-local (0.2.1)
-      fog-core (~> 1.27)
-    fog-powerdns (0.1.1)
-      fog-core (~> 1.27)
-      fog-json (~> 1.0)
-      fog-xml (~> 0.1)
-    fog-profitbricks (0.0.5)
-      fog-core
-      fog-xml
-      nokogiri
-    fog-radosgw (0.0.4)
-      fog-core (>= 1.21.0)
-      fog-json
-      fog-xml (>= 0.0.1)
-    fog-riakcs (0.1.0)
-      fog-core
-      fog-json
-      fog-xml
-    fog-sakuracloud (1.4.0)
-      fog-core
-      fog-json
-    fog-serverlove (0.1.2)
-      fog-core
-      fog-json
-    fog-softlayer (1.0.2)
-      fog-core
-      fog-json
-    fog-storm_on_demand (0.1.1)
-      fog-core
-      fog-json
-    fog-terremark (0.1.0)
-      fog-core
-      fog-xml
-    fog-vmfusion (0.1.0)
-      fission
-      fog-core
-    fog-voxel (0.1.0)
-      fog-core
-      fog-xml
-    fog-xenserver (0.2.2)
-      fog-core
-      fog-xml
-    fog-xml (0.1.2)
-      fog-core
-      nokogiri (~> 1.5, >= 1.5.11)
-    formatador (0.2.5)
-    fssm (0.2.10)
-    haml (4.0.7)
-      tilt
-    handlebars (0.7.0)
-      handlebars-source (~> 3.0.0)
-      therubyracer (~> 0.12.1)
-    handlebars-source (3.0.3)
-    hashdiff (0.2.3)
-    http-cookie (1.0.2)
-      domain_name (~> 0.5)
-    inflecto (0.0.2)
-    ipaddress (0.8.0)
-    json (1.8.3)
-    kramdown (1.9.0)
-    less (2.6.0)
-      commonjs (~> 0.2.7)
-    libv8 (3.16.14.13)
-    listen (3.0.5)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9)
-    markaby (0.8.0)
-      builder
-    maruku (0.7.2)
-    metaclass (0.0.4)
-    method_source (0.8.2)
-    mime-types (2.99)
-    mini_portile (0.6.2)
-    minitest (5.8.3)
-    mocha (1.1.0)
-      metaclass (~> 0.0.1)
-    multi_json (1.11.2)
-    mustache (1.0.2)
-    netrc (0.11.0)
-    nokogiri (1.6.6.4)
-      mini_portile (~> 0.6.0)
-    pandoc-ruby (1.0.0)
-    parser (2.2.3.0)
-      ast (>= 1.1, < 3.0)
-    posix-spawn (0.3.11)
-    powerpack (0.1.1)
-    pry (0.10.3)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    pygments.rb (0.6.3)
-      posix-spawn (~> 0.3.6)
-      yajl-ruby (~> 1.2.0)
-    rack (1.6.4)
-    rainbow (2.0.0)
-    rainpress (1.0)
-    rake (10.4.2)
-    rb-fsevent (0.9.6)
-    rb-inotify (0.9.5)
-      ffi (>= 0.5.0)
-    rdiscount (2.1.8)
-    rdoc (4.2.0)
-    redcarpet (3.3.3)
-    ref (2.0.0)
-    rest-client (1.8.0)
-      http-cookie (>= 1.0.2, < 2.0)
-      mime-types (>= 1.16, < 3.0)
-      netrc (~> 0.7)
-    rouge (1.10.1)
-    rspec (3.4.0)
-      rspec-core (~> 3.4.0)
-      rspec-expectations (~> 3.4.0)
-      rspec-mocks (~> 3.4.0)
-    rspec-core (3.4.1)
-      rspec-support (~> 3.4.0)
-    rspec-expectations (3.4.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-mocks (3.4.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-support (3.4.1)
-    rubocop (0.35.1)
-      astrolabe (~> 1.3)
-      parser (>= 2.2.3.0, < 3.0)
-      powerpack (~> 0.1)
-      rainbow (>= 1.99.1, < 3.0)
-      ruby-progressbar (~> 1.7)
-      tins (<= 1.6.0)
-    ruby-progressbar (1.7.5)
-    rubypants (0.2.0)
-    safe_yaml (1.0.4)
-    sass (3.2.19)
-    simplecov (0.10.0)
-      docile (~> 1.1.0)
-      json (~> 1.8)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.0)
-    slim (3.0.6)
-      temple (~> 0.7.3)
-      tilt (>= 1.3.3, < 2.1)
-    slop (3.6.0)
-    temple (0.7.6)
-    term-ansicolor (1.3.2)
-      tins (~> 1.0)
-    therubyracer (0.12.2)
-      libv8 (~> 3.16.14.0)
-      ref
-    thor (0.19.1)
-    tilt (2.0.1)
-    tins (1.6.0)
-    typogruby (1.0.18)
-      rubypants
-    uglifier (2.7.2)
-      execjs (>= 0.3.0)
-      json (>= 1.8.0)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.7.1)
-    vcr (3.0.0)
-    w3c_validators (1.2)
-      json
-      nokogiri
-    webmock (1.22.3)
-      addressable (>= 2.3.6)
-      crack (>= 0.3.2)
-      hashdiff
-    xml-simple (1.1.5)
-    yajl-ruby (1.2.1)
-    yard (0.8.7.6)
-    yuicompressor (1.3.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  RedCloth
-  adsf
-  bluecloth
-  builder
-  bundler (>= 1.7.10, < 2.0)
-  coderay
-  coffee-script
-  compass
-  coveralls
-  erubis
-  fog
-  haml
-  handlebars
-  kramdown
-  less (~> 2.0)
-  listen
-  markaby
-  maruku
-  mime-types
-  minitest (~> 5.0)
-  mocha
-  mustache (~> 1.0)
-  nanoc!
-  nokogiri (~> 1.6)
-  pandoc-ruby
-  pry
-  pygments.rb
-  rack
-  rainpress
-  rake
-  rdiscount
-  rdoc
-  redcarpet
-  rouge
-  rspec
-  rubocop
-  rubypants
-  sass (~> 3.2.2)
-  simplecov
-  slim
-  typogruby
-  uglifier
-  vcr
-  w3c_validators
-  webmock
-  yard
-  yuicompressor
-
-BUNDLED WITH
-   1.10.6