lolita-report 0.0.2 → 0.1.0

data/Gemfile

@@ -1,8 +1,7 @@
 source 'http://rubygems.org'
 
-gem "abstract"
+gem "lolita", "~> 3.1.4"
 gem "ruport"
-gem "lolita", "~> 3.1.0"
 gem "spreadsheet"
 
 group :test, :development do

data/README.rdoc

@@ -1,16 +1,13 @@
-= lolita-report
+= Lolita Report
 
-Description goes here.
+Lolita plugin that generate reports in HTML and allow to save in XLS
+== Instaltion
 
-== Contributing to lolita-report
- 
-* Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
-* Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it
-* Fork the project
-* Start a feature/bugfix branch
-* Commit and push until you are happy with your contribution
-* Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
-* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
+   gem install lolita-report
+=== First time instalation
+  rails g lolita-report:install
+=== Copying assets
+  rails g lolita-report:assets
 
 == Copyright
 

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.1.0

data/app/controllers/lolita/reports_controller.rb

@@ -2,16 +2,17 @@ class Lolita::ReportsController < ApplicationController
   include Lolita::Controllers::InternalHelpers
   layout "lolita/application"
   def show
-    report = self.resource_class.lolita.reports.by_name(params[:name])
-    report.generate_table_for_report
+    @report = self.resource_class.lolita.reports.by_name(params[:name])
     respond_to do |format|
       format.html{
-        @builder=report.build 
+        @html=@report.report_controller.render_html(:report=>@report)
         render
       }
       format.xls do |format|
-        xls=report.to_xls(:raw)
-        send_data xls, :type => :xls, :filename => report.file_name(:xls)
+        xls=@report.report_controller.render_xls(:report=>@report)
+        unless @report.file_base_name
+          send_data xls,:type=>:xls,:filename=>@report.file_name(:xls)
+        end
       end
     end
   end

data/app/reports/default_report.rb

@@ -0,0 +1,90 @@
+class DefaultReport < Ruport::Controller
+  required_option :report
+  stage :header,:body,:footer
+  finalize :report
+  
+  def setup
+    self.data=Ruport::Table(
+      :column_names=>options.report.column_names.map{|n| n.to_s.humanize},
+      :data=>collect_data(options.report.column_names)
+    )
+  end
+ 
+
+  def collect_data(column_names)
+    options.report.klass.find(:all).map{|record|
+      column_names.map{|column_name|
+        record.send(column_name.to_sym)
+      }
+    }
+  end
+
+  formatter :html do
+    build :header do
+      output << "<div class='box list'><h1 class='black'>&nbsp#{options.report.title}</h1>"
+      output << "<table><thead>"
+      data.column_names.each do |column_name|
+        output << "<th>#{column_name}</th>"
+      end
+      output << "</thead>"
+    end
+
+    build :body do
+      output << "<tbody>"
+      data.data.each{|row|
+        output << "<tr>#{row.inject(""){|result,f| result<<"<td>#{f}</td>"}}</tr>"
+      }
+      output << "</tbody>"
+    end
+
+    build :footer do
+      output << "</table>"
+      output << "</div>"
+    end
+  end
+end
+
+class XLS < Ruport::Formatter
+  renders :xls, :for=>DefaultReport
+
+  def initialize 
+    require "spreadsheet"
+    @book = Spreadsheet::Workbook.new
+    @sheet=@book.create_worksheet
+  end
+
+  def build_header
+    @sheet.name=options.report.title
+    @sheet.row(0).replace(options.report.column_names.map{|c| c.to_s.humanize})
+    @sheet.row(0).default_format=header_format()
+    0.upto(options.report.column_names.size-1) do |index|
+      @sheet.column(index).width=20
+    end
+  end
+
+  def build_body
+    data.data.each_with_index do |row,index|
+      @sheet.row(index+1).replace(row.map{|c| c.to_s})
+    end
+  end
+
+  def finalize_report
+    if options.report.save_in_file?
+      @book.write(options.report.file_name(:xls))
+    else
+      blob = StringIO.new("")
+      @book.write blob
+      output << blob.string
+    end
+  end
+
+  private
+
+  def header_format
+    Spreadsheet::Format.new(
+      :pattern_bg_color=>:grey,
+      :weight => :bold,
+      :size => 12
+    )
+  end
+end

data/app/views/lolita/reports/show.html.erb

@@ -1,9 +1,8 @@
-<div class="report">
-  <%= render_component *@builder %>
+<%= raw(@html) %>
 
-  <br/>
+<div>
   <% Lolita::Configuration::Report.formats.each do |format| %>
-    <%= link_to format.to_s.upcase, send(lolita_resource_name(:action=>:reports,:plural=>true),:format=>format) %>
+    <%= link_to image_tag("xls.png"), send(lolita_resource_name(:action=>:reports,:plural=>true),:format=>format) %>
     &nbsp;
   <% end %>
-</div>
+</div>

data/lib/generators/lolita_report/assets_generator.rb

@@ -0,0 +1,13 @@
+require 'generators/helpers/file_helper'
+module LolitaReport
+  module Generators
+    class AssetsGenerator < Rails::Generators::Base
+      include Lolita::Generators::FileHelper
+      desc "Copy all from public directory to project public directory."
+      def copy_all
+        root=File.expand_path("../../../../",__FILE__)
+        copy_dir("public",:root=>root)
+      end      
+    end
+  end
+end

data/lib/generators/lolita_report/install_generator.rb

@@ -0,0 +1,15 @@
+module LolitaReport
+  module Generators
+    class InstallGenerator < Rails::Generators::Base
+      include Lolita::Generators::FileHelper
+
+      desc "Copy assets"
+
+
+      def copy_assets
+        generate("lolita_report:assets")
+      end
+     
+    end
+  end
+end

data/lib/lolita-report.rb

@@ -3,7 +3,6 @@ $:<<File.dirname(__FILE__) unless $:.include?(File.dirname(__FILE__))
 require "lolita-report/configuration/base"
 require "lolita-report/rails"
 require "ruport"
-require "spreadsheet"
 module Lolita
   module Report
   
@@ -17,15 +16,17 @@ end
 require "lolita-report/module.rb"
 
 Lolita::Navigation::Tree.after_branch_added do
-  if self.name==:"left_side_navigation"
-    if @last_branch && @last_branch.object && @last_branch.object.is_a?(Lolita::Mapping) 
-      if @last_branch.object.to.lolita.reports.any?
-        @last_branch.object.to.lolita.reports.each do |report|
-          unless @last_branch.children.branches.detect{|b| b.options[:report_name]==report.name}
-            @last_branch.append(report,:title=>report.title,:report_name=>report.name,:url=>Proc.new{
-              send(lolita_resource_name(:action=>:reports,:plural=>true),:name=>report.name)
-            })
-          end
+  self.branches.each do |branch|
+    if branch.object.is_a?(Lolita::Mapping) && branch.object.to.lolita.reports.any?
+      klass=branch.object.to
+      klass.lolita.reports.each do |report|
+        unless branch.children.branches.detect{|child_branch| child_branch.object==report}
+          branch.append(report,:title=>report.title,:url=>Proc.new{|view,branch|
+            
+            options={:mapping=>branch.tree.parent.object,:action=>:reports,:plural=>true}
+            path_method=view.send(:lolita_resource_name,options)
+            view.send(path_method,:name=>branch.object.name)
+          })
         end
       end
     end

data/lib/lolita-report/configuration/report.rb

@@ -3,135 +3,50 @@
 module Lolita
   module Configuration
     class Report
-      include Lolita::Builder
-      
-      lolita_accessor :title,:name,:total_columns, :table,:fields
+      #include Lolita::Builder
       
+      lolita_accessor :title,:name,:class_name,:file_base_name,:controller
+      attr_writer :column_names
+
       def initialize(dbi,title=nil, &block)
   
         @dbi=dbi
-        @fields=[]
+        @column_names=[]
         @title=title
         self.instance_eval(&block) if block_given?
         raise ArgumentError, "Report must have title" unless @title
         set_default_values
       end
-      
-      # Set data for counting.
-      def total(*args)
-        @collumns_for_counting=args if args
-        @collumns_for_counting
-      end
-      # Return columns in array, which are needed counted.
-      def total_columns
-        @collumns_for_counting
-      end
-
-      # Set a title for report.
-      def name value=nil
-        @name=value if value
-        @name
-      end
 
-      def field *args, &block
-        @fields<<Lolita::Configuration::Field::Base.new(@dbi,*args,&block)
+      def report_controller
+        @controller || ::DefaultReport
       end
 
-      def fields *args
-        if args
-          @fields=[]
-          args.each{|f| field(f)}
+      def column_names *args
+        if args && args.any?
+          @column_names=args
         end
-        @fields
+        @column_names
       end
 
-      def file_name ext
-        "#{self.title} at #{Time.now.strftime("%Y-%m-%d %H:%M:%S")}.#{ext}"
+      def save_in_file?
+        !!@file_base_name
       end
 
-      # Return fields for displaying in report.
-      def custom_fields
-        @fields if @fields
+      def file_name(ext)
+        "#{@file_base_name||"#{self.name}"}_#{Time.now.strftime("%Y%m%d%H%M%S")}.#{ext}"
       end
-
-      # Generate table for report, which contain all necessary data
-      def generate_table_for_report
-        self.create_table
-        add_collumns_for_counting if collumns_for_counting_defined?
-        self.collect_data
-        @table
-      end
-
-      # generate excel file with necessary data and formating
-      def to_xls response_type=:raw
-        book = Spreadsheet::Workbook.new
-        sheet1=book.create_worksheet
-        sheet1.name=self.title
-        sheet1.row(0).replace(@table[0].attributes.map(&:to_s))
-        1.upto(@table.size){|i|
-          sheet1.row(i).replace(@table[0].attributes.collect{|f| @table[i-1].data[f]})
-        }
-        table_header_format_for sheet1
-        set_columns_width_for sheet1
-        if response_type==:raw
-          blob = StringIO.new("")
-          book.write blob
-          blob.string
+    
+      def klass
+        @klass||=if self.class_name
+          Lolita::DBI::Base.new(self.class_name.constantize)
         else
-          book.write self.file_name(:xls)
+          @dbi
         end
+        @klass
       end
-
-      protected
-
-      # set excel collumns width for sheet
-      def set_columns_width_for sheet
-        0.upto(@table[0].attributes.size-1){|i|
-          sheet.column(i).width=20
-        }
-      end
-
-      # make format for excel table header
-      def table_header_format_for sheet
-        title_format = Spreadsheet::Format.new :pattern_bg_color=>:grey,
-          :weight => :bold,
-          :size => 12
-        sheet.row(0).default_format =title_format
-      end
-
-      # Make table,which contain all necessary data for report.
-      def create_table
-        @table = Table @fields.map{|f| f.title}
-      end
-
-      # Set all necessary data into table.
-      def collect_data
-        field_names=@fields.map{|f| f.name}
-        @dbi.find(:all).each{|record|
-          @table<<field_names.map{|f_name|
-            record.send(f_name)
-          }
-        }
-      end
-
-      # Set necessary data in columns, where will bi counting something.
-      def set_data_in_counting_columns object
-        @collumns_for_counting.each{|method|
-          @hsh["#{method.to_s}_total"]=object.send(method).size
-        }
-      end
-
-      # Check if fields for counting are defined for report.
-      def collumns_for_counting_defined?
-        @collumns_for_counting.size>0 if @collumns_for_counting
-      end
-
-      # For setting data for cuonting, necessary to add this collumns to table.
-      def add_collumns_for_counting
-        @collumns_for_counting.each{|method|
-          @table.add_column("#{method.to_s}_total",:default=>0) if @table
-        }
-      end
+      
+      private
 
       def set_default_values
         @name||="report_for_#{dbi.class.to_s}_#{self.__id__}"
@@ -142,6 +57,7 @@ module Lolita
           [:xls]
         end
       end
+
     end
   end
 end

data/lib/lolita-report/rails.rb

@@ -2,5 +2,6 @@ require "lolita-report/routes"
 Mime::Type.register "application/vnd.ms-excel", :xls
 module LolitaReport
 	class Engine < Rails::Engine
+    config.autoload_paths << File.expand_path("../../../app/reports", __FILE__)
 	end
 end

data/lolita-report.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{lolita-report}
-  s.version = "0.0.2"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["ITHouse (Latvia)", "Arturs Meisters", "Artjoms Tjangins"]
-  s.date = %q{2011-04-15}
+  s.date = %q{2011-04-19}
   s.description = %q{Enable configuration and generate HTML view for Lolita resources, and also has ability to export to different formats.}
   s.email = %q{support@ithouse.lv}
   s.extra_rdoc_files = [
@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "app/controllers/lolita/reports_controller.rb",
-    "app/views/components/lolita/configuration/report/_display.html.erb",
+    "app/reports/default_report.rb",
     "app/views/lolita/reports/show.html.erb",
     "author",
     "doc/ActiveSupport.html",
@@ -78,6 +78,8 @@ Gem::Specification.new do |s|
     "doc/spec/factories/factories_rb.html",
     "doc/spec/orm/mongoid_rb.html",
     "doc/spec/spec_helper_rb.html",
+    "lib/generators/lolita_report/assets_generator.rb",
+    "lib/generators/lolita_report/install_generator.rb",
     "lib/lolita-report.rb",
     "lib/lolita-report/configuration/base.rb",
     "lib/lolita-report/configuration/report.rb",
@@ -86,6 +88,7 @@ Gem::Specification.new do |s|
     "lib/lolita-report/rails.rb",
     "lib/lolita-report/routes.rb",
     "lolita-report.gemspec",
+    "public/images/xls.png",
     "spec/configuration/report_spec.rb",
     "spec/configuration/reports_spec.rb",
     "spec/factories/factories.rb",
@@ -109,9 +112,8 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<abstract>, [">= 0"])
+      s.add_runtime_dependency(%q<lolita>, ["~> 3.1.4"])
       s.add_runtime_dependency(%q<ruport>, [">= 0"])
-      s.add_runtime_dependency(%q<lolita>, ["~> 3.1.0"])
       s.add_runtime_dependency(%q<spreadsheet>, [">= 0"])
       s.add_development_dependency(%q<factory_girl_rails>, [">= 0"])
       s.add_development_dependency(%q<cover_me>, [">= 1.0.0.rc6"])
@@ -121,9 +123,8 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
     else
-      s.add_dependency(%q<abstract>, [">= 0"])
+      s.add_dependency(%q<lolita>, ["~> 3.1.4"])
       s.add_dependency(%q<ruport>, [">= 0"])
-      s.add_dependency(%q<lolita>, ["~> 3.1.0"])
       s.add_dependency(%q<spreadsheet>, [">= 0"])
       s.add_dependency(%q<factory_girl_rails>, [">= 0"])
       s.add_dependency(%q<cover_me>, [">= 1.0.0.rc6"])
@@ -134,9 +135,8 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
     end
   else
-    s.add_dependency(%q<abstract>, [">= 0"])
+    s.add_dependency(%q<lolita>, ["~> 3.1.4"])
     s.add_dependency(%q<ruport>, [">= 0"])
-    s.add_dependency(%q<lolita>, ["~> 3.1.0"])
     s.add_dependency(%q<spreadsheet>, [">= 0"])
     s.add_dependency(%q<factory_girl_rails>, [">= 0"])
     s.add_dependency(%q<cover_me>, [">= 1.0.0.rc6"])

metadata

@@ -2,7 +2,7 @@
 name: lolita-report
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors: 
 - ITHouse (Latvia)
@@ -12,17 +12,17 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-15 00:00:00 +03:00
+date: 2011-04-19 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: abstract
+  name: lolita
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 3.1.4
   type: :runtime
   prerelease: false
   version_requirements: *id001
@@ -37,20 +37,9 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: lolita
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 3.1.0
-  type: :runtime
-  prerelease: false
-  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: spreadsheet
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -58,10 +47,10 @@ dependencies:
         version: "0"
   type: :runtime
   prerelease: false
-  version_requirements: *id004
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: factory_girl_rails
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -69,10 +58,10 @@ dependencies:
         version: "0"
   type: :development
   prerelease: false
-  version_requirements: *id005
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: cover_me
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -80,10 +69,10 @@ dependencies:
         version: 1.0.0.rc6
   type: :development
   prerelease: false
-  version_requirements: *id006
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: mongoid
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -91,10 +80,10 @@ dependencies:
         version: 2.0.0.beta
   type: :development
   prerelease: false
-  version_requirements: *id007
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: bson_ext
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -102,10 +91,10 @@ dependencies:
         version: 1.0.9
   type: :development
   prerelease: false
-  version_requirements: *id008
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: ruby-debug19
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -113,10 +102,10 @@ dependencies:
         version: "0"
   type: :development
   prerelease: false
-  version_requirements: *id009
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -124,10 +113,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *id010
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -135,7 +124,7 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *id011
+  version_requirements: *id010
 description: Enable configuration and generate HTML view for Lolita resources, and also has ability to export to different formats.
 email: support@ithouse.lv
 executables: []
@@ -153,7 +142,7 @@ files:
 - Rakefile
 - VERSION
 - app/controllers/lolita/reports_controller.rb
-- app/views/components/lolita/configuration/report/_display.html.erb
+- app/reports/default_report.rb
 - app/views/lolita/reports/show.html.erb
 - author
 - doc/ActiveSupport.html
@@ -207,6 +196,8 @@ files:
 - doc/spec/factories/factories_rb.html
 - doc/spec/orm/mongoid_rb.html
 - doc/spec/spec_helper_rb.html
+- lib/generators/lolita_report/assets_generator.rb
+- lib/generators/lolita_report/install_generator.rb
 - lib/lolita-report.rb
 - lib/lolita-report/configuration/base.rb
 - lib/lolita-report/configuration/report.rb
@@ -215,6 +206,7 @@ files:
 - lib/lolita-report/rails.rb
 - lib/lolita-report/routes.rb
 - lolita-report.gemspec
+- public/images/xls.png
 - spec/configuration/report_spec.rb
 - spec/configuration/reports_spec.rb
 - spec/factories/factories.rb
@@ -234,7 +226,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -493738605
+      hash: 1017491887
       segments: 
       - 0
       version: "0"

data/app/views/components/lolita/configuration/report/_display.html.erb

@@ -1 +0,0 @@
-<%=raw report.table.to_html%>