osheet 1.0.0.rc.2 → 1.0.0.rc.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    osheet (1.0.0.rc.2)
+    osheet (1.0.0.rc.3)
       enumeration (~> 1.3)
 
 GEM

data/lib/osheet/format.rb

@@ -20,7 +20,7 @@ module Osheet::Format
 
   class << self
     def new(type, *args)
-      unless VALUES.include?(type)
+      unless VALUES.include?(type.to_sym)
         raise ArgumentError, "'#{type.inspect}' is not a valid format type"
       end
       self.const_get(type.to_s.capitalize).new(*args)

data/lib/osheet/format/currency.rb

@@ -6,7 +6,7 @@ module Osheet::Format
   class Currency < Osheet::Format::Numeric
     def initialize(opts={})
       super({
-        :symbol => :dollar,
+        :symbol => 'dollar',
         :decimal_places => 2,
         :comma_separator => true
       }.merge(opts))

data/lib/osheet/format/numeric.rb

@@ -8,8 +8,17 @@ module Osheet::Format
     include Enumeration
 
     attr_accessor :decimal_places, :comma_separator
-    enum :symbol, [:none, :dollar, :euro]
-    enum :negative_numbers, [:black, :black_parenth, :red, :red_parenth]
+    enum :symbol, {
+      :none => "none",
+      :dollar => "dollar",
+      :euro => "euro"
+    }
+    enum :negative_numbers, {
+      :black => "black",
+      :black_parenth => "black_parenth",
+      :red => "red",
+      :red_parenth => "red_parenth"
+    }
 
     def initialize(opts={})
       self.symbol = opts[:symbol] || :none
@@ -66,13 +75,13 @@ module Osheet::Format
 
     def negative_numbers_style
       case @negative_numbers
-      when :black
+      when 'black'
         numeric_style
-      when :red
+      when 'red'
         "#{numeric_style};[Red]#{numeric_style}"
-      when :black_parenth
+      when 'black_parenth'
         "#{numeric_style}_);\(#{numeric_style}\)"
-      when :red_parenth
+      when 'red_parenth'
         "#{numeric_style}_);[Red]\(#{numeric_style}\)"
       end
     end
@@ -99,9 +108,9 @@ module Osheet::Format
 
     def symbol_style
       case @symbol
-      when :dollar
+      when 'dollar'
         "\"$\"#{symbol_suffix}"
-      when :euro
+      when 'euro'
         "\"€\"#{symbol_suffix}"
       else
         ''

data/lib/osheet/style.rb

@@ -17,13 +17,14 @@ module Osheet
       SETTINGS.each { |s| instance_variable_set("@#{s}", []) }
     end
 
-    SETTINGS.each do |setting|
-      define_method(setting) do |*args|
-        instance_variable_get("@#{setting}").tap do |value|
-          instance_variable_set("@#{setting}", value + args) if !args.empty?
-        end
-      end
-    end
+    def align(*args); @align += args; end
+    def font(*args);  @font  += args; end
+    def bg(*args);    @bg    += args; end
+
+    def border_top(*args);    @border_top    += args; end
+    def border_right(*args);  @border_right  += args; end
+    def border_bottom(*args); @border_bottom += args; end
+    def border_left(*args);   @border_left   += args; end
 
     def border(*args)
       BORDERS.each { |border| send(border, *args) }

data/lib/osheet/version.rb

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

data/lib/osheet/workbook.rb

@@ -27,9 +27,9 @@ module Osheet
 
       # setup the writer, element stack, and workbook_element
       writer.bind(self) if writer
-      set_ivar(:writer, writer)
-      set_ivar(:element_stack, Workbook::ElementStack.new)
-      set_ivar(:workbook_element, WorkbookElement.new)
+      @_osheet_writer = writer
+      @_osheet_element_stack = Workbook::ElementStack.new
+      @_osheet_workbook_element = WorkbookElement.new
 
       # push the workbook element onto the element stack
       element_stack.push(workbook)
@@ -39,15 +39,15 @@ module Osheet
     end
 
     def writer
-      get_ivar(:writer)
+      @_osheet_writer
     end
 
     def element_stack
-      get_ivar(:element_stack)
+      @_osheet_element_stack
     end
 
     def workbook_element
-      get_ivar(:workbook_element)
+      @_osheet_workbook_element
     end
     alias_method :workbook, :workbook_element
 
@@ -94,26 +94,6 @@ module Osheet
       define_method(meth) {|*args| writer.send(meth, *args) }
     end
 
-    private
-
-    OSHEET_IVAR_NS = "_osheet_"
-
-    def get_ivar(name)
-      instance_variable_get(ivar_name(name))
-    end
-
-    def set_ivar(name, value)
-      instance_variable_set(ivar_name(name), value)
-    end
-
-    def push_ivar(name, value)
-      get_ivar(name) << value
-    end
-
-    def ivar_name(name)
-      "@#{OSHEET_IVAR_NS}#{name}"
-    end
-
   end
 
 

data/osheet.gemspec

@@ -18,7 +18,6 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_development_dependency("assert", ["~> 0.3"])
-
   s.add_dependency("enumeration", ["~> 1.3"])
 
 end

data/test/format/accounting_test.rb

@@ -26,9 +26,9 @@ module Osheet::Format
 
     should "set default values" do
       assert_equal 2, subject.decimal_places
-      assert_equal :dollar, subject.symbol
+      assert_equal 'dollar', subject.symbol
       assert_equal true, subject.comma_separator
-      assert_equal :black, subject.negative_numbers
+      assert_equal 'black', subject.negative_numbers
     end
 
     should "only allow Fixnum decimal places between 0 and 30" do

data/test/format/currency_test.rb

@@ -26,9 +26,9 @@ module Osheet::Format
 
     should "set default values" do
       assert_equal 2, subject.decimal_places
-      assert_equal :dollar, subject.symbol
+      assert_equal 'dollar', subject.symbol
       assert_equal true, subject.comma_separator
-      assert_equal :black, subject.negative_numbers
+      assert_equal 'black', subject.negative_numbers
     end
 
     should "only allow Fixnum decimal places between 0 and 30" do

data/test/format/number_test.rb

@@ -20,7 +20,7 @@ module Osheet::Format
     should "set default values" do
       assert_equal 0, subject.decimal_places
       assert_equal false, subject.comma_separator
-      assert_equal :black, subject.negative_numbers
+      assert_equal 'black', subject.negative_numbers
     end
 
     should "only allow Fixnum decimal places between 0 and 30" do

data/test/format/percentage_test.rb

@@ -20,7 +20,7 @@ module Osheet::Format
     should "set default values" do
       assert_equal 2, subject.decimal_places
       assert_equal false, subject.comma_separator
-      assert_equal :black, subject.negative_numbers
+      assert_equal 'black', subject.negative_numbers
     end
 
     should "only allow Fixnum decimal places between 0 and 30" do

data/test/format/scientific_test.rb

@@ -20,7 +20,7 @@ module Osheet::Format
     should "set default values" do
       assert_equal 2, subject.decimal_places
       assert_equal false, subject.comma_separator
-      assert_equal :black, subject.negative_numbers
+      assert_equal 'black', subject.negative_numbers
     end
 
     should "only allow Fixnum decimal places between 0 and 30" do

data/test/format_test.rb

@@ -18,7 +18,7 @@ module Osheet
       assert_kind_of Format::Number, subject
       assert_equal 4, subject.decimal_places
       assert_equal true, subject.comma_separator
-      assert_equal :black_parenth, subject.negative_numbers
+      assert_equal 'black_parenth', subject.negative_numbers
     end
 
     should "error for invalid format types" do

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: osheet
 version: !ruby/object:Gem::Version 
-  hash: 15424049
+  hash: 15424051
   prerelease: 6
   segments: 
   - 1
   - 0
   - 0
   - rc
-  - 2
-  version: 1.0.0.rc.2
+  - 3
+  version: 1.0.0.rc.3
 platform: ruby
 authors: 
 - Kelly Redding
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-20 00:00:00 Z
+date: 2012-04-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :development