dimples 3.0.7 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d3f5d7e758762e3cba7f8d53520a06c1a7abe3f
-  data.tar.gz: be2d879b4f1475166d56b4210f03e26afe3834e9
+  metadata.gz: e347e41fcd6d975535e6acb93dae09e600b0b8aa
+  data.tar.gz: 4de9555a39ed438e94f76c4caef2ac79b0407914
 SHA512:
-  metadata.gz: 2eb2cd4791972d0475602e3860a8054e1ad1d554c31b8933d9551b4e5549f27de10dbdadb6cf6da19603e1c7dd4aef35781e9e6d5db2090da85a803057b9c85e
-  data.tar.gz: 0a4f49d040199d11db9b8d5a4df417db3f60cfb65786263d3265617f4f3166cde8d39885fa311ff25313442dbaf3213ec3f658fd0a7503ef4c8d05419f7e8ecf
+  metadata.gz: 2c76600d5243dd598286c17d36f177391cd2f7d1bb820f7c4281599f5b98937479462cf5cf1a5e5860a5f6c31910d9dbfd822030f9e18be9fda2c81c31105fa7
+  data.tar.gz: f502ff18da072fe8d6c0844b2691de1a72ecbdbe137c4fb68c37801cfbb437588ba6b837e97d005e989a3ba17d186da7e7f667d21660e2c98cdcdd93e379d64d

data/bin/dimples

@@ -5,6 +5,7 @@ $LOAD_PATH.unshift(File.join(__dir__, '..', 'lib'))
 
 require 'dimples'
 require 'dimples/version'
+require 'json'
 require 'trollop'
 
 trap('SIGINT') do
@@ -37,30 +38,33 @@ unless valid_commands.include?(command)
 end
 
 lib_path = File.join(Dir.pwd, options[:lib])
-config_path = File.join(Dir.pwd, options[:config] || 'config', 'site.yml')
-
-config_hash = {}
+config_path = options[:config] || File.join(Dir.pwd, 'config.json')
 
 if File.exist?(config_path)
   begin
-    config_hash = YAML.load_file(config_path) || {}
-  rescue
-    Trollop.die 'Invalid or malformed YAML config file'
+    config = JSON.parse(File.read(config_path), symbolize_names: true)
+  rescue => e
+    puts e.inspect
+    Trollop.die "Invalid or malformed config file (#{config_path})"
   end
-elsif options[:config]
-  Trollop.die 'Unable to find config file'
+else
+  Trollop.die "Unable to find config file (#{config_path})"
 end
 
-config_hash['verbose_logging'] = true if options[:verbose]
-config = Dimples::Configuration.new(config_hash)
+config[:verbose_logging] = options[:verbose] || false
 
 if Dir.exist?(lib_path)
-  Dir.glob(File.join(lib_path, '**', '*')) do |path|
+  Dir.glob(File.join(lib_path, '**', '*.rb')) do |path|
     require path
   end
 end
 
-site_klass = config.class_override(:site) || Dimples::Site
+site_klass = if config[:class_overrides][:site]
+              Object.const_get(config[:class_overrides][:site])
+            else
+              Dimples::Site
+            end
+
 site = site_klass.new(config)
 
 case command.to_sym

data/lib/dimples/category.rb

@@ -10,7 +10,7 @@ module Dimples
     def initialize(site, slug)
       @site = site
       @slug = slug
-      @name = @site.config['category_names'][slug] || slug.capitalize
+      @name = @site.config[:category_names][slug.to_sym] || slug.capitalize
       @posts = []
     end
 

data/lib/dimples/configuration.rb

@@ -4,83 +4,70 @@ module Dimples
   # A class that models a site's configuration.
   class Configuration
     def initialize(config = {})
-      @settings = Dimples::Configuration.default_settings
-
-      config.each_key do |key|
-        if @settings[key].is_a?(Hash)
-          @settings[key].merge!(config[key])
-        else
-          @settings[key] = config[key]
-        end
-      end
+      @settings = Configuration.default_settings.merge(config)
     end
 
     def [](key)
       @settings[key]
     end
 
-    def class_override(type)
-      klass = @settings['class_overrides'][type.to_s]
-      Object.const_get(klass) unless klass.nil?
-    end
-
     def self.default_settings
       {
-        'source_path' => Dir.pwd,
-        'destination_path' => File.join(Dir.pwd, 'site'),
-        'verbose_logging' => false,
-        'class_overrides' => { site: nil, post: nil },
-        'rendering' => {},
-        'category_names' => {},
-        'paths' => default_paths,
-        'layouts' => default_layouts,
-        'pagination' => default_pagination,
-        'generation' => default_generation,
-        'date_formats' => default_date_formats
+        source_path: Dir.pwd,
+        destination_path: File.join(Dir.pwd, 'site'),
+        verbose_logging: false,
+        class_overrides: { site: nil, post: nil },
+        rendering: {},
+        category_names: {},
+        paths: default_paths,
+        layouts: default_layouts,
+        pagination: default_pagination,
+        generation: default_generation,
+        date_formats: default_date_formats
       }
     end
 
     def self.default_layouts
       {
-        'posts' => 'posts',
-        'post' => 'post',
-        'category' => 'category',
-        'year_archives' => 'year_archives',
-        'month_archives' => 'month_archives',
-        'day_archives' => 'day_archives'
+        posts: 'posts',
+        post: 'post',
+        category: 'category',
+        year_archives: 'year_archives',
+        month_archives: 'month_archives',
+        day_archives: 'day_archives'
       }
     end
 
     def self.default_paths
       {
-        'archives' => 'archives',
-        'posts' => 'archives/%Y/%m/%d',
-        'categories' => 'archives/categories'
+        archives: 'archives',
+        posts: 'archives/%Y/%m/%d',
+        categories: 'archives/categories'
       }
     end
 
     def self.default_pagination
       {
-        'per_page' => 10
+        per_page: 10
       }
     end
 
     def self.default_generation
       {
-        'categories' => true,
-        'year_archives' => true,
-        'month_archives' => true,
-        'day_archives' => true,
-        'feeds' => true,
-        'category_feeds' => true
+        categories: true,
+        year_archives: true,
+        month_archives: true,
+        day_archives: true,
+        feeds: true,
+        category_feeds: true
       }
     end
 
     def self.default_date_formats
       {
-        'year' => '%Y',
-        'month' => '%Y-%m',
-        'day' => '%Y-%m-%d'
+        year: '%Y',
+        month: '%Y-%m',
+        day: '%Y-%m-%d'
       }
     end
   end

data/lib/dimples/page.rb

@@ -21,7 +21,7 @@ module Dimples
 
       if @path
         @filename = File.basename(@path, File.extname(@path))
-        @output_directory = File.dirname(@path).gsub(
+        @output_directory = File.dirname(@path).sub(
           @site.source_paths[:pages],
           @site.output_paths[:site]
         )

data/lib/dimples/pagination.rb

@@ -5,9 +5,9 @@ module Dimples
   module Pagination
     def paginate(site, items, path, layout, options = {})
       context = options.delete(:context) || {}
-      url = path.gsub(site.output_paths[:site], '') + '/'
+      url = path.sub(site.output_paths[:site], '') + '/'
       per_page = options.delete(:per_page) ||
-                 site.config['pagination']['per_page']
+                 site.config[:pagination][:per_page]
 
       pager = Pager.new(url, items, per_page, options)
 

data/lib/dimples/post.rb

@@ -22,7 +22,7 @@ module Dimples
 
       @filename = 'index'
       @slug = parts[4]
-      @layout = @site.config['layouts']['post']
+      @layout = @site.config[:layouts][:post]
 
       self.date = Time.mktime(parts[1], parts[2], parts[3])
 

data/lib/dimples/renderable.rb

@@ -38,8 +38,8 @@ module Dimples
         callback = proc { contents }
 
         if @path
-          ext = File.extname(@path)[1..-1]
-          options = @site.config['rendering'][ext] || {}
+          extension = File.extname(@path)[1..-1]
+          options = @site.config[:rendering][extension.to_sym] || {}
           Tilt.new(@path, options, &callback)
         else
           Tilt::StringTemplate.new(&callback)

data/lib/dimples/site.rb

@@ -17,8 +17,8 @@ module Dimples
     attr_accessor :post_class
     attr_accessor :errors
 
-    def initialize(config)
-      @config = config
+    def initialize(config = {})
+      @config = Dimples::Configuration.new(config)
 
       @templates = {}
       @categories = {}
@@ -29,18 +29,24 @@ module Dimples
       @archives = { year: {}, month: {}, day: {} }
       @latest_post = false
 
-      @post_class = @config.class_override(:post) || Dimples::Post
+      @post_class = if @config[:class_overrides][:post]
+                      Object.const_get(config[:class_overrides][:post])
+                    else
+                      Dimples::Post
+                    end
 
-      @source_paths = { root: File.expand_path(@config['source_path']) }
-      @output_paths = { site: File.expand_path(@config['destination_path']) }
+      @source_paths = { root: File.expand_path(@config[:source_path]) }
+      @output_paths = { site: File.expand_path(@config[:destination_path]) }
 
       %w[pages posts public templates].each do |path|
         @source_paths[path.to_sym] = File.join(@source_paths[:root], path)
       end
 
       %w[archives posts categories].each do |path|
-        output_path = File.join(@output_paths[:site], @config['paths'][path])
-        @output_paths[path.to_sym] = output_path
+        path_sym = path.to_sym
+        @output_paths[path_sym] = File.join(
+          @output_paths[:site], @config[:paths][path_sym]
+        )
       end
     end
 
@@ -53,7 +59,7 @@ module Dimples
       unless @posts.count.zero?
         generate_posts
         generate_archives
-        generate_categories if @config['generation']['categories']
+        generate_categories if @config[:generation][:categories]
       end
 
       copy_assets
@@ -68,7 +74,7 @@ module Dimples
     end
 
     def scan_files
-      Dimples.logger.debug('Scanning files...') if @config['verbose_logging']
+      Dimples.logger.debug('Scanning files...') if @config[:verbose_logging]
 
       scan_templates
       scan_pages
@@ -83,8 +89,8 @@ module Dimples
         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}"
+          relative_path = parent_path.sub(@source_paths[:templates], '')[1..-1]
+          slug = relative_path.sub(File::SEPARATOR, '.') + ".#{template.slug}"
         end
 
         @templates[slug] = template
@@ -144,7 +150,7 @@ module Dimples
     end
 
     def generate_posts
-      if @config['verbose_logging']
+      if @config[:verbose_logging]
         Dimples.logger.debug_generation('posts', @posts.length)
       end
 
@@ -154,14 +160,14 @@ module Dimples
         self,
         @posts,
         @output_paths[:archives],
-        @config['layouts']['posts']
+        @config[:layouts][:posts]
       )
 
-      generate_posts_feeds if @config['generation']['feeds']
+      generate_posts_feeds if @config[:generation][:feeds]
     end
 
     def generate_pages
-      if @config['verbose_logging']
+      if @config[:verbose_logging]
         Dimples.logger.debug_generation('pages', @pages.length)
       end
 
@@ -169,7 +175,7 @@ module Dimples
     end
 
     def generate_categories
-      if @config['verbose_logging']
+      if @config[:verbose_logging]
         Dimples.logger.debug_generation('category pages', @categories.length)
       end
 
@@ -185,31 +191,32 @@ module Dimples
           self,
           category.posts,
           path,
-          @config['layouts']['category'],
+          @config[:layouts][:category],
           options
         )
       end
 
-      generate_category_feeds if @config['generation']['category_feeds']
+      generate_category_feeds if @config[:generation][:category_feeds]
     end
 
     def generate_archives
       %w[year month day].each do |date_type|
-        next unless @config['generation']["#{date_type}_archives"]
+        date_archives_sym = "#{date_type}_archives".to_sym
+        next unless @config[:generation][date_archives_sym]
 
         @archives[date_type.to_sym].each do |date, posts|
-          year, month, day = date.split('/')
+          year, month, day = date.split('-')
 
           dates = { year: year }
           dates[:month] = month if month
           dates[:day] = day if day
 
           path = File.join(@output_paths[:archives], dates.values)
-          layout = @config['layouts']["#{date_type}_archives"]
+          layout = @config[:layouts][date_archives_sym]
 
           options = {
             context: dates,
-            title: posts[0].date.strftime(@config['date_formats'][date_type])
+            title: posts[0].date.strftime(@config[:date_formats][date_type.to_sym])
           }
 
           paginate(self, posts, path, layout, options)
@@ -233,14 +240,14 @@ module Dimples
     end
 
     def generate_posts_feeds
-      posts = @posts[0..@config['pagination']['per_page'] - 1]
+      posts = @posts[0..@config[:pagination][:per_page] - 1]
       generate_feeds(@output_paths[:site], posts: posts)
     end
 
     def generate_category_feeds
       @categories.each_value do |category|
         path = File.join(@output_paths[:categories], category.slug)
-        posts = category.posts[0..@config['pagination']['per_page'] - 1]
+        posts = category.posts[0..@config[:pagination][:per_page] - 1]
 
         generate_feeds(path, posts: posts, category: category.slug)
       end
@@ -252,7 +259,7 @@ module Dimples
 
     def copy_assets
       if Dir.exist?(@source_paths[:public])
-        Dimples.logger.debug('Copying assets...') if @config['verbose_logging']
+        Dimples.logger.debug('Copying assets...') if @config[:verbose_logging]
 
         path = File.join(@source_paths[:public], '.')
         FileUtils.cp_r(path, @output_paths[:site])
@@ -274,11 +281,11 @@ module Dimples
     end
 
     def archive_month(year, month)
-      @archives[:month]["#{year}/#{month}"] ||= []
+      @archives[:month]["#{year}-#{month}"] ||= []
     end
 
     def archive_day(year, month, day)
-      @archives[:day]["#{year}/#{month}/#{day}"] ||= []
+      @archives[:day]["#{year}-#{month}-#{day}"] ||= []
     end
   end
 end

data/lib/dimples/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Dimples
-  VERSION = '3.0.7'
+  VERSION = '4.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dimples
 version: !ruby/object:Gem::Version
-  version: 3.0.7
+  version: 4.0.0
 platform: ruby
 authors:
 - Daniel Bogan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-31 00:00:00.000000000 Z
+date: 2017-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
@@ -72,6 +72,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.7'
+- !ruby/object:Gem::Dependency
+  name: little-fixtures
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.1
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement