gen_sheet 0.0.4 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc08c206bc562c7453bd04dd705376f6f1c5e268
-  data.tar.gz: 99b212578eabb2dfa471f525ac61bc299c1a2ce2
+  metadata.gz: e186436a668732ade059542eed9ffdf4ebc1f861
+  data.tar.gz: 07920ab7916e4425a0fecf7f1f974e4f739c5a19
 SHA512:
-  metadata.gz: 1b91d5ca089d7b6796469acebd21e9a1c5e3d9c14d1efb11663cd41ff0c66defc214e54b81bcb7db69db867a65931d52b5b7913166eed7bbe3bcedeed2a7f8a2
-  data.tar.gz: bf60356f62cc002ffe7f4d1ea44e8b1fad814a6fd6807ba43e34859e5c9a624e1ea5ccba2a57d705b3fe205c5af2fa21f193d44bc3c3e8101b741e1d8ab2e576
+  metadata.gz: ef77eb88902d6ac5b34a5ed464d79cb6194b334ed891759f0f6cc794a40ad6159e7a04dece6fa18079d1adcc1ce2f4c893d89cd68359513a248dea91e4f70673
+  data.tar.gz: aec344e192676987d5c38aa658a4d1b83dde8928be56604737d72f3b83fb36f6e8a7c441e232942a191c6297042cd18a6611f635ed3b28918251363361e7c662

data/.gitignore

@@ -1,9 +1,8 @@
-*.swo
 *.swp
+*.swo
 .DS_Store
 .project
 Gemfile.lock
-Guardfile
 *.gem
 /tmp
 /spec/files/xls_out.xls

data/.rubocop.yml

@@ -0,0 +1,2 @@
+AsciiComments:
+      Enabled: false

data/Gemfile

@@ -8,4 +8,6 @@ group :development do
   gem 'libnotify'
   gem 'guard'
   gem 'guard-rspec'
+  gem 'rubocop'
+  gem 'guard-rubocop'
 end

data/Guardfile

@@ -0,0 +1,51 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+guard :rspec do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec" }
+
+  # Rails example
+  watch(%r{^app/(.+)\.rb$})                           { |m| "spec/#{m[1]}_spec.rb" }
+  watch(%r{^app/(.*)(\.erb|\.haml)$})                 { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
+  watch(%r{^app/controllers/(.+)_(controller)\.rb$})  { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/acceptance/#{m[1]}_spec.rb"] }
+  watch(%r{^spec/support/(.+)\.rb$})                  { "spec" }
+  watch('config/routes.rb')                           { "spec/routing" }
+  watch('app/controllers/application_controller.rb')  { "spec/controllers" }
+
+  # Capybara features specs
+  watch(%r{^app/views/(.+)/.*\.(erb|haml)$})          { |m| "spec/features/#{m[1]}_spec.rb" }
+
+  # Turnip features and steps
+  watch(%r{^spec/acceptance/(.+)\.feature$})
+  watch(%r{^spec/acceptance/steps/(.+)_steps\.rb$})   { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'spec/acceptance' }
+end
+
+
+guard :rspec do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec" }
+
+  # Rails example
+  watch(%r{^app/(.+)\.rb$})                           { |m| "spec/#{m[1]}_spec.rb" }
+  watch(%r{^app/(.*)(\.erb|\.haml)$})                 { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
+  watch(%r{^app/controllers/(.+)_(controller)\.rb$})  { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/acceptance/#{m[1]}_spec.rb"] }
+  watch(%r{^spec/support/(.+)\.rb$})                  { "spec" }
+  watch('config/routes.rb')                           { "spec/routing" }
+  watch('app/controllers/application_controller.rb')  { "spec/controllers" }
+
+  # Capybara features specs
+  watch(%r{^app/views/(.+)/.*\.(erb|haml)$})          { |m| "spec/features/#{m[1]}_spec.rb" }
+
+  # Turnip features and steps
+  watch(%r{^spec/acceptance/(.+)\.feature$})
+  watch(%r{^spec/acceptance/steps/(.+)_steps\.rb$})   { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'spec/acceptance' }
+end
+
+
+guard :rubocop do
+  watch(%r{.+\.rb$})
+  watch(%r{(?:.+/)?\.rubocop\.yml$}) { |m| File.dirname(m[0]) }
+end

data/gen_sheet.gemspec

@@ -1,9 +1,10 @@
 Gem::Specification.new do |s|
   s.name        = 'gen_sheet'
-  s.version     = '0.0.4'
-  s.summary     = "A spreadsheet generator (ODS, XLS) for Roo."
-  s.description = "Takes a Roo spreadsheet object and renders it in XLS or ODS. Also allows you to use a template sheet and fill it with data from Roo, then output a rendered sheet."
-  s.authors     = ["Rei Kagetsuki"]
+  s.version     = '0.1.0'
+  s.summary     = "A spreadsheet generator (ODS, XLS) and parsing tool. Uses Roo as a backend and attempts to implement newer features on top of it."
+  s.description = "A spreadsheet generator (ODS, XLS) and parsing tool. Uses Roo as a backend and attempts to implement newer features on top of it."
+  s.authors     = ["Rei Kagetsuki", "Rika Yoshida"]
+  s.license     = "GNU GPL version 3"
   s.email       = 'zero@genshin.org'
   s.files        = `git ls-files`.split("\n")
   s.homepage    = 'https://github.com/Genshin/GenSheet'

data/lib/GenSheet.rb

@@ -1,167 +1,11 @@
 require 'roo'
-require 'writeexcel'
-require 'odf/spreadsheet'
+require 'GenSheetExporters'
 
 class GenSheet
-
-  @roo
-
-  def to_xls(filename)
-    @outbook_xls = WriteExcel.new(filename)
-
-    workbook = @roo.instance_variable_get('@workbook')
-    formats = workbook.instance_variable_get('@formats')
-    worksheets = workbook.instance_variable_get('@worksheets')
-
-    # 出力シート準備、元シート分解
-    outsheets = Array.new
-    originalsheets = Array.new
-    names = Array.new
-    pre_sheet_xls(outsheets, originalsheets, names)
-
-    # mergeしてあるセルのセット
-    merges = Array.new
-    set_mergedcell_sheet(worksheets, outsheets, merges)
-
-    # シートのセット
-    set_sheet_xls(outsheets, originalsheets, names, merges)
-
-    # # 出力
-    # for i in 0..originalsheets.size - 1
-      # originalsheets[i].parse do |row|
-        # puts row
-      # end
-    # end
-
-    @outbook_xls.close
-  end
-
-  def pre_sheet_xls(outsheets, originalsheets, names)
-    @roo.each_with_pagename do |name, sheet|
-      outsheets << @outbook_xls.add_worksheet(name)
-      originalsheets << sheet.clone
-      names << name
-    end
-  end
-
-  def set_mergedcell_sheet(worksheets, outsheets, merges)
-    for i in 0..worksheets.size - 1
-      merges << worksheets[i].instance_variable_get('@merged_cells')
-      if merges[i] != nil && merges[i] != []
-        set_mergedcell(outsheets[i], merges[i])
-      end
-    end
-  end
-
-  def set_mergedcell(outsheet, merge)
-    format = @outbook_xls.add_format(:align => 'merge')
-    for j in 0..merge.size - 1
-      outsheet.merge_range(merge[j][0], merge[j][2], merge[j][1], merge[j][3], '', format)
-    end
-  end
-
-  def set_sheet_xls(outsheets, originalsheets, names, merges)
-    #@getformat = @formats[(x + 1) * (y + 1) - 1]   # fontもborderも入ってるけどもインデックスがわからない
-    fonts = @roo.instance_variable_get('@fonts')
-    for i in 0..originalsheets.size - 1
-      originalsheets[i].each_with_index do |row, y|
-        row.each_with_index do |cell, x|
-          font = fonts[names[i]][[y + 1, x + 1]]
-          set_cell_xls(outsheets[i], cell, x, y, font, merges[i])
-        end
-      end
+  class << self
+    def open(file)
+      sheet =Roo::Spreadsheet.open(file)
+      sheet.extend GenSheetExporters
     end
   end
-
-  def set_cell_xls(outsheet, cell, x, y, font, merge)
-    # cellが空の場合は何もしない
-    return if cell == nil
-
-    # 各フォントフォーマットのセット
-    format = set_format(font)
-
-    # mergeしてあるセルの場合フォーマット追加
-    for i in 0..merge.size - 1
-      if y == merge[i][0] && x == merge[i][2]
-        set_mergedcell_format(format)
-      end
-    end
-
-    outsheet.write(y, x, cell, format)
-  end
-
-  def set_format(font)
-    format = @outbook_xls.add_format(
-      #:bottom => 1,      #
-      #:top => 1,         # border
-      #:left => 1,        #
-      #:right => 1,       #
-      :color => font.instance_variable_get('@color'),
-      :italic => font.instance_variable_get('@italic') ? 1 : 0,
-      :font => font.instance_variable_get('@name'),
-      :outline => font.instance_variable_get('@outline'),
-      :shadow => font.instance_variable_get('@shadow'),
-      :size => font.instance_variable_get('@size'),
-      :strikeout => font.instance_variable_get('@strikeout'),
-      :underline => font..instance_variable_get('@underline') == :none ? 0 : 1,  # アンダーラインの種類は4つだけどとりあえず
-      :bold => font.instance_variable_get('@weight') > 400 ? 1 : 0              # weightが普通だと400、boldだと700になるようなのでとりあえず
-      #:encoding => font.encoding,                    #
-      #:escapement => font.escapement,                # fontにまとめて入っていたけど
-      #:family => font.family,                        # どれに対応するのか..
-      #:previous_fast_key => font.previous_fast_key,  #
-    )
-
-    return format
-  end
-
-  def set_mergedcell_format(format)
-    format.set_align('center')
-    format.set_valign('vcenter')
-  end
-
-  def to_ods(filename)
-    @outbook_ods = ODF::SpreadSheet.new
-
-    tables = Array.new
-    sheets = Array.new
-    pre_sheet_ods(tables, sheets)
-
-    @outbook_ods.write_to filename
-  end
-
-  def pre_sheet_ods(tables, sheets)
-    @roo.each_with_pagename do |name, sheet|
-      # シート作成
-      tables << (@outbook_ods.table name)
-      sheets << sheet.clone
-    end
-
-    set_sheet_ods(tables, sheets)
-  end
-
-  def set_sheet_ods(tables, sheets)
-    for i in 0..sheets.size - 1
-      sheets[i].each_with_index do |row, y|
-        # 行作成
-        ob_row = tables[i].row
-        set_cell_ods(row, ob_row)
-      end
-    end
-  end
-
-  def set_cell_ods(row, ob_row)
-    row.each_with_index do |cell, x|
-      # スタイル作成
-      @outbook_ods.style 'font-style', :family => :cell do
-        #property :text, 'font-weight' => 'bold', 'color' => '#ff0000'
-      end
-      # セル作成、スタイル適用
-      ob_cell = ob_row.cell(cell, :style => 'font-style')
-    end
-  end
-
-  def initialize(roo)
-    @roo = roo
-  end
-
 end

data/lib/GenSheetExporters.rb

@@ -0,0 +1,148 @@
+require 'writeexcel'
+require 'odf/spreadsheet'
+
+module GenSheetExporters
+  def to_ods(filename = nil)
+    ods = ODF::SpreadSheet.new
+    _workbook_to_ods(ods)
+    ods.write_to(filename) unless filename.nil?
+    return ods
+  end
+
+  def to_xls(filename = nil)
+    xls = WriteExcel.new(filename)
+
+    # 出力シート準備、元シート分解
+    outsheets, originalsheets, names = [], [], []
+    _workbook_to_xls(xls, outsheets, originalsheets, names)
+
+    # mergeしてあるセルのセット
+    merges = []
+    _set_sheet_mergedcells(xls, outsheets, merges)
+
+    # シートのセット
+    _set_cell_formating(xls, outsheets, originalsheets, names, merges)
+
+    xls.close
+    return xls
+  end
+
+  private
+
+  def _workbook_to_ods(ods)
+    tables, sheets = [], []
+    self.each_with_pagename do |name, sheet|
+      # シート作成
+      tables << (ods.table name)
+      sheets << sheet.clone
+    end
+
+    _set_ods_sheets(ods, tables, sheets)
+    return ods
+  end
+
+  def _set_ods_sheets(ods, tables, sheets)
+    for i in 0..sheets.size - 1
+      sheets[i].each_with_index do |row, y|
+        # 行作成
+        ob_row = tables[i].row
+        _set_cell_ods(ods, row, ob_row)
+      end
+    end
+  end
+
+  def _set_cell_ods(ods, row, ob_row)
+    row.each_with_index do |cell, x|
+      # スタイル作成
+      ods.style 'font-style', family: :cell do
+        # property :text, 'font-weight' => 'bold', 'color' => '#ff0000'
+      end
+      # セル作成、スタイル適用
+      ob_row.cell(cell, style: 'font-style')
+    end
+  end
+
+  def _workbook_to_xls(xls, outsheets, originalsheets, names)
+    self.each_with_pagename do |name, sheet|
+      outsheets << xls.add_worksheet(name)
+      originalsheets << sheet.clone
+      names << name
+    end
+  end
+
+  def _set_sheet_mergedcells(xls, outsheets, merges)
+    worksheets = @workbook.instance_variable_get('@worksheets')
+    for i in 0..worksheets.size - 1
+      merges << worksheets[i].instance_variable_get('@merged_cells')
+      if merges[i] != nil && merges[i] != []
+        _set_mergedcell(xls, outsheets[i], merges[i])
+      end
+    end
+  end
+
+  def _set_mergedcell(xls, outsheet, merge)
+    format = xls.add_format(align: 'merge')
+    for j in 0..merge.size - 1
+      outsheet.merge_range(merge[j][0], merge[j][2],
+                           merge[j][1], merge[j][3], '', format)
+    end
+  end
+
+  def _set_cell_formating(xls, outsheets, originalsheets, names, merges)
+    # fontもborderも入ってるけどもインデックスがわからない
+    for i in 0..originalsheets.size - 1
+      originalsheets[i].each_with_index do |row, y|
+        row.each_with_index do |cell, x|
+          font = @fonts[names[i]][[y + 1, x + 1]]
+          _set_cell_xls(xls, outsheets[i], cell, x, y, font, merges[i])
+        end
+      end
+    end
+  end
+
+  def _set_cell_xls(xls, outsheet, cell, x, y, font, merge)
+    # cellが空の場合は何もしない
+    return if cell == nil
+
+    # 各フォントフォーマットのセット
+    format = _set_format(xls, font)
+
+    # mergeしてあるセルの場合フォーマット追加
+    for i in 0..merge.size - 1
+      set_mergedcell_format(format) if y == merge[i][0] && x == merge[i][2]
+    end
+
+    outsheet.write(y, x, cell, format)
+  end
+
+  def _set_format(xls, font)
+    format = xls.add_format(
+      # :bottom => 1,      #
+      # :top => 1,         # border
+      # :left => 1,        #
+      # :right => 1,       #
+      color:    font.instance_variable_get('@color'),
+      italic:   font.instance_variable_get('@italic') ? 1 : 0,
+      font:     font.instance_variable_get('@name'),
+      outline:  font.instance_variable_get('@outline'),
+      shadow:   font.instance_variable_get('@shadow'),
+      size:     font.instance_variable_get('@size'),
+      strikeout:  font.instance_variable_get('@strikeout'),
+      # アンダーラインの種類は4つだけどとりあえず
+      underline:  font..instance_variable_get('@underline') == :none ? 0 : 1,
+      # weightが普通だと400、boldだと700になるようなのでとりあえず
+      bold: font.instance_variable_get('@weight') > 400 ? 1 : 0
+      # :encoding => font.encoding,                    #
+      # :escapement => font.escapement,                # fontにまとめて入っていたけど
+      # :family => font.family,                        # どれに対応するのか..
+      # :previous_fast_key => font.previous_fast_key,  #
+    )
+
+    return format
+  end
+
+  def set_mergedcell_format(format)
+    format.set_align('center')
+    format.set_valign('vcenter')
+  end
+end

data/spec/ods_ods_spec.rb

@@ -1,20 +1,13 @@
 require 'spec_helper'
 
-describe 'open ods with roo' do
-  it 'opens and inspects an xls file' do
+describe 'opens an ods file' do
+  it 'opens and inspects an ods file' do
     open_ods()
   end
 end
 
-describe '#new' do
-  it 'creates a new GenSheet object from Roo ODS' do
-    create_gens_from_ods()
-  end
-end
-
-describe '#to_ods' do
+describe 'ods #to_ods' do
   it 'creates an ods file' do
-    create_gens_from_ods()
-    @gens.to_ods('./spec/files/ods_out.ods')
+    open_ods().to_ods('./spec/files/ods_out.ods')
   end
 end

data/spec/ods_xls_spec.rb

@@ -1,8 +1,7 @@
 require 'spec_helper'
 
-describe '#to_xls' do
+describe 'ods #to_xls' do
   it 'creates an xls file from an ods base' do
-    create_gens_from_ods()
-    @gens.to_xls('./spec/files/ods_out.xls')
+    open_ods().to_xls('./spec/files/ods_out.xls')
   end
 end

data/spec/spec_helper.rb

@@ -1,26 +1,13 @@
-require 'roo'
 require_relative '../lib/GenSheet.rb'
 
-@xls
-@ods
-@gens
-
-def open_xls()
-  @xls = Roo::Spreadsheet.open('./spec/files/template.xls')
-  @xls.inspect
-end
-
-def open_ods()
-  @ods = Roo::Spreadsheet.open('./spec/files/template.ods')
-  @ods.inspect
-end
-
-def create_gens_from_xls()
-  open_xls()
-  @gens = GenSheet.new(@xls)
+def open_xls
+  xls = GenSheet.open('./spec/files/template.xls')
+  xls.inspect
+  return xls
 end
 
-def create_gens_from_ods()
-  open_ods()
-  @gens = GenSheet.new(@ods)
+def open_ods
+  ods = GenSheet.open('./spec/files/template.ods')
+  ods.inspect
+  return ods
 end

data/spec/xls_ods_spec.rb

@@ -1,8 +1,7 @@
 require 'spec_helper'
 
-describe '#to_ods' do
+describe 'xls #to_ods' do
   it 'creates an ods file from an xls base' do
-    create_gens_from_xls()
-    @gens.to_ods('./spec/files/xls_out.ods')
+    open_xls().to_ods('./spec/files/xls_out.ods')
   end
 end

data/spec/xls_xls_spec.rb

@@ -1,20 +1,13 @@
 require 'spec_helper'
 
-describe 'open xls with roo' do
+describe 'opens an xls file' do
   it 'opens and inspects an xls file' do
     open_xls()
   end
 end
 
-describe '#new' do
-  it 'creates a new GenSheet object from Roo XLS' do
-    create_gens_from_xls()
-  end
-end
-
-describe '#to_xls' do
+describe 'xls #to_xls' do
   it 'creates an xls file' do
-    create_gens_from_xls()
-    @gens.to_xls('./spec/files/xls_out.xls')
+    open_xls().to_xls('./spec/files/xls_out.xls')
   end
 end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: gen_sheet
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors:
 - Rei Kagetsuki
+- Rika Yoshida
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-24 00:00:00.000000000 Z
+date: 2013-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: roo
@@ -52,20 +53,22 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Takes a Roo spreadsheet object and renders it in XLS or ODS. Also allows
-  you to use a template sheet and fill it with data from Roo, then output a rendered
-  sheet.
+description: A spreadsheet generator (ODS, XLS) and parsing tool. Uses Roo as a backend
+  and attempts to implement newer features on top of it.
 email: zero@genshin.org
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rubocop.yml
 - Gemfile
+- Guardfile
 - README.md
 - Rakefile
 - gen_sheet.gemspec
 - lib/GenSheet.rb
+- lib/GenSheetExporters.rb
 - spec/files/template.ods
 - spec/files/template.xls
 - spec/ods_ods_spec.rb
@@ -74,7 +77,8 @@ files:
 - spec/xls_ods_spec.rb
 - spec/xls_xls_spec.rb
 homepage: https://github.com/Genshin/GenSheet
-licenses: []
+licenses:
+- GNU GPL version 3
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -92,8 +96,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0.rc.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
-summary: A spreadsheet generator (ODS, XLS) for Roo.
+summary: A spreadsheet generator (ODS, XLS) and parsing tool. Uses Roo as a backend
+  and attempts to implement newer features on top of it.
 test_files: []