glyph 0.5.2 → 0.5.3.1

data/spec/tasks/load_spec.rb

@@ -14,59 +14,59 @@ describe "load" do
 
 	it "should raise an error unless PROJECT is a valid project directory" do
 		delete_project
-		lambda { Glyph.run! 'load:all' }.should raise_error
+		expect { Glyph.run! 'load:all' }.to raise_error
 	end
 
 	it "[macros] should load macro definitions" do
-		lambda { Glyph.run! 'load:macros'}.should_not raise_error
-		Glyph::MACROS[:note].blank?.should == false
-		Glyph::MACROS[:"#"].blank?.should == false
+		expect { Glyph.run! 'load:macros'}.not_to raise_error
+		expect(Glyph::MACROS[:note].blank?).to eq(false)
+		expect(Glyph::MACROS[:"#"].blank?).to eq(false)
 	end
 
 	it "[macros] should be able to load only core macros" do
 		language 'core'
-		output_for("$:[options.macro_set|glyph]").blank?.should == true
-		Glyph['options.macro_set'].should == 'glyph'
+		expect(output_for("$:[options.macro_set|glyph]").blank?).to eq(true)
+		expect(Glyph['options.macro_set']).to eq('glyph')
 	end
 	
 	it "[macros] should be able to load only filter macros" do
 		language 'filters'
-		output_for("textile[*test*]").should == "<p><strong>test</strong></p>"
+		expect(output_for("textile[*test*]")).to eq("<p><strong>test</strong></p>")
 	end
 
 	it "[config] should load configuration files and apply overrides" do
     Glyph.config_refresh
-		lambda { Glyph.run! 'load:config'}.should_not raise_error
+		expect { Glyph.run! 'load:config'}.not_to raise_error
 		Glyph['system.quiet'] = true
-		Glyph::PROJECT_CONFIG.blank?.should == false
-		Glyph::SYSTEM_CONFIG.blank?.should == false
-		Glyph['system.structure.headers'].class.to_s.should == "Array"
+		expect(Glyph::PROJECT_CONFIG.blank?).to eq(false)
+		expect(Glyph::SYSTEM_CONFIG.blank?).to eq(false)
+		expect(Glyph['system.structure.headers'].class.to_s).to eq("Array")
 	end
 
 	it "[macros] should load HTML macros as well when generating web output" do
 		Glyph['document.output'] = 'web'
 		Glyph.run! 'load:macros'
-		Glyph::MACROS[:section].blank?.should == false
+		expect(Glyph::MACROS[:section].blank?).to eq(false)
 	end
 
 	it "[layouts] should load layouts" do
 		Glyph['document.output'] = 'web'
 		Glyph.run! 'load:macros'
-		Glyph::MACROS[:"layout/topic"].blank?.should == false
+		expect(Glyph::MACROS[:"layout/topic"].blank?).to eq(false)
 	end
 
 	it "[tasks] should load tasks" do
 		reset_quiet
 		file_copy Glyph::PROJECT/"../files/custom_tasks.rake", Glyph::PROJECT/"lib/tasks/custom_tasks.rake"
 		Glyph.run 'load:all'
-		stdout_for { Glyph.run 'custom:hello'}.should == "Hello, World!\n"
+		expect(stdout_for { Glyph.run 'custom:hello'}).to eq("Hello, World!\n")
 	end
 
 	it "[commands] should load tasks" do
 		reset_quiet
 		file_copy Glyph::PROJECT/"../files/custom_command.rb", Glyph::PROJECT/"lib/commands/custom_command.rb"
 		Glyph.run 'load:all'
-		run_command(['hello']).should == "Hello, World!\n"
+		expect(run_command(['hello'])).to eq("Hello, World!\n")
 	end
 
 end

data/spec/tasks/project_spec.rb

@@ -12,24 +12,24 @@ describe "project:create" do
 	end
 
 	it "should not create a new project if no valid directory is supplied" do
-		lambda { Glyph.run! 'project:create', 'test_dir' }.should raise_error
+		expect { Glyph.run! 'project:create', 'test_dir' }.to raise_error
 	end
 
 	it "should create a new project if an existing empty directory is supplied" do
-		lambda { Glyph.run! 'project:create', Glyph::PROJECT }.should_not raise_error
-		(Glyph::PROJECT/'lib').exist?.should == true
-		(Glyph::PROJECT/'document.glyph').exist?.should == true
-		(Glyph::PROJECT/'config.yml').exist?.should == true
-		(Glyph::PROJECT/'text').exist?.should == true
-		(Glyph::PROJECT/'styles').exist?.should == true
-		(Glyph::PROJECT/'images').exist?.should == true
-		(Glyph::PROJECT/'output').exist?.should == true
+		expect { Glyph.run! 'project:create', Glyph::PROJECT }.not_to raise_error
+		expect((Glyph::PROJECT/'lib').exist?).to eq(true)
+		expect((Glyph::PROJECT/'document.glyph').exist?).to eq(true)
+		expect((Glyph::PROJECT/'config.yml').exist?).to eq(true)
+		expect((Glyph::PROJECT/'text').exist?).to eq(true)
+		expect((Glyph::PROJECT/'styles').exist?).to eq(true)
+		expect((Glyph::PROJECT/'images').exist?).to eq(true)
+		expect((Glyph::PROJECT/'output').exist?).to eq(true)
 	end
 
 	it "should create a project in a directory containing just Gemfiles or hidden files" do
 		file_write Glyph::PROJECT/".test", "..." 
 		file_write Glyph::PROJECT/"Gemfile", "..." 
-		lambda { Glyph.run! 'project:create', Glyph::PROJECT }.should_not raise_error
+		expect { Glyph.run! 'project:create', Glyph::PROJECT }.not_to raise_error
 	end
 end
 
@@ -46,11 +46,11 @@ describe "project:add" do
 
 	it "should add new files to project" do
 		create_project
-		lambda { Glyph.run 'project:add', 'test.textile'}.should_not raise_error
-		(Glyph::PROJECT/'text/test.textile').exist?.should == true
-		lambda { Glyph.run 'project:add', 'test.textile'}.should raise_error
-		lambda { Glyph.run 'project:add', 'chapter1/test.textile'}.should_not raise_error
-		(Glyph::PROJECT/'text/chapter1/test.textile').exist?.should == true
+		expect { Glyph.run 'project:add', 'test.textile'}.not_to raise_error
+		expect((Glyph::PROJECT/'text/test.textile').exist?).to eq(true)
+		expect { Glyph.run 'project:add', 'test.textile'}.to raise_error
+		expect { Glyph.run 'project:add', 'chapter1/test.textile'}.not_to raise_error
+		expect((Glyph::PROJECT/'text/chapter1/test.textile').exist?).to eq(true)
 	end
 
 end

data/styles/coderay.css

@@ -347,3 +347,5 @@ ol.CodeRay li {
 
 .CodeRay .head .head {
   color: #f4f; }
+
+/*# sourceMappingURL=coderay.css.map */

data/styles/coderay.css.map

@@ -0,0 +1,7 @@
+{
+"version": 3,
+"mappings": "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",
+"sources": ["coderay.scss"],
+"names": [],
+"file": "coderay.css"
+}

data/styles/default.css

@@ -103,7 +103,7 @@ blockquote {
   color: #121212; }
 
 table {
-  border: 1px solid black; }
+  border: 1px solid #000; }
 
 th {
   background: #EEE; }
@@ -112,7 +112,7 @@ tr, td, th {
   padding: 5px; }
 
 td, tr, th {
-  border: 1px solid black; }
+  border: 1px solid #000; }
 
 sup {
   font-size: 0.7em;
@@ -133,8 +133,8 @@ sup {
   text-align: center; }
 
 .note, .important, .tip, .caution, .box {
-  border-top: 1px solid black;
-  border-bottom: 1px solid black;
+  border-top: 1px solid #000;
+  border-bottom: 1px solid #000;
   display: block;
   min-height: 50px;
   margin: 1em auto;
@@ -213,10 +213,10 @@ em {
   font-style: italic; }
 
 a {
-  color: #007bc4;
+  color: #007BC4;
   text-decoration: none; }
   a:hover {
-    color: #005b91; }
+    color: #005B91; }
 
 .code > pre {
   -webkit-border-radius: 5px;
@@ -238,7 +238,7 @@ nav, .navigation {
   display: block;
   margin: 1em auto;
   text-align: center;
-  border: 1px solid black; }
+  border: 1px solid #000; }
 
 nav.contents {
   margin: auto;
@@ -270,3 +270,5 @@ body {
 
 code, pre {
   font-family: "Inconsolata", Monospace; }
+
+/*# sourceMappingURL=default.css.map */

data/styles/default.css.map

@@ -0,0 +1,7 @@
+{
+"version": 3,
+"mappings": "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",
+"sources": ["default.scss","definitions.scss"],
+"names": [],
+"file": "default.css"
+}

data/styles/pagination.css

@@ -4,29 +4,23 @@
   @top {
     content: string(book-title) " - " string(chapter-title);
     font-style: italic; }
-
   @bottom {
-    content: counter(page, decimal); } }
-
+    content: counter(page,decimal); } }
 .bodymatter > :nth-child(1) {
   counter-reset: page 1; }
 
 @page frontmatter {
   @bottom {
-    content: counter(page, lower-roman); } }
-
+    content: counter(page,lower-roman); } }
 @page backmatter {
   @bottom {
-    content: counter(page, decimal); } }
-
+    content: counter(page,decimal); } }
 @page :first {
   padding-top: 10%;
   @top {
     content: normal; }
-
   @bottom {
     content: normal; } }
-
 ol.toc {
   margin-left: 1.5em; }
 
@@ -66,7 +60,7 @@ ol.toc {
 .toc > li[class~=chapter]::before {
   content: counter(toc1) ". "; }
 .toc > li[class~=appendix]::before {
-  content: counter(appendix1, upper-latin) ". "; }
+  content: counter(appendix1,upper-latin) ". "; }
 .toc > li[class] {
   margin: 1em 0; }
 .toc ol li[class]::before {
@@ -82,19 +76,19 @@ ol.toc {
 .toc ol li[class~=bodymatter]::before {
   content: counter(toc1) "." counter(toc2) "   "; }
 .toc ol li[class~=appendix]::before {
-  content: counter(appendix1, upper-latin) "." counter(toc2) "   "; }
+  content: counter(appendix1,upper-latin) "." counter(toc2) "   "; }
 .toc ol ol li[class~=bodymatter]::before {
   content: counter(toc1) "." counter(toc2) "." counter(toc3) "   "; }
 .toc ol ol li[class~=appendix]::before {
-  content: counter(appendix1, upper-latin) "." counter(toc2) "." counter(toc3) "   "; }
+  content: counter(appendix1,upper-latin) "." counter(toc2) "." counter(toc3) "   "; }
 .toc ol ol ol li[class~=bodymatter]::before {
   content: counter(toc1) "." counter(toc2) "." counter(toc3) "." counter(toc4) "   "; }
 .toc ol ol ol li[class~=appendix]::before {
-  content: counter(appendix1, upper-latin) "." counter(toc2) "." counter(toc3) "." counter(toc4) "   "; }
+  content: counter(appendix1,upper-latin) "." counter(toc2) "." counter(toc3) "." counter(toc4) "   "; }
 .toc ol ol ol ol li[class~=bodymatter]::before {
   content: counter(toc1) "." counter(toc2) "." counter(toc3) "." counter(toc4) "." counter(toc5) "   "; }
 .toc ol ol ol ol li[class~=appendix]::before {
-  content: counter(appendix1, upper-latin) "." counter(toc2) "." counter(toc3) "." counter(toc4) "." counter(toc5) "   "; }
+  content: counter(appendix1,upper-latin) "." counter(toc2) "." counter(toc3) "." counter(toc4) "." counter(toc5) "   "; }
 
 div.frontmatter {
   page: frontmatter; }
@@ -102,35 +96,35 @@ div.backmatter {
   page: backmatter; }
 
 .bodymatter h2::before, .bodymatter h1:before {
-  content: "Chapter " counter(h2, upper-roman) ":   ";
+  content: "Chapter " counter(h2,upper-roman) ":   ";
   counter-reset: footnote; }
 
 .backmatter h2::before {
-  content: "Appendix " counter(a2, upper-latin) ":   "; }
+  content: "Appendix " counter(a2,upper-latin) ":   "; }
 
 .bodymatter section h1:before {
-  content: "Appendix " counter(a2, upper-latin) ":   "; }
+  content: "Appendix " counter(a2,upper-latin) ":   "; }
 .bodymatter h3::before, .bodymatter section h1:before {
   content: counter(h2) "." counter(h3) "   "; }
 
 .backmatter h3.toc::before {
-  content: counter(a2, upper-latin) "." counter(h3) "   "; }
+  content: counter(a2,upper-latin) "." counter(h3) "   "; }
 
 .bodymatter section section h1.toc:before {
-  content: counter(a2, upper-latin) "." counter(h3) "   "; }
+  content: counter(a2,upper-latin) "." counter(h3) "   "; }
 .bodymatter h4.toc::before, .bodymatter section section h1.toc:before {
   content: counter(h2) "." counter(h3) "." counter(h4) "   "; }
 
 .backmatter h4.toc::before {
-  content: counter(a2, upper-latin) "." counter(h3) "." counter(h4) "   "; }
+  content: counter(a2,upper-latin) "." counter(h3) "." counter(h4) "   "; }
 
 .bodymatter section section section h2.toc:before {
-  content: counter(a2, upper-latin) "." counter(h3) "." counter(h4) "   "; }
+  content: counter(a2,upper-latin) "." counter(h3) "." counter(h4) "   "; }
 .bodymatter h5.toc::before, .bodymatter section section section section h2.toc:before {
   content: counter(h2) "." counter(h3) "." counter(h4) "." counter(h5) "   "; }
 
 .backmatter h5.toc::before, .bodymatter section section section section h2.toc:before {
-  content: counter(a2, upper-latin) "." counter(h3) "." counter(h4) "." counter(h5) "   "; }
+  content: counter(a2,upper-latin) "." counter(h3) "." counter(h4) "." counter(h5) "   "; }
 
 h2, section h1 {
   padding-top: 2em;
@@ -169,7 +163,6 @@ h1, h2, h3, h4, h5 {
 @page {
   @footnotes {
     border-top: 1px solid #000; } }
-
 .fn {
   font-size: 85%;
   margin-left: 1.5em;
@@ -185,3 +178,5 @@ h1, h2, h3, h4, h5 {
   .fn:footnote-marker {
     font-weight: bold;
     margin-right: 0.5em; }
+
+/*# sourceMappingURL=pagination.css.map */

data/styles/pagination.css.map

@@ -0,0 +1,7 @@
+{
+"version": 3,
+"mappings": "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",
+"sources": ["pagination.scss"],
+"names": [],
+"file": "pagination.css"
+}

data/tasks/generate.rake

@@ -25,12 +25,19 @@ namespace :generate do
 				subdir = f.parent.relative_path_from(styles_dir).to_s.gsub(/^\./, '')
 				dir = out_dir/subdir
 				dir.mkpath
-				case
-				when f.extname == ".css" then
+				case f.extname
+				when ".css" then
 					file_copy f, dir/f.basename
-				when f.extname == ".sass" then
-					style = Sass::Engine.new(file_load(f.to_s)).render
-					out_file = dir/f.basename.to_s.gsub(/\.sass$/, '.css')
+				when ".sass", ".scss" then
+					begin
+						require 'sass'
+						style = Sass::Engine.new(file_load(f.to_s), :syntax => f.extname.gsub(/^\./, '').to_sym).render
+					rescue LoadError
+						macro_error "Sass is not installed. Please run: gem install sass"
+					rescue Exception
+						raise
+					end
+					out_file = dir/f.basename.to_s.gsub(/\.s[ac]ss$/, '.css')
 					file_write out_file, style
 				else
 					raise RuntimeError, "Unsupported stylesheet: '#{f.basename}'"

metadata

@@ -1,176 +1,155 @@
 --- !ruby/object:Gem::Specification
 name: glyph
 version: !ruby/object:Gem::Version
-  version: 0.5.2
-  prerelease: 
+  version: 0.5.3.1
 platform: ruby
 authors:
 - Fabio Cevasco
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-10 00:00:00.000000000 Z
+date: 2014-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.4.1
+        version: 2.12.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.4.1
+        version: 2.12.2
 - !ruby/object:Gem::Dependency
   name: extlib
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.9.15
+        version: 0.9.16
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.9.15
+        version: 0.9.16
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.9.2.2
+        version: 10.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.9.2.2
+        version: 10.3.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.11.0
+        version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.11.0
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: 0.8.7.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: 0.8.7.4
 - !ruby/object:Gem::Dependency
   name: directory_watcher
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: 1.5.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: 1.5.1
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 3.2.1
+        version: 3.4.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 3.2.1
+        version: 3.4.5
 - !ruby/object:Gem::Dependency
   name: RedCloth
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 4.2.9
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 4.2.9
 - !ruby/object:Gem::Dependency
   name: bluecloth
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: coderay
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.8
+        version: 1.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.8
+        version: 1.1.0
 description: Glyph is a framework for structured document authoring.
 email: h3rald@h3rald.com
 executables:
@@ -188,8 +167,7 @@ files:
 - CHANGELOG.textile
 - config.yml
 - document.glyph
-- glyph-0.5.1.gem
-- glyph-0.5.2.gem
+- Gemfile.lock
 - glyph.gemspec
 - LICENSE.textile
 - README.textile
@@ -347,12 +325,15 @@ files:
 - spec/tasks/load_spec.rb
 - spec/tasks/project_spec.rb
 - styles/coderay.css
+- styles/coderay.css.map
 - styles/coderay.scss
 - styles/default.css
+- styles/default.css.map
 - styles/default.scss
 - styles/definitions.scss
 - styles/generate
 - styles/pagination.css
+- styles/pagination.css.map
 - styles/pagination.scss
 - styles/ultraviolet/active4d.css
 - styles/ultraviolet/all_hallows_eve.css
@@ -381,27 +362,26 @@ files:
 homepage: http://www.h3rald.com/glyph/
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Glyph -- A Ruby-powered Document Authoring Framework
 test_files:
 - spec/config.yml
@@ -446,4 +426,3 @@ test_files:
 - spec/tasks/generate_spec.rb
 - spec/tasks/load_spec.rb
 - spec/tasks/project_spec.rb
-has_rdoc: