rticles 0.1.0 → 0.2.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmI4M2E4YzI3Mjg0ZTFjNzI3NmY0YzU5YjliYWY1MWM1Y2UwZGRmYw==
+    YTcxY2YyZTYxMTYwOGFlNmJjYmQzZjI0YzFiMThjYmNkYTdhOGQ4MA==
   data.tar.gz: !binary |-
-    NGViZjgyMzQ2ZDJmN2Y3OWY4MzBkMTdhNjIyNDAzOTdlNTBlNjc0Ng==
-!binary "U0hBNTEy":
+    NGQ3NDk4MjhkMmY3NGVlODRlNTI1NDAyMjNlYjU4NDM2ZTcwNWVkNA==
+SHA512:
   metadata.gz: !binary |-
-    MTJjZGM1OGYzYTNhNDFhODJiMzc4YTQ4NWNiOTFhMTMzMzAzMTdhNDBmMzE2
-    OWUwMThhYzEyNjA3YWU0NTMwNjk3ZGQ2ZDc0NWU3ZDlmMmU5YjU4NmJhNTE2
-    ODI1ZGYyYmRmM2QyNzFhNTJlZWE5ZGYwMmZlZDExZjA1YjliY2M=
+    ZWI5MDU0NDhlNTFkMWZhMjc4YmM0MDQ3MTc2ZjBhNWQxYTNjMzgxNDZkYmY2
+    ZDZiMWU4MjBkNTVmNjdkMTI0OWNiYmM5YzE3MWU5NTMxM2RiOTVlZDc5MTRm
+    YjJiMGMxNzJkMWM0OTEyOGM2M2U5OTUwZWY0OWNlNTdjZWY5Mjc=
   data.tar.gz: !binary |-
-    ZTNkZjU2YWEyZjIwM2IyNzUxOTJhOTc2MDgyZDNlNTFiYTQ3NjMwN2Q4NWYy
-    NjM0ZThjNWIwZmFiYzkxODc1MmU0ZjAzNGMxNjE4ZWNiNjE2YmEyMTZhOGM2
-    ZDFjYWJmYjBkZDcwZmE4ZTQzZmFkYzA0N2EyZjg3OTRiMWE0OWI=
+    NjRiZDc3YWE4MTc3NWZiOGJiNjQ4ZDJhNGVmNzQwMzA4NThkMTQyZmU4OTgy
+    MzI2ZGM1Yjg5YzE1ZmQ4Y2MxODM5MDU4NjIxZjZlNTgyOTE3Nzc0MTlkMGI1
+    ODhkMDFmMjU0MjdlZTgyZTRiZGI3ODA2ZGM4YzRiMmM2YjQwN2Y=

data/.travis.yml

@@ -0,0 +1,9 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 2.0.0
+before_script:
+  "pushd spec/dummy && RAILS_ENV=test bundle exec rake db:create db:migrate; popd"
+notifications:
+  recipients:
+    - alerts@oneclickorgs.com

data/README.md

@@ -11,7 +11,7 @@ License
 Rticles is licensed under the [GNU Affero General Public License, Version 3](http://www.fsf.org/licensing/licenses/agpl-3.0.html).
 
     Rticles
-    Copyright (C) 2011, 2012 Circus Foundation
+    Copyright (C) 2011, 2012, 2013 Circus Foundation
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU Affero General Public License as

data/lib/rticles/document.rb

@@ -8,6 +8,7 @@ module Rticles
     TOPIC_RE = /\A#rticles#topic#([A-Za-z_]+) /
     CONTINUATION_RE = /\A#rticles#continue /
     HEADING_RE = /\A#rticles#heading(#\d+|) /
+    LIST_RE = /\A#rticles#list /
 
     has_many :paragraphs, :order => 'position'
     has_many :top_level_paragraphs, :class_name => 'Paragraph', :order => 'position', :conditions => "parent_id IS NULL"
@@ -42,19 +43,21 @@ module Rticles
         if body
           o.push(for_display ? tlp.body_for_display({:insertions => insertions, :choices => choices}.merge(options)) : tlp.body)
           unless tlp.children.empty?
-            o.push(sub_outline(tlp, options))
+            o.push(sub_outline(tlp, options.merge(list: tlp.list?)))
           end
         end
       end
       o
     end
 
-    def to_html
+    def to_html(options={})
       html = "<section>"
       html += Rticles::Paragraph.generate_html(top_level_paragraphs,
-        :insertions => insertions,
-        :choices => choices,
-        :numbering_config => numbering_config
+        {
+          :insertions => insertions,
+          :choices => choices,
+          :numbering_config => numbering_config
+        }.merge(options)
       )
       html += "</section>"
       html.html_safe
@@ -81,6 +84,7 @@ module Rticles
           topic = nil
           continuation = false
           heading = nil
+          list = false
 
           if name_match = text_or_sub_array.match(NAME_RE)
             text_or_sub_array = text_or_sub_array.sub(NAME_RE, '')
@@ -105,13 +109,20 @@ module Rticles
               heading = heading_match[1].sub(/\A#/, '').to_i
             end
           end
+
+          if text_or_sub_array.match(LIST_RE)
+            text_or_sub_array = text_or_sub_array.sub(LIST_RE, '')
+            list = true
+          end
+
           document.paragraphs.create(
             :parent_id => parent ? parent.id : nil,
             :body => text_or_sub_array,
             :name => name,
             :topic => topic,
             :heading => heading,
-            :continuation => continuation
+            :continuation => continuation,
+            :list => list
           )
         when Array
           paragraphs_relation = parent ? parent.children : document.paragraphs.select{|p| p.parent_id.nil?}
@@ -134,9 +145,21 @@ module Rticles
     end
 
     def paragraph_numbers_for_topic(topic, consolidate=false)
-      relevant_paragraphs = paragraphs.where(:topic => topic)
+      paragraph_numbers_for_topics([topic], consolidate)
+    end
+
+    def paragraph_numbers_for_topics(topics, consolidate=false)
+      relevant_paragraphs = paragraphs.where(:topic => topics)
       relevant_paragraphs = relevant_paragraphs.for_choices(choices)
-      paragraph_numbers = relevant_paragraphs.map{|p| p.full_index(true, choices)}.select{|i| !i.nil?}.sort
+      # TODO Sorting by position won't work properly if the query includes
+      # sub-paragraphs, but it is fine for the common case where only
+      # top-level paragraphs have topics.
+      # We should really be sorting by full_index, but
+      # we don't have a sort function for this yet. (A naive typographical
+      # sort isn't good enough.)
+      relevant_paragraphs = relevant_paragraphs.order('position ASC')
+
+      paragraph_numbers = relevant_paragraphs.map{|p| p.full_index(true, choices)}.select{|i| !i.nil?}
 
       if consolidate
         consolidate_paragraph_numbers(paragraph_numbers)
@@ -152,7 +175,7 @@ module Rticles
   protected
 
     def consolidate_paragraph_numbers(numbers)
-      numbers = numbers.sort
+      # numbers = numbers.sort
       consolidated_numbers = []
       current_run = []
       numbers.each do |n|
@@ -185,7 +208,8 @@ module Rticles
       for_display = options[:for_display]
 
       o = []
-      p.children.each do |c|
+      last_index = p.children.length - 1
+      p.children.each_with_index do |c, index|
         body = for_display ? c.body_for_display({:insertions => insertions, :choices => choices}.merge(options)) : c.body
         if body
           o.push(body)
@@ -194,6 +218,20 @@ module Rticles
           end
         end
       end
+      if options[:list]
+        # Add terminating punctuation to the String elements of o, but making the last one a full stop instead of a semicolon.
+        final_element = true
+        o.reverse_each do |p|
+          if p.is_a?(String)
+            if final_element
+              p.sub!(/\Z/, '.')
+              final_element = false
+            else
+              p.sub!(/\Z/, ';')
+            end
+          end
+        end
+      end
       o
     end
   end

data/lib/rticles/generators/install_generator.rb

@@ -12,6 +12,7 @@ module Rticles
 
       def create_migration
         migration_template 'create_documents_and_paragraphs.rb', 'db/migrate/create_documents_and_paragraphs.rb'
+        migration_template 'add_list_to_paragraphs.rb', 'db/migrate/add_list_to_paragraphs.rb'
       end
     end
   end

data/lib/rticles/generators/templates/add_list_to_paragraphs.rb

@@ -0,0 +1,9 @@
+class AddListToParagraphs < ActiveRecord::Migration
+  def self.up
+    add_column :paragraphs, :list, :boolean
+  end
+
+  def self.down
+    remove_column :paragraphs, :list
+  end
+end

data/lib/rticles/generators/update_generator.rb

@@ -0,0 +1,18 @@
+module Rticles
+  module Generators
+    class UpdateGenerator < Rails::Generators::Base
+      include Rails::Generators::Migration
+
+      source_root File.expand_path('../templates', __FILE__)
+
+      def self.next_migration_number(dirname)
+        next_migration_number = current_migration_number(dirname) + 1
+        ActiveRecord::Migration.next_migration_number(next_migration_number)
+      end
+
+      def create_migration
+        migration_template 'add_list_to_paragraphs.rb', 'db/migrate/add_list_to_paragraphs.rb'
+      end
+    end
+  end
+end

data/lib/rticles/paragraph.rb

@@ -3,7 +3,9 @@ require 'acts_as_list'
 module Rticles
   class Paragraph < ActiveRecord::Base
     attr_accessible :body, :parent_id, :after_id, :position, :before_id, :heading, :continuation,
-      :name, :topic
+      :name, :topic, :list
+
+    attr_writer :choices
 
     belongs_to :document
     belongs_to :parent, :class_name => 'Paragraph'
@@ -14,7 +16,7 @@ module Rticles
     scope :for_choices, lambda {|choices|
         choices_condition = ["", {}]
         choices.each do |k, v|
-          choices_condition[0] += "AND body NOT LIKE :#{k}"
+          choices_condition[0] += "AND body NOT LIKE :#{k} "
           choices_condition[1][k.to_sym] = "#rticles##{v ? 'false' : 'true'}##{k}%"
         end
         choices_condition[0].sub!(/\AAND /, '')
@@ -206,7 +208,7 @@ module Rticles
       string.gsub(insertion_re) do |match|
         insertion_name = match.sub('#rticles#', '')
         if insertions[insertion_name].present?
-          insertions[insertion_name]
+          insertions[insertion_name].to_s.gsub("\n", "<br>")
         else
           "[#{insertion_name.humanize.upcase}]"
         end
@@ -249,11 +251,36 @@ module Rticles
 
     def self.generate_html_for_paragraph_groups(paragraph_groups, options={})
       previous_type = nil
-      html = paragraph_groups.inject("") do |memo, paragraph_group|
+
+      # Remove paragraph groups that should not be displayed, given the choices that have been passed in
+      paragraph_groups = paragraph_groups.map do |pg|
+        first_paragraph = pg[0]
+        first_paragraph.choices = options[:choices]
+        if first_paragraph.resolve_choices(first_paragraph.body)
+          pg
+        else
+          nil
+        end
+      end
+      paragraph_groups = paragraph_groups.compact
+
+      # Handle last paragraph group separately so we can do list punctuation if necessary.
+
+      paragraph_groups_except_last = paragraph_groups[0..-2]
+      last_paragraph_group = paragraph_groups[-1]
+
+      html = paragraph_groups_except_last.inject("") do |memo, paragraph_group|
         # FIXME: Don't generate HTML by interpolating into a string;
         # use some standard library function that provides some safe
         # escaping defaults, etc..
-        if paragraph_group.first.heading?
+
+        if options[:list]
+          options[:list_punctuation] = ';'
+        end
+
+        first_paragraph = paragraph_group[0]
+
+        if first_paragraph.heading?
           if previous_type == :paragraph
             memo += "</ol>"
           end
@@ -267,11 +294,42 @@ module Rticles
           unless previous_type == :paragraph
             memo += "<ol>"
           end
-          memo += "<li>#{generate_html_for_paragraphs(paragraph_group, options)}</li>"
+          index = first_paragraph.index(options[:choices])
+          li_opening_tag = "<li value=\"#{index}\">"
+          memo += "#{li_opening_tag}#{generate_html_for_paragraphs(paragraph_group, options)}</li>"
           previous_type = :paragraph
         end
+
         memo
       end
+
+      # Process final paragraph group
+      if options[:list]
+        options[:list_punctuation] = '.'
+      end
+
+      first_paragraph = last_paragraph_group[0]
+
+      if first_paragraph.heading?
+        if previous_type == :paragraph
+          html += "</ol>"
+        end
+        if last_paragraph_group.length == 1
+          html += generate_html_for_paragraphs(last_paragraph_group, options)
+        else
+          html += "<hgroup>#{generate_html_for_paragraphs(last_paragraph_group, options)}</hgroup>"
+        end
+        previous_type = :heading
+      else
+        unless previous_type == :paragraph
+          html += "<ol>"
+        end
+        index = first_paragraph.index(options[:choices])
+        li_opening_tag = "<li value=\"#{index}\">"
+        html += "#{li_opening_tag}#{generate_html_for_paragraphs(last_paragraph_group, options)}</li>"
+        previous_type = :paragraph
+      end
+
       if previous_type == :paragraph
         html += "</ol>"
       end
@@ -283,13 +341,13 @@ module Rticles
         return memo if body.nil?
 
         if paragraph.heading?
-          memo += "<h#{paragraph.heading_level}>#{body}</h#{paragraph.heading_level}>"
+          memo += "<h#{paragraph.heading_level}>#{body}#{options[:list_punctuation]}</h#{paragraph.heading_level}>"
         else
-          memo += body
+          memo += "#{body}#{options[:list_punctuation]}"
         end
 
         if !paragraph.children.empty?
-          memo += generate_html(paragraph.children, options)
+          memo += generate_html(paragraph.children, options.merge(list: paragraph.list?, list_punctuation: nil))
         end
         memo
       end

data/lib/rticles/railtie.rb

@@ -1,5 +1,6 @@
 class Rticles::Railtie < Rails::Railtie
   generators do
     require 'rticles/generators/install_generator'
+    require 'rticles/generators/update_generator'
   end
 end

data/lib/rticles/version.rb

@@ -1,3 +1,3 @@
 module Rticles
-  VERSION = "0.1.0"
+  VERSION = "0.2.1"
 end

data/rticles.gemspec

@@ -12,15 +12,17 @@ Gem::Specification.new do |s|
   s.homepage    = "https://github.com/oneclickorgs/rticles"
   s.summary     = "Consistent editing for legal documents."
   s.description = "Rticles is a Rails plugin that allows for web-based editing of legal documents. It lets you create nested, numbered paragraphs, along with intra-document references that remain accurate as paragraphs are inserted, removed and moved."
+  s.licenses    = ['AGPL-3']
 
   s.files       = `git ls-files`.split($\)
 
   s.add_dependency "rails", "~> 3.2.8"
-  s.add_dependency "acts_as_list", "~>0.1.8"
+  s.add_dependency "acts_as_list", ">=0.1.8", "<0.3.0"
   s.add_dependency "roman-numerals", "~>0.3.0"
 
   s.add_development_dependency "sqlite3"
   s.add_development_dependency "rspec-rails"
   s.add_development_dependency "nokogiri"
   s.add_development_dependency "equivalent-xml"
+  s.add_development_dependency "coveralls"
 end

data/spec/document_spec.rb

@@ -124,6 +124,73 @@ describe Rticles::Document do
     end
   end
 
+  describe "list punctuation" do
+    before(:each) do
+      yaml = File.open('spec/fixtures/list_termination.yml', 'r')
+      @document = Rticles::Document.from_yaml(yaml)
+      @document.save!
+
+      @document.choices = {
+        users: true,
+        employees: true,
+        supporters: true,
+      }
+    end
+
+    it "punctuates lists of sub-clauses correctly when all sub-clauses are present" do
+      expect(@document.outline(for_display: true)).to eq([
+        "The Board shall consist of:",
+        [
+          "Users;",
+          "Employees;",
+          "Supporters."
+        ]
+      ])
+    end
+
+    it "punctuates lists of sub-clauses correctly when some sub-clauses are omitted" do
+      @document.choices = {
+        users: true,
+        employees: true,
+        supporters: false
+      }
+
+      expect(@document.outline(for_display: true)).to eq([
+        "The Board shall consist of:",
+        [
+          "Users;",
+          "Employees."
+        ]
+      ])
+    end
+
+    it "punctuates lists correctly when generating HTML" do
+      @document.choices = {
+        users: true,
+        employees: true,
+        supporters: false
+      }
+
+      expected_html = <<-EOF
+      <section>
+        <ol>
+          <li value="1">
+            The Board shall consist of:
+            <ol>
+              <li value="1">Users;</li>
+              <li value="2">Employees.</li>
+            </ol>
+          </li>
+        </ol>
+      </section>
+      EOF
+
+      html = @document.to_html(with_index: false)
+
+      expect(html).to be_equivalent_to(expected_html)
+    end
+  end
+
   describe "topic lookup" do
     it "takes into account the current choices" do
       @document = Rticles::Document.create
@@ -151,6 +218,17 @@ describe Rticles::Document do
       @document.choices[:single_shareholding] = false
       @document.paragraph_numbers_for_topic('shares', true).should eq "35–40"
     end
+
+    it "can handle multiple topics" do
+      @document = Rticles::Document.create
+      @document.top_level_paragraphs.create(:body => "First shares rule", :topic => 'shares')
+      @document.top_level_paragraphs.create(:body => "Objectives rule", :topic => 'objectives')
+      @document.top_level_paragraphs.create(:body => "Other rule")
+      @document.top_level_paragraphs.create(:body => "Second shares rule", :topic => 'shares')
+
+      @document.paragraph_numbers_for_topics(['shares', 'objectives'], true).should eq '1–2, 4'
+    end
+
   end
 
   describe "numbering config" do

data/spec/dummy/app/views/paragraphs/_paragraph_internal.html.haml

@@ -4,7 +4,7 @@
       = content_tag("h#{paragraph.heading_level}") do
         = paragraph.body_for_display
     - else
-      = simple_format(paragraph.full_index + ' ' + paragraph.body_for_display)
+      = simple_format((paragraph.full_index || '') + ' ' + (paragraph.body_for_display || ''))
     - if @editing
       %p.control
         = link_to "Edit", edit_document_paragraph_path(:document_id => paragraph.document, :id => paragraph), :class => 'edit_paragraph'

data/spec/dummy/config/initializers/session_store.rb

@@ -1,6 +1,6 @@
 # Be sure to restart your server when you modify this file.
 
-Dummy::Application.config.session_store :cookie_store, key: '_dummy_session'
+Dummy::Application.config.session_store :cookie_store, :key => '_dummy_session'
 
 # Use the database for sessions instead of the cookie-based default,
 # which shouldn't be used to store highly confidential information

data/spec/dummy/config/initializers/wrap_parameters.rb

@@ -5,7 +5,7 @@
 
 # Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
 ActiveSupport.on_load(:action_controller) do
-  wrap_parameters format: [:json]
+  wrap_parameters :format => [:json]
 end
 
 # Disable root element in JSON by default.

data/spec/dummy/db/migrate/20140112165306_add_list_to_paragraphs.rb

@@ -0,0 +1,9 @@
+class AddListToParagraphs < ActiveRecord::Migration
+  def self.up
+    add_column :paragraphs, :list, :boolean
+  end
+
+  def self.down
+    remove_column :paragraphs, :list
+  end
+end

data/spec/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20120828203449) do
+ActiveRecord::Schema.define(:version => 20140112165306) do
 
   create_table "documents", :force => true do |t|
     t.string   "title"
@@ -30,6 +30,7 @@ ActiveRecord::Schema.define(:version => 20120828203449) do
     t.string   "topic"
     t.datetime "created_at",   :null => false
     t.datetime "updated_at",   :null => false
+    t.boolean  "list"
   end
 
 end

data/spec/fixtures/list_termination.yml

@@ -0,0 +1,5 @@
+- "#rticles#list The Board shall consist of:"
+-
+  - "#rticles#true#users Users"
+  - "#rticles#true#employees Employees"
+  - "#rticles#true#supporters Supporters"

data/spec/paragraph_spec.rb

@@ -224,21 +224,21 @@ describe Rticles::Paragraph do
           <h2>For demonstration purposes only</h2>
         </hgroup>
         <ol>
-          <li>1 This is the first rule.</li>
-          <li>
+          <li value="1">1 This is the first rule.</li>
+          <li value="2">
             2 This is the second rule, which applies when:
             <ol>
-              <li>2.1 This condition;</li>
-              <li>2.2 and this condition.</li>
+              <li value="1">2.1 This condition;</li>
+              <li value="2">2.2 and this condition.</li>
             </ol>
             except when it is a Full Moon.
           </li>
-          <li>3 This is the third rule.</li>
-          <li>4 This is the fourth rule.</li>
+          <li value="3">3 This is the third rule.</li>
+          <li value="4">4 This is the fourth rule.</li>
         </ol>
         <h2>And finally...</h2>
         <ol>
-          <li>5 This is the final rule.</li>
+          <li value="5">5 This is the final rule.</li>
         </ol>
       </section>
       EOF
@@ -247,5 +247,159 @@ describe Rticles::Paragraph do
 
       html.should be_equivalent_to(expected_html)
     end
+
+    context "with insertions" do
+      it "converts newlines into br tags" do
+        @document.top_level_paragraphs.create(
+          :body => "A custom rule is: #rticles#custom_rule",
+          :after_id => @document.top_level_paragraphs.all[4].id
+        )
+
+        expected_html = <<-EOF
+        <section>
+          <hgroup>
+            <h1>A Simple Constitution</h1>
+            <h2>For demonstration purposes only</h2>
+          </hgroup>
+          <ol>
+            <li value="1">1 This is the first rule.</li>
+            <li value="2">
+              2 This is the second rule, which applies when:
+              <ol>
+                <li value="1">2.1 This condition;</li>
+                <li value="2">2.2 and this condition.</li>
+              </ol>
+              except when it is a Full Moon.
+            </li>
+            <li value="3">3 A custom rule is: I can format my clauses<br>how I<br>please.</li>
+            <li value="4">4 This is the third rule.</li>
+            <li value="5">5 This is the fourth rule.</li>
+          </ol>
+          <h2>And finally...</h2>
+          <ol>
+            <li value="6">6 This is the final rule.</li>
+          </ol>
+        </section>
+        EOF
+
+        @document.insertions = {:custom_rule => "I can format my clauses\nhow I\nplease."}
+
+        html = @document.to_html
+
+        html.should be_equivalent_to(expected_html)
+      end
+    end
+
+    context "with choices" do
+      before(:each) do
+        @document.top_level_paragraphs.create(
+          :body => "#rticles#true#free_cake All members shall be entitled to free cake",
+          :after_id => @document.top_level_paragraphs.all[4].id
+        )
+      end
+
+      it "includes the 'true' clause when the choice is set to true" do
+        expected_html = <<-EOF
+        <section>
+          <hgroup>
+            <h1>A Simple Constitution</h1>
+            <h2>For demonstration purposes only</h2>
+          </hgroup>
+          <ol>
+            <li value="1">1 This is the first rule.</li>
+            <li value="2">
+              2 This is the second rule, which applies when:
+              <ol>
+                <li value="1">2.1 This condition;</li>
+                <li value="2">2.2 and this condition.</li>
+              </ol>
+              except when it is a Full Moon.
+            </li>
+            <li value="3">3 All members shall be entitled to free cake</li>
+            <li value="4">4 This is the third rule.</li>
+            <li value="5">5 This is the fourth rule.</li>
+          </ol>
+          <h2>And finally...</h2>
+          <ol>
+            <li value="6">6 This is the final rule.</li>
+          </ol>
+        </section>
+        EOF
+
+        @document.choices = {:free_cake => true}
+
+        html = @document.to_html
+
+        html.should be_equivalent_to(expected_html)
+      end
+
+      it "excludes the 'true' clause when the choice is set to false" do
+        expected_html = <<-EOF
+        <section>
+          <hgroup>
+            <h1>A Simple Constitution</h1>
+            <h2>For demonstration purposes only</h2>
+          </hgroup>
+          <ol>
+            <li value="1">1 This is the first rule.</li>
+            <li value="2">
+              2 This is the second rule, which applies when:
+              <ol>
+                <li value="1">2.1 This condition;</li>
+                <li value="2">2.2 and this condition.</li>
+              </ol>
+              except when it is a Full Moon.
+            </li>
+            <li value="3">3 This is the third rule.</li>
+            <li value="4">4 This is the fourth rule.</li>
+          </ol>
+          <h2>And finally...</h2>
+          <ol>
+            <li value="5">5 This is the final rule.</li>
+          </ol>
+        </section>
+        EOF
+
+        @document.choices = {:free_cake => false}
+
+        html = @document.to_html
+
+        html.should be_equivalent_to(expected_html)
+      end
+    end
+
+    context "without indexes" do
+      it "works" do
+        expected_html = <<-EOF
+        <section>
+          <hgroup>
+            <h1>A Simple Constitution</h1>
+            <h2>For demonstration purposes only</h2>
+          </hgroup>
+          <ol>
+            <li value="1">This is the first rule.</li>
+            <li value="2">
+              This is the second rule, which applies when:
+              <ol>
+                <li value="1">This condition;</li>
+                <li value="2">and this condition.</li>
+              </ol>
+              except when it is a Full Moon.
+            </li>
+            <li value="3">This is the third rule.</li>
+            <li value="4">This is the fourth rule.</li>
+          </ol>
+          <h2>And finally...</h2>
+          <ol>
+            <li value="5">This is the final rule.</li>
+          </ol>
+        </section>
+        EOF
+
+        html = @document.to_html(:with_index => false)
+
+        html.should be_equivalent_to(expected_html)
+      end
+    end
   end
 end

data/spec/spec_helper.rb

@@ -1,3 +1,6 @@
+require 'coveralls'
+Coveralls.wear!
+
 # This file is copied to spec/ when you run 'rails generate rspec:install'
 ENV["RAILS_ENV"] ||= 'test'
 require File.expand_path("../dummy/config/environment", __FILE__)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rticles
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Chris Mear
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-01 00:00:00.000000000 Z
+date: 2014-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -28,16 +28,22 @@ dependencies:
   name: acts_as_list
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.1.8
+    - - <
+      - !ruby/object:Gem::Version
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.1.8
+    - - <
+      - !ruby/object:Gem::Version
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: roman-numerals
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +114,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Rticles is a Rails plugin that allows for web-based editing of legal
   documents. It lets you create nested, numbered paragraphs, along with intra-document
   references that remain accurate as paragraphs are inserted, removed and moved.
@@ -119,6 +139,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -128,7 +149,9 @@ files:
 - lib/rticles.rb
 - lib/rticles/document.rb
 - lib/rticles/generators/install_generator.rb
+- lib/rticles/generators/templates/add_list_to_paragraphs.rb
 - lib/rticles/generators/templates/create_documents_and_paragraphs.rb
+- lib/rticles/generators/update_generator.rb
 - lib/rticles/numbering.rb
 - lib/rticles/paragraph.rb
 - lib/rticles/railtie.rb
@@ -179,6 +202,7 @@ files:
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/db/migrate/20120828203449_create_documents_and_paragraphs.rb
+- spec/dummy/db/migrate/20140112165306_add_list_to_paragraphs.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/lib/assets/.gitkeep
 - spec/dummy/log/.gitkeep
@@ -189,13 +213,15 @@ files:
 - spec/dummy/script/rails
 - spec/fixtures/constitution.yml
 - spec/fixtures/ips.yml
+- spec/fixtures/list_termination.yml
 - spec/fixtures/simple.yml
 - spec/paragraph_spec.rb
 - spec/spec_helper.rb
 - spec/support/custom_matchers.rb
 - spec/support/document_macros.rb
 homepage: https://github.com/oneclickorgs/rticles
-licenses: []
+licenses:
+- AGPL-3
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -213,7 +239,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Consistent editing for legal documents.