report_logic 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6cea2b2274f2df932ea10af17de0b1a67a784132
-  data.tar.gz: c42344ccba2cc912cb674f51fbea93d1ca4d0ad1
+  metadata.gz: 61001da4659fe8fed8fe0dd7eb7a00e0f053531e
+  data.tar.gz: 98e2a5f2f72b48bbd96fbb0d6f75af6c9667809a
 SHA512:
-  metadata.gz: 51970b4691bf3dd8c0b156829ea95c926bd1d4f565e74647b1a85b7f9de513be51ddb7b2b23454ec40361fe502b938440b99bc94e67ec14d4908a2909ebfa81b
-  data.tar.gz: d32eb19919641f367dbf782212597645f32b4c16bc1b26d719e868ca0c7b3c519a81fe0974adb5af8574acbf742d49d6f0f08920627b17fe3052d3faae3fca61
+  metadata.gz: 85932e315fea9508600ac8e9f68492c20e79cd10dce0716aa9ed48d8daf75cd94854b4eb5e8153fd0d94c95287eca8ec75d9e99099aa5f235691aad847b01ead
+  data.tar.gz: cac5ad2ac88e7ac4f2db7a9b1b972c86d7fde70840c03fce938d2393da9b01f7f839a473132a8f760b39fa98fa22b2a9129c3fc4049eac498aa0cc76217b7ce7

data/README.md

@@ -68,8 +68,8 @@ report.each(:row) do |row|
     print field.value
     print ' | '
   end
+  puts
 end
-puts
 ```
 
 This output sucks, but it shows how simple it is to read a report
@@ -125,7 +125,7 @@ end
 You can apply a decorator to a specific field. To do so, you need to:
 
 ```ruby
-field 'Name', record.name, decorate_with: SpecifiDecorator.new
+field 'Name', record.name, decorate_with: SpecificDecorator.new
 ```
 
 ## I18n Support

data/lib/report_logic.rb

@@ -1,3 +1,5 @@
+require 'forwardable'
+
 module ReportLogic
   autoload :Base         , 'report_logic/base'
   autoload :Decorable    , 'report_logic/decorable'

data/lib/report_logic/base.rb

@@ -1,6 +1,6 @@
 module ReportLogic
   class Base
-    include Decorable
+    extend Forwardable
 
     attr_reader :collection
 
@@ -8,37 +8,20 @@ module ReportLogic
       @collection = collection
     end
 
-    def each(key)
-      return to_enum(__callee__, key) unless block_given?
-      ensure_built_and_decorated
-      sessions[key] and sessions[key].fields.each { |field| yield field }
-    end
-
-    def session(key, collection = nil, &block)
-      @current_session = sessions[key] ||= Session.new(key, self)
-      @current_session.process(collection, &block)
-    ensure
-      @current_session = nil
-    end
-
     def count
       @collection.size
     end
 
-    def method_missing(method_name, *args, &block)
-      if @current_session && @current_session.public_methods.include?(method_name)
-        @current_session.public_send(method_name, *args, &block)
-      else
-        super
-      end
+    def main_session
+      @main_session ||= Session.new(nil, self)
     end
 
-    def decorate_with(*args)
-      if @current_session
-        @current_session.decorate_with(*args)
-      else
-        super
-      end
+    def_delegators :main_session, :session, :decorate_with, :field, :value,
+      :decorate, :children
+
+    def each(*args, &block)
+      ensure_built_and_decorated
+      main_session.each(*args, &block)
     end
 
     protected
@@ -53,17 +36,5 @@ module ReportLogic
     def build
       raise NotImplementedError
     end
-
-    def decorate
-      sessions.values.each do |sess|
-        sess.decorate(@decorators)
-      end
-    end
-
-    private
-
-    def sessions
-      @sessions ||= {}
-    end
   end
 end

data/lib/report_logic/field.rb

@@ -2,13 +2,14 @@ module ReportLogic
   class Field
     include Decorable
 
-    attr_accessor :key, :value, :type, :name
+    attr_accessor :key, :value, :type, :name, :config
 
-    def initialize(name, value=nil, type: nil, key: nil, decorate_with: nil)
-      @name  = name
-      @value = value
-      @type  = type
-      @key   = key || (name.is_a?(Symbol) ? name : nil)
+    def initialize(name, value=nil, type: nil, key: nil, decorate_with: nil, **config)
+      @name   = name
+      @value  = value
+      @type   = type
+      @config = config
+      @key    = key || (name.is_a?(Symbol) ? name : nil)
       self.decorate_with(decorate_with)
     end
 

data/lib/report_logic/i18n_support.rb

@@ -1,7 +1,7 @@
 module ReportLogic
   module I18nSupport
     def i18n_decorate
-      decorators << I18nDecorator.new
+      decorate_with I18nDecorator.new
     end
   end
 end

data/lib/report_logic/session.rb

@@ -24,16 +24,19 @@ module ReportLogic
       field(nil, val, **options)
     end
 
-    def process(collection = nil)
+    def process(collection = nil, &block)
       if collection.respond_to?(:each)
         collection.each do |record|
-          @current_row = []
-          yield record
-          fields.push current_row
-          @current_row = nil
+          begin
+            @current_row = []
+            instance_exec record, &block
+            fields.push current_row
+          ensure
+            @current_row = nil
+          end
         end
       else
-        yield
+        instance_exec &block
       end
     end
 
@@ -46,6 +49,23 @@ module ReportLogic
           field_or_row.decorate(master_decorators + decorators)
         end
       end
+      children.each do |_, sess|
+        sess.decorate(decorators)
+      end
+    end
+
+    def each(key)
+      return to_enum(__callee__, key) unless block_given?
+      children[key] and children[key].fields.each { |field| yield field }
+    end
+
+    def session(key, collection = nil, &block)
+      sess = children[key] ||= Session.new(key, @report)
+      sess.process(collection, &block)
+    end
+
+    def children
+      @children ||= {}
     end
   end
 end

data/report_logic.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name        = 'report_logic'
-  s.version     = '0.0.2'
-  s.date        = '2014-09-18'
+  s.version     = '0.1.0'
+  s.date        = '2014-11-18'
   s.summary     = "Generating report logic."
   s.description = "This gem provides an easy way to generate reports' logic. "\
     "Using this, you can so export this report to any format you want."

data/script/console

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+runner='irb'
+
+if [ `which pry` ]; then
+  runner='pry'
+fi
+
+$runner -I "$0/../../lib" -r report_logic

data/spec/app/my_nested_sessions.rb

@@ -0,0 +1,11 @@
+class MyNestedSessions < ReportLogic::Base
+  def build
+    session :parent do
+      value "I'm a father!"
+
+      session :child, [1, 2] do
+        value "bééééé"
+      end
+    end
+  end
+end

data/spec/app/my_report.rb

@@ -13,7 +13,7 @@ class MyReport < ReportLogic::Base
     end
 
     session(:test_context) do
-      context_value
+      report.context_value
     end
 
     session(:test_master_decorator) do

data/spec/report_logic/base_spec.rb

@@ -37,4 +37,14 @@ describe ReportLogic::Base do
     expect(s1.first.value).to eq(3)
     expect(s2.first.value).to eq(3)
   end
+
+  context 'nesting sessions' do
+    it 'nests sessions' do
+      report = MyNestedSessions.new
+      report.build
+      expect(report.children.size).to eq(1)
+      expect(report.children.values.first.children.size).to eq(1)
+      expect(report.children.values.first.children.values.first.fields.size).to eq(2)
+    end
+  end
 end

data/spec/report_logic/field_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+module ReportLogic
+  describe Field do
+    it 'stores extra arguments in config' do
+      field = Field.new(nil, extra1: :a, extra2: :b)
+
+      expect(field.config).to eq({ extra1: :a, extra2: :b })
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: report_logic
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Diego Aguir Selzlein
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-18 00:00:00.000000000 Z
+date: 2014-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -44,11 +44,14 @@ files:
 - lib/report_logic/i18n_support.rb
 - lib/report_logic/session.rb
 - report_logic.gemspec
+- script/console
 - spec/app/my_decorator.rb
 - spec/app/my_i18n_report.rb
+- spec/app/my_nested_sessions.rb
 - spec/app/my_report.rb
 - spec/report_logic/base_spec.rb
 - spec/report_logic/decorator_spec.rb
+- spec/report_logic/field_spec.rb
 - spec/report_logic/i18n_support_spec.rb
 - spec/report_logic/session_spec.rb
 - spec/spec_helper.rb