brief 1.10.0 → 1.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c99e43e2cb14081fa9dfb044d30bf1e21771225e
-  data.tar.gz: 75be39413bbe58d8d0169eccc6ae936223635e92
+  metadata.gz: 34377388822fff11372135724730e1748dab72e4
+  data.tar.gz: 25da9b0127fb67a0ddd85bc8f9c88069b7dc02ae
 SHA512:
-  metadata.gz: 2ee79d64d3b01159c7493672b4c7c13ad9bc7fdab0446253729fd037ed0e576a8813676e9d202ca2e26da33108dae58c1859fac7362953b689818e96c1719d0b
-  data.tar.gz: 52992dd1e843eb9259d6210fa828d50c760d6866639280d823b8b2a8581530a38b837647cc21e9464c3a33f44dc591f75a9a241fb637eece79d31cc5a052edc5
+  metadata.gz: 954cb0e8ff81647ca21192495a65c825884076d63e95450d8afc578a30f243b417a42d1e9e941cffd6bbb647a2e4cf05fe1543c57b7392134e32a9ef95783ff1
+  data.tar.gz: 73b3977ab6e15e30dad59a52cc5c50b7b850ee56b99a9717c6ce5da908d81cdcf39fda99f0c0cfa08c2ebfe2e837f0fb60af5757a67bbed009945b194c0b7ee2

data/Gemfile.lock

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

data/apps/blueprint/models/epic.rb

@@ -43,7 +43,8 @@ As a **User** I would like to **Do this** so that I can **succeed**
     define_section "Features" do
       each("h2").has(:title     => "h2",
                      :paragraph => "p:first-of-type",
-                     :components   => "p:first-of-type strong"
+                     :components   => "p:first-of-type strong",
+                     :tasks => "ul li"
                     )
 
       each("h2").is_a :feature

data/lib/brief/briefcase.rb

@@ -192,7 +192,7 @@ module Brief
 
     def model_class_for(document)
       return generic_model_class_for(document) unless uses_app?
-      app_models.find {|k| k.type_alias == document.document_type }
+      app_models.find {|k| k.type_alias == document.document_type } || generic_model_class_for(document)
     end
 
     def generic_model_class_for(document)

data/lib/brief/document/section/builder.rb

@@ -22,7 +22,7 @@ class Brief::Document::Section
       begin
         run
       rescue
-        raise BuilderError
+        raise BuilderError, $!
       end
     end
 
@@ -46,7 +46,12 @@ class Brief::Document::Section
       until even? || maxed_out?
         source.map! do |item|
           level, fragments = item
-          [level, fragments.first]
+
+          [level, (fragments && fragments.first)]
+        end
+
+        if source.any? {|i| i[1].nil? }
+          raise BuilderError, 'Fragments by level seems invalid'
         end
 
         source.each_with_index do |item, index|

data/lib/brief/document/structure.rb

@@ -98,11 +98,16 @@ module Brief
         level, group = item
         group.reject! { |i| i.text == "\n" }
 
+        #puts "Mapping! #{ level } group length: #{ group.length }"
+
         if level == 0
+          #puts "== Condition A"
           base_fragment = fragment = Nokogiri::HTML.fragment("<div class='brief top level'>#{ group.map(&:to_html).join('') }</div>")
         elsif level <= lowest_level
+          #puts "== Condition B"
           fragment = Nokogiri::HTML.fragment("<section>#{ group.map(&:to_html).join('') }</section>")
         elsif level > lowest_level
+          #puts "== Condition C"
           # should be able to look at the document section mappings and
           # apply custom css classes to these based on the name of the section
           fragment = Nokogiri::HTML.fragment("<article>#{ group.map(&:to_html).join('') }</article>")
@@ -114,6 +119,7 @@ module Brief
       begin
         self.fragment = Brief::Document::Section::Builder.run(mapping, low: lowest_level, high: highest_level)
       rescue Brief::Document::Section::BuilderError
+        ##puts "== Error, returning default fragment: #{ $! }"
         @fragment
       end
     end

data/lib/brief/model/serializers.rb

@@ -24,7 +24,9 @@ module Brief::Model::Serializers
       sections: {},
       section_headings: [],
     }.tap do |h|
+
       h[:content] = document.combined_data_and_content if options[:content] || options[:include_content]
+
       h[:rendered] = document.to_html if options[:rendered] || options[:include_rendered]
 
       if options[:attachments] || options[:include_attachments]
@@ -41,10 +43,22 @@ module Brief::Model::Serializers
         schema_url: "/schema/#{ type }",
         actions_url: "/actions/:action/#{ doc_path }"
       } if options[:urls] || options[:include_urls]
-    end.tap do |h|
+
       if document.has_sections?
         h[:section_headings] = document.section_headings
         h[:sections] = document.sections_data
+
+        structure = document.structure
+
+        h[:structure] = {
+          highest_level: structure.highest_level,
+          lowest_level: structure.lowest_level,
+          headings_by_level: (structure.levels.reduce({}) do |m, l|
+            headings = structure.headings_at_level(l.to_i)
+            m[l.to_s] = headings.map(&:heading)
+            m
+          end)
+        }
       end
     end
   end

data/lib/brief/version.rb

@@ -1,3 +1,3 @@
 module Brief
-  VERSION = '1.10.0'
+  VERSION = '1.10.1'
 end

data/spec/fixtures/example/brief.rb

@@ -24,6 +24,12 @@ define "Outline" do
   end
 end
 
+define "CustomModel" do
+  meta do
+    title
+  end
+end
+
 define "Feature" do
   meta do
     title

data/spec/fixtures/example/docs/custom_model.md

@@ -0,0 +1,7 @@
+---
+type: custom_model
+title: Custom Model Example
+---
+
+This document shows that even when you use an app, you can apply your
+own per briefcase model definitions

data/spec/lib/brief/briefcase_spec.rb

@@ -55,7 +55,7 @@ describe "The Briefcase" do
   context "Document Mappings" do
     it "has all of the documents" do
       expect(briefcase.epics.length).to eq(1)
-      expect(briefcase.documents.length).to eq(9)
+      expect(briefcase.documents.length).to be_greater_than(9)
     end
   end
 end

data/spec/lib/brief/repository_spec.rb

@@ -47,7 +47,7 @@ describe "The Brief Document Repository" do
 
     it "supports different operators" do
       query = repository.where(:type.neq => "epic")
-      expect(query.length).to eq(8)
+      expect(query.length).to be_greater_than(8)
     end
 
     it "limits the results to the specified size" do

data/spec/support/test_helpers.rb

@@ -1,3 +1,13 @@
+class Fixnum
+  def greater_than?(other)
+    self > other
+  end
+
+  def greater_than_or_equal_to?(other)
+    self >= other
+  end
+end
+
 module TestHelpers
   def app
     Brief.testcase.server

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brief
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.10.1
 platform: ruby
 authors:
 - Jonathan Soeder
@@ -386,6 +386,7 @@ files:
 - spec/fixtures/example/brief.rb
 - spec/fixtures/example/data/items.json
 - spec/fixtures/example/docs/concept.html.md
+- spec/fixtures/example/docs/custom_model.md
 - spec/fixtures/example/docs/epics/epic.html.md
 - spec/fixtures/example/docs/index.md
 - spec/fixtures/example/docs/page.html.md
@@ -482,6 +483,7 @@ test_files:
 - spec/fixtures/example/brief.rb
 - spec/fixtures/example/data/items.json
 - spec/fixtures/example/docs/concept.html.md
+- spec/fixtures/example/docs/custom_model.md
 - spec/fixtures/example/docs/epics/epic.html.md
 - spec/fixtures/example/docs/index.md
 - spec/fixtures/example/docs/page.html.md