corundum 0.3 → 0.3.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDZjODAzMjAxN2MyYmMzMDA1NjZlYjFmZmVhMTA0ZTNhYzE5Y2VhZg==
+    MzI1YWM4YzFmOWM5MzAwZWE2YmI0ZDA5Mjk4YmI2MWI2OWExN2Q4NQ==
   data.tar.gz: !binary |-
-    NjI5OTU2MjdhZGVhYmUwYTM2Mjc0N2RjYjAxZDgzODZlYTM2YWUyNg==
+    NTI4ZjFmZDg0OThhN2IyMWIwODllZTJhMzVmMzM3MzgwMmYyM2E0Nw==
 SHA512:
   metadata.gz: !binary |-
-    YTRlNDczZTFjMzI4MDQ0NmM4Mzc2Nzg2NDc0NDhmNmVmZmI1YjMwMmRmMDcw
-    ZDBmMTIxMDZiYWM5MGQ1MGIyOThmZTgzMDk5OTZhZjk3ZmUxOGE2MjNiNGY4
-    Y2U3ZTkxZTQ2YzQxZmJjMzdlZTdjNDJjN2ZkMDljZjJjODczY2U=
+    MTJiNDNiNTJmY2JhMTg4NjBjMDdiODY5Y2I3ZjAwOTJlOTU5ZThjYTI4N2Vm
+    ZDM0NThiZTMwMDJkZDNkZDNjNDJiYmE4NWU5NjRhYzg3NzMyYzI2YmM2N2Q2
+    YjhkM2M2Mzc1MGYyMDU0NTUwM2ZhZWRjZmRhYTk3MTkzM2YxYmU=
   data.tar.gz: !binary |-
-    N2Q0YmY2MzFiMzBhODJmM2E1NmM5ZmE0MTM0M2NlMzc2YzVhMWNmMWMxNjk0
-    ZWI4MjUxNDYxYzZmNWIwZDA5ZTQ4Nzg3NThhNTc3NDZhMjUyNWNmYTU5NWJm
-    NzU0ZGFlZDM4NjAxNGIyNWI0M2Q3OGRjOWQ1NWJkZmYxZTFkMmY=
+    ZjBmMjA2ODA5NzRlZGJmZWUwOWI0ZDY4MWJlZjM2N2Q3NjU1Mjk4YWQ3NTNm
+    Mjk2MDE0NGI2ZDk2MjQwNWQxNTU3NWQ2NTliNDM5ZjY0ODBlYTRiNzBkODMx
+    N2Q0OWVkMTlhN2E2ZmUyOGFkM2ZkNjJiOGY4NzY5MzVmNzQ1MzY=

data/lib/corundum/documentation-task.rb

@@ -6,6 +6,7 @@ module Corundum
     setting :browser
     setting :gemspec
 
+    #TODO update to use new paths DSL
     setting :corundum_dir
     setting :docs_root
 
@@ -34,21 +35,21 @@ module Corundum
 
     def resolve_configuration
       super
-      if unset?(docs_root)
+      if field_unset?(:docs_root)
         self.docs_root = File::join(corundum_dir, "docs")
       end
 
-      if unset?(target_dir)
+      if field_unset?(:target_dir)
         self.target_dir = File::join(docs_root, sub_dir)
       else
         self.sub_dir = target_dir.sub(/^#{docs_root}\//,"")
       end
 
-      if unset?(entry_path)
+      if field_unset?(:entry_path)
         self.entry_path = File::join(target_dir, entry_file)
       end
 
-      if unset?(entry_link)
+      if field_unset?(:entry_link)
         self.entry_link = File::join(sub_dir, entry_file)
       end
     end

data/lib/corundum/documentation/assembly.rb

@@ -1,19 +1,27 @@
-require 'corundum/documentation-task'
-require 'mattock/template-host'
 require 'compass'
+require 'corundum/documentation-task'
+#require 'mattock/template-host'
 
 module Corundum
   class DocumentationAssembly < DocumentationTask
-    include Mattock::TemplateTaskLib
 
     title 'Assembled Documentation'
 
+    dir(:assembly_sub, "doc_assembly",
+        dir(:theme_dir, "theme",
+            dir(:theme_sass, "sass",
+               path(:root_stylesheet, "styles"))),
+        path(:index_source, "index.html"))
+
+    dir(:target, path(:stylesheet, "stylesheet.css"))
+
+    setting :templates
+
     setting :sub_dir, "assembled"
     setting :documenters, []
     setting :extra_data, {}
     setting :external_docs, {}
-    setting :stylesheet
-    setting :css_dir, "stylesheets"
+    setting :css_dir, "stylesheets" #XXX
     setting :compass_config, nested(
       :http_path => "/",
       :line_comments => false,
@@ -26,20 +34,37 @@ module Corundum
     def default_configuration(toolkit, *documenters)
       super(toolkit)
       self.documenters = documenters
-      self.templates_are_in(Corundum::configuration_store.valise)
 
-      self.compass_config.http_stylesheets_path = css_dir
-      self.compass_config.project_path = template_path("doc_assembly/theme")
+      self.compass_config.http_stylesheets_path = css_dir #XXX
     end
 
     def resolve_configuration
       super
+      assembly_sub.absolute_path = assembly_sub.relative_path
+      target.absolute_path = target_dir
+
+      resolve_paths
+
+      if field_unset?(:templates)
+        self.templates = Corundum::configuration_store.valise.templates do |mapping|
+          case mapping
+          when "sass", "scss"
+            {:template_options => Compass.sass_engine_options }
+          else
+            nil
+          end
+        end
+      end
+
+      self.compass_config.project_path = templates.find("doc_assembly/theme").full_path
+
       self.documenters = documenters.each_with_object({}) do |doccer, hash|
         hash[File::join(target_dir, doccer.sub_dir)] = doccer
       end
-      if unset?(stylesheet)
+      if field_unset?(:stylesheet)
         self.stylesheet = File::join(target_dir, "stylesheet.css")
       end
+
     end
 
 
@@ -58,18 +83,26 @@ module Corundum
           end
         end
 
-        #Collision of doc groups
+        #XXX Collision of doc groups
         task :collect => documenters.keys
 
         task :setup_compass do
           Compass.add_configuration(compass_config.to_hash, __FILE__)
         end
 
-        template_task("doc_assembly/theme/sass/styles.scss", stylesheet, Compass.sass_engine_options)
-        file stylesheet => [:setup_compass, target_dir]
+        file stylesheet.abspath => [:setup_compass, target.abspath] do |task|
+          template = templates.find(root_stylesheet.abspath).contents
+          File::open(task.name, "w") do |file|
+            file.write(template.render(nil, nil))
+          end
+        end
 
-        template_task("doc_assembly/index.html.erb", entry_point)
-        file entry_point => [stylesheet, target_dir, :collect]
+        file entry_point => [stylesheet.abspath, target.abspath, :collect] do |task|
+          template = templates.find(index_source.abspath).contents
+          File::open(task.name, "w") do |file|
+            file.write(template.render(self, {}))
+          end
+        end
       end
       super
     end

data/lib/corundum/questionable-content.rb

@@ -2,21 +2,6 @@ require 'mattock/tasklib'
 
 module Corundum
   class QuestionableContent < Mattock::Tasklib
-    default_namespace :content
-    setting :type, :debugging
-    setting :words
-    setting :limit, 0
-    setting :comments, false
-    setting :accept_token, /#ok/
-    setting :files
-    setting :qa_rejections
-
-    def default_configuration(core)
-      super
-      core.copy_settings_to(self)
-      self.files = core.file_lists.code
-    end
-
     #I hate putting these lists together. I have to keep reminding myself that
     #it's akin to discussing the use of the word.
     #Also, this is a place I'm especially open to contributions.
@@ -39,6 +24,22 @@ module Corundum
       WORD_SETS[other] = WORD_SETS[name]
     end
 
+    default_namespace :content
+    setting :type, :debugging
+    setting :words
+    setting :limit, 0
+    setting :comments, false
+    setting :accept_token, /#ok/
+    setting :files
+    setting :qa_rejections
+
+    def default_configuration(core)
+      super
+      core.copy_settings_to(self)
+      self.files = core.file_lists.code
+      self.qa_rejections = core.qa_rejections
+    end
+
     def resolve_configuration
       if field_unset?(:words)
         self.words = WORD_SETS.fetch(type.to_s) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: corundum
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: 0.3.1
 platform: ruby
 authors:
 - Judson Lester
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-25 00:00:00.000000000 Z
+date: 2013-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -127,14 +127,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.7'
   prerelease: false
   name: mattock
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.7'
   type: :runtime
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -333,7 +333,7 @@ metadata: {}
 post_install_message: 
 rdoc_options:
 - --title
-- corundum-0.3 RDoc
+- corundum-0.3.1 RDoc
 require_paths:
 - lib/
 required_ruby_version: !ruby/object:Gem::Requirement