maglove-engine 2.0.6 → 2.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b33ea3ae9a4392b21838f7d14ea2fb6782aa6fd
-  data.tar.gz: fcae4f92106eb3fccf05b56e2895e7dd496769b1
+  metadata.gz: a2e5ec24d541ec97e5cd06f7528d96200ba25f26
+  data.tar.gz: 941908173805b33a3eec4d2c3bd991789472552b
 SHA512:
-  metadata.gz: b99f56682b39e9a8448ac8f8dadfac4fb6a5aa6fbfb7a516316950d2fa6bb8973c81810a0bdfc21d5728ad56dc1745d9e0fd6b54ecb3fa7eccf840982e52bd26
-  data.tar.gz: 62547cfb134727e8f85204fb1523ef6e5e73741c77ffeb449560655f11bb2a1f3f23bfdcb5f6731ab27d522b7935828ab00fe02e65ca8d77cfcddcc877001b84
+  metadata.gz: 85fb6a73cab59398572064539919d3a49b5753650fd5669062200c488964cb27f899c3b486ab2724747f0c6de721874ae82b31753700d1e884fee99b9834fa4f
+  data.tar.gz: 07d7f44b8b701e46ecca22f2a9a8c343680ef41f5b3fbd394e21ed74286d63d605c6c0422e6ca964d6497ede867a454b84d7bc66ec119f6c5f7e2ffb634787d7

data/lib/maglove/engine/configuration.rb

@@ -4,6 +4,13 @@ module Maglove
       include Singleton
       attr_accessor :asset_uri
       attr_accessor :block_path
+      attr_accessor :block_resolver
+      
+      def initialize
+        @block_resolver = lambda do |identifier, variables|
+          File.read(File.join(Maglove::Engine.config.block_path, "#{identifier}.haml"))
+        end
+      end
     end
   end
 end

data/lib/maglove/engine/scope.rb

@@ -14,10 +14,6 @@ module Maglove
         var(:asset_uri, Maglove::Engine.config.asset_uri)
       end
 
-      def block_path
-        var(:block_path, Maglove::Engine.config.block_path)
-      end
-
       def asset(url)
         "#{asset_uri}/themes/#{theme}/#{url}"
       end
@@ -35,9 +31,9 @@ module Maglove
       end
 
       def block(identifier, variables = {})
-        path = File.join(block_path, "#{identifier}.haml")
-        haml = File.read(path)
-        Maglove::Engine.render(haml, @variables.merge(variables))
+        variables = @variables.merge(variables)
+        haml = Maglove::Engine.config.block_resolver.call(identifier, variables)
+        Maglove::Engine.render(haml, variables)
       end
 
       def var(key, default = nil)

data/lib/maglove/engine/version.rb

@@ -1,5 +1,5 @@
 module Maglove
   module Engine
-    VERSION = "2.0.6"
+    VERSION = "2.0.7"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: maglove-engine
 version: !ruby/object:Gem::Version
-  version: 2.0.6
+  version: 2.0.7
 platform: ruby
 authors:
 - Tobias Strebitzer