bemer 0.1.0 → 0.2.0

data/lib/bemer/configuration.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'singleton'
+require 'rails'
 
 module Bemer
   class Configuration
@@ -17,6 +18,7 @@ module Bemer
     def initialize # rubocop:disable Metrics/MethodLength
       @asset_paths              = []
       @bem                      = false
+      # Gem::Version.new('0.4.1') > Gem::Version.new('0.10.1')
       @can_use_new_matcher      = RUBY_VERSION >= '2.4.0'
       @default_block_tag        = :div
       @default_element_tag      = :div
@@ -30,7 +32,7 @@ module Bemer
     end
 
     def path
-      Rails.root.join(@path)
+      Rails.root ? Rails.root.join(@path) : @path
     end
   end
 end

data/lib/bemer/context_extentions/structure.rb

@@ -8,10 +8,9 @@ module Bemer
 
         node.params.merge!(options)
 
-        output      = node.add_child_nodes
+        node.add_child_nodes
+      ensure
         node.params = old_params
-
-        output
       end
 
       def ctx(**options)

data/lib/bemer/entity.rb

@@ -50,8 +50,8 @@ module Bemer
 
     attr_reader :css_classes, :html_attrs, :mixins, :modifiers
 
-    def extract_content(plain_text, &content)
-      block_given? ? content : plain_text
+    def extract_content(plain_content, &block)
+      block_given? ? block : plain_content
     end
 
     def extract_options!(options) # rubocop:disable Metrics/AbcSize

data/lib/bemer/entity_builder.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'active_support/core_ext/object/blank'
-require 'active_support/core_ext/hash/deep_merge'
+require 'active_support/core_ext/string/filters'
 
 module Bemer
   class EntityBuilder < Entity
@@ -11,7 +11,7 @@ module Bemer
 
       return attributes unless bem?
 
-      attributes.deep_merge!(js)
+      attributes.merge!(js)
     end
 
     def attrs=(new_attrs, save = true)
@@ -36,16 +36,12 @@ module Bemer
       bem_cascade_via_option? ? super : true
     end
 
-    def bem_cascade=(new_bem_cascade, save = true)
-      save ? @bem_cascade = new_bem_cascade : new_bem_cascade
-    end
-
     def cls
       return super unless bem?
 
       js_class = 'i-bem' if @js.present? && bem_class.present?
 
-      [bem_class, mods, mix, super, js_class].reject(&:blank?)
+      [bem_class, mods, mix, super, js_class].join(' ').squish
     end
 
     def cls=(new_cls, save = true)
@@ -61,9 +57,9 @@ module Bemer
     def js
       return {} if @js.blank? || bem_class.blank?
 
-      attrs = @js.instance_of?(TrueClass) ? {} : super
+      js_attrs = @js.instance_of?(TrueClass) ? {} : super
 
-      { data: { bem: { name => attrs } } }
+      { 'data-bem': { name => js_attrs }.to_json }
     end
 
     def js=(new_js, save = true)

data/lib/bemer/helpers.rb

@@ -10,10 +10,12 @@ module Bemer
       Bemer::Tag.new(block, element, options, &content).render
     end
 
+    # Использовать mix
     def bem_mix(*mix)
       Bemer::MixinList.new(mix).to_s
     end
 
+    # Использовать mods
     def bem_mods(*block_and_element, mods)
       block, element = *block_and_element
 
@@ -37,5 +39,13 @@ module Bemer
     def component_pack(&block)
       Bemer::ComponentPack.new(self).render(&block)
     end
+
+    def component_asset_path(name)
+      Bemer::PathResolver.new(self).resolve(name)
+    end
+
+    def component_partial_path(name)
+      Bemer::PathResolver.new(self).resolve(name, true)
+    end
   end
 end

data/lib/bemer/mixin_list.rb

@@ -14,7 +14,7 @@ module Bemer
     end
 
     def to_s
-      @mix_as_string ||= to_a.join(' ')
+      @to_s ||= to_a.join(' ')
     end
 
     protected

data/lib/bemer/modifier_list.rb

@@ -12,11 +12,11 @@ module Bemer
     end
 
     def to_a
-      @mods_as_array ||= to_h.map { |name, value| build_css_class(name, value) }
+      @to_a ||= to_h.map { |name, value| build_css_class(name, value) }
     end
 
     def to_s
-      @mods_as_string ||= to_a.join(' ')
+      @to_s ||= to_a.join(' ')
     end
 
     def to_h

data/lib/bemer/path_resolver.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Bemer
+  class PathResolver
+    def initialize(view)
+      @view = view
+    end
+
+    def resolve(name, partial = false)
+      virtual_path = view.instance_variable_get(:@virtual_path)
+      directory    = [File.dirname(virtual_path)]
+      file_name    = name.to_s
+
+      return file_name unless view.lookup_context.exists?(file_name, directory, partial)
+
+      File.join(directory, file_name).to_s
+    end
+
+    protected
+
+    attr_reader :view
+  end
+end

data/lib/bemer/pipeline/handler.rb

@@ -54,20 +54,18 @@ module Bemer
 
         node.params.merge!(params)
 
-        output      = template.nil? ? CommonTemplate.new(mode).apply!(node) : template.apply(node)
+        template.nil? ? CommonTemplate.new(mode).apply!(node) : template.apply(node)
+      ensure
         node.params = old_params
-
-        output
       end
 
       def apply_template!(mode, node)
         node.applied_modes[mode] = true
         template                 = find_template(mode, node)
-        output                   = template ? template.apply!(node) : nil
 
+        template ? template.apply!(node) : nil
+      ensure
         disable_related_modes!(mode, node)
-
-        output
       end
 
       def disable_related_modes!(mode, node)

data/lib/bemer/railtie.rb

@@ -1,25 +1,38 @@
 # frozen_string_literal: true
 
+require 'rails/railtie'
+require 'rails/version'
+require 'active_support/lazy_load_hooks'
+require 'action_controller/railtie'
+
 module Bemer
   class Railtie < ::Rails::Railtie
+    class << self
+      def assets_path_initializer
+        case ::Rails::VERSION::MAJOR
+        when 5    then :append_assets_path
+        when 3..4 then :load_config_initializers
+        end
+      end
+    end
+
     config.eager_load_namespaces << Bemer if config.respond_to?(:eager_load_namespaces)
 
     config.after_initialize do
-      ActionController::Base.prepend_view_path([Bemer.path, *Bemer.paths])
-      ActionMailer::Base.prepend_view_path([Bemer.path, *Bemer.paths])
+      paths = [Bemer.path, *Bemer.paths]
+
+      ActionController::Base.prepend_view_path(paths)
+
+      next unless defined?(ActionMailer::Base)
+
+      ActionMailer::Base.prepend_view_path(paths)
     end
 
     initializer 'bemer.helpers' do
       ActiveSupport.on_load(:action_view) { include Bemer::Helpers }
     end
 
-    initializer_name =
-      case ::Rails::VERSION::MAJOR
-      when 5    then :append_assets_path
-      when 3..4 then :load_config_initializers
-      end
-
-    initializer 'bemer.prepend_asset_paths', group: :all, after: initializer_name do |app|
+    initializer 'bemer.prepend_asset_paths', group: :all, after: assets_path_initializer do |app|
       next unless defined?(::Sprockets) && Bemer.prepend_asset_paths?
 
       app.config.assets.paths.unshift(Bemer.path.to_s, *Bemer.asset_paths)

data/lib/bemer/renderer.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'action_view/helpers/tag_helper'
+require 'action_view'
 
 module Bemer
   class Renderer

data/lib/bemer/template_list.rb

@@ -16,11 +16,9 @@ module Bemer
 
       add_default_templates
 
-      output = view.render(template: template, locals: { **options })
-
+      view.render(template: template, locals: { **options })
+    ensure
       remove_template_catalog!
-
-      output
     end
 
     protected

data/lib/bemer/tree.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'active_support/core_ext/string/output_safety'
+require 'action_view/buffers'
 require 'active_support/dependencies/autoload'
 
 module Bemer
@@ -28,7 +28,7 @@ module Bemer
       return unless block_given?
 
       builder = Builders::Tree.new(self)
-      output  = ActiveSupport::SafeBuffer.new
+      output  = ::ActionView::OutputBuffer.new
 
       output << block.binding.receiver.capture(builder, &block)
       output << render_root_nodes
@@ -86,7 +86,7 @@ module Bemer
     end
 
     def render_root_nodes
-      output   = ActiveSupport::SafeBuffer.new
+      output   = ::ActionView::OutputBuffer.new
       position = 0
 
       while position < root_nodes.length

data/lib/bemer/tree/node.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'active_support/core_ext/string/output_safety'
+require 'action_view/buffers'
 
 module Bemer
   class Tree
@@ -48,11 +48,9 @@ module Bemer
         old_parent_node  = tree.parent_node
         tree.parent_node = self
 
-        output = yield
-
+        yield
+      ensure
         tree.parent_node = old_parent_node
-
-        output
       end
 
       def print(level = 0)
@@ -74,7 +72,7 @@ module Bemer
       protected
 
       def capture_content
-        output     = ActiveSupport::SafeBuffer.new
+        output     = ::ActionView::OutputBuffer.new
         plain_text = replace_parent_and_execute { add_child_nodes } if need_add_child_nodes?
 
         output << entity_builder.content if need_include_builder_content?
@@ -94,7 +92,7 @@ module Bemer
         return if children.empty?
 
         position = 0
-        output   = ActiveSupport::SafeBuffer.new
+        output   = ::ActionView::OutputBuffer.new
 
         replace_parent_and_execute do
           while position < children.length

data/lib/bemer/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Bemer
-  VERSION = '0.1.0'.freeze
+  VERSION = '0.2.0'.freeze
 end

data/spec/bemer/railtie_spec.rb

@@ -0,0 +1,95 @@
+# frozen_string_literal: true
+
+RSpec.describe Bemer::Railtie do
+  def view_paths_for(klass)
+    klass.view_paths.map { |view_path| view_path.instance_variable_get(:@path) }
+  end
+
+  def find_initializer(name)
+    described_class.initializers.find { |initializer| initializer.name.eql?(name) }
+  end
+
+  let(:assets_path_initializer_name) { ::Rails::VERSION::MAJOR.eql?(5) ? :append_assets_path : :load_config_initializers }
+
+  describe '.assets_path_initializer' do
+    it { expect(described_class.assets_path_initializer).to be(assets_path_initializer_name) }
+  end
+
+  describe '.eager_load_namespaces' do
+    it { expect(described_class.config.eager_load_namespaces).to include(Bemer) if described_class.config.respond_to?(:eager_load_namespaces) }
+  end
+
+  describe 'view paths' do
+    let(:view_path)             { Rails.root.join('app', 'views').to_s }
+    let(:bemer_view_paths)      { [Bemer.path, *Bemer.paths].map(&:to_s) }
+    let(:mailer_view_paths)     { view_paths_for(ActionMailer::Base) }
+    let(:controller_view_paths) { view_paths_for(ActionController::Base) }
+
+    it { expect(controller_view_paths).to start_with(*bemer_view_paths, view_path) }
+    it { expect(mailer_view_paths).to start_with(*bemer_view_paths, view_path) }
+  end
+
+  describe '.initializers' do
+    let(:initializer_names) { %w[bemer.helpers bemer.prepend_asset_paths bemer.assets_precompile] }
+
+    it { expect(described_class.initializers.map(&:name)).to match_array(initializer_names) }
+  end
+
+  describe 'bemer.helpers initializer' do
+    subject(:initializer) { find_initializer('bemer.helpers') }
+
+    let(:action_view) { ActionView::Base.new }
+
+    helper_methods = %i[
+      block_tag elem_tag bem_mix bem_mods render_component
+      refine_component define_templates define_component
+      component_pack component_asset_path component_partial_path
+    ]
+
+    it { expect(initializer.after).to be_nil }
+    it { is_expected.not_to be_belongs_to(:all) }
+
+    helper_methods.each do |helper_method|
+      it { expect(action_view).to be_respond_to(helper_method) }
+    end
+  end
+
+  describe 'bemer.prepend_asset_paths initializer' do
+    subject(:initializer) { find_initializer('bemer.prepend_asset_paths') }
+
+    let(:app) { Dummy::Application }
+
+    let(:asset_paths) do
+      assets_root      = Rails.root.join('app', 'assets')
+      javascripts_path = assets_root.join('javascripts').to_s
+      stylesheets_path = assets_root.join('stylesheets').to_s
+
+      [Bemer.path.to_s, *Bemer.asset_paths, javascripts_path, stylesheets_path]
+    end
+
+    it { expect(initializer.after).to eql(assets_path_initializer_name) }
+    it { is_expected.to be_belongs_to(:all) }
+    it { expect(app.config.assets.paths).to start_with(*asset_paths) if defined?(::Sprockets) }
+
+    context 'when prepend_asset_paths is set to true' do
+      before { Bemer.config.prepend_asset_paths = true }
+
+      it { expect(initializer.run(app).uniq).to start_with(*asset_paths) if defined?(::Sprockets) }
+      it { expect(initializer.run(app)).to be_nil unless defined?(::Sprockets) }
+    end
+
+    context 'when prepend_asset_paths is set to false' do
+      before { Bemer.config.prepend_asset_paths = false }
+
+      it { expect(initializer.run(app)).to be_nil }
+    end
+  end
+
+  describe 'bemer.assets_precompile initializer' do
+    subject(:initializer) { find_initializer('bemer.assets_precompile') }
+
+    it { expect(initializer.after).to be :load_config_initializers }
+    it { is_expected.to be_belongs_to(:all) }
+    it { expect(Rails.application.config.assets.precompile[0].class).to be(Bemer::AssetMatcher) if ::Rails::VERSION::MAJOR < 4 && defined?(::Sprockets) }
+  end
+end

data/spec/dummy/config/application.rb

@@ -2,26 +2,44 @@
 
 require_relative 'boot'
 
-# Pick the frameworks you want:
-require 'active_record/railtie'
 require 'action_controller/railtie'
 require 'action_view/railtie'
 require 'action_mailer/railtie'
-require 'active_job/railtie'
-# require "action_cable/engine"
-# require "rails/test_unit/railtie"
-# require "sprockets/railtie"
+
+begin
+  require 'sprockets/railtie'
+rescue LoadError # rubocop:disable Lint/HandleExceptions
+end
 
 Bundler.require(*Rails.groups)
+
 require 'bemer'
 
 module Dummy
-  class Application < Rails::Application
-    # Initialize configuration defaults for originally generated Rails version.
-    config.load_defaults 5.1
+  class Application < ::Rails::Application
+    config.cache_classes = true
+
+    # Do not eager load code on boot. This avoids loading your whole application
+    # just for the purpose of running a single test. If you are using a tool that
+    # preloads Rails for running tests, you may have to set it to true.
+    config.eager_load = false
+
+    # Show full error reports and disable caching.
+    config.consider_all_requests_local       = true
+    config.action_controller.perform_caching = false
+
+    # Raise exceptions instead of rendering exception templates.
+    config.action_dispatch.show_exceptions = false
+
+    # Disable request forgery protection in test environment.
+    config.action_controller.allow_forgery_protection = false
+
+    # Print deprecation notices to the stderr.
+    config.active_support.deprecation = :stderr
 
-    # Settings in config/environments/* take precedence over those specified here.
-    # Application configuration should go into files in config/initializers
-    # -- all .rb files in that directory are automatically loaded.
+    unless ENV['RAILS_ENABLE_TEST_LOG']
+      config.logger    = Logger.new(nil)
+      config.log_level = :fatal
+    end
   end
 end