osheet 1.0.0.rc.1 → 1.0.0.rc.2

data/Gemfile

@@ -3,4 +3,5 @@ source "http://rubygems.org"
 # Specify your gem's dependencies in osheet.gemspec
 gemspec
 
+gem 'bundler', '~>1.1'
 gem 'rake', '~>0.9.2'

data/Gemfile.lock

@@ -1,9 +1,8 @@
 PATH
   remote: .
   specs:
-    osheet (1.0.0.rc.1)
+    osheet (1.0.0.rc.2)
       enumeration (~> 1.3)
-      xmlss (~> 1.0.0.rc)
 
 GEM
   remote: http://rubygems.org/
@@ -16,21 +15,13 @@ GEM
       undies (~> 2.0)
     enumeration (1.3.1)
     rake (0.9.2.2)
-    ruby-prof (0.10.8)
     undies (2.2.1)
-    whysoslow (0.0.2)
-      ansi (~> 1.4)
-    xmlss (1.0.0.rc.1)
-      enumeration (~> 1.3)
-      undies (~> 2.2.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   assert (~> 0.3)
-  bundler (~> 1.0)
+  bundler (~> 1.1)
   osheet!
   rake (~> 0.9.2)
-  ruby-prof
-  whysoslow (~> 0.0)

data/README.rdoc

@@ -10,7 +10,9 @@ A DSL for specifying and generating spreadsheets using Ruby.
 
 == Basic Example
 
-    require 'osheet'
+This example uses the Xmlss writer provided by Osheet::Xmlss (https://github.com/kellyredding/osheet-xmlss).
+
+    require 'osheet/xmlss'
 
     fields = ['Sex', 'Age', 'Height', 'Weight']
     data = {
@@ -20,8 +22,9 @@ A DSL for specifying and generating spreadsheets using Ruby.
     }
 
     # this will dump the above data to a single-sheet workbook w/ no styles
+    # - this example is using the Xmlss writer (https://github.com/kellyredding/xmlss)
 
-    Osheet::Workbook.new {
+    Osheet::Workbook.new(Osheet::XmlssWriter.new) {
       title "basic"
 
       template(:column, :data) { |field, index|

data/Rakefile

@@ -5,44 +5,3 @@ require 'bundler'
 Bundler::GemHelper.install_tasks
 
 task :default => :build
-
-namespace :bench do
-
-  desc "Run the bench script."
-  task :run do
-    require 'bench/bench_runner'
-    OsheetBenchRunner.new
-  end
-
-  desc "Run the profiler on 1000 rows."
-  task :profiler do
-    require 'bench/profiler_runner'
-    runner = OsheetProfilerRunner.new(1000)
-    runner.print_flat(STDOUT, :min_percent => 3)
-  end
-
-  desc "Run the example workbook builds."
-  task :examples do
-    require 'examples/trivial'
-    require 'examples/basic'
-    require 'examples/basic_with_templates'
-    require 'examples/formats'
-    require 'examples/formula'
-    require 'examples/styles'
-  end
-
-  desc "Run all the tests, then the example builds, then the profiler."
-  task :all do
-    Rake::Task['test'].invoke
-    Rake::Task['bench:run'].invoke
-    Rake::Task['bench:profiler'].invoke
-    Rake::Task['bench:examples'].invoke
-  end
-
-
-end
-
-task :bench do
-  Rake::Task['bench:run'].invoke
-end
-

data/lib/osheet/version.rb

@@ -1,3 +1,3 @@
 module Osheet
-  VERSION = "1.0.0.rc.1"
+  VERSION = "1.0.0.rc.2"
 end

data/lib/osheet.rb

@@ -1,5 +1,5 @@
 module Osheet; end
 
 require 'osheet/workbook'
-require 'osheet/xmlss_writer'
+require 'osheet/mixin'
 

data/osheet.gemspec

@@ -17,12 +17,8 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_development_dependency("bundler", ["~> 1.0"])
   s.add_development_dependency("assert", ["~> 0.3"])
-  s.add_development_dependency("whysoslow", ["~> 0.0"])
-  s.add_development_dependency("ruby-prof")
 
   s.add_dependency("enumeration", ["~> 1.3"])
-  s.add_dependency("xmlss", ["~> 1.0.0.rc"])
 
 end

data/test/format/general_test.rb

@@ -12,7 +12,7 @@ module Osheet::Format
       assert_equal nil, subject.style
     end
 
-    should "always provide and empty format key" do
+    should "provide a format key" do
       assert_equal '', subject.key
     end
 

data/test/helper.rb

@@ -5,14 +5,6 @@ $LOAD_PATH.unshift(File.expand_path("../..", __FILE__))
 
 class Assert::Context
 
-  def xmlss_style_markup(writer)
-    Xmlss::Workbook.writer(writer.xmlss_workbook).styles_markup.flush.to_s
-  end
-
-  def xmlss_element_markup(writer)
-    Xmlss::Workbook.writer(writer.xmlss_workbook).worksheets_markup.flush.to_s
-  end
-
   # Macros
 
   def self.be_a_meta_element(*args)

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: osheet
 version: !ruby/object:Gem::Version 
-  hash: 15424055
+  hash: 15424049
   prerelease: 6
   segments: 
   - 1
   - 0
   - 0
   - rc
-  - 1
-  version: 1.0.0.rc.1
+  - 2
+  version: 1.0.0.rc.2
 platform: ruby
 authors: 
 - Kelly Redding
@@ -17,26 +17,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-15 00:00:00 Z
+date: 2012-03-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :development
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
-  name: bundler
-  version_requirements: *id001
-  prerelease: false
-- !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -47,40 +32,11 @@ dependencies:
         - 3
         version: "0.3"
   name: assert
-  version_requirements: *id002
-  prerelease: false
-- !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 0
-        - 0
-        version: "0.0"
-  name: whysoslow
-  version_requirements: *id003
-  prerelease: false
-- !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: ruby-prof
-  version_requirements: *id004
+  version_requirements: *id001
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :runtime
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -91,24 +47,7 @@ dependencies:
         - 3
         version: "1.3"
   name: enumeration
-  version_requirements: *id005
-  prerelease: false
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7712010
-        segments: 
-        - 1
-        - 0
-        - 0
-        - rc
-        version: 1.0.0.rc
-  name: xmlss
-  version_requirements: *id006
+  version_requirements: *id002
   prerelease: false
 description: A DSL for specifying and generating spreadsheets using Ruby
 email: 
@@ -125,22 +64,6 @@ files:
 - Gemfile.lock
 - README.rdoc
 - Rakefile
-- bench/bench_runner.rb
-- bench/profiler.rb
-- bench/profiler_1000.xls
-- bench/profiler_runner.rb
-- examples/basic.rb
-- examples/basic.xls
-- examples/basic_with_templates.rb
-- examples/basic_with_templates.xls
-- examples/formats.rb
-- examples/formats.xls
-- examples/formula.rb
-- examples/formula.xls
-- examples/styles.rb
-- examples/styles.xls
-- examples/trivial.rb
-- examples/trivial.xls
 - lib/osheet.rb
 - lib/osheet/cell.rb
 - lib/osheet/column.rb
@@ -169,9 +92,6 @@ files:
 - lib/osheet/workbook_api.rb
 - lib/osheet/workbook_element.rb
 - lib/osheet/worksheet.rb
-- lib/osheet/xmlss_writer.rb
-- lib/osheet/xmlss_writer/style_cache.rb
-- lib/osheet/xmlss_writer/style_settings.rb
 - osheet.gemspec
 - test/cell_test.rb
 - test/column_test.rb
@@ -199,11 +119,6 @@ files:
 - test/workbook_element_test.rb
 - test/workbook_test.rb
 - test/worksheet_test.rb
-- test/xmlss_writer/api_test.rb
-- test/xmlss_writer/style_cache_test.rb
-- test/xmlss_writer/style_settings_test.rb
-- test/xmlss_writer/styles_test.rb
-- test/xmlss_writer_test.rb
 homepage: http://github.com/kellyredding/osheet
 licenses: []
 
@@ -266,8 +181,3 @@ test_files:
 - test/workbook_element_test.rb
 - test/workbook_test.rb
 - test/worksheet_test.rb
-- test/xmlss_writer/api_test.rb
-- test/xmlss_writer/style_cache_test.rb
-- test/xmlss_writer/style_settings_test.rb
-- test/xmlss_writer/styles_test.rb
-- test/xmlss_writer_test.rb

data/bench/bench_runner.rb

@@ -1,91 +0,0 @@
-require 'whysoslow'
-require 'stringio'
-
-require 'osheet'
-
-class OsheetBenchResults
-
-  def initialize(row_count)
-    @row_count = row_count
-    @printer = Whysoslow::DefaultPrinter.new({
-      :title => "#{@row_count} rows",
-      :verbose => true
-    })
-    @runner = Whysoslow::Runner.new(@printer)
-  end
-
-  def run
-    @runner.run do
-      data_values = {
-        :number   => 1,
-        :text     => 'text',
-        :currency => 123.45,
-        :text     => "<>&'\"/",
-        :currency => 45.23
-      }
-
-      outstream = StringIO.new(out = "")
-      outstream << Osheet::Workbook.new(Osheet::XmlssWriter.new(:pp => 2), {
-        :bench_row_count => @row_count,
-        :runner => @runner
-      }) {
-        title "bench"
-
-        template(:row, :header) {
-          columns.each do |column|
-            cell {
-              data column.meta[:label]
-            }
-          end
-        }
-
-        template(:row, :data) { |values|
-          columns.each do |col|
-            cell {
-              data values[col.meta[:label]]
-              format col.meta[:label]
-            }
-          end
-        }
-
-        worksheet {
-          name "bench results"
-
-          data_values.keys.each do |label|
-            column {
-              width 200
-              meta(:label => label)
-            }
-          end
-
-          row :header
-
-          10.times do |i|
-            (bench_row_count / 10).times do
-              row :data, data_values
-            end
-            runner.snapshot("#{((i+1)*10).to_s.rjust(3)}%")
-          end
-        }
-      }.to_data
-    end
-  end
-
-end
-
-class OsheetBenchRunner
-
-  ROWS = [10, 100, 1000, 10000]#, 30000]
-
-  def initialize
-    puts "Benchmark Results:"
-    puts
-    ROWS.each do |size|
-      OsheetBenchResults.new(size).run
-      puts
-    end
-    puts
-  end
-
-end
-

data/bench/profiler.rb

@@ -1,6 +0,0 @@
-# $ bundle exec ruby bench/profiler.rb
-
-require 'bench/profiler_runner'
-
-runner = OsheetProfilerRunner.new(ARGV[0] ? ARGV[0].to_i : 1000)
-runner.print_flat(STDOUT, :min_percent => 1)