attributes_for 0.4.4 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 884ad21850f6d97f3810393ca925b8f009b28101
-  data.tar.gz: 4603726f20a2eccd172caed557ea4bb70301e38f
+  metadata.gz: 21f33333a9b99cbf9570de9a631293eed058d910
+  data.tar.gz: 221fa4a21ec0f980e1b6b20237e555868ca1fdc3
 SHA512:
-  metadata.gz: e87c5a2daeed06a14f86c4c7872d0140a376f7b2525416d2f768cf2ced8835a58078c57628c8a02ee4d4373214d8a16eee13657a8d269f1fae699ae909823661
-  data.tar.gz: 1c555ee303dffae5250d5fedf9fe9d937c97153a0059a4203ccd28953a5fdafea256337b61d4ff90b1c76debf28255c5452f89f7acc74d6db1548f4f4d8ebe7e
+  metadata.gz: b6a6bd76ba365bbd95278722adb7fcfd3eb89e34a7b1236609275c803f7d62cfea97f35ff03a655bc2901aac931cbb7f9fb0e2254be1faffa5c66147398d9f51
+  data.tar.gz: 9d5868db7a235f928d47ba5a2d7750bc59120f14b5c60abb851003a6eb195cbb3c421824aa7cd5a33aa764bb166a0ea87c5f67cd9fd674016e4fa29f425a1a9b

data/CHANGELOG.md

@@ -1,6 +1,16 @@
 # Changelog
 
-## [0.4.4] - 2015-09-10
+## [0.5.0] - 2015-21-09
+### Fixed
+- Use font-awesome-rails `fa_icon` helper to handle icons. Icons are now
+  positioned in front of content instead of wrapping it.
+- Fixed tests.
+
+### Changed
+- Use options[:icon] to handle Font Awesome icons.
+- Wrap key-val pairs with <span> tags.
+
+## [0.4.4] - 2015-09-09
 ### Fixed
 - Explicitly require dependencies.
 

data/Gemfile.lock

@@ -1,17 +1,21 @@
 PATH
   remote: .
   specs:
-    attributes_for (0.4.4)
-      actionview (>= 3.2, < 5.0)
-      activemodel (>= 3.2, < 5.0)
+    attributes_for (0.5.0)
       chronic_duration (~> 0.10)
       font-awesome-rails (~> 4.0)
       phony (~> 2.0)
-      railties (>= 3.2, < 5.0)
+      rails (>= 3.2, < 5.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    actionmailer (4.2.4)
+      actionpack (= 4.2.4)
+      actionview (= 4.2.4)
+      activejob (= 4.2.4)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
     actionpack (4.2.4)
       actionview (= 4.2.4)
       activesupport (= 4.2.4)
@@ -25,15 +29,23 @@ GEM
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    activejob (4.2.4)
+      activesupport (= 4.2.4)
+      globalid (>= 0.3.0)
     activemodel (4.2.4)
       activesupport (= 4.2.4)
       builder (~> 3.1)
+    activerecord (4.2.4)
+      activemodel (= 4.2.4)
+      activesupport (= 4.2.4)
+      arel (~> 6.0)
     activesupport (4.2.4)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
+    arel (6.0.3)
     builder (3.2.2)
     chronic_duration (0.10.6)
       numerizer (~> 0.1.1)
@@ -49,12 +61,16 @@ GEM
     erubis (2.7.0)
     font-awesome-rails (4.4.0.0)
       railties (>= 3.2, < 5.0)
+    globalid (0.3.6)
+      activesupport (>= 4.1.0)
     http-cookie (1.0.2)
       domain_name (~> 0.5)
     i18n (0.7.0)
     json (1.8.3)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
+    mail (2.6.3)
+      mime-types (>= 1.16, < 3)
     mime-types (2.6.1)
     mini_portile (0.6.2)
     minitest (5.8.0)
@@ -62,10 +78,21 @@ GEM
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
     numerizer (0.1.1)
-    phony (2.15.0)
+    phony (2.15.1)
     rack (1.6.4)
     rack-test (0.6.3)
       rack (>= 1.0)
+    rails (4.2.4)
+      actionmailer (= 4.2.4)
+      actionpack (= 4.2.4)
+      actionview (= 4.2.4)
+      activejob (= 4.2.4)
+      activemodel (= 4.2.4)
+      activerecord (= 4.2.4)
+      activesupport (= 4.2.4)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.2.4)
+      sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
     rails-dom-testing (1.0.7)
@@ -89,6 +116,13 @@ GEM
       json (~> 1.8)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
+    sprockets (3.3.4)
+      rack (~> 1.0)
+    sprockets-rails (2.3.3)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (>= 2.8, < 4.0)
+    sqlite3 (1.3.10)
     term-ansicolor (1.3.2)
       tins (~> 1.0)
     thor (0.19.1)
@@ -106,6 +140,7 @@ PLATFORMS
 DEPENDENCIES
   attributes_for!
   coveralls
+  sqlite3
 
 BUNDLED WITH
-   1.10.3
+   1.10.6

data/README.md

@@ -43,6 +43,11 @@ Preferred icon and CSS framework is [Font Awesome][fontawesome] Bring
 ## Screenshot
 ![Screenshot](https://cloud.githubusercontent.com/assets/1222916/9355402/295b6324-46a3-11e5-9f8c-ff864b837cdd.png)
 
+## Sample Application
+
+Sample application using `attributes_for` can be found
+[here](https://github.com/blacktangent/attributes_for-demo).
+
 ## Usage
 
 Present attributes using the API in the example below. It can also generate a
@@ -52,14 +57,14 @@ strings can also be presented using the `string` method.
 ```erb
 <ul class="list-unstyled">
   <%= attributes_for @company do |b| %>
-    <li><%= b.attribute :name, class: 'fa fa-building-o' %></li>
+    <li><%= b.attribute :name, icon: 'building-o' %></li>
     <li><%= b.phone :phone %></li>
-    <li><%= b.phone :fax, class: 'fa fa-fax' %></li>
+    <li><%= b.phone :fax, icon: 'fax' %></li>
     <li><%= b.email :email %></li>
     <li><%= b.email :support_email %></li>
     <li><%= b.url :website, id: :site %></li>
     <li>
-      <%= b.attribute(:user, class: 'fa fa-user') do %>
+      <%= b.attribute(:user, icon: 'user') do %>
         <%= link_to @company.user_name, url_for(@company.user) %>
       <% end %>
     </li>
@@ -82,6 +87,8 @@ Available options:
 * __:label__ - Disables label if set to false
 * __:css__ - Override element's CSS
 * __:id__ - Set element's ID
+* __:format__ - Used with `date` helper to format dates.
+* __:icon__ - Name of Font Awesome icon to use.
 
 ## Development
 

data/app/helpers/attributes_for/rails/attributes_for_helper.rb

@@ -8,6 +8,7 @@ module AttributesFor
 
       class AttributeBuilder
         include ActionView::Helpers
+        include FontAwesome::Rails::IconHelper
 
         attr_accessor :object, :template
 
@@ -15,20 +16,28 @@ module AttributesFor
           @object, @template = object, template
         end
 
-        def string(label, options = {}, &block)
-          wrap_content(" #{label}: " + template.capture(&block), options)
+        def method_missing(method, *args, &block)
+          build_content(method, *args, &block)
         end
 
-        def method_missing(m, *args, &block)
-          build_content(m, *args, &block)
+        def string(label, options = {}, &block)
+          wrap_content(label, template.capture(&block), options)
         end
 
         private
 
         def build_content(method, attribute_name, options = {}, &block)
+          content = format_attribute(method, attribute_name, options, &block)
+
+          options[:icon] ||= icon_map(method)
+
+          wrap_content(human_name(attribute_name), content, options)
+        end
+
+        def format_attribute(method, attribute_name, options = {}, &block)
           value = object.public_send(attribute_name)
 
-          content = if block_given?
+          if block_given?
             template.capture(&block)
           elsif value.to_s.empty?
             I18n.t "attributes_for.not_set"
@@ -51,34 +60,35 @@ module AttributesFor
               value
             end
           end
+        end
 
-          options[:class] ||= icon_map(method)
-          options[:id]    ||= attribute_name.to_s
+        def wrap_content(label, content, options)
+          html_options         = options[:html] || {}
+          html_options[:id]    = options.delete(:id) if options.key?(:id)
+          html_options[:class] = options.delete(:class) if options.key?(:class)
 
-          wrap_content(label(attribute_name, options) + content, options)
-        end
+          content = "#{label}: " + content unless options[:label] === false
+          content = content_tag(:span, content.html_safe, html_options)
 
-        def wrap_content(content, options = {})
-          content_tag(:i, content, id: options[:id], class: options[:class])
-        end
+          if options[:icon]
+            content = fa_icon(options[:icon], text: content)
+          end
 
-        def label(attribute, options)
-          return " ".html_safe if options[:label] === false
-          " #{human_name(attribute)}: ".html_safe
+          content
         end
 
         def human_name(attribute)
-          object.class.human_attribute_name(attribute)
+          object.class.human_attribute_name(attribute, default: attribute.to_s.titleize)
         end
 
         def icon_map(method)
           {
-            boolean:  'fa fa-check',
-            date:     'fa fa-calendar',
-            duration: 'fa fa-clock-o',
-            email:    'fa fa-envelope',
-            phone:    'fa fa-phone',
-            url:      'fa fa-globe',
+            boolean:  'check',
+            date:     'calendar',
+            duration: 'clock-o',
+            email:    'envelope',
+            phone:    'phone',
+            url:      'globe',
           }[method]
         end
 

data/attributes_for.gemspec

@@ -20,12 +20,11 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 1.9.3'
 
-  spec.add_dependency 'railties', '>= 3.2', '< 5.0'
-  spec.add_dependency 'actionview', '>= 3.2', '< 5.0'
-  spec.add_dependency 'activemodel', '>= 3.2', '< 5.0'
+  spec.add_dependency 'rails', '>= 3.2', '< 5.0'
   spec.add_dependency 'font-awesome-rails', '~> 4.0'
   spec.add_dependency 'chronic_duration', '~> 0.10'
   spec.add_dependency 'phony', '~> 2.0'
 
   spec.add_development_dependency 'coveralls'
+  spec.add_development_dependency 'sqlite3'
 end

data/lib/attributes_for.rb

@@ -1,5 +1,3 @@
 require "attributes_for/version"
 require "attributes_for/engine"
 require "phony"
-require "action_view"
-require "active_model"

data/lib/attributes_for/version.rb

@@ -1,3 +1,3 @@
 module AttributesFor
-  VERSION = "0.4.4"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,57 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: attributes_for
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.5.0
 platform: ruby
 authors:
 - Ole J. Rosendahl
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-09-10 00:00:00.000000000 Z
+date: 2015-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: railties
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-- !ruby/object:Gem::Dependency
-  name: actionview
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-- !ruby/object:Gem::Dependency
-  name: activemodel
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -126,6 +86,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ActiveView Helper to present formatted ActiveModel attributes with icons.
 email:
 - ole.johnny.rosendahl@gmail.com