hamloft 0.2.7 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 113c06e824ad187b4ff9ff2fa781d18bac54f295
-  data.tar.gz: 017326d8fb0800435c70542c8994241634c607f4
+  metadata.gz: 8569026b061930afc52b6ab828d4d8148020ff87
+  data.tar.gz: 07a4764607bf3ecee70ad7dd7435bcdbc3b483dd
 SHA512:
-  metadata.gz: f379f89815e31ec317928f7a2dfec30809206fba71caac6f30ed5bdf8bdc2c9b95ebca5e7e622de103526a97994465beb6fa6e5e06e33f02f2d542449a897bdf
-  data.tar.gz: 063e1da499ad39faf8f8840483ab2651816942fcdfdd6102885efef39b6052d26ac2c4c7161a95c48043410e547c26962553f2b99aa09420ef3318943b85a842
+  metadata.gz: c8f309ab38a398063b273ff0097af269d5ca3c479e092e7f6663aa4cc8969a64583cb35817e04ce3e867cdae05a2cb5b9bd3e5f2264ccd7074c1ffc4ba2595d3
+  data.tar.gz: 60a36a85a83e142ab2ac07ffedd6dee280d82fb1a3ace22c5e7ab0cdcc44b273e9815d0760df54220fc1cb929f5e5974d3fe93af6ed6f224cea129ba7b2f4768

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hamloft (0.2.6)
+    hamloft (2.0.2)
       haml (~> 5.0)
       nokogiri (~> 1.8)
 
@@ -11,7 +11,7 @@ GEM
     ast (2.3.0)
     coderay (1.1.1)
     diff-lcs (1.3)
-    haml (5.0.1)
+    haml (5.0.2)
       temple (>= 0.8.0)
       tilt
     method_source (0.8.2)
@@ -52,7 +52,7 @@ GEM
     ruby-progressbar (1.8.1)
     slop (3.6.0)
     temple (0.8.0)
-    tilt (2.0.7)
+    tilt (2.0.8)
     unicode-display_width (1.2.1)
 
 PLATFORMS
@@ -65,4 +65,4 @@ DEPENDENCIES
   rubocop (~> 0.49)
 
 BUNDLED WITH
-   1.14.6
+   1.15.1

data/lib/hamloft/engine.rb

@@ -19,7 +19,7 @@ module Hamloft
         extend Hamloft::Helpers
 
         # Inject widget helpers
-        Hamloft.widgets.each do |widget|
+        Hamloft.widgets.values.each do |widget|
           extend widget::Helpers if defined?(widget::Helpers)
         end
 

data/lib/hamloft/helpers.rb

@@ -41,7 +41,10 @@ module Hamloft
       end
     end
 
-    def link(href, &block)
+    def link(href, referrer = 'Baker', &block)
+      if referrer && !referrer.empty? && !href.include?('referrer=')
+        href = "#{href}#{href.include?('?') ? '&' : '?'}referrer=#{referrer}"
+      end
       haml_tag :a, href: href do
         yield if block
       end
@@ -72,11 +75,10 @@ module Hamloft
       haml_tag :div, class: '_typeloft_widget_drop_container'
     end
 
-    # widgets
-
-    def widget_block(widget, &block)
-      haml_tag :div, widget.typeloft_widget_options do
-        yield(widget) if block
+    def widget(identifier, options={}, &block)
+      widget = Hamloft.widgets[identifier].new(options, self)
+      haml_tag :widget, widget.widget_options do
+        widget.template(&block)
       end
     end
   end

data/lib/hamloft/version.rb

@@ -1,3 +1,3 @@
 module Hamloft
-  VERSION = '0.2.7'.freeze
+  VERSION = '2.0.2'.freeze
 end

data/lib/hamloft.rb

@@ -5,11 +5,10 @@ require 'hamloft/engine'
 require 'hamloft/style_builder'
 require 'hamloft/helpers'
 require 'hamloft/template'
-require 'hamloft/widget'
 
 module Hamloft
   @@_templates = {}
-  @@_widgets = []
+  @@_widgets = {}
   @@_block_resolver = nil
   @@_asset_uri = nil
 
@@ -37,8 +36,8 @@ module Hamloft
     @@_templates[key] = template
   end
 
-  def self.register_widget(klass)
-    @@_widgets.push(klass)
+  def self.register_widget(identifier, klass)
+    @@_widgets[identifier] = klass
   end
 
   def self.widgets

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hamloft
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 2.0.2
 platform: ruby
 authors:
 - Tobias Strebitzer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-06 00:00:00.000000000 Z
+date: 2017-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
@@ -99,7 +99,6 @@ files:
 - lib/hamloft/style_builder.rb
 - lib/hamloft/template.rb
 - lib/hamloft/version.rb
-- lib/hamloft/widget.rb
 - spec/fixtures/template/tumblr.rb
 - spec/fixtures/test.haml
 - spec/fixtures/widget/sample.rb

data/lib/hamloft/widget.rb

@@ -1,29 +0,0 @@
-module Hamloft
-  class Widget
-    include Hamloft::Helpers
-    attr_accessor :options
-
-    def identifier
-      'base'
-    end
-
-    def defaults
-      {}
-    end
-
-    def initialize(options)
-      @options = defaults.merge(options)
-    end
-
-    def typeloft_widget_options
-      attributes = {
-        :class => '_typeloft_widget',
-        :"data-widget-identifier" => identifier
-      }
-      @options.each do |k, v|
-        attributes["data-attribute-#{k}"] = v
-      end
-      attributes
-    end
-  end
-end