simple_report 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f98c990ab100b1bbbbfe334f4ece710ed895f682
-  data.tar.gz: b4f0681aaddd82c82a6731ba74670355b622cf1d
+  metadata.gz: '059e4443b7a7da77afb6aaf74a997fd3a701b309'
+  data.tar.gz: 6c0bcf4155da5e41b12f6394f31bcbbc4317956a
 SHA512:
-  metadata.gz: f506009a364c546294118f3d5d97ebae95c70ff4b0d40aec84391c3fd47aba6335ffcaed42b113d2e6b8d174a529013c5e94bb1e5de3b726fa83cf2b544200ec
-  data.tar.gz: 4a62e6e447fee563d3befd74bc28cfc03ba311c4cec22fdecd14346f3b53bb60bd45c8a649dc898eeca7a5cdad7f9de6f131929a054de990cc960385a1b4844d
+  metadata.gz: 441965e971b584be1c63a6e00779ee6032f7a6f4fb61a00d64f32f1a5f546230ba4506f60506ccaa9facc5389d396b096d80ce618dc064d0b802044eae83c5bd
+  data.tar.gz: 4163d38ba55e7f7a18f262ccee4ce4234f712b35d59373971a277e78de3f89371a4faf25921607ec669a9bb75f4dfb96a0bc84ff24f3a11bfb6ee93d4e35c31e

data/README.md

@@ -1,4 +1,4 @@
-# SimpleReports
+# simple_report
 
 [![Build Status](https://travis-ci.org/lostapathy/simple_report.svg?branch=master)](https://travis-ci.org/lostapathy/simple_report)
 [![Code Climate](https://api.codeclimate.com/v1/badges/04ced70d7b66d1a7c42d/maintainability)](https://codeclimate.com/github/lostapathy/simple_report)

data/lib/simple_report/base.rb

@@ -1,28 +1,17 @@
 module SimpleReport
   class Base
+    def initialize
+      @sheets = []
+    end
+
     def add_format(name, format)
       @formats ||= {}
       @formats[name] = format
     end
 
-    def initialize
-      @file = Tempfile.new('simple_report')
-      @workbook = WriteXLSX.new(@file.path)
-      money = @workbook.add_format
-      money.set_num_format('$0.00')
-      add_format :money, money
-
-      heading = @workbook.add_format
-      heading.set_bold
-      add_format :heading, heading
-
-      percent = @workbook.add_format
-      percent.set_num_format('0%')
-      add_format :percent, percent
-    end
-
     def report_xls(*params)
       report(*params)
+      generate_report
       @workbook.close
       File.read @file.path
     end
@@ -30,41 +19,52 @@ module SimpleReport
     private
 
     def add_sheet(name, data)
-      sheet = Sheet.new(name)
-      @fields = []
-      sheet = @workbook.add_worksheet(name)
-      yield
-      @sheets ||= []
+      sheet = Sheet.new(name, data)
+      yield sheet
       @sheets << sheet
+    end
 
-      @fields.each_with_index do |f, index|
-        sheet.set_column(index, index, f.width)
-        sheet.write(0, index, f.name, @formats[:heading])
-      end
-
-      data.each_with_index do |ic, row|
-        @fields.each_with_index do |field, column|
-          if field.field
-            value = ic.send(field.field)
-          elsif field.value
-            value = field.value
-          elsif field.block
-            value = field.block.call(ic)
+    def generate_report
+      @file = Tempfile.new('simple_report')
+      @workbook = WriteXLSX.new(@file.path)
+      add_formats
+      @sheets.each do |sheet|
+        output_sheet = @workbook.add_worksheet(sheet.name)
+        sheet.fields.each_with_index do |f, index|
+          output_sheet.set_column(index, index, f.width)
+          output_sheet.write(0, index, f.name, @formats[:heading])
+        end
+        sheet.collection.each_with_index do |ic, row|
+          sheet.fields.each_with_index do |field, column|
+            if field.field
+              value = ic.send(field.field)
+            elsif field.value
+              value = field.value
+            elsif field.block
+              value = field.block.call(ic)
+            end
+            output_sheet.write(row + 1, column, value, find_format(field.format))
           end
-          sheet.write(row + 1, column, value, find_format(field.format))
         end
       end
     end
 
-    def field(name, field = nil, width: nil, format: nil, value: nil, &block)
-      rf = Field.new(name, field, width: width, format: format, value: value, &block)
-      @fields << rf
+    def find_format(format)
+      @formats[format]
     end
 
-    private
+    def add_formats
+      money = @workbook.add_format
+      money.set_num_format('$0.00')
+      add_format :money, money
 
-    def find_format(format)
-      @formats[format]
+      heading = @workbook.add_format
+      heading.set_bold
+      add_format :heading, heading
+
+      percent = @workbook.add_format
+      percent.set_num_format('0%')
+      add_format :percent, percent
     end
   end
 end

data/lib/simple_report/sheet.rb

@@ -1,7 +1,15 @@
 module SimpleReport
   class Sheet
-    def initialize(name)
+    attr_reader :name, :collection, :fields
+
+    def initialize(name, collection)
       @name = name
+      @collection = collection
+      @fields = []
+    end
+
+    def add_field(name, field = nil, width: nil, format: nil, value: nil, &block)
+      @fields << Field.new(name, field, width: width, format: format, value: value, &block)
     end
   end
 end

data/lib/simple_report/version.rb

@@ -1,3 +1,3 @@
 module SimpleReport
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/simple_report.rb

@@ -1,3 +1,4 @@
+require "write_xlsx"
 require "simple_report/version"
 require "simple_report/base"
 require "simple_report/sheet"

data/simple_report.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |spec|
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
-    f.match(%r{^(test|spec|features)/})
+    f.match(%r{^(test|spec|features)/}) || f.match(%r{gem$})
   end
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_report
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Joe Francis
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-14 00:00:00.000000000 Z
+date: 2017-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler