caracal 1.0.7 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8aeb4bbbf23d57b58d105f3cb14e93721476dccb
-  data.tar.gz: 24a30fd6c194b1ce00d29277a62937c956307494
+  metadata.gz: b18e4eda1bbb02a4efb9191d1c65d99701e54800
+  data.tar.gz: 5720059a89acdabe4f278fff2abb6c08c40ffb99
 SHA512:
-  metadata.gz: 22d42de924ae632ff309b1c74254331d34ab37502a8115960964277657c5b655342439bac025f7ac3b9465126ee3ac1214bc2d8ba6b81f06576eed6d7ffd7feb
-  data.tar.gz: 75e87e2efd8f69ed0803316c5f84fb56812fb768457b6ac4a6d91ce0a16ea6e673f84ba42836314ae8fe3c4253e9998050d51a1bb022a934f9fa0fc03475d53e
+  metadata.gz: 707f70ec9a572317a0bef6d04cb44c7247b9e7d7b1d5baa7d8176eb4297eedfb5a405d8aeeebf7af29827b98955e5582fadb77bdafadce38fa399c15b65d5888
+  data.tar.gz: ef395004b3eef312499f6ea2db4465ec50409f0a75580289d41cd10a98ccec0d0e6942bd651b4059387560dcbf4254488e0dadcdf4338836a2cf204c301e3adc

data/CHANGELOG.md

@@ -1,4 +1,16 @@
-#### v1.0.5
+#### v1.0.8
+
+* Enhancements
+  * Added indentation controls to paragraph commands (@avolochnev).
+
+
+#### v1.0.7
+
+* Enhancements
+  * Added an :orientation option to :page_size so print jobs work as expected (@jdugan h/t @swedishpotato).
+
+
+#### v1.0.6
 
 * Bug Fixes
   * Changed Paragraph and Table Cell Models slightly to allow syntax flexibility with respect to options (@jdugan).

data/README.md

@@ -331,19 +331,22 @@ Paragraph style classes can be defined using the `style` method.  The method acc
 
 ```ruby
 docx.style do
-  id        'Heading1'      # sets the internal identifier for the style.
-  name      'heading 1'     # sets the friendly name of the style.
-  font      'Palantino'     # sets the font family.
-  color     '333333'        # sets the text color. accepts hex RGB.
-  size      28              # sets the font size. units in half points.
-  bold      false           # sets the font weight.
-  italic    false           # sets the font style.
-  underline false           # sets whether or not to underline the text.
-  caps      false           # sets whether or not text should be rendered in all capital letters.
-  align     :left           # sets the alignment. accepts :left, :center, :right, and :both.
-  line      360             # sets the line height. units in twips.
-  top       100             # sets the spacing above the paragraph. units in twips.
-  bottom    0               # sets the spacing below the paragraph. units in twips.
+  id              'Heading1'  # sets the internal identifier for the style.
+  name            'heading 1' # sets the friendly name of the style.
+  font            'Palantino' # sets the font family.
+  color           '333333'    # sets the text color. accepts hex RGB.
+  size            28          # sets the font size. units in half points.
+  bold            false       # sets the font weight.
+  italic          false       # sets the font style.
+  underline       false       # sets whether or not to underline the text.
+  caps            false       # sets whether or not text should be rendered in all capital letters.
+  align           :left       # sets the alignment. accepts :left, :center, :right, and :both.
+  line            360         # sets the line height. units in twips.
+  top             100         # sets the spacing above the paragraph. units in twips.
+  bottom          0           # sets the spacing below the paragraph. units in twips.
+  indent_left     360         # sets the left indent. units in twips.
+  indent_right    360         # sets the rights indent. units in twips.
+  indent_first    720         # sets the first line indent. units in twips.
 end
 ```
 
@@ -631,7 +634,7 @@ end
 If your table contains more complex data (multiple paragraphs, images, lists, etc.), you will probably want to instantiate your `TableCellModel` instances directly.  With the exception of page breaks, table cells can contain anything the document can contain, including another table.
 
 ```ruby
-c1 = Caracal::Core::Models:TableCellModel.new do
+c1 = Caracal::Core::Models::TableCellModel.new do
   background 'cccccc'    # sets the background color. defaults to 'ffffff'.
   margins do
     top                  # sets the top margin. defaults to 0. units in twips.

data/lib/caracal/core/models/style_model.rb

@@ -45,6 +45,9 @@ module Caracal
         attr_reader :style_line
         attr_reader :style_base
         attr_reader :style_next
+        attr_reader :style_indent_left
+        attr_reader :style_indent_right
+        attr_reader :style_indent_first
 
         # initialization
         def initialize(options={}, &block)
@@ -84,7 +87,7 @@ module Caracal
         end
 
         # integers
-        [:bottom, :size, :line, :top].each do |m|
+        [:bottom, :size, :line, :top, :indent_left, :indent_right, :indent_first].each do |m|
           define_method "#{ m }" do |value|
             instance_variable_set("@style_#{ m }", value.to_i)
           end
@@ -126,7 +129,7 @@ module Caracal
         private
 
         def option_keys
-          [:bold, :italic, :underline, :caps, :top, :bottom, :size, :line, :id, :name, :color, :font, :align]
+          [:bold, :italic, :underline, :caps, :top, :bottom, :size, :line, :id, :name, :color, :font, :align, :indent_left, :indent_right, :indent_first]
         end
 
       end

data/lib/caracal/renderers/styles_renderer.rb

@@ -45,7 +45,7 @@ module Caracal
                   xml.send 'w:keepLines',    { 'w:val' => '0' }
                   xml.send 'w:widowControl', { 'w:val' => '1' }
                   xml.send 'w:spacing',      spacing_options(s, true)
-                  xml.send 'w:ind',          { 'w:left' => '0', 'w:firstLine' => '0', 'w:right' => '0' }
+                  xml.send 'w:ind',          indentation_options(s, true)
                   xml.send 'w:jc',           { 'w:val' => s.style_align.to_s }
                 end
               end
@@ -76,6 +76,7 @@ module Caracal
                   xml.send 'w:spacing',           spacing_options(s)                              unless spacing_options(s).nil?
                   xml.send 'w:contextualSpacing', { 'w:val' => '1' }
                   xml.send 'w:jc',                { 'w:val' => s.style_align.to_s }               unless s.style_align.nil?
+                  xml.send 'w:ind',               indentation_options(s)                          unless indentation_options(s).nil?
                 end
                 xml.send 'w:rPr' do
                   xml.send 'w:rFonts',    font_options(s)                                         unless s.style_font.nil?
@@ -125,18 +126,16 @@ module Caracal
         { 'w:cs' => name, 'w:hAnsi' => name, 'w:eastAsia' => name, 'w:ascii' => name }
       end
 
-      def spacing_options(style, default=false)
-        top     = (default) ? style.style_top.to_i    : style.style_top
-        bottom  = (default) ? style.style_bottom.to_i : style.style_bottom
-        line    = style.style_line
-
+      def indentation_options(style, default=false)
+        left    = (default) ? style.style_indent_left.to_i  : style.style_indent_left
+        right   = (default) ? style.style_indent_right.to_i : style.style_indent_right
+        first   = (default) ? style.style_indent_first.to_i : style.style_indent_first
         options = nil
-        if [top, bottom, line].compact.size > 0
-          options               = {}
-          options['w:lineRule'] = 'auto'
-          options['w:before']   = top      unless top.nil?
-          options['w:after']    = bottom   unless bottom.nil?
-          options['w:line']     = line     unless line.nil?
+        if [left, right, first].compact.size > 0
+          options                  = {}
+          options['w:left']        = left    unless left.nil?
+          options['w:right']       = right   unless right.nil?
+          options['w:firstLine']   = first   unless first.nil?
         end
         options
       end
@@ -161,6 +160,22 @@ module Caracal
         }
       end
 
+      def spacing_options(style, default=false)
+        top     = (default) ? style.style_top.to_i    : style.style_top
+        bottom  = (default) ? style.style_bottom.to_i : style.style_bottom
+        line    = style.style_line
+
+        options = nil
+        if [top, bottom, line].compact.size > 0
+          options               = {}
+          options['w:lineRule'] = 'auto'
+          options['w:before']   = top      unless top.nil?
+          options['w:after']    = bottom   unless bottom.nil?
+          options['w:line']     = line     unless line.nil?
+        end
+        options
+      end
+
     end
   end
 end

data/lib/caracal/version.rb

@@ -1,3 +1,3 @@
 module Caracal
-  VERSION = '1.0.7'
+  VERSION = '1.0.8'
 end

data/spec/lib/caracal/core/models/style_model_spec.rb

@@ -107,6 +107,21 @@ describe Caracal::Core::Models::StyleModel do
 
       it { expect(subject.style_top).to eq 100 }
     end
+    describe '.indent_left' do
+      before { subject.indent_left(1440) }
+
+      it { expect(subject.style_indent_left).to eq 1440 }
+    end
+    describe '.indent_right' do
+      before { subject.indent_right(720) }
+
+      it { expect(subject.style_indent_right).to eq 720 }
+    end
+    describe '.indent_right' do
+      before { subject.indent_first(567) }
+
+      it { expect(subject.style_indent_first).to eq 567 }
+    end
 
     # strings
     describe '.id' do
@@ -184,7 +199,7 @@ describe Caracal::Core::Models::StyleModel do
     # .option_keys
     describe '.option_keys' do
       let(:actual)   { subject.send(:option_keys).sort }
-      let(:expected) { [:bold, :italic, :underline, :caps, :top, :bottom, :size, :line, :id, :name, :color, :font, :align].sort }
+      let(:expected) { [:bold, :italic, :underline, :caps, :top, :bottom, :size, :line, :id, :name, :color, :font, :align, :indent_left, :indent_right, :indent_first].sort }
 
       it { expect(actual).to eq expected }
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caracal
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
 platform: ruby
 authors:
 - Trade Infomatics
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-10 00:00:00.000000000 Z
+date: 2016-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri