trap 1.1.2 → 2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6242cdc25feb12f29bc7c83766806c37ae6ad5d7
-  data.tar.gz: f1e1288c9e0fd16841263a92364053e0e6db2a7a
+  metadata.gz: 1d9c932c31ecce9f96dbb36a22ccc91d4462164b
+  data.tar.gz: 1882e7b6bfb7fb0daff4bfbf1f213b7156d48345
 SHA512:
-  metadata.gz: c7ac55cca6b3b4f8c722e6bff0cfad6f6de272b913cfef5dab1a396b40587cb3a2ac00da09db0c45f982430b1ff003d8e4959397ac45a2092376463c4f4d0fb2
-  data.tar.gz: e2051c5425644d2e52a4d0b8af52905d2e94b9d800ee406abe676ca85c3993349c8cea5f4fca9bb4880965adfdba9aee12f5a41d99e2b5b4008a0feab8dd081e
+  metadata.gz: dffe666a921e2970f67a63892124eedba40089fe71e474f484acc91f1697e061f0e47c7e60129d4ed1139039dae095f111e10a058080585e3a1db47172650530
+  data.tar.gz: f01b4e13fc51c051c6be787ef56e5d958f4e3223b5925a8422e9be56bbcf13aef7fca6faf33cae09fef2821ccd23a40c18ed220f7562d504d472fd2f96cf4ad5

data/README.md

@@ -47,6 +47,10 @@ Using `menu_item` instead of
 </li>
 ```
 
+## For Bootstrap 
+
+You should use `trap-1.x` versions to include Bootstrap 3. Contributing to `bootstrap-3` branch.
+
 ## Contributing
 
 1. Fork it ( https://github.com/[my-github-username]/trap/fork )

data/lib/trap/helpers/bootstrap_helper.rb

@@ -2,52 +2,13 @@ module BootstrapHelper
   def menu_item(name = nil, path = '#', *args, &block)
     path = name || path if block_given?
     options = args.extract_options!
-    content_tag :li, class: is_active?(path, options) do
+    options[:class] = [options[:class], 'nav-link'].join(' ')
+    content_tag :li, class: "nav-item #{is_active?(path, options)}" do
       name, path = path, options if block_given?
       link_to name, path, options, &block
     end
   end
 
-  def dropdown(text, icon = nil, &block)
-    content_tag :li, class: :drowdown do
-      concat(link_to('#', class: 'dropdown-toggle', data: { toggle: :dropdown }) do
-	if icon
-	  concat icon_element icon
-	  concat ' '
-	end
-	concat text
-	unless icon
-	  concat ' '
-	  concat content_tag :span, '', class: :caret
-	end
-      end)
-      concat(content_tag(:ul, class: 'dropdown-menu') do
-	yield block
-      end)
-    end
-  end
-
-  def icon_element(name)
-    content_tag :i, '', class: "fa fa-#{name}"
-  end
-
-  def model_menu_item(model:, route:, icon: nil, number: nil)
-    title = model.is_a?(Class) ? model.model_name.human.pluralize(:ru) : model
-    if icon
-      menu_item route do
-        concat icon_element icon
-        concat ' '
-        concat title
-        if number && number != 0
-          concat ' '
-          concat(content_tag(:span, number.to_s, class: 'badge danger'))
-        end
-      end
-    else
-      menu_item title, route
-    end
-  end
-
   private
 
   def is_active?(path, options = {})

data/lib/trap/version.rb

@@ -1,3 +1,3 @@
 module Trap
-  VERSION = '1.1.2'
+  VERSION = '2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trap
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: '2.0'
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-26 00:00:00.000000000 Z
+date: 2017-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -79,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Bootstrap helpers