konjac 0.3.1 → 0.3.2

data/.gitignore

@@ -2,6 +2,7 @@
 .bundle
 .DS_Store
 Gemfile.lock
+~$*.*
 doc/
 pkg/*
 spec/office/bin/sample.*.diff

data/lib/konjac/office/generic.rb

@@ -41,15 +41,16 @@ module Konjac
         end
       end
 
+      # Provides the delimiters used for Word documents
       def delimiter(type)
         if type.nil?
-          "\v"
+          "\r"
         else
           case type
           when :shape
-            "\r"
-          else
             "\v"
+          else
+            "\r"
           end
         end
       end

data/lib/konjac/office/mac/excel.rb

@@ -17,13 +17,17 @@ module Konjac
         end
 
         def write(text, *args)
-          if args.empty?
+          opts = super(text, *args)
+          if opts.map(&:last).all?(&:nil?)
             @current.formula.set text
-          else
+          elsif opts[:type].nil? || opts[:type].empty?
             opts = parse_args(*args)
             @document.sheets[opts[:sheet]]
                      .rows[opts[:row]]
                      .cells[opts[:cell]].formula.set text
+          else
+            @document.sheets[opts[:sheet]]
+                     .shapes[opts[:row]].text_frame.characters.content.set text
           end
         end
 
@@ -39,18 +43,35 @@ module Konjac
                 tags << temp unless temp.blank?
               end
             end
+
+            # TODO: I should optimize this later like above, to prevent large
+            # shapes from getting out of hand
+            sheet.shapes.get.each_with_index do |shape, index|
+              temp = Tag.new
+              temp.indices = [s + 1, index + 1]
+              temp.removed = temp.added =
+                clean(shape.text_frame.characters.content.get, :shape)
+              temp.type = :shape
+              tags << temp unless temp.blank?
+            end rescue NoMethodError  # ignore sheets without shapes
           end
           tags
         end
 
         # Finds the paragraph indicated by the provided index
+        # TODO: Clean up the second unless statement
         def find(*args)
-          unless args.empty?
-            @indices = args
+          unless args.empty? || args.nil?
             opts = parse_args(*args)
-            @current = @document.sheets[opts[:sheet]]
-                                .rows[opts[:row]]
-                                .cells[opts[:cell]]
+            if (opts[:type].nil? || opts[:type].empty?) && !opts.map(&:last).all?(&:nil?)
+              @index   = [opts[:sheet], opts[:row], opts[:cell]]
+              @current = @document.sheets[opts[:sheet]]
+                                  .rows[opts[:row]]
+                                  .cells[opts[:cell]]
+            elsif opts[:type] == :shape
+              return @document.sheets[opts[:sheet]]
+                              .shapes[opts[:row]].text_frame.characters.content.get
+            end
           end
 
           @current.formula.get
@@ -60,7 +81,7 @@ module Konjac
         # fetches all row and column elements and can thus be very expensive for
         # large spreadsheets.
         def size
-          @document.sheets.inject(0) do |result, sheet|
+          @document.sheets.get.inject(0) do |result, sheet|
             range   = sheet.used_range 
             result += range.rows.get.size * range.columns.get.size
           end
@@ -70,4 +91,3 @@ module Konjac
     end
   end
 end
-

data/lib/konjac/office/mac/power_point.rb

@@ -6,7 +6,6 @@ module Konjac
         def initialize(path = nil)
           super "Microsoft PowerPoint", path
           @strippable = //
-          @delimiter = "\r"
           @parse_order = [:slide, :shape]
           find 1, 1
         end
@@ -42,11 +41,13 @@ module Konjac
 
         # Finds the paragraph indicated by the provided index
         def find(*args)
-          unless args.empty?
+          unless args.empty? || args.nil?
             @indices = args
             opts = parse_args(*args)
-            @current = @document.slides[opts[:slide]]
-                                .shapes[opts[:shape]]
+            unless opts.map(&:last).all?(&:nil?)
+              @current = @document.slides[opts[:slide]]
+                                  .shapes[opts[:shape]]
+            end
           end
 
           @current.text_frame.text_range.content.get

data/lib/konjac/office/mac/word.rb

@@ -50,7 +50,7 @@ module Konjac
             temp = Tag.new
             temp.indices = [index + 1]
             temp.removed = temp.added =
-              clean(shape.text_frame.text_range.content.get)
+              clean(shape.text_frame.text_range.content.get, :shape)
             temp.type = :shape
             tags << temp unless temp.blank?
           end
@@ -91,6 +91,20 @@ module Konjac
         end
         alias :next :succ
 
+        # Provides the delimiters used for Word documents
+        def delimiter(type)
+          if type.nil?
+            "\v"
+          else
+            case type
+            when :shape
+              "\r"
+            else
+              "\v"
+            end
+          end
+        end
+
         # Selects the paragraph indicated by an indicated, or +nil+ to select
         # the current paragraph
         def select(*args)

data/lib/konjac/version.rb

@@ -1,4 +1,4 @@
 module Konjac
   # The current version number of Konjac
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/spec/office/excel_spec.rb

@@ -2,4 +2,100 @@
 require File.dirname(__FILE__) + "/../spec_helper"
 
 describe "Excel", :excel do
+  describe "opening the sample document" do
+    before :all do
+      @export_target = StringIO.new <<-eof
+--- /Users/bryan/Projects/konjac/spec/office/bin/sample.xlsx
++++ /Users/bryan/Projects/konjac/spec/office/bin/sample.xlsx
+@@ 1,1,1 @@
+-=UPPER("Formula")
++=UPPER("Formula")
+@@ 1,2,4 @@
+-32768
++32768
+@@ 1,3,2 @@
+-No formula
++No formula
+@@ 1,5,1 @@
+-Cell with
+-a line break
++Cell with
++a line break
+@@ shape 1,1 @@
+-Text box
+-with soft return
++Text box
++with soft return
+@@ 2,4,3 @@
+-New sheet
++New sheet
+      eof
+      @spec_path = File.dirname(File.expand_path(__FILE__))
+      @path = File.join(@spec_path, "bin", "sample.xlsx")
+      @diff_path = "#{@path}.diff"
+      @book = Office.excel(@path)
+      @original_size = @book.size
+    end
+
+    after :all do
+      @book.close :saving => false
+    end
+
+    it "should open the test document" do
+      @book.read.should == ['=UPPER("Formula")']
+    end
+
+    it "should return the same path" do
+      @book.path.should == @path
+    end
+
+    it "should export tags to a tags file" do
+      File.delete @diff_path rescue Errno::ENOENT
+      @book.export
+      File.exists?(@diff_path).should == true
+    end
+
+    it "should have exported the expected tags" do
+      @export_target.rewind
+      tags = File.open(@diff_path)
+      tags.each_line do |tag|
+        tag.should == @export_target.readline
+      end
+    end
+
+    it "should read some arbitrary items correctly" do
+      @book.read(1, 3, 2).should == ["No formula"]
+      @book.read(1, 5, 1).should == ["Cell with", "a line break"]
+      @book.read(1, 2, 4).should == ["32768"]
+      @book.read(1, 1, :type => :shape).should == ["Text box", "with soft return"]
+    end
+
+    it "should import all tags correctly" do
+      @export_target.rewind
+      @book.find 1, 1, 1
+      index = 0
+      lines = []
+      File.open(@diff_path, "w") do |file|
+        @export_target.each do |line|
+          if line =~ /^\+/ && line !~ /^\+\+\+/
+            line = "#{line.chomp} - #{index}"
+            lines << line[1..-1]
+            index += 1
+          end
+
+          file.puts line
+        end
+      end
+      @book.import
+      @book.data.each do |tag|
+        tag.added.each do |tag_part|
+          tag_part.should == lines.shift
+        end
+      end
+    end
+
+    it "should not have any change in size" do
+      @book.size.should == @original_size
+    end
+  end
 end

data/spec/office/power_point_spec.rb

@@ -2,4 +2,98 @@
 require File.dirname(__FILE__) + "/../spec_helper"
 
 describe "PowerPoint", :power_point do
+  describe "opening the sample document" do
+    before :all do
+      @export_target = StringIO.new <<-eof
+--- /Users/bryan/Projects/konjac/spec/office/bin/sample.pptx
++++ /Users/bryan/Projects/konjac/spec/office/bin/sample.pptx
+@@ 1,1 @@
+-Title
++Title
+@@ 1,2 @@
+-Subtitle
++Subtitle
+@@ 2,1 @@
+-Page title
++Page title
+@@ 2,2 @@
+-Bullet point 1
+-Bullet point 2with a line break
+-Bullet point 3
+-Indented bullet point
++Bullet point 1
++Bullet point 2with a line break
++Bullet point 3
++Indented bullet point
+@@ 2,3 @@
+-Text box
++Text box
+      eof
+      @spec_path = File.dirname(File.expand_path(__FILE__))
+      @path = File.join(@spec_path, "bin", "sample.pptx")
+      @diff_path = "#{@path}.diff"
+      @deck = Office.power_point(@path)
+      @original_size = @deck.size
+    end
+
+    after :all do
+      @deck.close :saving => false
+    end
+
+    it "should open the test document" do
+      @deck.read.should == ["Title"]
+    end
+
+    it "should return the same path" do
+      @deck.path.should == @path
+    end
+
+    it "should export tags to a tags file" do
+      File.delete @diff_path rescue Errno::ENOENT
+      @deck.export
+      File.exists?(@diff_path).should == true
+    end
+
+    it "should have exported the expected tags" do
+      @export_target.rewind
+      tags = File.open(@diff_path)
+      tags.each_line do |tag|
+        tag.should == @export_target.readline
+      end
+    end
+
+    it "should read some arbitrary items correctly" do
+      @deck.read(1, 2).should == ["Subtitle"]
+      @deck.read(2, 2).should == ["Bullet point 1", "Bullet point 2\vwith a line break", "Bullet point 3", "Indented bullet point"]
+      @deck.read(2, 3).should == ["Text box"]
+    end
+
+    it "should import all tags correctly" do
+      @export_target.rewind
+      @deck.find 1, 1, 1
+      index = 0
+      lines = []
+      File.open(@diff_path, "w") do |file|
+        @export_target.each do |line|
+          if line =~ /^\+/ && line !~ /^\+\+\+/
+            line = "#{line.chomp} - #{index}"
+            lines << line[1..-1]
+            index += 1
+          end
+
+          file.puts line
+        end
+      end
+      @deck.import
+      @deck.data.each do |tag|
+        tag.added.each do |tag_part|
+          tag_part.should == lines.shift
+        end
+      end
+    end
+
+    it "should not have any change in size" do
+      @deck.size.should == @original_size
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: konjac
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amatch
-  requirement: &70305013220300 !ruby/object:Gem::Requirement
+  requirement: &70103350529580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70305013220300
+  version_requirements: *70103350529580
 - !ruby/object:Gem::Dependency
   name: git
-  requirement: &70305013219840 !ruby/object:Gem::Requirement
+  requirement: &70103350528820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70305013219840
+  version_requirements: *70103350528820
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70305013219080 !ruby/object:Gem::Requirement
+  requirement: &70103350527780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70305013219080
+  version_requirements: *70103350527780
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70305013218100 !ruby/object:Gem::Requirement
+  requirement: &70103350526520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70305013218100
+  version_requirements: *70103350526520
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70305013216940 !ruby/object:Gem::Requirement
+  requirement: &70103350525840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70305013216940
+  version_requirements: *70103350525840
 - !ruby/object:Gem::Dependency
   name: rb-appscript
-  requirement: &70305013216160 !ruby/object:Gem::Requirement
+  requirement: &70103350525260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70305013216160
+  version_requirements: *70103350525260
 - !ruby/object:Gem::Dependency
   name: sdoc
-  requirement: &70305013215520 !ruby/object:Gem::Requirement
+  requirement: &70103350524360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70305013215520
+  version_requirements: *70103350524360
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &70305013214700 !ruby/object:Gem::Requirement
+  requirement: &70103350522660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70305013214700
+  version_requirements: *70103350522660
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70305013213200 !ruby/object:Gem::Requirement
+  requirement: &70103350521760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70305013213200
+  version_requirements: *70103350521760
 - !ruby/object:Gem::Dependency
   name: autotest
-  requirement: &70305013212040 !ruby/object:Gem::Requirement
+  requirement: &70103350520920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70305013212040
+  version_requirements: *70103350520920
 - !ruby/object:Gem::Dependency
   name: autotest-fsevent
-  requirement: &70305013211000 !ruby/object:Gem::Requirement
+  requirement: &70103350519960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70305013211000
+  version_requirements: *70103350519960
 - !ruby/object:Gem::Dependency
   name: autotest-growl
-  requirement: &70305013210200 !ruby/object:Gem::Requirement
+  requirement: &70103350519460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70305013210200
+  version_requirements: *70103350519460
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70305013209760 !ruby/object:Gem::Requirement
+  requirement: &70103350519040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70305013209760
+  version_requirements: *70103350519040
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70305013209200 !ruby/object:Gem::Requirement
+  requirement: &70103350516560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,7 +164,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70305013209200
+  version_requirements: *70103350516560
 description: A Ruby command-line utility for translating files using a YAML wordlist
 email:
 - bryan.mckelvey@gmail.com
@@ -217,6 +217,8 @@ files:
 - spec/dictionary_spec.rb
 - spec/language_spec.rb
 - spec/office/bin/sample.docx
+- spec/office/bin/sample.pptx
+- spec/office/bin/sample.xlsx
 - spec/office/excel_spec.rb
 - spec/office/generic_spec.rb
 - spec/office/power_point_spec.rb
@@ -254,6 +256,8 @@ test_files:
 - spec/dictionary_spec.rb
 - spec/language_spec.rb
 - spec/office/bin/sample.docx
+- spec/office/bin/sample.pptx
+- spec/office/bin/sample.xlsx
 - spec/office/excel_spec.rb
 - spec/office/generic_spec.rb
 - spec/office/power_point_spec.rb