dom_for 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8fc0fad1bfddcb6a68a0801745603b5d4a4aed9
-  data.tar.gz: 6c713b8e9135fb37737a3c5dd56da9dc05b5b09a
+  metadata.gz: ff2f6bc3ad37ace7fcf626962600351cfb257088
+  data.tar.gz: ab0d28b29b3b99c5977414e5192c55d285d70474
 SHA512:
-  metadata.gz: 22b9ee7cb04d7c2c19328533812d64bfe486d7a687333cb43c6e52e422e15c58f445877a374b164b8b12b4d384704001cddd8ca2917b6e2ccbf271d2c26ac2b1
-  data.tar.gz: 001723acf36b81251b7ac16a9c266fc2c31863f449ad06a10131f1c8ec80839d9d2949cc1bdd0b843323ae1aee0d0c5cb18d4d7b95beb720f7f291f0d368dc48
+  metadata.gz: 18bbd0f94835183e60dd520c573d6dd1de354608f9ebdfb5b8e4c010cb5bc6338e6ee865e626198cc168f206f66a670f11f591b8f18c7c481219bfae4a586321
+  data.tar.gz: 2a81fa2105bedbfe31a65708160d68189b0441967a01f80bda3be72361b71c1939a9ecbb73f22e4846893a394ed0879b4d53a7acaae34344224b75fa16f58e8a

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.2.0 (24/11/2015)
+
+### Features
+
+* Ability to passing html class as an argument
+
 ## 1.1.0 (24/11/2015)
 
 ### Features

data/README.md

@@ -24,11 +24,11 @@ Or install it yourself as:
 
 ## Usage
 
-By default the helper `dom_for` creates tag `div`. But it can override, passing an additional argument `tag`, for example: `dom _for User, tag: :span`:
+By default the helper `dom_for` creates tag `div`. But it can override, passing an additional argument `tag: :span`, for example:
 
 ```erb
 <%# /app/views/users/index.html.erb %>
-<%= dom_for User, attribute_1: 'value_1', attribute_2: 'value_2', attribute_3: 'value_3' do %>
+<%= dom_for User, class: 'customers', attribute_1: 'value_1', attribute_2: 'value_2', attribute_3: 'value_3' do %>
   <% @users.each do |user| %>
     <%= dom_for user, tag: :p, admin: user.admin, blocked: user.blocked do %>
       <%= content_tag(:span, user.name) %>
@@ -38,7 +38,7 @@ By default the helper `dom_for` creates tag `div`. But it can override, passing
 ```
 
 ```html
-<div id="users" class="users" data-action="index" data-attribute-1="value_1" data-attribute-2="value_2" data-attribute-3="value_3">
+<div id="users" class="users customers" data-action="index" data-attribute-1="value_1" data-attribute-2="value_2" data-attribute-3="value_3">
   <p id="user_1" class="user" data-admin="true" data-blocked="false" data-object-id="1">
     <span>Mikhail</span>
   </div>
@@ -82,13 +82,13 @@ The second argument passed to additional html-attributes (is optional):
 
 ```erb
 <%# /app/views/users/index.html.erb %>
-<%= dom_for User, attribute_1: 'value_1', attribute_2: 'value_2' do %>
+<%= dom_for User class: 'clients', attribute_1: 'value_1', attribute_2: 'value_2' do %>
   <%= tag(:span) %>
 <% end %>
 ```
 
 ```html
-<div id="users" class="users" data-action="index" data-attribute-1="value_1" data-attribute-2="value_2">
+<div id="users" class="users clients" data-action="index" data-attribute-1="value_1" data-attribute-2="value_2">
   <span />
 </div>
 ```

data/lib/dom_for.rb

@@ -28,12 +28,13 @@ module DomFor
   # @return [String] Sanitized HTML string
   #
   def dom_for(object, attrs = {}, &block)
-    tag = attrs.delete(:tag) || :div
+    tag   = attrs.delete(:tag) || :div
+    klass = attrs.delete(:class)
 
     if object.instance_of? Class
-      _dom_for_model(object, tag, attrs, &block)
+      _dom_for_model(object, tag, klass, attrs, &block)
     else
-      _dom_for_record(object, tag, attrs, &block)
+      _dom_for_record(object, tag, klass, attrs, &block)
     end
   end
 end

data/lib/dom_for/model.rb

@@ -47,12 +47,13 @@ module DomFor
     #
     # @param klass [Class] Model of ActiveRecord::Base
     # @param tag [Symbol] HTML tag name
+    # @param user_class [String] HTML class
     # @param attrs [Hash] Additional attributes for the record
     # @param block [Proc] Block for a div tag
     #
     # @return [String] Sanitized HTML string
     #
-    def _dom_for_model(klass, tag, attrs = {}, &block)
+    def _dom_for_model(klass, tag, user_class, attrs = {}, &block)
       object_classes  = []
       class_name      = klass.to_s.underscore
       request_action  = request.path_parameters[:action]
@@ -77,10 +78,12 @@ module DomFor
                     class_name.pluralize
                   end
 
+      html_class = object_classes.push(user_class).compact
+
       if block_given?
-        content_tag(tag, id: object_id, class: object_classes.join(' '), data: attrs, &block)
+        content_tag(tag, id: object_id, class: html_class, data: attrs, &block)
       else
-        tag(tag, id: object_id, class: object_classes.join(' '), data: attrs)
+        tag(tag, id: object_id, class: html_class, data: attrs)
       end
     rescue
       content_tag(tag, &block)

data/lib/dom_for/record.rb

@@ -26,21 +26,23 @@ module DomFor
     #
     # @param record [ActiveRecord::Base] Instance of ActiveRecord::Base
     # @param tag [Symbol] HTML tag name
+    # @param user_class [String] HTML class
     # @param attrs [Hash] Additional attributes for the record
     # @param block [Proc] Block for a div tag
     #
     # @return [String] Sanitized HTML string
     #
-    def _dom_for_record(record, tag, attrs = {}, &block)
+    def _dom_for_record(record, tag, user_class, attrs = {}, &block)
       object_id     = dom_id(record)
       object_class  = dom_class(record.class)
+      html_class    = [object_class, user_class].compact
 
       attrs = attrs.merge(object_id: record.id) if record.persisted?
 
       if block_given?
-        content_tag(tag, id: object_id, class: object_class, data: attrs, &block)
+        content_tag(tag, id: object_id, class: html_class, data: attrs, &block)
       else
-        tag(tag, id: object_id, class: object_class, data: attrs)
+        tag(tag, id: object_id, class: html_class, data: attrs)
       end
     rescue
       content_tag(tag, &block)

data/lib/dom_for/version.rb

@@ -1,3 +1,3 @@
 module DomFor
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
 end

data/spec/helpers/dom_for_spec.rb

@@ -10,6 +10,10 @@ describe DomFor do
       expect(helper.dom_for(User, tag: :span)).to eq '<span id="users" class="users" />'
     end
 
+    it 'returns div with html class' do
+      expect(helper.dom_for(User, class: 'test ruby')).to eq '<div id="users" class="users test ruby" />'
+    end
+
     context 'with model' do
       it 'returns div without nested tags' do
         expect(helper.dom_for(User)).to eq '<div id="users" class="users" />'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dom_for
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Mikhail Grachev