osheet 0.6.0 → 0.7.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    osheet (0.6.0)
+    osheet (0.7.0)
       enumeration (~> 1.1.0)
       xmlss (~> 0.2.0)
 
@@ -43,7 +43,6 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 1.0)
-  enumeration (~> 1.1.0)
   open4
   osheet!
   rack-test (>= 0.5.3)
@@ -51,4 +50,3 @@ DEPENDENCIES
   sinatra (>= 0.9.4)
   test-belt (= 0.2.1)
   webrat (>= 0.6.0)
-  xmlss (~> 0.2.0)

data/lib/osheet/mixin.rb

@@ -25,6 +25,15 @@ module Osheet::Mixin
     def templates
       instance_variable_get("@t") || []
     end
+
+    def partial(name, &block)
+      instance_variable_set("@p",
+        (instance_variable_get("@p") || []) << ::Osheet::Partial.new(name, &block)
+      )
+    end
+    def partials
+      instance_variable_get("@p") || []
+    end
   end
 
 end

data/lib/osheet/version.rb

@@ -1,3 +1,3 @@
 module Osheet
-  VERSION = "0.6.0"
+  VERSION = "0.7.0"
 end

data/lib/osheet/workbook.rb

@@ -50,6 +50,7 @@ module Osheet
     def use(mixin)
       (mixin.styles || []).each{ |s| push_ivar(:styles, s) }
       (mixin.templates || []).each{ |t| push_ivar(:templates, t) }
+      (mixin.partials || []).each{ |p| push_ivar(:partials, p) }
     end
 
     def writer

data/test/mixin_test.rb

@@ -7,12 +7,13 @@ module Osheet
     context "Osheet::Mixin thing" do
       subject { DefaultMixin }
 
-      should_have_readers :styles, :templates
-      should_have_instance_methods :style, :template
+      should_have_readers :styles, :templates, :partials
+      should_have_instance_methods :style, :template, :partial
 
       should "set it's defaults" do
         assert_equal [], subject.styles
         assert_equal [], subject.templates
+        assert_equal [], subject.partials
       end
     end
   end
@@ -43,4 +44,47 @@ module Osheet
     end
   end
 
+  class MixinPartialTest < Test::Unit::TestCase
+    context "that defines partials" do
+      subject { PartialedMixin }
+
+      should "have it's partials defined" do
+        assert subject.partials
+        assert_equal 2, subject.partials.size
+        assert_kind_of Partial, subject.partials.first
+      end
+    end
+  end
+
+  class MixinUseTest < Test::Unit::TestCase
+    context "A workbook that uses mixins" do
+      setup do
+        @workbook = Osheet::Workbook.new do
+          use PartialedMixin
+          use TemplatedMixin
+          use StyledMixin
+        end
+      end
+      subject { @workbook }
+
+      should "have mixin partials" do
+        workbook_partials = @workbook.partials.values
+        PartialedMixin.partials.each do |partial|
+          assert workbook_partials.include?(partial)
+        end
+      end
+
+      should "have mixin templates" do
+        workbook_templates = @workbook.templates.values.collect{ |t| t.values.first }
+        TemplatedMixin.templates.each do |template|
+          assert workbook_templates.include?(template)
+        end
+      end
+
+      should "have mixin styles" do
+        assert_equal StyledMixin.styles, @workbook.styles
+      end
+    end
+  end
+
 end

data/test/mixins.rb

@@ -29,3 +29,20 @@ class TemplatedMixin
   }
 
 end
+
+class PartialedMixin
+  include Osheet::Mixin
+
+  partial(:three_empty_rows) {
+    row { }
+    row { }
+    row { }
+  }
+
+  partial(:two_cells_in_a_row) {
+    row {
+      cell { data "one" }
+      cell { data "two" }
+    }
+  }
+end

data/test/rails/three/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../../..
   specs:
-    osheet (0.5.0)
+    osheet (0.7.0)
       enumeration (~> 1.1.0)
       xmlss (~> 0.2.0)
 

data/test/rails/two/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../../..
   specs:
-    osheet (0.5.0)
+    osheet (0.7.0)
       enumeration (~> 1.1.0)
       xmlss (~> 0.2.0)
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: osheet
 version: !ruby/object:Gem::Version 
-  hash: 7
-  prerelease: false
+  hash: 3
+  prerelease: 
   segments: 
   - 0
-  - 6
+  - 7
   - 0
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors: 
 - Kelly Redding
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-20 00:00:00 -05:00
-default_executable: 
+date: 2011-04-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bundler
@@ -322,7 +321,6 @@ files:
 - test/xmlss_writer/base_test.rb
 - test/xmlss_writer/elements_test.rb
 - test/xmlss_writer/styles_test.rb
-has_rdoc: true
 homepage: http://github.com/kelredd/osheet
 licenses: []
 
@@ -352,7 +350,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: A DSL for specifying and generating spreadsheets using Ruby