magicka 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 790574b274384507133ba81bff57316fdee267695e6a86bbb36da2065d98f918
-  data.tar.gz: ded516626da7b9825e1711aa4d299cd0388de7293776cc20c9facc607b4ba8ef
+  metadata.gz: 72a1f044386185ab6424ca7bee6714e104cc5e3187bf4ce0f789dda229e71f2c
+  data.tar.gz: 34ea858057a3b387a71d1eb1d9a25ac2265344e90d4a4e0b5b9ab5f5327dc399
 SHA512:
-  metadata.gz: a2fb23dfa2dca070216bede19831ca54bc0c9ee1340418848e647512d4ec7668ee97b0015aa8d7d3b85e6014883e263107ce8360efed4286342e714f502d93ce
-  data.tar.gz: 6e165bd37c83eb5d3c0c760164f2f93e9d51d05f284621960012e24b81d5b7779140cca6f1d47128bd24a4545201e77becd489fa20d9e0ac6ba816cd01dc8fdf
+  metadata.gz: 618d045f43772a81df679643ffcf7999f2a05ca424d0d2fe5e30ee82a0a96801cfe5c6b2598b8dbd9efb8bb2ff5552a7d61a1d8b5555e2f6732c4106a35e4d0f
+  data.tar.gz: 8830926f9724a6ec3a516a222348be09f959059aae45311f2ae567f591c0d41a0e921c49a9fe71e6f708395c5739e6899d87e3873adebc120a629babed97edb0

data/.rubocop.yml

@@ -32,7 +32,7 @@ RSpec/MultipleExpectations:
     - 'spec/integration/readme/**/*_spec.rb'
 
 RSpec/NestedGroups:
-  Max: 4
+  Max: 5
   Exclude:
     - 'spec/integration/yard/**/*.rb'
 

data/README.md

@@ -11,7 +11,7 @@ Magicka
 
 Yard Documentation
 -------------------
-[https://www.rubydoc.info/gems/magicka/0.5.3](https://www.rubydoc.info/gems/magicka/0.5.3)
+[https://www.rubydoc.info/gems/magicka/0.5.4](https://www.rubydoc.info/gems/magicka/0.5.4)
 
 Installation
 ---------------

data/config/check_specs.yml

@@ -1,6 +1,5 @@
 ignore:
   - lib/magicka/version.rb
   - lib/magicka.rb
-  - lib/magicka/aggregator.rb
   - lib/magicka/aggregator/method_builder.rb
   - lib/magicka/helper.rb

data/config/yardstick.yml

@@ -1,4 +1,4 @@
-threshold: 84.2
+threshold: 84.1
 require_exact_threshold: false
 rules:
   ApiTag::Presence:

data/lib/magicka/aggregator.rb

@@ -8,9 +8,9 @@ module Magicka
     autoload :MethodBuilder, 'magicka/aggregator/method_builder'
 
     class << self
-      def with_element(element_class, method_name = nil)
+      def with_element(element_class, method_name = nil, template: nil)
         MethodBuilder
-          .new(self, element_class, method_name)
+          .new(self, element_class, method_name, template: template)
           .prepare
           .build
       end

data/lib/magicka/aggregator/method_builder.rb

@@ -6,19 +6,23 @@ module Magicka
     #
     # Class responsible for building an {Aggregator} method
     class MethodBuilder < Sinclair
-      def initialize(klass, element_class, method_name = nil)
+      def initialize(klass, element_class, method_name = nil, template: nil)
         super(klass)
 
         @element_class = element_class
         @method_name = method_name
+        @template = template
       end
 
       def prepare
         element_klass = element_class
+        template_file = template
 
         add_method(method_name) do |field, model: self.model, **args|
           element_klass.render(
-            renderer: renderer, field: field, model: model, **args
+            renderer: renderer, field: field,
+            model: model, template: template_file,
+            **args
           )
         end
 
@@ -27,7 +31,7 @@ module Magicka
 
       private
 
-      attr_reader :element_class
+      attr_reader :element_class, :template
 
       def method_name
         @method_name ||= element_class

data/lib/magicka/element.rb

@@ -77,8 +77,11 @@ module Magicka
     #
     # @return [String]
     def template
-      self.class.name.underscore
-          .gsub(%r{^.*/}, "#{template_folder}/")
+      @template ||= self
+                    .class
+                    .name
+                    .underscore
+                    .gsub(%r{^.*/}, "#{template_folder}/")
     end
   end
 end

data/lib/magicka/element/method_builder.rb

@@ -14,7 +14,7 @@ module Magicka
       #
       # @return [Array<Sinclair::MethodDefinition>]
       def add_template(template)
-        add_method(:template) do
+        add_method(:template, cached: true) do
           template
         end
 

data/lib/magicka/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Magicka
-  VERSION = '0.5.3'
+  VERSION = '0.5.4'
 end

data/spec/lib/magicka/aggregator_spec.rb

@@ -0,0 +1,209 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Magicka::Aggregator do
+  subject(:aggregator) { aggregator_class.new(renderer, model) }
+
+  let(:aggregator_class) { Class.new(described_class) }
+  let(:model)            { :my_model }
+  let(:renderer)         { instance_double('renderer') }
+  let(:template)         { 'templates/forms/input' }
+  let(:locals)           { {} }
+
+  describe '.with_element' do
+    context 'when seeting element class only' do
+      it do
+        expect { aggregator_class.with_element(Magicka::Input) }
+          .to add_method(:input)
+          .to(aggregator)
+      end
+
+      context 'when built method is called' do
+        let(:template)    { 'templates/forms/input' }
+        let(:field)       { :field }
+        let(:label)       { 'Label' }
+        let(:placeholder) { 'Value' }
+
+        let(:locals) do
+          {
+            field: field,
+            label: label,
+            ng_errors: 'my_model.errors.field',
+            ng_model: 'my_model.field',
+            placeholder: placeholder
+          }
+        end
+
+        let(:arguments) do
+          {
+            label: label,
+            placeholder: placeholder
+          }
+        end
+
+        before do
+          aggregator_class.with_element(Magicka::Input)
+
+          allow(renderer)
+            .to receive(:render)
+            .with(partial: template, locals: locals)
+        end
+
+        it 'renders an input' do
+          aggregator.input(field, arguments)
+
+          expect(renderer).to have_received(:render)
+        end
+
+        context 'when passing a custom model' do
+          let(:locals) do
+            {
+              field: field,
+              label: label,
+              ng_errors: 'my_custom_model.errors.field',
+              ng_model: 'my_custom_model.field',
+              placeholder: placeholder
+            }
+          end
+
+          it 'renders an input' do
+            aggregator.input(field, model: 'my_custom_model', **arguments)
+
+            expect(renderer).to have_received(:render)
+          end
+        end
+      end
+    end
+
+    context 'when seeting element class and method' do
+      it do
+        expect { aggregator_class.with_element(Magicka::Input, :my_input) }
+          .to add_method(:my_input)
+          .to(aggregator)
+      end
+
+      context 'when built method is called' do
+        let(:template)    { 'templates/forms/input' }
+        let(:field)       { :field }
+        let(:label)       { 'Label' }
+        let(:placeholder) { 'Value' }
+
+        let(:locals) do
+          {
+            field: field,
+            label: label,
+            ng_errors: 'my_model.errors.field',
+            ng_model: 'my_model.field',
+            placeholder: placeholder
+          }
+        end
+
+        let(:arguments) do
+          {
+            label: label,
+            placeholder: placeholder
+          }
+        end
+
+        before do
+          aggregator_class.with_element(Magicka::Input, :my_input)
+
+          allow(renderer)
+            .to receive(:render)
+            .with(partial: template, locals: locals)
+        end
+
+        it 'renders an input' do
+          aggregator.my_input(field, arguments)
+
+          expect(renderer).to have_received(:render)
+        end
+
+        context 'when passing a custom model' do
+          let(:locals) do
+            {
+              field: field,
+              label: label,
+              ng_errors: 'my_custom_model.errors.field',
+              ng_model: 'my_custom_model.field',
+              placeholder: placeholder
+            }
+          end
+
+          it 'renders an input' do
+            aggregator.my_input(field, model: 'my_custom_model', **arguments)
+
+            expect(renderer).to have_received(:render)
+          end
+        end
+      end
+    end
+
+    context 'when seeting element class and template' do
+      it do
+        expect do
+          aggregator_class.with_element(Magicka::Input, template: template)
+        end
+          .to add_method(:input)
+          .to(aggregator)
+      end
+
+      context 'when built method is called' do
+        let(:template)    { 'my_templates/my_input' }
+        let(:field)       { :field }
+        let(:label)       { 'Label' }
+        let(:placeholder) { 'Value' }
+
+        let(:locals) do
+          {
+            field: field,
+            label: label,
+            ng_errors: 'my_model.errors.field',
+            ng_model: 'my_model.field',
+            placeholder: placeholder
+          }
+        end
+
+        let(:arguments) do
+          {
+            label: label,
+            placeholder: placeholder
+          }
+        end
+
+        before do
+          aggregator_class.with_element(Magicka::Input, template: template)
+
+          allow(renderer)
+            .to receive(:render)
+            .with(partial: template, locals: locals)
+        end
+
+        it 'renders an input' do
+          aggregator.input(field, arguments)
+
+          expect(renderer).to have_received(:render)
+        end
+
+        context 'when passing a custom model' do
+          let(:locals) do
+            {
+              field: field,
+              label: label,
+              ng_errors: 'my_custom_model.errors.field',
+              ng_model: 'my_custom_model.field',
+              placeholder: placeholder
+            }
+          end
+
+          it 'renders an input' do
+            aggregator.input(field, model: 'my_custom_model', **arguments)
+
+            expect(renderer).to have_received(:render)
+          end
+        end
+      end
+    end
+  end
+end

data/spec/lib/magicka/element_spec.rb

@@ -82,5 +82,46 @@ describe Magicka::Element do
         expect(renderer).to have_received(:render)
       end
     end
+
+    context 'when class has a template but is initialized with template' do
+      subject(:element) do
+        klass.new(renderer: renderer, template: custom_template)
+      end
+
+      let(:custom_template) { 'custom_folder/custom_template' }
+      let(:expected_template) { custom_template }
+
+      before do
+        klass.template(template)
+      end
+
+      it do
+        element.render
+
+        expect(renderer).to have_received(:render)
+      end
+    end
+
+    context 'when class has folder but is initialized with template' do
+      subject(:element) do
+        klass.new(renderer: renderer, template: custom_template)
+      end
+
+      let(:custom_template)   { 'custom_folder/custom_template' }
+      let(:expected_template) { custom_template }
+
+      before do
+        klass.template_folder(folder)
+
+        method_builder.add_class_method(:name) { 'Magicka::MyElement' }
+        method_builder.build
+      end
+
+      it do
+        element.render
+
+        expect(renderer).to have_received(:render)
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: magicka
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - DarthJee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-10 00:00:00.000000000 Z
+date: 2020-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -474,6 +474,7 @@ files:
 - spec/dummy/storage/.keep
 - spec/integration/readme/.keep
 - spec/integration/yard/.keep
+- spec/lib/magicka/aggregator_spec.rb
 - spec/lib/magicka/button_spec.rb
 - spec/lib/magicka/display_spec.rb
 - spec/lib/magicka/element/class_methods_spec.rb