dimples 1.2.7 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a73dc6ff33514291145038bf268afb9accc0850
-  data.tar.gz: 2322912a45d40638953802426d010f94b4f244bf
+  metadata.gz: 6137fed4c04eb60b2980b23535eaa6f2896b29a7
+  data.tar.gz: d067089b92d87469f81dc41f8e746cce3be5981f
 SHA512:
-  metadata.gz: 9c3e1148fc8dd3c9145cfb89e0dacaeb3dddadfc906625bae5f9a8407f6466cf408133af07a50cbc4f0809a5173c988855e843883928b743f71ea2b26ff141bc
-  data.tar.gz: b5d15cac9bcb4a3a9bf51e9c4916ceef8d7020060be89d07dbc123fbd59866a05423213bf558e244e834f2620a4964035dc339abb6e08b1d5a24c61c30d4555b
+  metadata.gz: d936bbfb627af7aec7f603cfa62084e5cfb6734e53c5f1a61211175f18a728cba3f55165caacd68624505724949be075c73853f2a49d22aba0619853334251bb
+  data.tar.gz: 71e5fd671cadeeb9ba4543577d0a562aa190c2dfede666f23aabebbeca2ba66f8d623ba75555f333af2039acc56efb1421fe76f6f9aed35efe1df37a95ff512d

data/lib/dimples/category.rb

@@ -3,16 +3,12 @@ module Dimples
     include Frontable
 
     attr_accessor :slug
-    attr_accessor :path
     attr_accessor :name
     attr_accessor :posts
 
-    def initialize(slug, path)
+    def initialize(slug, name = nil)
       @slug = slug
-      @path = path
-      @name = @slug.capitalize
-
-      read_with_yaml(path)
+      @name = name || @slug.capitalize
 
       @posts = []
     end

data/lib/dimples/configuration.rb

@@ -65,7 +65,10 @@ module Dimples
           'year' => '%Y',
           'month' => '%Y-%m',
           'day' => '%Y-%m-%d',
-        }
+        },
+
+        'categories' => [
+        ]
       }
     end
   end

data/lib/dimples/post.rb

@@ -50,8 +50,10 @@ module Dimples
       @categories = {}
 
       slugs.each do |slug|
+        @site.categories[slug] ||= Dimples::Category.new(slug)
         @site.categories[slug].posts << self
-        @categories[slug] = @site.categories[slug]
+
+        @categories[slug] ||= @site.categories[slug]
       end
     end
 

data/lib/dimples/site.rb

@@ -32,7 +32,7 @@ module Dimples
       @source_paths[:root] = File.expand_path(@config['source_path'])
       @output_paths[:site] = File.expand_path(@config['destination_path'])
 
-      %w{categories pages posts public templates}.each do |path|
+      %w{pages posts public templates}.each do |path|
         @source_paths[path.to_sym] = File.join(@source_paths[:root], path)
       end
 
@@ -41,6 +41,7 @@ module Dimples
 
     def generate
       prepare_site
+      prepare_categories
       scan_files
       generate_files
       copy_assets
@@ -62,9 +63,14 @@ module Dimples
       end
     end
 
+    def prepare_categories
+      @config["categories"].each do |category|
+        @categories[category["slug"]] = Dimples::Category.new(category["slug"], category["name"])
+      end
+    end
+
     def scan_files
       scan_templates
-      scan_categories
       scan_pages
       scan_posts
     end
@@ -76,15 +82,6 @@ module Dimples
       end
     end
 
-    def scan_categories
-      Dir.glob(File.join(@source_paths[:categories], '*.*')).each do |path|
-        slug = File.basename(path, File.extname(path))
-        category = Dimples::Category.new(slug, path)
-
-        @categories[category.slug] = category
-      end
-    end
-
     def scan_pages
       Dir.glob(File.join(@source_paths[:pages], '**', '*.*')).each do |path|
         @pages << @page_class.new(self, path)

data/lib/dimples/version.rb

@@ -1,3 +1,3 @@
 module Dimples
-  VERSION = "1.2.7"
+  VERSION = "1.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dimples
 version: !ruby/object:Gem::Version
-  version: 1.2.7
+  version: 1.3.0
 platform: ruby
 authors:
 - Daniel Bogan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-09 00:00:00.000000000 Z
+date: 2015-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
@@ -62,7 +62,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A basic static site generator