osheet 0.4.0 → 0.5.0

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    osheet (0.2.0)
+    osheet (0.5.0)
       enumeration (~> 1.1.0)
-      xmlss (~> 0.1.0)
+      xmlss (~> 0.2.0)
 
 GEM
   remote: http://rubygems.org/
@@ -13,13 +13,28 @@ GEM
     kelredd-useful (0.4.1)
       json
     leftright (0.9.0)
+    mime-types (1.16)
     nokogiri (1.4.4)
+    open4 (1.0.1)
+    rack (1.2.2)
+    rack-test (0.5.7)
+      rack (>= 1.0)
+    rest-client (1.6.1)
+      mime-types (>= 1.16)
     shoulda (2.11.3)
+    sinatra (1.2.1)
+      rack (~> 1.1)
+      tilt (>= 1.2.2, < 2.0)
     test-belt (0.2.1)
       kelredd-useful (~> 0.4.0)
       leftright (~> 0.9.0)
       shoulda (~> 2.11)
-    xmlss (0.1.0)
+    tilt (1.2.2)
+    webrat (0.7.3)
+      nokogiri (>= 1.2.0)
+      rack (>= 1.0)
+      rack-test (>= 0.5.3)
+    xmlss (0.2.0)
       enumeration (~> 1.1.0)
       nokogiri (~> 1.4.0)
 
@@ -29,6 +44,11 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.0)
   enumeration (~> 1.1.0)
+  open4
   osheet!
+  rack-test (>= 0.5.3)
+  rest-client
+  sinatra (>= 0.9.4)
   test-belt (= 0.2.1)
-  xmlss (~> 0.1.0)
+  webrat (>= 0.6.0)
+  xmlss (~> 0.2.0)

data/examples/basic_with_templates.rb

@@ -81,4 +81,4 @@ Osheet::Workbook.new {
       row :data, name, stats
     end
   }
-}.to_file('examples/basic_with_templates.xls')
+}.to_file('examples/basic_with_templates.xls', :format)

data/examples/formats.rb

@@ -363,4 +363,4 @@ Osheet::Workbook.new {
 
 
 
-}.to_file('examples/formats.xls')
+}.to_file('examples/formats.xls', :format)

data/examples/styles.rb

@@ -238,4 +238,4 @@ Osheet::Workbook.new {
 
 
 
-}.to_file('examples/styles.xls')
+}.to_file('examples/styles.xls', :format)

data/examples/trivial.rb

@@ -18,4 +18,4 @@ Osheet::Workbook.new {
       }
     }
   }
-}.to_file('examples/trivial.xls')
+}.to_file('examples/trivial.xls', :format)

data/lib/osheet/associations.rb

@@ -20,18 +20,14 @@ module Osheet::Associations
 
       # define collection reader
       self.send(:define_method, plural, Proc.new do
-        if instance_variable_get("@#{plural}").nil?
-          instance_variable_set("@#{plural}", [])
-        end
-        instance_variable_get("@#{plural}")
+        set_ivar(plural, []) if get_ivar(plural).nil?
+        get_ivar(plural)
       end)
 
       # define collection item writer
       self.send(:define_method, singular) do |*args, &block|
-        if instance_variable_get("@#{plural}").nil?
-          instance_variable_set("@#{plural}", [])
-        end
-        instance_variable_get("@#{plural}") << if self.respond_to?(:workbook)
+        set_ivar(plural, []) if get_ivar(plural).nil?
+        push_ivar(plural, if self.respond_to?(:workbook)
           # on: worksheet, column, row
           # creating: column, row, cell
           worksheet = self.respond_to?(:worksheet) ? self.worksheet : self
@@ -52,7 +48,7 @@ module Osheet::Associations
             # add by block
             klass.new(self, &block)
           end
-        end
+        end)
       end
 
     end

data/lib/osheet/cell.rb

@@ -3,48 +3,52 @@ require 'osheet/format'
 
 module Osheet
   class Cell
+    include Instance
     include WorkbookElement
     include WorksheetElement
     include StyledElement
 
     def initialize(workbook=nil, worksheet=nil, *args, &block)
-      @workbook = workbook
-      @worksheet = worksheet
-      @data = nil
-      @format = Format.new(:general)
-      @rowspan = 1
-      @colspan = 1
-      @href = nil
-      instance_exec(*args, &block) if block_given?
+      set_ivar(:workbook, workbook)
+      set_ivar(:worksheet, worksheet)
+      set_ivar(:data, nil)
+      set_ivar(:format, Format.new(:general))
+      set_ivar(:rowspan, 1)
+      set_ivar(:colspan, 1)
+      set_ivar(:href, nil)
+      if block_given?
+        set_binding_ivars(block.binding)
+        instance_exec(*args, &block)
+      end
     end
 
     def data(value)
-      @data = case value
+      set_ivar(:data, case value
       when ::String, ::Numeric, ::Date, ::Time, ::DateTime
         value
       when ::Symbol
         value.to_s
       else
         value.inspect.to_s
-      end
+      end)
     end
 
     def format(type, opts={})
-      @format = Format.new(type, opts)
+      set_ivar(:format, Format.new(type, opts))
     end
 
-    def rowspan(value); @rowspan = value; end
-    def colspan(value); @colspan = value; end
-    def href(value); @href = value; end
+    def rowspan(value); set_ivar(:rowspan, value); end
+    def colspan(value); set_ivar(:colspan, value); end
+    def href(value); set_ivar(:href, value); end
 
     def attributes
       {
-        :style_class => @style_class,
-        :data => @data,
-        :format => @format,
-        :colspan => @colspan,
-        :rowspan => @rowspan,
-        :href => @href,
+        :style_class => get_ivar(:style_class),
+        :data => get_ivar(:data),
+        :format => get_ivar(:format),
+        :colspan => get_ivar(:colspan),
+        :rowspan => get_ivar(:rowspan),
+        :href => get_ivar(:href)
       }
     end
 

data/lib/osheet/column.rb

@@ -1,33 +1,37 @@
 module Osheet
   class Column
+    include Instance
     include WorkbookElement
     include WorksheetElement
     include StyledElement
     include MetaElement
 
     def initialize(workbook=nil, worksheet=nil, *args, &block)
-      @workbook = workbook
-      @worksheet = worksheet
-      @width = nil
-      @autofit = false
-      @hidden = false
-      instance_exec(*args, &block) if block_given?
+      set_ivar(:workbook, workbook)
+      set_ivar(:worksheet, worksheet)
+      set_ivar(:width, nil)
+      set_ivar(:autofit, false)
+      set_ivar(:hidden, false)
+      if block_given?
+        set_binding_ivars(block.binding)
+        instance_exec(*args, &block)
+      end
     end
 
     def width(value=nil)
-      !value.nil? ? @width = value : @width
+      !value.nil? ? set_ivar(:width, value) : get_ivar(:width)
     end
-    def autofit(value); @autofit = !!value; end
-    def autofit?; @autofit; end
-    def hidden(value); @hidden = !!value; end
-    def hidden?; @hidden; end
+    def autofit(value); set_ivar(:autofit, !!value); end
+    def autofit?; get_ivar(:autofit); end
+    def hidden(value); set_ivar(:hidden, !!value); end
+    def hidden?; get_ivar(:hidden); end
 
     def attributes
       {
-        :style_class => @style_class,
-        :width => @width,
-        :autofit => @autofit,
-        :hidden => @hidden
+        :style_class => get_ivar(:style_class),
+        :width => get_ivar(:width),
+        :autofit => get_ivar(:autofit),
+        :hidden => get_ivar(:hidden)
       }
     end
 

data/lib/osheet/instance.rb

@@ -0,0 +1,32 @@
+module Osheet::Instance
+
+  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
+
+  def set_binding_ivars(binding)
+    binding.eval('instance_variables').
+    reject{|ivar| ivar =~ /^@#{OSHEET_IVAR_NS}/}.
+    each do |ivar|
+      # puts "binding #{ivar}: "+binding.eval(ivar).object_id.to_s
+      instance_variable_set(ivar, binding.eval(ivar))
+      # puts "inst #{ivar}: "+ instance_variable_get(ivar).object_id.to_s
+    end
+  end
+end

data/lib/osheet/railtie.rb

@@ -0,0 +1,9 @@
+module Osheet
+  class Railtie < Rails::Railtie
+
+    initializer "osheet.register" do |app|
+      ::Osheet.register
+    end
+
+  end
+end

data/lib/osheet/row.rb

@@ -2,6 +2,7 @@ require 'osheet/cell'
 
 module Osheet
   class Row
+    include Instance
     include Associations
     include WorkbookElement
     include WorksheetElement
@@ -11,28 +12,31 @@ module Osheet
     hm :cells
 
     def initialize(workbook=nil, worksheet=nil, *args, &block)
-      @workbook = workbook
-      @worksheet = worksheet
-      @height = nil
-      @autofit = false
-      @hidden = false
-      instance_exec(*args, &block) if block_given?
+      set_ivar(:workbook, workbook)
+      set_ivar(:worksheet, worksheet)
+      set_ivar(:height, nil)
+      set_ivar(:autofit, false)
+      set_ivar(:hidden, false)
+      if block_given?
+        set_binding_ivars(block.binding)
+        instance_exec(*args, &block)
+      end
     end
 
     def height(value=nil)
-      !value.nil? ? @height = value : @height
+      !value.nil? ? set_ivar(:height, value) : get_ivar(:height)
     end
-    def autofit(value); @autofit = !!value; end
-    def autofit?; @autofit; end
-    def hidden(value); @hidden = !!value; end
-    def hidden?; @hidden; end
+    def autofit(value); set_ivar(:autofit, !!value); end
+    def autofit?; get_ivar(:autofit); end
+    def hidden(value); set_ivar(:hidden, !!value); end
+    def hidden?; get_ivar(:hidden); end
 
     def attributes
       {
-        :style_class => @style_class,
-        :height => @height,
-        :autofit => @autofit,
-        :hidden => @hidden
+        :style_class => get_ivar(:style_class),
+        :height => get_ivar(:height),
+        :autofit => get_ivar(:autofit),
+        :hidden => get_ivar(:hidden)
       }
     end
 

data/lib/osheet/style.rb

@@ -5,23 +5,28 @@ module Osheet
     #  each setting collects any arguments passed to it and
     #  it is up to the drivers to determine how to use the settings
 
+    include Instance
+
     BORDER_POSITIONS = [:top, :right, :bottom, :left]
     BORDERS = BORDER_POSITIONS.collect{|p| "border_#{p}".to_sym}
     SETTINGS = [:align, :font, :bg] + BORDERS
 
-    attr_reader :selectors
-
     def initialize(*selectors, &block)
-      @selectors = verify(selectors)
-      SETTINGS.each do |setting|
-        instance_variable_set("@#{setting}", [])
+      set_ivar(:selectors, verify(selectors))
+      SETTINGS.each {|setting| set_ivar(setting, [])}
+      if block_given?
+        set_binding_ivars(block.binding)
+        instance_eval(&block)
       end
-      instance_eval(&block) if block_given?
+    end
+
+    def selectors
+      get_ivar(:selectors)
     end
 
     SETTINGS.each do |setting|
       define_method(setting) do |*args|
-        instance_variable_set("@#{setting}", instance_variable_get("@#{setting}") + args)
+        set_ivar(setting, get_ivar(setting) + args)
       end
     end
 
@@ -33,7 +38,7 @@ module Osheet
 
     def attributes
       SETTINGS.inject({}) do |attrs, s|
-        attrs[s] = instance_variable_get("@#{s}")
+        attrs[s] = get_ivar(s)
         attrs
       end
     end

data/lib/osheet/styled_element.rb

@@ -1,5 +1,5 @@
 module Osheet::StyledElement
-  def style_class(value); @style_class = verify_style_class(value); end
+  def style_class(value); set_ivar(:style_class, verify_style_class(value)); end
 
   private
 

data/lib/osheet/template.rb

@@ -6,17 +6,26 @@ module Osheet
     #  if an element is initialized from a template, the template
     #  block will be instance_eval'd for the element being initialized
 
-    ELEMENTS = ['worksheet', 'column', 'row', 'cell']
+    include Instance
 
-    attr_accessor :element, :name
+    ELEMENTS = ['worksheet', 'column', 'row', 'cell']
 
     def initialize(element, name)
       verify(element, name)
-      @element = element.to_s
-      @name = name.to_s
+      set_ivar(:element, element.to_s)
+      set_ivar(:name, name.to_s)
       super()
     end
 
+    [:element, :name].each do |meth|
+      define_method(meth) do
+        get_ivar(meth)
+      end
+      define_method("#{meth}=") do |value|
+        set_ivar(meth, value)
+      end
+    end
+
     private
 
     def verify(element, name)

data/lib/osheet/template_handler/rails.rb

@@ -0,0 +1,44 @@
+# Rails 2.X Template
+if Rails.version =~ /^2/
+  require 'action_view/base'
+  require 'action_view/template'
+
+  module ActionView
+    module TemplateHandlers
+      class OsheetHandler < TemplateHandler
+        include Compilable
+
+        def compile(template)
+          # template.format => 'xls' (or xlsx or whatever they specify)
+          %{::Osheet::Workbook.new {#{template.source}\n }.to_data}
+        end
+
+      end
+    end
+  end
+
+  ::ActionView::Template.register_template_handler :osheet, ActionView::TemplateHandlers::OsheetHandler
+end
+
+# Rails 3.X Template
+if Rails.version =~ /^3/
+  require 'action_view/base'
+  require 'action_view/template'
+
+  module ActionView
+    module Template::Handlers
+      class OsheetHandler < Template::Handler
+        include Compilable
+
+        self.default_format = Osheet::MIME_TYPE
+        def compile(template)
+          # template.format => 'xls' (or xlsx or whatever they specify)
+          %{::Osheet::Workbook.new {\n#{template.source}\n }.to_data}
+        end
+
+      end
+    end
+  end
+
+  ::ActionView::Template.register_template_handler :osheet, ActionView::Template::Handlers::OsheetHandler
+end

data/lib/osheet/template_handler/tilt.rb

@@ -0,0 +1,42 @@
+# TILT/Sinatra template engine
+module Osheet
+  class TiltHandler < Tilt::Template
+
+    def self.engine_initialized?
+      defined? ::Osheet::Workbook
+    end
+
+    def initialize_engine
+      require_template_library 'osheet'
+    end
+
+    def prepare; end
+
+    def precompiled_preamble(locals)
+      "::Osheet::Workbook.new {\n#{super}"
+    end
+
+    def precompiled_template(locals)
+      data.to_str
+    end
+    def precompiled_postamble(locals)
+      "}.to_data"
+    end
+
+  end
+end
+
+Tilt.register 'osheet', Osheet::TiltHandler
+
+if defined?(::Sinatra::Base)
+  class ::Sinatra::Base
+
+    # use this helper method to render Osheet views in Sinatra
+    # => view files should be named: "#{template}.osheet"
+    def osheet(template, options={}, locals={})
+      options.merge! :layout => false, :default_content_type => ::Osheet::MIME_TYPE
+      render :osheet, template, options, locals
+    end
+
+  end
+end

data/lib/osheet/template_handler.rb

@@ -0,0 +1,2 @@
+require 'osheet/template_handler/tilt' if defined?(Tilt)
+require 'osheet/template_handler/rails' if defined?(Rails)

data/lib/osheet/version.rb

@@ -1,3 +1,3 @@
 module Osheet
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/lib/osheet/workbook.rb

@@ -1,3 +1,4 @@
+require 'osheet/instance'
 require 'osheet/style_set'
 require 'osheet/template_set'
 require 'osheet/worksheet'
@@ -5,31 +6,41 @@ require 'osheet/xmlss_writer'
 
 module Osheet
   class Workbook
+    include Instance
     include Associations
 
     hm :worksheets
-    attr_reader :styles, :templates
 
     def initialize(&block)
-      @title = nil
-      @styles = StyleSet.new
-      @templates = TemplateSet.new
-      instance_eval(&block) if block_given?
+      set_ivar(:title, nil)
+      set_ivar(:styles, StyleSet.new)
+      set_ivar(:templates, TemplateSet.new)
+      if block_given?
+        set_binding_ivars(block.binding)
+        instance_eval(&block)
+      end
     end
 
     def title(value=nil)
-      !value.nil? ? @title = value : @title
+      !value.nil? ? set_ivar(:title, value) : get_ivar(:title)
+    end
+
+    def style(*selectors, &block); push_ivar(:styles, Style.new(*selectors, &block)); end
+    def styles
+      get_ivar(:styles)
+    end
+    def template(element, name, &block); push_ivar(:templates, Template.new(element, name, &block)); end
+    def templates
+      get_ivar(:templates)
     end
-    def style(*selectors, &block); @styles << Style.new(*selectors, &block); end
-    def template(element, name, &block); @templates << Template.new(element, name, &block); end
 
     def attributes
-      { :title => @title }
+      { :title => get_ivar(:title) }
     end
 
     def use(mixin)
-      (mixin.styles || []).each{ |s| @styles << s }
-      (mixin.templates || []).each{ |t| @templates << t }
+      (mixin.styles || []).each{ |s| push_ivar(:styles, s) }
+      (mixin.templates || []).each{ |t| push_ivar(:templates, t) }
     end
 
     def writer

data/lib/osheet/workbook_element.rb

@@ -1,21 +1,17 @@
 module Osheet::WorkbookElement
-  class << self
 
-    def included(receiver)
-
-      receiver.send(:attr_reader, :workbook)
+  def workbook
+    get_ivar(:workbook)
+  end
 
-      [:styles, :templates].each do |thing|
-        receiver.send(:define_method, thing) do
-          if workbook && workbook.respond_to?(thing)
-            workbook.send(thing)
-          else
-            nil
-          end
-        end
+  [:styles, :templates].each do |thing|
+    define_method(thing) do
+      if workbook && workbook.respond_to?(thing)
+        workbook.send(thing)
+      else
+        nil
       end
-
     end
-
   end
+
 end

data/lib/osheet/worksheet.rb

@@ -3,6 +3,7 @@ require 'osheet/row'
 
 module Osheet
   class Worksheet
+    include Instance
     include Associations
     include WorkbookElement
     include MetaElement
@@ -11,23 +12,26 @@ module Osheet
     hm :rows
 
     def initialize(workbook=nil, *args, &block)
-      @workbook = workbook
-      @name = nil
-      instance_exec(*args, &block) if block_given?
+      set_ivar(:workbook, workbook)
+      set_ivar(:name, nil)
+      if block_given?
+        set_binding_ivars(block.binding)
+        instance_exec(*args, &block)
+      end
     end
 
     def name(value=nil)
-      !value.nil? ? @name = sanitized_name(value) : @name
+      !value.nil? ? set_ivar(:name, sanitized_name(value)) : get_ivar(:name)
     end
 
     def attributes
-      { :name => @name }
+      { :name => get_ivar(:name) }
     end
 
     private
 
     def sanitized_name(name_value)
-      if @workbook && @workbook.worksheets.collect{|ws| ws.name}.include?(name_value)
+      if get_ivar(:workbook) && get_ivar(:workbook).worksheets.collect{|ws| ws.name}.include?(name_value)
         raise ArgumentError, "the sheet name '#{name_value}' is already in use.  choose a sheet name that is not used by another sheet"
       end
       name_value

data/lib/osheet/worksheet_element.rb

@@ -1,8 +1,7 @@
 module Osheet::WorksheetElement
-  class << self
-    def included(receiver)
-      receiver.send(:attr_reader, :worksheet)
-    end
+
+  def worksheet
+    get_ivar(:worksheet)
   end
 
   [:columns, :rows].each do |meth|