AR2H 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 78cd604ee19ed84f6cc042874bb82930dc92c408
-  data.tar.gz: 7d3a2974b396088dac1a9af9e969f231013c29e4
+  metadata.gz: 8ef4662b01dddfa99efdc01e395b75490a4fe7b2
+  data.tar.gz: 4422ee47ef65b3aa1d5188d3d009f911eb1be652
 SHA512:
-  metadata.gz: 595e245e38640802f4156a3b5af38bc6ef73a5ec1c695acc4e381972eaa28ecc8d9433834532448468e3f29b8c4ddbc992d7c19b454502d8b2afbc7f95f55c06
-  data.tar.gz: b84c618822e9105e0992d75e6baa3834356d018b0e8a047cdc7eb15ff04746efd2f01e78f06aa65dc90ac926fbded3ae5fe66fc2f4c79e56fdf0f20c6d2c396d
+  metadata.gz: 9fb88d0f765aa69e8f6d0e4b8523c4e07e505fb666ca1a02c2f27a502e54049967d101157de1e7ab426fa117f11ed84e078f842eea456be96b4bb674ee8c943d
+  data.tar.gz: 5d4ea13f2f580f8c9bdefa84fef462030504b396fdbec84d5dbec00f4c271c23b5597cc61ffc722b57572bc1730b1e730a14591db24953c6528961e9f85dfba5

data/AR2H.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'AR2H'
-  spec.version       = '0.0.1'
+  spec.version       = '0.0.2'
   spec.authors       = ['Eugene Yak']
   spec.email         = ['GeneAYak@gmail.com']
 

data/lib/AR2H.rb

@@ -1,4 +1,5 @@
 require 'AR2H/executor'
+require 'AR2H/logger'
 
 require 'AR2H/concerns/active_record/base'
 require 'AR2H/concerns/active_record/relation'

data/lib/AR2H/concerns/active_record/base.rb

@@ -6,8 +6,11 @@ module AR2H
       module Base
         extend ActiveSupport::Concern
 
-        def present(presenter = :default)
-          Executor.run(self, presenter)
+        def present(presenter: :default)
+          model = self.class
+          ActiveSupport::Notifications.instrument('ar2h.presenting', model: model, presenter: presenter) do
+            Executor.run(self, presenter)
+          end
         end
 
         def presenters

data/lib/AR2H/concerns/active_record/relation.rb

@@ -6,8 +6,11 @@ module AR2H
       module Relation
         extend ActiveSupport::Concern
 
-        def present(presenter = :default)
-          self.map { |e| Executor.run(e, presenter) }
+        def present(presenter: :default)
+          model = self.model.to_s.pluralize
+          ActiveSupport::Notifications.instrument('ar2h.presenting', model: model, presenter: presenter) do
+            Executor.run(self, presenter, multiple = true)
+          end
         end
       end
 

data/lib/AR2H/executor.rb

@@ -1,12 +1,27 @@
 module AR2H
   class Executor
-    def self.run(object, presenter)
-      self.new(object, presenter).execute
+    class << self
+      def run(object, presenter_name, multiple = false)
+        presenter = object.presenters.find(presenter_name)
+        unless presenter
+          model = multiple ? object.model : object.class
+          raise ArgumentError.new("#{model}: presenter #{presenter_name} not found")
+        end
+
+        case multiple
+          when false
+            new(object, presenter).execute
+          when true
+            object.map { |el| new(el, presenter).execute }
+          else
+            raise ArgumentError.new('Bad multiple argument')
+        end
+      end
     end
 
     def initialize(object, presenter)
       @object    = object
-      @presenter = object.presenters.find presenter
+      @presenter = presenter
       @result    = Hash.new
     end
 
@@ -27,17 +42,18 @@ module AR2H
       attrs.each { |attr| attr(attr) }
     end
 
-    def has_one(model, &block)
-      _has_branch(model, &block)
+    def has_one(model, presenter: nil)
+      _has_branch(model, presenter, false)
     end
 
-    def has_many(model, &block)
-      _has_branch(model, &block)
+    def has_many(model, presenter: nil)
+      _has_branch(model, presenter, true)
     end
 
-    def _has_branch(child, &block) # :nodoc:
-      child_presenter = block ? block.call : @presenter.name
-      @result[child] = object.send(child).present(child_presenter)
+    def _has_branch(model, presenter, multiple) # :nodoc:
+      child_presenter = presenter || @presenter.name
+      child_object    = object.send(model)
+      @result[model]  = Executor.run(child_object, child_presenter, multiple)
     end
   end
 end

data/lib/AR2H/logger.rb

@@ -0,0 +1,7 @@
+ActiveSupport::Notifications.subscribe('ar2h.presenting') do |_, started, finished, _, payload|
+  time      = (1000.0 * (finished - started)).round(1)
+  model     = payload[:model]
+  presenter = payload[:presenter]
+  message   = "  Presented #{model} as #{presenter} in #{time}ms"
+  ActionController::Base.logger.info message
+end if defined? 'action_controller'

data/lib/AR2H/presenters/collection.rb

@@ -1,14 +1,14 @@
 module AR2H
   module Presenters
     class Collection
-      def initialize(model_name)
-        @model_name = model_name
+      def initialize(model)
+        @model      = model
         @presenters = Array.new
       end
 
       def add(presenter)
         if self.include? presenter.name
-          raise Exception.new("#{@model_name}: presenter #{presenter.name} is already exists")
+          raise Exception.new("#{@model}: presenter #{presenter.name} is already exists")
         else
           @presenters << presenter
         end
@@ -19,7 +19,7 @@ module AR2H
       end
 
       def list
-        @presenters.map{ |presenter| presenter.name }
+        @presenters.map { |presenter| presenter.name }
       end
 
       def include?(name)
@@ -27,9 +27,7 @@ module AR2H
       end
 
       def find(name)
-        presenter = @presenters.find{ |hasher| hasher.name == name }
-        raise Exception.new("#{@model_name}: presenter #{name} not found") unless presenter
-        presenter
+        @presenters.find { |presenter| presenter.name == name }
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: AR2H
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Eugene Yak
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-29 00:00:00.000000000 Z
+date: 2016-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -132,6 +132,7 @@ files:
 - lib/AR2H/concerns/active_record/base.rb
 - lib/AR2H/concerns/active_record/relation.rb
 - lib/AR2H/executor.rb
+- lib/AR2H/logger.rb
 - lib/AR2H/presenters/collection.rb
 - lib/AR2H/presenters/presenter.rb
 homepage: https://gitlab.com/yak/AR2H