murdoc 0.1.3 → 0.1.5

data/Gemfile

@@ -1,7 +1,9 @@
 source "http://rubygems.org"
 
-gem "jeweler"
-gem "rspec", "~> 2.1.0"
 gem "rdiscount", "~> 1.6.5"
 gem "haml", "~> 3.0.0"
-gem "sass", "~> 3.1.0"
+
+group :development do
+  gem "jeweler"
+  gem "rspec", "~> 2.1.0"  
+end

data/Gemfile.lock

@@ -18,7 +18,6 @@ GEM
     rspec-expectations (2.1.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.1.0)
-    sass (3.1.0.alpha.39)
 
 PLATFORMS
   ruby
@@ -28,4 +27,3 @@ DEPENDENCIES
   jeweler
   rdiscount (~> 1.6.5)
   rspec (~> 2.1.0)
-  sass (~> 3.1.0)

data/README.md

@@ -13,6 +13,8 @@ Example
 
 See example at [GH.pages](http://markiz.github.com/murdoc).
 
+Bonus: [example](http://markiz.github.com/murdoc/docs) of integration with [jsus](http://github.com/markiz/jsus).
+
 License and authorship
 ======================
 

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.5

data/lib/murdoc/paragraph.rb

@@ -34,13 +34,13 @@ module Murdoc
 
     def formatted_source
       @formatted_source ||= if pygments_installed? && options[:highlight_source]
-        IO.popen("pygmentize -l #{source_type} -f html", "w+") do |pipe|
+        IO.popen("pygmentize -l #{source_type} -O encoding=UTF8 -f html -O nowrap", "w+") do |pipe|
           pipe.puts source
           pipe.close_write
           pipe.read
         end
       else
-        "<pre>" + CGI.escapeHTML(source) + "</pre>"
+        CGI.escapeHTML(source)
       end
     end
 

data/markup/stylesheet.css

@@ -1,15 +1,16 @@
 html, body {
-  min-height: 100%; }
+  min-height: 100%;
+  line-height: 1.5; }
 
-p, h1, h2, h3, ol, li, ol, ul, dt, dd, dl, body, html {
+p, h1, h2, h3, ol, li, ul, dt, dd, dl, body, html {
   padding: 0;
   margin: 0; }
 
 body {
-  width: 45%;
+  width: 40%;
   padding-left: 2.5%;
   padding-right: 2.5%;
-  background: #7ba32d;
+  background: #BFA730;
   font-family: Helvetica; }
   body:after {
     content: ".";
@@ -18,30 +19,43 @@ body {
     display: block;
     clear: both; }
 
+figure#relations h2 ~ h2 {
+  margin-top: 1.5em; }
+
 body > * {
   padding-left: 6%;
   padding-right: 6%; }
 
 html {
-  background: #094201; }
+  background: #FFD300; }
 
 header {
   background: rgba(255, 255, 255, 0.1);
-  padding-top: 1em;
   display: block; }
   header dl {
-    margin-top: 1.125em;
-    font-size: 0.75em; }
+    margin-top: 2em;
+    font-size: 0.75em;
+    line-height: 2em;
+    overflow: hidden; }
     header dl dt {
       width: 5em;
       font-weight: bold; }
 
+section, руфвук {
+  float: left;
+  clear: both;
+  width: 88%; }
+
 p, dl, li {
-  color: #c4eeff;
+  color: #665504;
   font-weight: normal; }
 
 a {
-  color: #a41717; }
+  color: #BF7330; }
+  a:hover {
+    color: #FF7800; }
+  a:visited {
+    color: #A64E00; }
 
 p {
   margin-top: 1.5em; }
@@ -50,26 +64,21 @@ h1 {
   font-size: 2em; }
 
 h2 {
-  font-size: 1em;
-  line-height: 2em; }
+  font-size: 1em; }
 
 h1, h2, h3 {
-  color: #a41717; }
+  color: #A41717; }
 
 ol, li {
   margin-left: 1em; }
 
-body > div.paragraph, body > h1, body > h2 {
-  clear: both; }
+body > p, body > h1, body > h2 {
+  clear: left; }
 
 header {
   padding-bottom: 1em;
   overflow: hidden; }
 
-pre {
-  margin-top: 0;
-}
-
 dl {
   clear: left; }
   dl dt, dl dd {
@@ -79,42 +88,33 @@ dl {
   dl dd {
     margin-left: 1em; }
 
-section {
-    clear: both;
-}
-
 figure {
   display: block;
   float: right;
-  margin-right: -112.5%;
-  width: 95%;
+  margin-right: -140%;
+  width: 122.75%;
   clear: right;
-  padding: 2.5em 5% 3em; }
+  padding: 1.5em 5% 3em; }
   figure > ol {
+    text-shadow: 0 1px 0 #FFDE40;
+    -moz-text-shadow: 0 1px 0 #FFDE40;
+    -webkit-text-shadow: 0 1px 0 #FFDE40;
     width: 7.5%;
     text-align: right;
     float: left;
     font-size: 0.8em;
-    color: #7ba32d;
     -webkit-border-radius: 0.2em;
-    background: rgba(255, 255, 255, 0.1);
+    background: rgba(166, 137, 0, 0.1);
     border: 1px solid rgba(0, 0, 0, 0.3);
     list-style: none;
-    margin-left: -11.25%; }
+    margin-left: -9.25%; }
     figure > ol li {
       margin: 0; }
-  figure pre {
-      background: rgba(255, 255, 255, 0.5);
-      border: 1px solid rgba(0, 0, 0, 0.3);
-      border-left: none;
-      margin-bottom: 0;
-      padding-bottom: 0;
-  }
   figure > code, figure > ol {
     font-size: 1em;
     font-family: monospace; }
-  figure ~ figure {
-    padding-top: 1.5em; }
+  figure > code {
+    white-space: pre; }
 
 body .hll {
   background-color: #ffffcc; }
@@ -122,7 +122,7 @@ body .c {
   color: #408080;
   font-style: italic; }
 body .err {
-  border: 1px solid red; }
+  border: 1px solid #FF0000; }
 body .k {
   color: #954121; }
 body .o {
@@ -131,33 +131,33 @@ body .cm {
   color: #408080;
   font-style: italic; }
 body .cp {
-  color: #bc7a00; }
+  color: #BC7A00; }
 body .c1, body .cs {
   color: #408080;
   font-style: italic; }
 body .gd {
-  color: #a00000; }
+  color: #A00000; }
 body .ge {
   font-style: italic; }
 body .gr {
-  color: red; }
+  color: #FF0000; }
 body .gh {
-  color: navy;
+  color: #000080;
   font-weight: bold; }
 body .gi {
-  color: #00a000; }
+  color: #00A000; }
 body .go {
-  color: gray; }
+  color: #808080; }
 body .gp {
-  color: navy;
+  color: #000080;
   font-weight: bold; }
 body .gs {
   font-weight: bold; }
 body .gu {
-  color: purple;
+  color: #800080;
   font-weight: bold; }
 body .gt {
-  color: #0040d0; }
+  color: #0040D0; }
 body .kc {
   color: #954121; }
 body .kd, body .kn {
@@ -169,42 +169,42 @@ body .kr {
   color: #954121;
   font-weight: bold; }
 body .kt {
-  color: #b00040; }
+  color: #B00040; }
 body .m {
   color: #666666; }
 body .s {
   color: #219161; }
 body .na {
-  color: #7d9029; }
+  color: #7D9029; }
 body .nb {
   color: #954121; }
 body .nc {
-  color: blue;
+  color: #0000FF;
   font-weight: bold; }
 body .no {
   color: #880000; }
 body .nd {
-  color: #aa22ff; }
+  color: #AA22FF; }
 body .ni {
   color: #999999;
   font-weight: bold; }
 body .ne {
-  color: #d2413a;
+  color: #D2413A;
   font-weight: bold; }
 body .nf {
-  color: blue; }
+  color: #0000FF; }
 body .nl {
-  color: #a0a000; }
+  color: #A0A000; }
 body .nn {
-  color: blue;
+  color: #0000FF;
   font-weight: bold; }
 body .nt {
   color: #954121;
   font-weight: bold; }
 body .nv {
-  color: #19469d; }
+  color: #19469D; }
 body .ow {
-  color: #aa22ff;
+  color: #AA22FF;
   font-weight: bold; }
 body .w {
   color: #bbbbbb; }
@@ -218,24 +218,24 @@ body .sd {
 body .s2 {
   color: #219161; }
 body .se {
-  color: #bb6622;
+  color: #BB6622;
   font-weight: bold; }
 body .sh {
   color: #219161; }
 body .si {
-  color: #bb6688;
+  color: #BB6688;
   font-weight: bold; }
 body .sx {
   color: #954121; }
 body .sr {
-  color: #bb6688; }
+  color: #BB6688; }
 body .s1 {
   color: #219161; }
 body .ss {
-  color: #19469d; }
+  color: #19469D; }
 body .bp {
   color: #954121; }
 body .vc, body .vg, body .vi {
-  color: #19469d; }
+  color: #19469D; }
 body .il {
   color: #666666; }

data/murdoc.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{murdoc}
-  s.version = "0.1.3"
+  s.version = "0.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mark Abramov"]
-  s.date = %q{2010-11-23}
+  s.date = %q{2010-12-11}
   s.default_executable = %q{murdoc}
   s.description = %q{Annotated documentation generator, see README.md for details}
   s.email = %q{markizko@gmail.com}
@@ -59,28 +59,25 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<jeweler>, [">= 0"])
-      s.add_runtime_dependency(%q<rspec>, ["~> 2.1.0"])
       s.add_runtime_dependency(%q<rdiscount>, ["~> 1.6.5"])
       s.add_runtime_dependency(%q<haml>, ["~> 3.0.0"])
-      s.add_runtime_dependency(%q<sass>, ["~> 3.1.0"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.1.0"])
       s.add_runtime_dependency(%q<haml>, ["~> 3.0.0"])
       s.add_runtime_dependency(%q<rdiscount>, ["~> 1.6.5"])
     else
-      s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<rspec>, ["~> 2.1.0"])
       s.add_dependency(%q<rdiscount>, ["~> 1.6.5"])
       s.add_dependency(%q<haml>, ["~> 3.0.0"])
-      s.add_dependency(%q<sass>, ["~> 3.1.0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<rspec>, ["~> 2.1.0"])
       s.add_dependency(%q<haml>, ["~> 3.0.0"])
       s.add_dependency(%q<rdiscount>, ["~> 1.6.5"])
     end
   else
-    s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<rspec>, ["~> 2.1.0"])
     s.add_dependency(%q<rdiscount>, ["~> 1.6.5"])
     s.add_dependency(%q<haml>, ["~> 3.0.0"])
-    s.add_dependency(%q<sass>, ["~> 3.1.0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<rspec>, ["~> 2.1.0"])
     s.add_dependency(%q<haml>, ["~> 3.0.0"])
     s.add_dependency(%q<rdiscount>, ["~> 1.6.5"])
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Mark Abramov
@@ -14,85 +14,70 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-23 00:00:00 +03:00
+date: 2010-12-11 00:00:00 +03:00
 default_executable: murdoc
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: jeweler
+  name: rdiscount
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
-        - 0
-        version: "0"
+        - 1
+        - 6
+        - 5
+        version: 1.6.5
   type: :runtime
   prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: haml
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         segments: 
-        - 2
-        - 1
+        - 3
         - 0
-        version: 2.1.0
+        - 0
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rdiscount
+  name: jeweler
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         segments: 
-        - 1
-        - 6
-        - 5
-        version: 1.6.5
-  type: :runtime
+        - 0
+        version: "0"
+  type: :development
   prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: haml
+  name: rspec
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         segments: 
-        - 3
-        - 0
-        - 0
-        version: 3.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: sass
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 3
+        - 2
         - 1
         - 0
-        version: 3.1.0
-  type: :runtime
+        version: 2.1.0
+  type: :development
   prerelease: false
-  version_requirements: *id005
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: haml
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -104,10 +89,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *id006
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: rdiscount
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -119,7 +104,7 @@ dependencies:
         version: 1.6.5
   type: :runtime
   prerelease: false
-  version_requirements: *id007
+  version_requirements: *id006
 description: Annotated documentation generator, see README.md for details
 email: markizko@gmail.com
 executables: 
@@ -166,7 +151,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1860456984422582036
+      hash: 959709025
       segments: 
       - 0
       version: "0"