rubyword 1.0.0 → 1.1.0

data/lib/rubyword/writer/part/footer.rb

@@ -20,12 +20,7 @@ module Rubyword
           builder = Nokogiri::XML::Builder.new(:encoding => 'UTF-8') do |xml|
             xml.send('w:ftr', ATTRIBUTE) {
               xml.p {
-                if footer[:text_align]
-                  xml.send('w:pPr') {
-                    xml.send('w:jc', 'w:val' => footer[:text_align])
-                  }
-                end
-                
+                Writer::Style::Paragraph.new(@section, xml, @rubyword).write(footer[:style])
                 nums_type = footer[:nums_type].to_s.downcase
                 if footer[:text].nil? || nums_type == 'roman' || nums_type == 'number'
                   text = 'PAGE'

data/lib/rubyword/writer/part/header.rb

@@ -16,15 +16,11 @@ module Rubyword
         }
 
         def write
-          text_align = @rubyword.header[:text_align]
+          header = @rubyword.header
           builder = Nokogiri::XML::Builder.new(:encoding => 'UTF-8') do |xml|
             xml.send('w:hdr', ATTRIBUTE) {
               xml.p {
-                if text_align
-                  xml.send('w:pPr') {
-                    xml.send('w:jc', 'w:val' => text_align)
-                  }
-                end
+                Writer::Style::Paragraph.new(@section, xml, @rubyword).write(header[:style])
                 xml.send('w:r') { 
                   xml.send('w:t', {'xml:space' => "preserve"}, @rubyword.header[:text])
                 }

data/lib/rubyword/writer/style/base.rb

@@ -5,7 +5,6 @@ module Rubyword
       class Base
         attr_accessor :rubyword, :style, :section, :xml
         def initialize(section, xml, rubyword)
-          @style = section.style
           @section = section
           @xml = xml
           @rubyword = rubyword

data/lib/rubyword/writer/style/paragraph.rb

@@ -0,0 +1,47 @@
+# -*- encoding : utf-8 -*-
+module Rubyword
+  module Writer
+    module Style
+      class Paragraph < Base
+
+        ParagraphStyleList = {
+          text_align: 'w:jc',
+          spacing: 'w:spacing',
+          indent_left: 'w:ind',
+          indent_right: 'w:ind',
+          indent_between: 'w:ind'
+        }.freeze
+
+        # write paragraph style
+        def write(style)
+          return unless !style.nil? && style.is_a?(Hash)
+          @xml.send('w:pPr') {
+            style.keys.each do |style_name|
+              style_name = style_name.to_sym
+              next unless ParagraphStyleList.keys.include?(style_name)
+              value = style[style_name]
+              attribute = case style_name.to_s
+                          when 'spacing'
+                            {'w:after' => value}
+                          when 'indent_left'
+                            {'w:left' => value}
+                          when 'indent_right'
+                            {'w:right' => value}
+                          when 'indent_between'
+                            v = value.split '-'
+                            next unless v.is_a?(Array)
+                            { 'w:left' => v[0].to_i, 'w:right' => v[1].to_i }
+                          when !!value == value
+                            nil
+                          else
+                            {'w:val' => value}
+                          end
+              doc_style = ParagraphStyleList[style_name]
+              @xml.send(doc_style, attribute)
+            end
+          }
+        end
+      end
+    end
+  end
+end

data/lib/rubyword/writer/style/section.rb

@@ -31,7 +31,6 @@ module Rubyword
         def write
           @xml.send('w:sectPr') {
             # header or footerReference
-
             [@rubyword.header, @rubyword.footer].each do |target|
               next if target.nil?
               @xml.send("w:#{target[:type]}Reference", {

data/lib/rubyword/writer/style/word.rb

@@ -0,0 +1,40 @@
+# -*- encoding : utf-8 -*-
+module Rubyword
+  module Writer
+    module Style
+      class Word < Base
+        WordStyleList = {
+          font_size: 'w:sz',
+          color: 'w:color',
+          underline: 'w:u', 
+          blod: 'w:b', 
+          all_caps: 'w:caps',
+          italic: 'w:i',
+          bgcolor: 'w:highlight'
+        }.freeze
+
+        def write(style)
+          if !style.nil? && style.is_a?(Hash)
+            @xml.send('w:rPr') {
+              style.keys.each do |style_name|
+                style_name = style_name.to_sym
+                if WordStyleList.keys.include?(style_name)
+                  value = style[style_name]
+                  attribute = if !!value != value # not a bool type
+                                {'w:val' => value}
+                              else
+                                nil
+                              end
+                  doc_style = WordStyleList[style_name]
+                  @xml.send(doc_style, attribute)
+                  @xml.send('w:szCs', attribute) if style_name == :font_size
+                end
+              end
+            }
+          end
+        end
+
+      end
+    end
+  end
+end

data/rubyword.gemspec

@@ -21,7 +21,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "nokogiri"
-  spec.add_development_dependency "zip"
-  spec.add_development_dependency "open-uri"
+  spec.add_development_dependency "rubyzip"
   spec.add_development_dependency "fastimage"
 end

data/spec/rubyword/document_spec.rb

@@ -1,10 +1,25 @@
 require "spec_helper"
 module Rubyword
   describe Document do
-    describe "#create section" do
-      let(:document) { Rubyword::Document.new }
+    before(:each) do
+      @document = Document.new
+    end 
+    describe "Initialize Document" do
       it "return a document class" do
-        
+        expect(@document.class).to eq(Rubyword::Document)
+      end
+
+      it "return a section" do
+        expect(@document.section.class).to eq(Rubyword::Element::Section)
+      end
+
+      it "add mutiple section" do
+        section1 = @document.section
+        section2 = @document.section
+        section3 = @document.section
+        expect(section1.section_id).to eq(1)
+        expect(section2.section_id).to eq(2)
+        expect(section3.section_id).to eq(3)
       end
     end
   end

data/spec/rubyword/element/page_break_spec.rb

@@ -0,0 +1,55 @@
+require "spec_helper"
+module Rubyword
+  describe Document do
+    before(:each) do
+      @document = Document.new
+    end
+    let(:page_num) { 2 }
+    describe "Add pagebreak" do
+      subject(:pagebreak) { 
+        pagebreak = Element::PageBreak.new(@document)
+        pagebreak.save(page_num)
+        pagebreak
+      }
+
+      it "save page break to PageBreak Object" do
+        expect(pagebreak.numbers.size.to_i).to eq(1)
+      end
+
+      it "check the numbers pop" do
+        number = pagebreak.numbers.pop
+        expect(number).to eq(page_num)
+        expect(pagebreak.numbers.size.to_i).to eq(0)
+      end
+
+      it "Write pagebreak xml" do
+        build = Nokogiri::XML::Builder.new(:encoding => 'UTF-8') do |xml|
+          xml.send('w:document') {
+            xml.send('w:body') {
+              pagebreak.write(nil, xml)
+            }
+          }
+        end
+        result =<<-EOL
+          <?xml version="1.0" encoding="UTF-8"?>
+          <w:document>
+            <w:body>
+              <w:p>
+                <w:r>
+                  <w:br w:type="page"/>
+                </w:r>
+              </w:p>
+              <w:p>
+                <w:r>
+                  <w:br w:type="page"/>
+                </w:r>
+              </w:p>
+            </w:body>
+          </w:document>
+        EOL
+        expect(remove_whitespace(build.to_xml)).to eq(remove_whitespace(result))
+      end
+    end
+
+  end
+end

data/spec/rubyword/element/text_break_spec.rb

@@ -0,0 +1,46 @@
+require "spec_helper"
+module Rubyword
+  describe Document do
+    before(:each) do
+      @document = Document.new
+    end
+    let(:page_num) { 2 }
+    describe "Add TextBreak" do
+      subject(:textbreak) { 
+        textbreak = Element::TextBreak.new(@document)
+        textbreak.save(page_num)
+        textbreak
+      }
+
+      it "save page break to textbreak Object" do
+        expect(textbreak.numbers.size.to_i).to eq(1)
+      end
+
+      it "check the numbers pop" do
+        number = textbreak.numbers.pop
+        expect(number).to eq(page_num)
+        expect(textbreak.numbers.size.to_i).to eq(0)
+      end
+
+      it "Write textbreak xml" do
+        build = Nokogiri::XML::Builder.new(:encoding => 'UTF-8') do |xml|
+          xml.send('w:document') {
+            xml.send('w:body') {
+              textbreak.write(nil, xml)
+            }
+          }
+        end
+        result =<<-EOL
+          <?xml version="1.0" encoding="UTF-8"?>
+          <w:document>
+            <w:body>
+              <w:p/><w:p/>
+            </w:body>
+          </w:document>
+        EOL
+        expect(remove_whitespace(build.to_xml)).to eq(remove_whitespace(result))
+      end
+    end
+
+  end
+end

data/spec/rubyword/element/text_spec.rb

@@ -0,0 +1,50 @@
+require "spec_helper"
+module Rubyword
+  describe Document do
+    before(:each) do
+      @document = Document.new
+    end
+    let(:section) { @document.section }
+    subject(:text_obj) { 
+      Element::Text.new(@document, section)
+    }
+
+    context "Add A Simple Text" do
+      it 'should return nil' do 
+        text = text_obj.save(nil)
+        expect(text).to eq(nil)
+        text = text_obj.save('simple', nil)
+        expect(text).to eq(nil)
+      end
+
+      it 'should return queue object' do
+        text = text_obj.save('sample text', 'text')
+        expect(text.class).to eq(Queue)
+      end
+
+      it 'should return hash' do
+        string = 'sample'
+        text = text_obj.save(string, 'text')
+        expect(text.pop.to_s).to eq({size: 'normal', text: string, style: nil}.to_s)
+      end
+
+      it 'should output xml' do
+        string = 'sample'
+        text_obj.save(string, 'text')
+        build = Nokogiri::XML::Builder.new(:encoding => 'UTF-8') do |xml|
+          text_obj.write(section, xml)
+        end
+        result =<<-EOL
+        <?xml version="1.0" encoding="UTF-8"?>
+          <w:p>
+            <w:r>
+              <w:t xml:space="preserve">sample</w:t>
+            </w:r>
+          </w:p>
+        EOL
+        expect(remove_whitespace(build.to_xml)).to eq(remove_whitespace(result))
+      end
+    end
+    
+  end
+end

data/spec/spec_helper.rb

@@ -1,32 +1,5 @@
 require "rubyword"
-RSpec.configure do |config|
-  # rspec-expectations config goes here. You can use an alternate
-  # assertion/expectation library such as wrong or the stdlib/minitest
-  # assertions if you prefer.
-  config.expect_with :rspec do |expectations|
-    # This option will default to `true` in RSpec 4. It makes the `description`
-    # and `failure_message` of custom matchers include text for helper methods
-    # defined using `chain`, e.g.:
-    #     be_bigger_than(2).and_smaller_than(4).description
-    #     # => "be bigger than 2 and smaller than 4"
-    # ...rather than:
-    #     # => "be bigger than 2"
-    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
-  end
 
-  # rspec-mocks config goes here. You can use an alternate test double
-  # library (such as bogus or mocha) by changing the `mock_with` option here.
-  config.mock_with :rspec do |mocks|
-    # Prevents you from mocking or stubbing a method that does not exist on
-    # a real object. This is generally recommended, and will default to
-    # `true` in RSpec 4.
-    mocks.verify_partial_doubles = true
-  end
-
-  # This option will default to `:apply_to_host_groups` in RSpec 4 (and will
-  # have no way to turn it off -- the option exists only for backwards
-  # compatibility in RSpec 3). It causes shared context metadata to be
-  # inherited by the metadata hash of host groups and examples, rather than
-  # triggering implicit auto-inclusion in groups with matching metadata.
-  config.shared_context_metadata_behavior = :apply_to_host_groups
-end
+def remove_whitespace(wordml)
+  wordml.gsub(/\s+/, ' ').gsub(/(?<keep>>)\s+|\s+(?<keep><)/, '\k<keep>').strip
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubyword
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - young
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-21 00:00:00.000000000 Z
+date: 2017-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -67,21 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: zip
-  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'
-- !ruby/object:Gem::Dependency
-  name: open-uri
+  name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -114,21 +100,56 @@ email:
 - youngjy6@gmail.com
 executables:
 - console
+- run-example
 - setup
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
-- CHANGELOG.txt
+- CHANGELOG.md
 - Gemfile
 - LICENSE
+- README.cn.md
 - README.md
 - Rakefile
 - bin/console
+- bin/run-example
 - bin/setup
 - doc/README.md
+- doc/doc-information.md
+- doc/footer.md
+- doc/header.md
+- doc/image.md
+- doc/link.md
+- doc/list.md
+- doc/paragraph.md
+- doc/table.md
 - doc/text.md
+- doc/title.md
+- doc/toc.md
+- example/doc_information.rb
+- example/footer.rb
+- example/header.rb
+- example/image.rb
+- example/link.rb
+- example/list.rb
+- example/paragraph.rb
+- example/result/.keep
+- example/result/doc-information.docx
+- example/result/footer.docx
+- example/result/header.docx
+- example/result/image.docx
+- example/result/link.docx
+- example/result/list.docx
+- example/result/paragraph.docx
+- example/result/table.docx
+- example/result/test.docx
+- example/result/text.docx
+- example/table.rb
+- example/test.rb
+- example/text.rb
+- example/toc.rb
 - lib/rubyword.rb
 - lib/rubyword/configuration.rb
 - lib/rubyword/document.rb
@@ -137,9 +158,12 @@ files:
 - lib/rubyword/element/link.rb
 - lib/rubyword/element/list.rb
 - lib/rubyword/element/page_break.rb
+- lib/rubyword/element/paragraph.rb
 - lib/rubyword/element/section.rb
+- lib/rubyword/element/table.rb
 - lib/rubyword/element/text.rb
 - lib/rubyword/element/text_break.rb
+- lib/rubyword/style.rb
 - lib/rubyword/version.rb
 - lib/rubyword/writer.rb
 - lib/rubyword/writer/part/base.rb
@@ -160,10 +184,14 @@ files:
 - lib/rubyword/writer/part/toc.rb
 - lib/rubyword/writer/part/web_settings.rb
 - lib/rubyword/writer/style/base.rb
+- lib/rubyword/writer/style/paragraph.rb
 - lib/rubyword/writer/style/section.rb
+- lib/rubyword/writer/style/word.rb
 - rubyword.gemspec
-- sample/test.rb
 - spec/rubyword/document_spec.rb
+- spec/rubyword/element/page_break_spec.rb
+- spec/rubyword/element/text_break_spec.rb
+- spec/rubyword/element/text_spec.rb
 - spec/spec_helper.rb
 - template/fontTable.xml
 - template/theme.xml
@@ -193,5 +221,7 @@ specification_version: 4
 summary: Generate MS Word for ruby
 test_files:
 - spec/rubyword/document_spec.rb
+- spec/rubyword/element/page_break_spec.rb
+- spec/rubyword/element/text_break_spec.rb
+- spec/rubyword/element/text_spec.rb
 - spec/spec_helper.rb
-has_rdoc: