dimples 1.3.2 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5c65d03c199955ae095e192c3c8346b89bd58ed
-  data.tar.gz: 8ad9c5458cea55b0db90612d80d49e23d7adc6be
+  metadata.gz: 2cee8ecb479f503e8ece058309263c9e2938cd43
+  data.tar.gz: 91394c39524a45ba5799c84ba19a206cb9cb43f0
 SHA512:
-  metadata.gz: 409da9ce05cb4917ab8a63d4a60df7a89ad83ef884953593f1891f66938f77f386589d8d51d73346e04cddd8da5fefe0c347e54e40f077a8917d5714cd38994d
-  data.tar.gz: f8c53a1fa44dc0f75365a52edf8fa38e178fe52434455fece6adf4932542efc37b6d81a4e3fc0837bd30ce8383a061f4b9fb47afbf76af1f2bec82c79f499e2a
+  metadata.gz: 2571e6458603880d8d1dd9f05f86ccfe6ce8197a1a15402dd6b2312581b3543d3e3a2c377fd43687597b6ee6555e9bf7aeb0997a347924341b33a9ca601aecc5
+  data.tar.gz: 10a1c214aab4f4bef3c1f2c29afee61897d27aca18c1abc44f16a2f9778d2f10b9c89ed22dcc9d9c63a5c1164102ff208174b666e9d48b1704c2fdbdfaa56af2

data/lib/dimples.rb

@@ -11,7 +11,6 @@ require 'dimples/writeable'
 require 'dimples/renderable'
 
 require 'dimples/configuration'
-require 'dimples/category'
 require 'dimples/page'
 require 'dimples/post'
 require 'dimples/site'

data/lib/dimples/configuration.rb

@@ -68,8 +68,7 @@ module Dimples
           'day' => '%Y-%m-%d',
         },
 
-        'categories' => [
-        ]
+        'category_names' => {}
       }
     end
   end

data/lib/dimples/post.rb

@@ -44,28 +44,12 @@ module Dimples
       @day = @date.strftime('%d')
 
       @contents = read_with_yaml(path)
-
     end
 
     def contents
       @contents
     end
 
-    def categories=(slugs)
-      @categories = {}
-
-      slugs.each do |slug|
-        @site.categories[slug] ||= Dimples::Category.new(slug)
-        @site.categories[slug].posts << self
-
-        @categories[slug] ||= @site.categories[slug]
-      end
-    end
-
-    def categories
-      @categories
-    end
-
     def output_file_path(parent_path)
       parts = [parent_path]
 

data/lib/dimples/site.rb

@@ -45,7 +45,6 @@ module Dimples
       @generation_options.merge!(options)
 
       prepare_site
-      prepare_categories
       scan_files
       generate_files
       copy_assets
@@ -67,12 +66,6 @@ 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_pages
@@ -97,6 +90,10 @@ module Dimples
         post = @post_class.new(self, path)
         next if !@generation_options[:include_drafts] && post.draft
 
+        post.categories.each do |slug|
+          (@categories[slug] ||= []) << post
+        end
+
         %w[year month day].each do |date_type|
           if @config['generation']["#{date_type}_archives"]
 
@@ -143,8 +140,9 @@ module Dimples
     end
 
     def generate_categories
-      @categories.each_value do |category|
-        paginate(posts: category.posts, title: category.name, paths: [@output_paths[:categories], category.slug], layout: @config['layouts']['category'])
+      @categories.each do |slug, posts|
+        category_name = @config['category_names'][slug] || slug.capitalize
+        paginate(posts: posts, title: category_name, paths: [@output_paths[:categories], slug], layout: @config['layouts']['category'])
       end
     end
 
@@ -181,8 +179,8 @@ module Dimples
     end
 
     def generate_category_feeds
-      @categories.each_value do |category|
-        generate_feed(File.join(@output_paths[:categories], category.slug), {posts: category.posts[0..@config['pagination']['per_page'] - 1], category: category.slug})
+      @categories.each do |slug, posts|
+        generate_feed(File.join(@output_paths[:categories], slug), {posts: posts[0..@config['pagination']['per_page'] - 1], category: slug})
       end
     end
 

data/lib/dimples/version.rb

@@ -1,3 +1,3 @@
 module Dimples
-  VERSION = "1.3.2"
+  VERSION = "1.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dimples
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.4.0
 platform: ruby
 authors:
 - Daniel Bogan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-18 00:00:00.000000000 Z
+date: 2015-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
@@ -102,7 +102,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/dimples.rb
-- lib/dimples/category.rb
 - lib/dimples/configuration.rb
 - lib/dimples/errors.rb
 - lib/dimples/frontable.rb

data/lib/dimples/category.rb

@@ -1,16 +0,0 @@
-module Dimples
-  class Category
-    include Frontable
-
-    attr_accessor :slug
-    attr_accessor :name
-    attr_accessor :posts
-
-    def initialize(slug, name = nil)
-      @slug = slug
-      @name = name || @slug.capitalize
-
-      @posts = []
-    end
-  end
-end