effective_resources 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63c9976e91dbea32eaa92ee0213e89a5ec269cd3
-  data.tar.gz: b48931b04be6d3e2efd48a4fb180bade8b7287c9
+  metadata.gz: fde8a7116e90e55e54e43b683dac085b29af3dae
+  data.tar.gz: 187aa06eba950381a7162ff8f4f7ad3d47456414
 SHA512:
-  metadata.gz: 4c7dec755e65f89fada642b273f407d3c8c293e078fd705ac83e61efec021d0e3de154f9bd9b2318b980a711af0fee991c74ae39dc9e71461dbdf69dd535fd6d
-  data.tar.gz: eaeac90e0905b8cf25007007a77bb0a03e7d8f7f5d9cfd42bb9c0e675c74fc11adc715d45fd0341aa8aadb0995f84cc56d56b60d57ac1d935498842ebca4feec
+  metadata.gz: 6caec9e92919a827a1722c299bc6822bd8cc92ba911ac6a6f3d0c7005302cbd249b9a47ad3b8d862e07fc86b580b373486166a0fb287a7a5dd7bcdde7a0c398c
+  data.tar.gz: 3a0756a8dcb1d1d7267152f80714a87fe22817cc22656dee89eef7c6c05729f69fae4a9bb9c2077ead73e89ffa3363f7ec1407d8d00a9afe13766e6240ad44ed

data/README.md

@@ -76,7 +76,55 @@ Implements the 7 RESTful actions: `index`, `new`, `create`, `show`, `edit`, `upd
 - Does the right thing with member and collection actions
 - Intelligently redirects based on commit message
 
-## Helpers
+## Bootstrap3 Helpers
+
+### nav_link_to
+
+Use `nav_link_to` and `nav_dropdown` to create bootstrap3 menus.
+
+The helper automatically assigns the `active` class based on the request path.
+
+```haml
+%nav.navbar.navbar-default
+  .container
+    .navbar-header
+      = link_to(image_tag('logo.png', alt: 'Logo'), '/', class: 'navbar-brand')
+      %button.navbar-toggle.collapsed{data: {toggle: 'collapse', target: '.navbar-collapse', 'aria-expanded': false}}
+        %span.icon-bar
+        %span.icon-bar
+        %span.icon-bar
+    .collapse.navbar-collapse
+      %ul.nav.navbar-nav.navbar-right
+        - if current_user.present?
+          - if can?(:index, Things)
+            = nav_link_to 'Things', things_path
+
+          = nav_dropdown 'Settings' do
+            = nav_link_to 'Account Settings', user_settings_path
+            %li.divider
+            = nav_link_to 'Sign Out', destroy_user_session_path, method: :delete
+        - else
+          = nav_link_to 'Sign In', new_user_session_path
+```
+
+### tabs
+
+Use `tabs do` and `tabs` to create bootstrap3 tabs.
+
+The helper inserts both the tablist and the tabpanel, and assigns the `active` class.
+
+```haml
+= tabs do
+  = tab 'Imports' do
+    %p Imports
+
+  = tab 'Exports' do
+    %p Exports
+```
+
+You can also call `tabs(active: 'Exports') do` to set the active tab.
+
+## Simple Form Helpers
 
 ### simple_form_submit
 

data/app/helpers/effective_bootstrap3_helper.rb

@@ -0,0 +1,73 @@
+module EffectiveBootstrap3Helper
+
+  # An effective Bootstrap3 menu DSL
+  # Automatically puts in the 'active' class based on request path
+
+  # %ul.nav.navbar-nav.navbar-right
+  #   = nav_link_to 'Sign In', new_user_session_path
+  #   = nav_dropdown 'Settings' do
+  #     = nav_link_to 'Account Settings', user_settings_path
+  #     %li.divider
+  #     = nav_link_to 'Sign In', new_user_session_path, method: :delete
+  def nav_link_to(label, path, opts = {})
+    content_tag(:li, class: ('active' if request.fullpath.include?(path))) do
+      link_to(label, path, opts)
+    end
+  end
+
+  def nav_dropdown(label, link_class: [], list_class: [], &block)
+    raise 'expected a block' unless block_given?
+
+    content_tag(:li, class: 'dropdown') do
+      content_tag(:a, class: 'dropdown-toggle', href: '#', 'data-toggle': 'dropdown', role: 'button', 'aria-haspopup': 'true', 'aria-expanded': 'false') do
+        label.html_safe + content_tag(:span, '', class: 'caret')
+      end + content_tag(:ul, class: 'dropdown-menu') { yield }
+    end
+  end
+
+  # An effective Bootstrap3 tabpanel DSL
+  # Inserts both the tablist and the tabpanel
+
+  # = tabs do
+  #   = tab 'Imports' do
+  #     %p Imports
+
+  #   = tab 'Exports' do
+  #     %p Exports
+
+  # If you pass active 'label' it will make that tab active. Otherwise first.
+  def tabs(active: nil, &block)
+    raise 'expected a block' unless block_given?
+
+    @_tab_mode = :panel
+    @_tab_active = (active || :first)
+
+    content_tag(:div, role: 'tabpanel') do
+      content_tag(:ul, class: 'nav nav-tabs', role: 'tablist') { yield } # Yield to tab the first time
+    end + content_tag(:div, class: 'tab-content') do
+      @_tab_mode = :content
+      @_tab_active = (active || :first)
+      yield # Yield tot ab the second time
+    end
+  end
+
+  def tab(label, &block)
+    controls = label.to_s.downcase.to_param
+    active = (@_tab_active == :first || @_tab_active == label)
+
+    @_tab_active = nil if @_tab_active == :first
+
+    if @_tab_mode == :panel # Inserting the label into the tabpanel top
+      content_tag(:li, role: 'presentation', class: ('active' if active)) do
+        content_tag(:a, href: '#' + controls, 'aria-controls': controls, 'data-toggle': 'tab', role: 'tab') do
+          label
+        end
+      end
+    else # Inserting the content into the tab itself
+      content_tag(:div, id: controls, class: "tab-pane#{' active' if active}", role: 'tabpanel') do
+        yield
+      end
+    end
+  end
+
+end

data/app/models/effective/attribute.rb

@@ -71,7 +71,14 @@ module Effective
         [true, 'true', 't', '1'].include?(value)
       when :date, :datetime
         if (digits = value.to_s.scan(/(\d+)/).flatten).present?
-          date = Time.zone.local(*digits)
+          date = if digits.first.length == 4  # 2017-01-10
+            Time.zone.local(*digits)
+          else # 01/10/2016
+            year = digits.find { |d| d.length == 4}
+            digits = [year] + (digits - [year])
+            Time.zone.local(*digits)
+          end
+
           name.to_s.start_with?('end_') ? date.end_of_day : date
         end
       when :time

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '0.7.1'.freeze
+  VERSION = '0.7.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-27 00:00:00.000000000 Z
+date: 2017-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -37,6 +37,7 @@ files:
 - app/assets/javascripts/effective_resources/effective_ujs.js
 - app/controllers/concerns/effective/crud_controller.rb
 - app/controllers/concerns/effective/flash_messages.rb
+- app/helpers/effective_bootstrap3_helper.rb
 - app/helpers/effective_resources_helper.rb
 - app/models/effective/access_denied.rb
 - app/models/effective/attribute.rb