report_logic 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61001da4659fe8fed8fe0dd7eb7a00e0f053531e
-  data.tar.gz: 98e2a5f2f72b48bbd96fbb0d6f75af6c9667809a
+  metadata.gz: af450b5d734ada4dd2dc96785aa307b71f772d47
+  data.tar.gz: 6c59231be591478bef3921a3a946eee9185eba5d
 SHA512:
-  metadata.gz: 85932e315fea9508600ac8e9f68492c20e79cd10dce0716aa9ed48d8daf75cd94854b4eb5e8153fd0d94c95287eca8ec75d9e99099aa5f235691aad847b01ead
-  data.tar.gz: cac5ad2ac88e7ac4f2db7a9b1b972c86d7fde70840c03fce938d2393da9b01f7f839a473132a8f760b39fa98fa22b2a9129c3fc4049eac498aa0cc76217b7ce7
+  metadata.gz: 3684b23a5b2f11e95dfc7a10de0cd0981c7915d837416dc21df5ef3ef91032b38f0e7b727f6d23ae43df833e1e768e6507364d76644ad1cca03c1e49837171db
+  data.tar.gz: 984b3b63965d5dc82086538a47fada270405a0b16f64b39592c614a0c40ee49bc52317a7c93c1edc4aa226903afdf15e5088031d7a411e2dd039f070c4a61217

data/README.md

@@ -12,7 +12,7 @@ gem install report_logic
 Using Bundler:
 
 ```ruby
-gem 'report_logic', '~> 0.0.2'
+gem 'report_logic', '~> 0.1.1'
 ```
 
 ## Usage

data/deploy

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+gem build *.gemspec && gem push *.gem && rm *.gem

data/lib/report_logic/base.rb

@@ -1,6 +1,6 @@
 module ReportLogic
   class Base
-    extend Forwardable
+    include Decorable
 
     attr_reader :collection
 
@@ -8,20 +8,37 @@ 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 main_session
-      @main_session ||= Session.new(nil, self)
+    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
     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)
+    def decorate_with(*args)
+      if @current_session
+        @current_session.decorate_with(*args)
+      else
+        super
+      end
     end
 
     protected
@@ -36,5 +53,18 @@ 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/i18n_support.rb

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

data/lib/report_logic/session.rb

@@ -24,19 +24,16 @@ module ReportLogic
       field(nil, val, **options)
     end
 
-    def process(collection = nil, &block)
+    def process(collection = nil)
       if collection.respond_to?(:each)
         collection.each do |record|
-          begin
-            @current_row = []
-            instance_exec record, &block
-            fields.push current_row
-          ensure
-            @current_row = nil
-          end
+          @current_row = []
+          yield record
+          fields.push current_row
+          @current_row = nil
         end
       else
-        instance_exec &block
+        yield
       end
     end
 
@@ -49,23 +46,6 @@ 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/lib/report_logic.rb

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

data/report_logic.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'report_logic'
-  s.version     = '0.1.0'
+  s.version     = '0.1.1'
   s.date        = '2014-11-18'
   s.summary     = "Generating report logic."
   s.description = "This gem provides an easy way to generate reports' logic. "\

data/spec/app/my_report.rb

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

data/spec/report_logic/base_spec.rb

@@ -37,14 +37,4 @@ 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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: report_logic
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Diego Aguir Selzlein
@@ -34,6 +34,7 @@ files:
 - ".rspec"
 - ".ruby-version"
 - README.md
+- deploy
 - lib/report_logic.rb
 - lib/report_logic/base.rb
 - lib/report_logic/decorable.rb
@@ -47,7 +48,6 @@ files:
 - 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

data/spec/app/my_nested_sessions.rb

@@ -1,11 +0,0 @@
-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