card-mod-bootstrap 0.11.0 → 0.11.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb22a07be3da857bf3be570e9cddf086b344f1eb1ca918414b41a6343bcadba8
-  data.tar.gz: 412e7017a6dc34b1b76ccbc228d5d14a21b84a10b0a2f1a107c9a6c06aea03cf
+  metadata.gz: 3cec84d4d107eb10c36b89dcdcf027d3c5dd2f6fd3a0f37409099cee8fe037b9
+  data.tar.gz: 641ae7a1c7480deac8d098899b3188d8e0b0e55579ebdc430d393f423b4e7754
 SHA512:
-  metadata.gz: ff9a23373846462c9fa0dc437426d931227073978b59e7329917f7b19d8cdbfb0d874ab8bf7d8384f5bbb5b5852f0ae938c73e2520bd13b1dcc3ef20275aeedc
-  data.tar.gz: f820f08dedddcae7540dc6ea8be9e94b6089d56ac04ff96dc00780dca2987a745c99ee3a1d823d303218a55baf85e38440d0075807caa9b299488c62c45e1da1
+  metadata.gz: d1ddfdf005e2cc00e919f50f6e39c5395eaae0de0c713ecb44bb8dc9a66a7a5390d89fb12f99a21f0d681eef7aa8abf97a86e188d670ebbcb355058ba9c03f84
+  data.tar.gz: 748a9964081887d8b5a9123197db0e5278e03d55201302c7b3b5843f9fa2c8273fd0770ee7d8d749dd1061c7c2694745bef2b65656f30718394159a659ed2e1b

data/db/migrate_core_cards/20170719163733_update_bootswatch_themes_to_4_beta.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+
 require_relative "lib/skin"
 
 class UpdateBootswatchThemesTo4Beta < Cardio::Migration::Core
@@ -51,5 +52,3 @@ class UpdateBootswatchThemesTo4Beta < Cardio::Migration::Core
     end
   end
 end
-
-

data/db/migrate_core_cards/20170726111053_add_bootstrap_mixins.rb

@@ -3,9 +3,9 @@
 class AddBootstrapMixins < Cardio::Migration::Core
   def up
     ensure_card "style: bootstrap mixins", type_id: Card::ScssID,
-                codename: "style_bootstrap_mixins"
+                                           codename: "style_bootstrap_mixins"
 
     ensure_card "style: bootstrap breakpoints", type_id: Card::ScssID,
-                    codename: "style_bootstrap_breakpoints"
+                                                codename: "style_bootstrap_breakpoints"
   end
 end

data/db/migrate_core_cards/20170726145012_select2.rb

@@ -3,8 +3,8 @@
 class Select2 < Cardio::Migration
   def up
     add_script "select2",
-                type_id: Card::JavaScriptID,
-                to: "*all+*script"
+               type_id: Card::JavaScriptID,
+               to: "*all+*script"
 
     # add_style "select2",
     #           type_id: Card::CssID,

data/db/migrate_core_cards/20180423160231_migrate_customized_bootstrap_skin.rb

@@ -51,6 +51,7 @@ class MigrateCustomizedBootstrapSkin < Cardio::Migration::Core
   def migrate_customizable_bootstrap_skin
     referers = Card.search refer_to: { codename: OLD_SKIN.to_s }
     return unless referers.present?
+
     replace_old_skin referers
     build_new_skin
     delete_code_card OLD_SKIN

data/db/migrate_core_cards/20180423170283_add_type_bootswatch_skin.rb

@@ -25,6 +25,7 @@ class AddTypeBootswatchSkin < Cardio::Migration::Core
       puts "updating #{skin_name}"
       card = Card.fetch(skin_name)
       next puts "card not found" unless card
+
       card.update! type_id: Card::BootswatchSkinID
     end
   end

data/db/migrate_core_cards/20180425174433_delete_deprecated_skin_cards.rb

@@ -6,6 +6,7 @@ class Skin
   def delete_deprecated_skin_cards
     skin_cards.each do |name_parts|
       next if !Card.fetch(name_parts) || !Card.fetch(name_parts).pristine?
+
       delete_card name_parts
     end
   end

data/db/migrate_core_cards/20181129140917_fix_skin_images.rb

@@ -1,4 +1,3 @@
-
 require_relative "lib/skin"
 
 class FixSkinImages < ActiveRecord::Migration[5.2]

data/db/migrate_core_cards/data/20181108181219_migrate_classic_skins_to_bootstrap.rb

@@ -22,6 +22,7 @@ class MigrateClassicSkinsToBootstrap < ActiveRecord::Migration[5.2]
 
     layout_rule = Card[:all, :layout]
     return unless layout_rule.first_name.key == UNSUPPORTED_LAYOUT
+
     layout_rule.update! content: DEFAULT_LAYOUT
   end
 end

data/db/migrate_core_cards/lib/skin.rb

@@ -4,7 +4,7 @@ class Skin
 
   class << self
     def vendor_path
-      File.expand_path "../../../../vendor", __FILE__
+      File.expand_path "../../../vendor", __dir__
     end
 
     def bootstrap_scss_path filename

data/lib/bootstrap.rb

@@ -6,11 +6,13 @@ class Bootstrap
   extend ComponentLoader
   load_components
 
+  attr_reader :context
+
   def initialize context=nil
     @context = context
   end
 
   def render *args, &block
-    instance_exec *args, &block
+    instance_exec(*args, &block)
   end
 end

data/lib/bootstrap/component.rb

@@ -1,68 +1,8 @@
-#! no set module
 class Bootstrap
-  class TagMethod
-    def initialize component, name, html_class, tag_opts={}, &tag_block
-      @component = component
-      @name = name
-      @html_class = html_class
-      @tag_opts = tag_opts
-      @tag_block = tag_block
-      @append = []
-      @wrap = []
-      @xm = Builder::XmlMarkup.new
-    end
-
-    def call *args, &content_block
-      component.content.push "".html_safe
-
-      content, opts = content_block.call
-      wrappers = @wrap.pop
-      if wrappers.present?
-        while wrappers.present? do
-          wrapper = wrappers.shift
-          if wrapper.is_a? Symbol
-            send wrapper, &content_block
-          else
-            instance_exec(content, &wrappers.shift)
-          end
-        end
-      else
-        add_content content
-      end
-
-      collected_content = @content.pop
-      tag_name = opts.delete(:tag) if tag_name == :yield
-      add_content content_tag(tag_name, collected_content, opts, false)
-      @append.pop.each do |block|
-        add_content instance_exec(&block)
-      end
-      ""
-    end
-
-    def method_missing method, *args, &block
-      @component.send method, *args, &block
-    end
-
-    def prepend &block
-      tmp = @content.pop
-      instance_exec &block
-      @content << tmp
-    end
-
-    def wrap &block
-      instance_exec &block
-    end
-
-    def append &block
-      @append[-1] << block
-    end
-
-    def wrapInner tag=nil, &block
-      @wrap[-1] << (block_given? ? block : tag)
-    end
-  end
-
+  # render components of bootstrap library
   class Component
+    extend ComponentClass
+
     def initialize context, *args, &block
       @context = context
       @content = ["".html_safe]
@@ -74,64 +14,18 @@ class Bootstrap
       @html = Builder::XmlMarkup.new
     end
 
-    class << self
-      def render format, *args, &block
-        new(format, *args, &block).render
-      end
-
-      # Like def_tag_method but always generates a div tag
-      # The tag option is not available
-      def def_div_method name, html_class, opts={}, &tag_block
-        def_tag_method name, html_class, opts.merge(tag: :div), &tag_block
-      end
-
-      # Defines a method that generates a html tag
-      # @param method_name [Symbol, String] the name of the method. If no :tag option in tag_opts is defined then the name is also the name of the tag that the method generates
-      # @param html_class [String] a html class that is added to tag. Use nil if you don't want a html_class
-      # @param tag_opts [Hash] additional argument that will be added to the tag
-      # @option tag_opts [Symbol, String] tag the name of the tag
-      # @example
-      #   def_tag_method :link, "known-link", tag: :a, id: "uniq-link"
-      #   link  # => <a class="known-link" id="uniq-link"></a>
-      def def_tag_method method_name, html_class, tag_opts={}, &tag_opts_block
-        tag = tag_opts.delete(:tag) || method_name
-        return def_simple_tag_method method_name, tag, html_class, tag_opts unless block_given?
-
-        define_method method_name do |*args, &content_block|
-          content, opts, new_child_args = standardize_args args, &tag_opts_block
-          add_classes opts, html_class, tag_opts.delete(:optional_classes)
-
-          @html.tag! tag, opts do
-            instance_exec &content_block
-          end
-        end
-      end
-
-      def def_simple_tag_method method_name, tag, html_class, tag_opts={}
-        define_method method_name do |*args, &content_block|
-          @html.tag! tag, class: html_class do
-            instance_exec &content_block
-          end
-        end
-      end
-    end
-
-
     def render
-      @rendered = begin
-        render_content
-        # @content[-1]
-      end
+      @rendered = render_content
     end
 
     def prepend &block
       tmp = @content.pop
-      instance_exec &block
+      instance_exec(&block)
       @content << tmp
     end
 
     def insert &block
-      instance_exec &block
+      instance_exec(&block)
     end
 
     def append &block
@@ -142,46 +36,63 @@ class Bootstrap
       @wrap[-1] << (block_given? ? block : tag)
     end
 
+    def card
+      @context.context.card
+    end
+
     private
 
+    def tag_method_opts args, html_class, tag_opts, &tag_opts_block
+      opts = {}
+      _blah, opts, _blah = standardize_args args, &tag_opts_block if block_given?
+      add_classes opts, html_class, tag_opts.delete(:optional_classes)
+      opts
+    end
+
     def render_content
       # if @build_block.arity > 0
-      instance_exec *@args, &@build_block
+      instance_exec(*@args, &@build_block)
     end
 
     def generate_content content, processor, &block
-      content = instance_exec &block if block.present?
+      content = instance_exec(&block) if block.present?
       return content if !processor || !content.is_a?(Array)
-      content.each {|item| send processor, item}
+
+      content.each { |item| send processor, item }
       ""
     end
 
     def with_child_args args
       @child_args << args if args.present?
-      res = yield
-      @child_args.pop if args.present?
-      res
+      yield.tap { @child_args.pop if args.present? }
     end
 
     def add_content content
       @content[-1] << "\n#{content}".html_safe if content.present?
     end
 
-    def process_tag tag_name, &content_block
+    def standardize_args args, &block
+      opts = standardize_opts args
+      items = items_from_args args
+      opts, args = standardize_block_args opts, args, &block if block.present?
+
+      [items, opts, args]
     end
 
-    def standardize_args args, &block
-      opts = args.last.is_a?(Hash) ? args.pop : {}
-      items = ((args.one? && args.last.is_a?(String)) || args.last.is_a?(Array)) &&
-        args.pop
-      if block.present?
-        opts, args = instance_exec opts, args, &block
-        unless opts.is_a?(Hash)
+    def standardize_opts args
+      args.last.is_a?(Hash) ? args.pop : {}
+    end
+
+    def items_from_args args
+      ((args.one? && args.last.is_a?(String)) || args.last.is_a?(Array)) && args.pop
+    end
+
+    def standardize_block_args opts, args, &block
+      instance_exec(opts, args, &block).tap do |s_opts, _s_args|
+        unless s_opts.is_a? Hash
           raise Card::Error, "first return value of a tag block has to be a hash"
         end
       end
-
-      [items, opts, args]
     end
 
     def add_classes opts, html_class, optional_classes

data/lib/bootstrap/component/carousel.rb

@@ -2,14 +2,14 @@ class Bootstrap
   class Component
     class Carousel < Component
       def render_content
-        carousel *@args, &@build_block
+        carousel(*@args, &@build_block)
       end
 
       def carousel id, active_index, &block
         @id = id
         @active_item_index = active_index
         @items = []
-        instance_exec &block
+        instance_exec(&block)
 
         @html.div class: "carousel slide", id: id, "data-ride" => "carousel" do
           indicators
@@ -26,16 +26,24 @@ class Bootstrap
       def items
         @html.div class: "carousel-inner", role: "listbox" do
           @items.each_with_index do |item, index|
-            html_opts = { class: "carousel-item" }
-            add_class html_opts, "active" if index == @active_item_index
-            @html.div html_opts do
-              item = item.call if item.respond_to?(:call)
-              @html << item if item.is_a?(String)
-            end
+            carousel_item item, carousel_item_opts(index)
           end
         end
       end
 
+      def carousel_item_opts index
+        { class: "carousel-item" }.tap do |opts|
+          add_class opts, "active" if index == @active_item_index
+        end
+      end
+
+      def carousel_item item, html_opts
+        @html.div html_opts do
+          item = item.call if item.respond_to?(:call)
+          @html << item if item.is_a?(String)
+        end
+      end
+
       def control_prev
         @html.a class: "carousel-control-prev", href: "##{@id}", role: "button",
                 "data-slide" => "prev" do

data/lib/bootstrap/component/component_class.rb

@@ -0,0 +1,36 @@
+class Bootstrap
+  class Component
+    # class methods for Bootstrap::Component
+    module ComponentClass
+      def render format, *args, &block
+        new(format, *args, &block).render
+      end
+
+      # Like def_tag_method but always generates a div tag
+      # The tag option is not available
+      def def_div_method name, html_class, opts={}, &tag_block
+        def_tag_method name, html_class, opts.merge(tag: :div), &tag_block
+      end
+
+      # Defines a method that generates a html tag
+      # @param method_name [Symbol, String] the name of the method. If no :tag option
+      #   in tag_opts is defined then the name is also the name of the tag that the
+      #   method generates
+      # @param html_class [String] a html class that is added to tag. Use nil if you
+      #   don't want a html_class
+      # @param tag_opts [Hash] additional argument that will be added to the tag
+      # @option tag_opts [Symbol, String] tag the name of the tag
+      # @example
+      #   def_tag_method :link, "known-link", tag: :a, id: "uniq-link"
+      #   link  # => <a class="known-link" id="uniq-link"></a>
+      def def_tag_method method_name, html_class, tag_opts={}, &tag_opts_block
+        tag = tag_opts.delete(:tag) || method_name
+        define_method method_name do |*args, &content_block|
+          @html.tag! tag, tag_method_opts(args, html_class, tag_opts, &tag_opts_block) do
+            instance_exec(&content_block)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/bootstrap/component/form.rb

@@ -2,7 +2,7 @@ class Bootstrap
   class Component
     class Form < Component
       def render_content *args
-        form *args, &@build_block
+        form(*args, &@build_block)
       end
 
       #
@@ -23,13 +23,13 @@ class Bootstrap
         add_class opts, "form-horizontal" if opts.delete(:horizontal)
         add_class opts, "form-inline" if opts.delete(:inline)
         @html.form opts do
-          instance_exec &block
+          instance_exec(&block)
         end
       end
 
       def group text=nil, &block
         @html.div text, class: "form-group" do
-          instance_exec &block
+          instance_exec(&block)
         end
       end
 
@@ -53,7 +53,7 @@ class Bootstrap
         #   opts
         # end
 
-        define_method tag do |text: nil, id:, label: |
+        define_method tag do |id:, label:, text: nil|
           @html.input id: id, class: "form-control", type: tag do
             @html.label label, for: id if label
             @html << text