hamloft 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d8bedfe512c4d28b5d122a61f1846b5db24edbe
-  data.tar.gz: 78a65d753d323867d5d311423550969d648706e9
+  metadata.gz: 8127ffd8d6d91c2727a33e2df8f8f4734b68aac4
+  data.tar.gz: 84ff27e660a7400e6247a91a213d471b24236238
 SHA512:
-  metadata.gz: 1cc595fd725dc5f8ac71645b40ec37e7d0d5ea51fcc45c09c101e0a12230b62296f60cd4d7a4b0f614801b137a337b9e4edcc3394c08dbeca22de305a92d7312
-  data.tar.gz: 97ab36fba2cf92ebaa67a6f6ed6ddc323cfa8e4aeee097329471ba0e51db9b539bfe6089a3835fe0b2532f9d7474d93139533684b663ef74576e344fa93d9b30
+  metadata.gz: '039251f98048ee6dde732b6a0fafd1217011e277175996ccf25b75a32ae64b47bf08c711d2645e48e2fc78e1fdf137d5f27d33e7e4bae61cc4612264fef10d87'
+  data.tar.gz: c80aa6a0c8f60a321fea69e155e5ad0d33e734fd3f3c8d709b34ad283b2ff6a54f7c36e3f060340caeac7d673d0d71e95b772c4f275c7f4f0a5b8a8232fb092d

data/Gemfile.lock

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

data/lib/hamloft/helpers.rb

@@ -12,7 +12,15 @@ module Hamloft
 
     # styles
     def asset(url)
-      "#{Hamloft::Options.defaults[:asset_uri]}/themes/#{@_haml_locals[:theme]}/#{url}"
+      "#{asset_uri}/themes/#{@_haml_locals[:theme]}/#{url}"
+    end
+    
+    def root_asset(url)
+      "#{asset_uri}/#{url}"
+    end
+    
+    def asset_uri
+      @_haml_locals[:asset_uri] || Hamloft.asset_uri
     end
     
     def var(key, default=nil)

data/lib/hamloft/version.rb

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

data/lib/hamloft.rb

@@ -2,7 +2,6 @@ require "haml"
 require "erb"
 require "nokogiri"
 require "hamloft/engine"
-require "hamloft/options"
 require "hamloft/style_builder"
 require "hamloft/helpers"
 require "hamloft/template"
@@ -12,6 +11,7 @@ module Hamloft
   @@_templates = {}
   @@_widgets = []
   @@_block_resolver = nil
+  @@_asset_uri = nil
   
   def self.block_resolver=(resolver)
     @@_block_resolver = resolver
@@ -20,6 +20,14 @@ module Hamloft
   def self.block_resolver
     @@_block_resolver
   end
+
+  def self.asset_uri=(asset_uri)
+    @@_asset_uri = asset_uri
+  end
+  
+  def self.asset_uri
+    @@_asset_uri
+  end
   
   def self.render(haml, variables={})
     Hamloft::Engine.new(haml, remove_whitespace: true).render(Object.new, variables)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hamloft
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Tobias Strebitzer
@@ -96,7 +96,6 @@ files:
 - lib/hamloft.rb
 - lib/hamloft/engine.rb
 - lib/hamloft/helpers.rb
-- lib/hamloft/options.rb
 - lib/hamloft/style_builder.rb
 - lib/hamloft/template.rb
 - lib/hamloft/version.rb

data/lib/hamloft/options.rb

@@ -1,33 +0,0 @@
-module Hamloft
-  class Options
-    @defaults = {
-      asset_uri: "http://localhost:3000"
-    }
-
-    def self.defaults
-      @defaults
-    end
-
-    attr_accessor :asset_uri
-
-    def initialize(values = {}, &block)
-      defaults.each {|k, v| instance_variable_set :"@#{k}", v}
-      values.reject {|k, v| !defaults.has_key?(k) || v.nil?}.each {|k, v| send("#{k}=", v)}
-      yield if block_given?
-    end
-
-    def [](key)
-      send key
-    end
-
-    def []=(key, value)
-      send "#{key}=", value
-    end
-
-    private
-
-    def defaults
-      self.class.defaults
-    end
-  end
-end