brief 1.9.12 → 1.9.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 316633c274b953b641bfba353bd834ba968a22a7
-  data.tar.gz: db0f92002cd2c63c2e44dfb89972fec21f1ea9e7
+  metadata.gz: ffd7a1f8f048a0d051ae83e1365775048bc7961e
+  data.tar.gz: 7c3a9ea58040102998143f4e20ef5a289c92bdf1
 SHA512:
-  metadata.gz: 716128ec26d9525c7eddca5c448ff4486a95ac0aff751ba2fd33e38c99981067015e13223cf4d93a07d332a9f7ae627c9a176748117033020c634c967b639a68
-  data.tar.gz: f72905da6879984d8b52b5252024cb1e876781f2fef27c5fb43c3c732332a942ba62337c28ff530ba5e55a114b910f8dd203a3bf27fd4d92e32191cc201da061
+  metadata.gz: ee496381895b9ee3243f8d1e719b02aaef678670609672f52e3c542ada03005e7c4f10985b00f5b642d74bae3493707e3ade50bc48ab22115f0993ac9d8b7c59
+  data.tar.gz: 9e93004ee76ba3fc42b3cf99bcc9c09a4a3ae1e0312895283588cc8f55556a2b73d629faecddc314bf9ef89ae9e24e40dc53ab5ceada036e45b23f7f8df56583

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    brief (1.9.12)
+    brief (1.9.13)
       activesupport (~> 4.0)
       commander (~> 4.3)
       em-websocket (= 0.5.1)

data/lib/brief/document/transformer.rb

@@ -14,10 +14,20 @@ module Brief
 
     def inline_svg_content
       inline_svg_images.each do |img|
-        _, value = img['src'].to_s.split("=")
+        src = img['src'].to_s
 
-        if asset = document.briefcase.find_asset(value)
-          img.replace("<div class='svg-wrapper'>#{ asset.read }</div>")
+        if src.match(/=/)
+          _, value = img['src'].to_s.split("=")
+        else
+          value = src
+        end
+
+        begin
+          if asset = document.briefcase.find_asset(value)
+            img.replace("<div class='svg-wrapper'>#{ asset.read }</div>")
+          end
+        rescue
+          nil
         end
       end
     end
@@ -30,9 +40,14 @@ module Brief
         if instruction == "link" && attribute == "path"
           begin
             link_to_doc = document.briefcase.document_at(value)
-            text = link_to_doc.send(strategy)
-            node.inner_html = text
-            node['href'] = "brief://#{ link_to_doc.path }"
+
+            if link_to_doc.exist?
+              text = link_to_doc.send(strategy)
+              node.inner_html = text
+              node['href'] = "brief://#{ link_to_doc.path }"
+            else
+              node['href'] = "brief://document-not-found"
+            end
           rescue
             nil
           end
@@ -57,6 +72,8 @@ module Brief
           node.replace(replacement) if replacement
         end
       end
+    rescue
+      nil
     end
 
     private

data/lib/brief/document.rb

@@ -31,6 +31,10 @@ module Brief
       self
     end
 
+    def title
+      (data && data.title) || css('h1:first-of-type').text || path.to_s.split("/").last.gsub(/\..*/,'')
+    end
+
     def to_s
       "#{ model_class }.at_path(#{relative_path})"
     end

data/lib/brief/model/serializers.rb

@@ -10,10 +10,6 @@ module Brief::Model::Serializers
       doc_path = path.realpath.relative_path_from(briefcase_docs_path).to_s
     end
 
-    # TEMP
-    title = data.try(:[], :title) || extracted_content_data.try(:title) || (send(:title) rescue nil) || path.basename.to_s.gsub(/\.html.md/,'')
-    title = title.to_s.gsub(/\.md/,'')
-
     {
       data: data,
       extracted: extracted_content_data,

data/lib/brief/model.rb

@@ -29,6 +29,10 @@ module Brief
     end
 
     module AccessorMethods
+      def title
+        document_title
+      end
+
       def document_title
         data.try(:[], :title) ||
         extracted_content_data.try(:title) ||
@@ -265,7 +269,7 @@ module Brief
         definition.send(:section_mappings, *args)
       end
 
-      def generate_template_content_from(object, include_frontmatter = true)
+      def generate_template_content_from(object={}, include_frontmatter = true)
         @erb ||= ERB.new(template_body)
         content = @erb.result(binding)
         frontmatter = object.slice(*attribute_names)

data/lib/brief/repository.rb

@@ -65,6 +65,9 @@ module Brief
     InvalidPath = Class.new(Exception)
 
     def normalize_path(p)
+      p = p.to_s
+      p = p + '.md' unless p.match(/\.\w+$/)
+
       docs_path.join(p).tap do |normalized|
         if normalized.to_s.split("/").length < docs_path.realpath.to_s.split("/").length
           raise InvalidPath

data/lib/brief/version.rb

@@ -1,3 +1,3 @@
 module Brief
-  VERSION = '1.9.12'
+  VERSION = '1.9.13'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brief
 version: !ruby/object:Gem::Version
-  version: 1.9.12
+  version: 1.9.13
 platform: ruby
 authors:
 - Jonathan Soeder