hamloft 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5828cf52d103a0efddb830b76a84e14701c59ba9
-  data.tar.gz: 39948ac1b1e686caffbcbc33ff58c1702ef7f132
+  metadata.gz: 9d8bedfe512c4d28b5d122a61f1846b5db24edbe
+  data.tar.gz: 78a65d753d323867d5d311423550969d648706e9
 SHA512:
-  metadata.gz: 65920f83ae63a71f2979ef079ee622a037c6d58b1b9256fb391c3187ee84c0af759845aae8295e86068e6e3c305e95e6ee4dc1109cae0aa081a5af467e89892b
-  data.tar.gz: a1c34e93360b90b88bf4ec21ca58ac777e357eb48f987bd83238e6a95a1215755ed19cfb5688c82fb9995d84a9ebf7b3e3aac6fa9e78eab7ba5b34ea76f38ecb
+  metadata.gz: 1cc595fd725dc5f8ac71645b40ec37e7d0d5ea51fcc45c09c101e0a12230b62296f60cd4d7a4b0f614801b137a337b9e4edcc3394c08dbeca22de305a92d7312
+  data.tar.gz: 97ab36fba2cf92ebaa67a6f6ed6ddc323cfa8e4aeee097329471ba0e51db9b539bfe6089a3835fe0b2532f9d7474d93139533684b663ef74576e344fa93d9b30

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hamloft (0.2.1)
+    hamloft (0.2.2)
       haml (~> 4.0)
       nokogiri (~> 1.6)
 

data/lib/hamloft/helpers.rb

@@ -6,7 +6,7 @@ module Hamloft
     end
     
     def block(identifier, variables={})
-      haml_contents = File.read("src/themes/#{@_haml_locals[:theme]}/blocks/#{identifier}.haml")
+      haml_contents = Hamloft.block_resolver.resolve(identifier, @_haml_locals)
       Hamloft.render(haml_contents, theme: @_haml_locals[:theme], base_path: @_haml_locals[:base_path], variables: variables)
     end
 
@@ -16,7 +16,7 @@ module Hamloft
     end
     
     def var(key, default=nil)
-      variable(:variables)[key.to_sym] || default
+      variable(:variables, {})[key.to_sym] || default
     end
   
     def variable(key, default=false)

data/lib/hamloft/options.rb

@@ -1,12 +1,9 @@
 module Hamloft
   class Options
-
     @defaults = {
-      :asset_uri            => "http://localhost:3000"
+      asset_uri: "http://localhost:3000"
     }
 
-    # The default option values.
-    # @return Hash
     def self.defaults
       @defaults
     end
@@ -19,15 +16,10 @@ module Hamloft
       yield if block_given?
     end
 
-    # Retrieve an option value.
-    # @param key The value to retrieve.
     def [](key)
       send key
     end
 
-    # Set an option value.
-    # @param key The key to set.
-    # @param value The value to set for the key.
     def []=(key, value)
       send "#{key}=", value
     end
@@ -37,6 +29,5 @@ module Hamloft
     def defaults
       self.class.defaults
     end
-
   end
 end

data/lib/hamloft/version.rb

@@ -1,3 +1,3 @@
 module Hamloft
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/lib/hamloft.rb

@@ -11,6 +11,15 @@ require "hamloft/widget"
 module Hamloft
   @@_templates = {}
   @@_widgets = []
+  @@_block_resolver = nil
+  
+  def self.block_resolver=(resolver)
+    @@_block_resolver = resolver
+  end
+  
+  def self.block_resolver
+    @@_block_resolver
+  end
   
   def self.render(haml, variables={})
     Hamloft::Engine.new(haml, remove_whitespace: true).render(Object.new, variables)
@@ -31,5 +40,4 @@ module Hamloft
   def self.template(key)
     @@_templates[key]
   end
-  
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hamloft
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Tobias Strebitzer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-23 00:00:00.000000000 Z
+date: 2016-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml