maglove-widgets 1.1.9 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1eb5cd011e1042cd44a2baaa9f11a8f9403957c5
-  data.tar.gz: 171a8610081e015bdb38b1750663a67252b46a2d
+  metadata.gz: 2542b44bbf19c26ed7dcabe16a07c5f24c628178
+  data.tar.gz: 4688b2ad33b157f0bc1ad5087b79b36ea28bf2f6
 SHA512:
-  metadata.gz: 743056e8d8b6aba7a112f60ef688c876b32c7a96888ec3ba97f2c12f8c6b2a04cb52779d06311c5c7da24318a93fadd1a39daaaf030b66b8e6a066a0ccfcba41
-  data.tar.gz: b0cb6ec8c3fa90db057ca4272f78aef7d88635f0ea74dd8aebc40faa86b05c3aaad3fe83fa32f9a0cee240cd0f01f895e77ba16546e724c67e957758dc60a842
+  metadata.gz: 0b54cf13eb3d8ae71dc8b4198d1bf8c0568189565d9bbfefa43fd74b738d240da3acc646403e9e9430f5dec9f1559b0e713a31f401ea97b1fc72b26044b3dcb1
+  data.tar.gz: c892ae7b1c20a78dd42e1bb5d4c1b8e9d84cbfe2153b3ba5f39c67ccc49f54c7f9631044424675531dcbd226d1e894669793261e57f1e69e380e57e4c9e5f968

data/Gemfile.lock

@@ -1,24 +1,23 @@
 PATH
   remote: .
   specs:
-    maglove-widgets (1.1.9)
-      bundler (~> 1.14)
-      hamloft (~> 0.2)
+    maglove-widgets (2.0.0)
+      bundler (~> 1.10)
+      haml (~> 4.0)
+      hamloft (~> 0.2.4)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    haml (5.0.4)
-      temple (>= 0.8.0)
+    haml (4.0.7)
       tilt
-    hamloft (0.2.7)
-      haml (~> 5.0)
-      nokogiri (~> 1.8)
-    mini_portile2 (2.3.0)
-    nokogiri (1.8.2)
-      mini_portile2 (~> 2.3.0)
-    temple (0.8.0)
-    tilt (2.0.8)
+    hamloft (0.2.4)
+      haml (~> 4.0)
+      nokogiri (~> 1.6)
+    mini_portile2 (2.1.0)
+    nokogiri (1.7.0.1)
+      mini_portile2 (~> 2.1.0)
+    tilt (2.0.7)
 
 PLATFORMS
   ruby
@@ -27,4 +26,4 @@ DEPENDENCIES
   maglove-widgets!
 
 BUNDLED WITH
-   1.16.1
+   1.14.6

data/lib/maglove/widgets.rb

@@ -6,9 +6,7 @@ require "maglove/widgets/container"
 require "maglove/widgets/heading"
 require "maglove/widgets/horizontal_rule"
 require "maglove/widgets/image"
-require "maglove/widgets/listitem"
 require "maglove/widgets/paragraph"
-require "maglove/widgets/raw_html"
 require "maglove/widgets/scrollable_image"
 require "maglove/widgets/slider"
 require "maglove/widgets/video"
@@ -24,9 +22,7 @@ module Maglove
     Hamloft.register_widget(Heading)
     Hamloft.register_widget(HorizontalRule)
     Hamloft.register_widget(Image)
-    Hamloft.register_widget(Listitem)
     Hamloft.register_widget(Paragraph)
-    Hamloft.register_widget(RawHtml)
     Hamloft.register_widget(ScrollableImage)
     Hamloft.register_widget(Slider)
     Hamloft.register_widget(Video)

data/lib/maglove/widgets/base.rb

@@ -17,16 +17,19 @@ module Maglove
       end
 
       def typeloft_widget_options
+        classes = ["_typeloft_widget", "#{identifier.dasherize}-widget"]
+        classes.push("mobile-#{@options[:mobile]}") if @options[:mobile]
         attributes = {
-          :class => "_typeloft_widget",
+          :class => classes.join(" "),
           :"data-widget-identifier" => identifier
         }
-        @options.each do |k, v|
-          if k == :padding or k == :margin
-            [:top, :right, :bottom, :left].each do |dir|
-              attributes["data-attribute-#{k}_#{dir}"] = v
-            end
-          end
+        widget_style_keys = [:padding, :padding_top, :padding_bottom, :padding_left, :padding_right, :background_color, :background_image, :background_size, :background_position]
+        widget_options = @options.except(*widget_style_keys)
+        styles = @options.slice(*widget_style_keys)
+        attributes[:style] = style_string(styles, :padding, :background_color, :background_size, :background_position) do |sb|
+          sb.add(:background_image, styles[:background_image], "url(<%= value %>)")
+        end
+        widget_options.each do |k, v|
           attributes["data-attribute-#{k}"] = v
         end
         attributes

data/lib/maglove/widgets/container.rb

@@ -7,42 +7,26 @@ module Maglove
 
       def defaults
         {
-            animate: "none",
-            image_source: false,
-            image_position: "center_center",
-            image_size: "cover",
-            parallax_effect: "none",
-            parallax_speed: 0.6,
-            background_color: "",
-            bg_color: "",
-            opacity: "",
-            border_radius: "",
-            border_width: "",
-            border_color: "#111111",
-            border_style: "",
-            style: "default",
-            padding_top: "",
-            padding_right: "",
-            padding_bottom: "",
-            padding_left: "",
-            alignment: "center",
-            min_height: "",
-            max_height: "",
-            max_width: "",
-            margin_top: "",
-            margin_right: "",
-            margin_bottom: "",
-            margin_left: "",
-            overflow_y: ""
+          animate: "none",
+          image_source: false,
+          image_position: "center_center",
+          parallax_effect: "none",
+          bg_color: "",
+          opacity: "",
+          border_radius: "",
+          border_width: "",
+          border_style: "",
+          border_color: "transparent",
+          style: "default",
+          min_height: "",
+          max_height: "",
+          overflow_y: ""
         }
       end
 
       def container_options
         result = { class: container_classes, style: container_styles }
-        if !@options[:parallax_effect].empty? and @options[:parallax_effect] != "none"
-          result["data-parallax-style"] = @options[:parallax_effect]
-          result["data-parallax-speed"] = @options[:parallax_speed]
-        end
+        result["data-parallax-style"] = @options[:parallax_effect] if !@options[:parallax_effect].empty? and @options[:parallax_effect] != "none"
         result
       end
 
@@ -54,36 +38,16 @@ module Maglove
         classes = ["one-container"]
         classes.push("animate #{@options[:animate]}") if @options[:animate] != "none"
         classes.push("container-#{@options[:style]}") unless @options[:style].empty?
-        classes.push("container-image-#{@options[:image_size]}") unless @options[:image_size].empty?
         classes.push("container-parallax") if !@options[:parallax_effect].empty? and @options[:parallax_effect] != "none"
         classes.join(" ")
       end
 
       def container_styles
-        style_string @options, :opacity, :border, :opacity, :border_radius, :border_width, :border_color, :border_style, :margin do |sb|
-          sb.add(:background_color, @options[:background_color] == "custom" ? @options[:bg_color] : nil)
-          if @options[:background_color] == "overlay"
-            sb.add(:background_image, @options[:image_source], "linear-gradient(rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0.5)), url(<%= value %>)")
-          elsif
-            sb.add(:background_image, @options[:image_source], "url(<%= value %>)")
-          end
-          sb.add(:background_position, @options[:image_position], "<%= value.split('_').join(' ') %>")
-        end
+        style_string @options, :opacity, :border, :opacity, :border_radius, :border_width, :border_style, :border_color, :min_height
       end
 
       def image_styles
-        if @options[:alignment] == "left"
-          @options[:margin_left] = "0"
-          @options[:margin_right] = "auto"
-        elsif @options[:alignment] == "right"
-          @options[:margin_left] = "auto"
-          @options[:margin_right] = "0"
-        else
-          @options[:margin_left] = "auto"
-          @options[:margin_right] = "auto"
-        end
-
-        style_string @options, :min_height, :max_height, :max_width, :padding, :overflow_y, :margin_left, :margin_right
+        style_string @options, :max_height, :overflow_y
       end
 
       module Helpers
@@ -100,4 +64,4 @@ module Maglove
       end
     end
   end
-end
+end

data/lib/maglove/widgets/heading.rb

@@ -10,9 +10,7 @@ module Maglove
           type: "h1",
           style: "default",
           align: "left",
-          margin_bottom: "1em",
-          line_height: "",
-          letter_spacing: ""
+          line_height: ""
         }
       end
 
@@ -23,8 +21,8 @@ module Maglove
             options = {}
           end
           widget_block(Widgets::Heading.new(options)) do |widget|
-            haml_tag :header, class: "#{widget.options[:style]} align-#{widget.options[:align]}", style: style_string(widget.options, :margin, :padding) do
-              haml_tag widget.options[:type], class: "_typeloft_editable _typeloft_widget_autoselect", style: style_string(widget.options, :line_height, :letter_spacing) do
+            haml_tag :header, class: "#{widget.options[:style]} align-#{widget.options[:align]}" do
+              haml_tag widget.options[:type], class: "_typeloft_editable _typeloft_widget_autoselect", style: style_string(widget.options, :line_height) do
                 haml_concat(contents) if contents
                 yield if block
               end

data/lib/maglove/widgets/image.rb

@@ -9,12 +9,8 @@ module Maglove
         {
           style: "img-responsive",
           align: "center",
-          title: "",
           source: false,
           magnify: false,
-          margin_bottom: "0",
-          max_width: "100%",
-          min_width: "0",
           tooltip_icon: "bullhorn",
           tooltip_text_alignment: "justify",
           tooltip_text_size: "medium",
@@ -37,14 +33,14 @@ module Maglove
       module Helpers
         def image_widget(options = {})
           widget_block(Widgets::Image.new(options)) do |widget|
-            haml_tag :div, class: widget.image_classes, style: "min-width: #{widget.options[:min_width]}; max-width: #{widget.options[:max_width]}; #{style_string(widget.options, :margin, :padding)}" do
+            haml_tag :div, class: widget.image_classes do
               if widget.popup?
                 haml_tag :i, class: "popup fa fa-lg fa-#{widget.options[:tooltip_icon]}"
                 haml_tag :div, class: "popup-box", style: "font-size: #{widget.options[:tooltip_text_size]}, text-align: #{widget.options[:tooltip_text_alignment]};" do
                   haml_concat(widget.options[:tooltip_text])
                 end
               end
-              haml_tag :img, class: "image #{widget.options[:style]} #{widget.options[:magnify] ? 'magnific-image' : ''}", src: widget.options[:source], title: widget.options[:title]
+              haml_tag :img, class: "image #{widget.options[:style]} #{widget.options[:magnify] ? 'magnific-image' : ''}", src: widget.options[:source]
               haml_tag :div, class: "image-drop-target"
             end
           end
@@ -54,7 +50,7 @@ module Maglove
           widget_block(Widgets::Image.new(options)) do |widget|
             haml_tag :div, class: "image-widget align-#{widget.options[:align]}" do
               link options[:href] do
-                haml_tag :img, style: style_string(widget.options, :margin, :padding), class: "image #{widget.options[:style]} #{widget.options[:magnify] ? 'magnific-image' : ''}", src: widget.options[:source]
+                haml_tag :img, class: "image #{widget.options[:style]} #{widget.options[:magnify] ? 'magnific-image' : ''}", src: widget.options[:source]
               end
               haml_tag :div, class: "image-drop-target"
             end

data/lib/maglove/widgets/paragraph.rb

@@ -10,7 +10,6 @@ module Maglove
           style: "default",
           align: "left",
           size: "md",
-          margin_bottom: "1em",
           drop_cap: "",
           drop_cap_color: "#000000",
           line_height: ""
@@ -24,12 +23,10 @@ module Maglove
             options = {}
           end
           widget_block(Widgets::Paragraph.new(options)) do |widget|
-            haml_tag :div, style: style_string(widget.options, :margin, :padding), class: "paragraph #{widget.options[:style]} align-#{widget.options[:align]} size-#{widget.options[:size]}" do
+            haml_tag :div, style: style_string(widget.options, :padding), class: "paragraph #{widget.options[:style]} align-#{widget.options[:align]} size-#{widget.options[:size]}" do
               unless widget.options[:drop_cap].empty?
-                if widget.options[:style].include?('inverse-dropcap')
-                  set_dropcap widget, "background-color"
-                else
-                  set_dropcap widget, "color"
+                haml_tag :span, class: "__dropcap", style: "color: #{widget.options[:drop_cap_color]};" do
+                  haml_concat(widget.options[:drop_cap])
                 end
               end
 
@@ -40,12 +37,6 @@ module Maglove
             end
           end
         end
-
-        def set_dropcap widget, color_attribute
-          haml_tag :span, class: "__dropcap", style: "#{color_attribute}: #{widget.options[:drop_cap_color]};" do
-            haml_concat(widget.options[:drop_cap])
-          end
-        end
       end
     end
   end

data/lib/maglove/widgets/scrollable_image.rb

@@ -15,12 +15,11 @@ module Maglove
       end
 
       module Helpers
-        def scrollable_image_widget(options = {}, &block)
+        def scrollable_image_widget(options = {})
           widget_block(Widgets::ScrollableImage.new(options)) do |widget|
             haml_tag :div, class: "scrollable-image-container #{widget.options[:show_navigation] ? 'show-navigation' : ''}", style: style_string(widget.options, :margin, :padding, :height) do
               haml_tag :div, class: "scrollable-image-inner" do
                 haml_tag :img, class: "scrollable-image", src: widget.options[:source]
-                yield if block
               end
               if widget.options[:show_navigation]
                 haml_tag :div, class: "scrollable-image-navigator scrollable-image-navigator-left"

data/maglove-widgets.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |s|
   s.name        = "maglove-widgets"
-  s.version     = "1.1.9"
+  s.version     = "2.0.0"
   s.licenses    = ["BSD-3-Clause"]
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Tobias Strebitzer"]
@@ -11,8 +11,9 @@ Gem::Specification.new do |s|
   s.homepage    = "https://bitbucket.org/MagLoft/maglove-widgets"
   s.summary     = "MagLove Widgets Repository"
   s.description = "This gem contains shared widgets for MagLove."
-  s.add_runtime_dependency "bundler", "~> 1.14"
-  s.add_runtime_dependency 'hamloft', "~> 0.2"
+  s.add_runtime_dependency "bundler", "~> 1.10"
+  s.add_runtime_dependency 'haml', "~> 4.0"
+  s.add_runtime_dependency 'hamloft', "~> 0.2.4"
   s.files        = `git ls-files`.split("\n")
   s.executables  = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.require_path = 'lib'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maglove-widgets
 version: !ruby/object:Gem::Version
-  version: 1.1.9
+  version: 2.0.0
 platform: ruby
 authors:
 - Tobias Strebitzer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-06 00:00:00.000000000 Z
+date: 2017-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,28 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '1.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '1.10'
+- !ruby/object:Gem::Dependency
+  name: haml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: hamloft
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: 0.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: 0.2.4
 description: This gem contains shared widgets for MagLove.
 email:
 - tobias.strebitzer@magloft.com
@@ -59,9 +73,7 @@ files:
 - lib/maglove/widgets/heading.rb
 - lib/maglove/widgets/horizontal_rule.rb
 - lib/maglove/widgets/image.rb
-- lib/maglove/widgets/listitem.rb
 - lib/maglove/widgets/paragraph.rb
-- lib/maglove/widgets/raw_html.rb
 - lib/maglove/widgets/scrollable_image.rb
 - lib/maglove/widgets/slider.rb
 - lib/maglove/widgets/video.rb

data/lib/maglove/widgets/listitem.rb

@@ -1,68 +0,0 @@
-module Maglove
-  module Widgets
-    class Listitem < Base
-      def identifier
-        "listitem"
-      end
-
-      def defaults
-        {
-          background_color: "#18B545",
-          text_color: "#FFFFFF",
-          arrow_color: "#FFFFFF",
-          size: "md",
-          badge: nil,
-          badge_color: "#FFFFFF",
-          badge_background: "rgba(255, 255, 255, 0.25)",
-          badge_width: "24px",
-          title: "Title",
-          subtitle: nil,
-          subtitle_style: "normal",
-          image_source: nil
-        }
-      end
-
-      def styles
-        style_string @options, :border_color, :background_color
-      end
-
-      module Helpers
-        def listitem_widget(options = {})
-          widget_block(Widgets::Listitem.new(options)) do |widget|
-            haml_tag :a, { class: "list-item list-item-#{widget.options[:size]}", href: (widget.options[:href] or "#"), style: widget.styles } do
-              if widget.options[:icon]
-                haml_tag :i, { class: "list-item-icon fa fa-#{widget.options[:icon]}" }
-              end
-              if widget.options[:image_source]
-                image_style = style_string(widget.options) do |sb|
-                  sb.add(:background_image, widget.options[:image_source], "url(<%= value %>)")
-                end
-                haml_tag :div, { class: "list-item-image", style: image_style }
-              end
-              haml_tag :div, { class: "list-item-main" } do
-                haml_tag :div, { class: "list-item-title", style: "color: #{widget.options[:text_color]}" } do
-                  haml_concat(widget.options[:title])
-                end
-                if widget.options[:subtitle]
-                  haml_tag :div, { class: "list-item-subtitle", style: "color: #{widget.options[:text_color]}; font-style: #{widget.options[:subtitle_style]}" } do
-                    haml_concat(widget.options[:subtitle])
-                  end
-                end
-              end
-              if widget.options[:badge]
-                haml_tag :div, { class: "list-item-badge" } do
-                  haml_tag :span, { style: "color: #{widget.options[:badge_color]}; background-color: #{widget.options[:badge_background]}; width: #{widget.options[:badge_width]};" } do
-                    haml_concat(widget.options[:badge])
-                  end
-                end
-              end
-              if widget.options[:href]
-                haml_tag :i, { class: "list-item-arrow fa fa-angle-right", style: "color: #{widget.options[:arrow_color]}" }
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/maglove/widgets/raw_html.rb

@@ -1,26 +0,0 @@
-module Maglove
-  module Widgets
-    class RawHtml < Base
-      def identifier
-        "raw_html"
-      end
-
-      def defaults
-        {
-            src: "",
-            css: ""
-        }
-      end
-
-      module Helpers
-        def raw_html_widget(options = {}, &block)
-          widget_block(Widgets::RawHtml.new(options)) do |widget|
-            haml_tag :div, class: "iframe-container", style: style_string(widget.options, :margin, :padding) do
-              haml_tag :iframe, src: widget.options[:src], style: widget.options[:css]
-            end
-          end
-        end
-      end
-    end
-  end
-end