dimples 2.5.1 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b28b18c7a1d70bec5bb597f86ce463cf1ba1d145
-  data.tar.gz: adabb1486a6d04c4ad7ac6cb8b655898cf0c987e
+  metadata.gz: 2421b96587bc304996570ff3802c720e92d534e9
+  data.tar.gz: 74b291833e3e6425e0b8137561f59ac54982b578
 SHA512:
-  metadata.gz: 7f2c51438a1f720fbff005ee906644e6debfdd2c87136012bab712acb948371a4eefae56d05ed1dce372f89e9129c32daf63ff89d6c746f06d1d613915e75316
-  data.tar.gz: 45e37e1cc7f02fb717c097ab142b6689c2643520c18620986d4a1051cc5091bc972dcf19eb02bbf27659193547888812bf2a676598f9a0022d9ff2429f4ebdb2
+  metadata.gz: c1a0a782d1bd484b9e83a2e6ced7ee82874875f5fc8b574094ef43d864c7349c4f8b672d01cc5efbb6ddb87fd00b0b4f0edb49d6f725abb2e5991f48d4450871
+  data.tar.gz: df14101587a2ede3d70b34eb8e4807d6d9e985c3998a40dbae05fbb832ab65b77ddf4ce70cd227c6456e41539777261448528fd7ca3c691e68c298c75e8ca515

data/lib/dimples/configuration.rb

@@ -36,7 +36,6 @@ module Dimples
         'layouts' => default_layouts,
         'pagination' => default_pagination,
         'generation' => default_generation,
-        'feed_formats' => default_feed_formats,
         'date_formats' => default_date_formats
       }
     end
@@ -77,10 +76,6 @@ module Dimples
       }
     end
 
-    def self.default_feed_formats
-      ['atom']
-    end
-
     def self.default_date_formats
       {
         'year' => '%Y',

data/lib/dimples/site.rb

@@ -93,7 +93,16 @@ module Dimples
     def scan_templates
       Dir.glob(File.join(@source_paths[:templates], '**', '*.*')).each do |path|
         template = Dimples::Template.new(self, path)
-        @templates[template.slug] = template
+
+        parent_path = File.dirname(path)
+        if parent_path == @source_paths[:templates]
+          slug = template.slug
+        else
+          relative_path = parent_path.gsub(@source_paths[:templates], '')[1..-1]
+          slug = relative_path.gsub(File::SEPARATOR, '.') + ".#{template.slug}"
+        end
+
+        @templates[slug] = template
       end
     end
 
@@ -256,13 +265,13 @@ module Dimples
     end
 
     def generate_feeds(path, options)
-      @config['feed_formats'].each do |format|
+      feed_templates.each do |format|
         next unless @templates[format]
 
         feed = @page_class.new(self)
 
         feed.filename = 'feed'
-        feed.extension = format
+        feed.extension = @templates[format].slug
         feed.layout = format
 
         feed.write(feed.output_path(path), options)
@@ -283,6 +292,10 @@ module Dimples
       end
     end
 
+    def feed_templates
+      @feed_templates ||= @templates.keys.select { |k| k =~ /^feeds\./ }
+    end
+
     def copy_assets
       if Dir.exist?(@source_paths[:public])
         Dimples.logger.debug('Copying assets...') if @config['verbose_logging']

data/lib/dimples/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Dimples
-  VERSION = '2.5.1'.freeze
+  VERSION = '2.6.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dimples
 version: !ruby/object:Gem::Version
-  version: 2.5.1
+  version: 2.6.0
 platform: ruby
 authors:
 - Daniel Bogan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-28 00:00:00.000000000 Z
+date: 2017-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
@@ -170,7 +170,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: A basic static site generator