effective_resources 0.7.10 → 0.7.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7c20435511222c5ce79dd666f0316afd80725d7
-  data.tar.gz: 70f5d6058d90bc1a1d0e0464c33b0169066769ba
+  metadata.gz: 2e44162d953de99661aac288c2e8669aa08a5087
+  data.tar.gz: 596ef36a05b5da9e203b63ca8d7238f07adc8d7f
 SHA512:
-  metadata.gz: 1f42d5f5d8bc2818e92e7f242546bdb795a7a62a9d780825e775a49876dc42a515da003e00c9391a22cc72eb5fd404a3ec91d5de2582e86196ab143d9e09fe35
-  data.tar.gz: a5dfe04ab6f0cee8360208feacba38c4c202160ee53efbd5fbaf5564bff6612cfa31a3ac089f47eed9a3a0b8e3c9f589989721f39cde23858daba92bbe33e98d
+  metadata.gz: 43c8affec3f9c374ce8b360ca99af890f4ae15396f2fa0c9a4a7129ac707056e56b21a121dbdea040721f1c5519821fe003b49c13570c102ca7dd476b16fffd3
+  data.tar.gz: c349c0453fb2839f3c38ccad102dc247cdac31dae701c1ed3c8359a02c13d784e3ce2d42b995bf62802d2eaca76003dcbe84668319390b1b7e65068b83b21ab7

data/app/helpers/effective_resources_helper.rb

@@ -37,7 +37,7 @@ module EffectiveResourcesHelper
       end
 
       # I think this is a bug. I can't override default button class when passing my own class: variable. it merges them.
-      if (btn_class = SimpleForm.button_class).present?
+      if defined?(SimpleForm) && (btn_class = SimpleForm.button_class).present?
         buttons = buttons.map { |button| button.sub(btn_class, '') }
       end
 
@@ -85,54 +85,7 @@ module EffectiveResourcesHelper
     ].compact.join
   end
 
-  ### Icon Helpers for actions_column or elsewhere
-  def show_icon_to(path, options = {})
-    glyphicon_to('eye-open', path, {title: 'Show'}.merge(options))
-  end
-
-  def edit_icon_to(path, options = {})
-    glyphicon_to('edit', path, {title: 'Edit'}.merge(options))
-  end
-
-  def destroy_icon_to(path, options = {})
-    defaults = {title: 'Destroy', data: {method: :delete, confirm: 'Delete this item?'}}
-    glyphicon_to('trash', path, defaults.merge(options))
-  end
-
-  def settings_icon_to(path, options = {})
-    glyphicon_to('cog', path, {title: 'Settings'}.merge(options))
-  end
-
-  def ok_icon_to(path, options = {})
-    glyphicon_to('ok', path, {title: 'OK'}.merge(options))
-  end
-
-  def approve_icon_to(path, options = {})
-    glyphicon_to('ok', path, {title: 'Approve'}.merge(options))
-  end
-
-  def remove_icon_to(path, options = {})
-    glyphicon_to('remove', path, {title: 'Remove'}.merge(options))
-  end
-
-  def glyphicon_tag(icon, options = {})
-    if icon.to_s.start_with?('glyphicon-')
-      content_tag(:span, '', {class: "glyphicon #{icon}"}.merge(options))
-    else
-      content_tag(:span, '', {class: "glyphicon glyphicon-#{icon}"}.merge(options))
-    end
-  end
-
-  def glyphicon_to(icon, path, options = {})
-    content_tag(:a, options.merge(href: path)) do
-      glyphicon_tag(icon)
-    end
-  end
-  alias_method :bootstrap_icon_to, :glyphicon_to
-  alias_method :glyph_icon_to, :glyphicon_to
-
   ### Tableize attributes
-
   # This is used by effective_orders, effective_logging, effective_trash and effective_mergery
   def tableize_hash(obj, table: 'table', th: true, sub_table: 'table', sub_th: true, flatten: true)
     case obj

data/app/models/effective/attribute.rb

@@ -43,7 +43,7 @@ module Effective
         when :text        ; :text
         when :time        ; :time
         when FalseClass   ; :boolean
-        when Fixnum       ; :integer
+        when (defined?(Integer) ? Integer : Fixnum) ; :integer
         when Float        ; :decimal
         when NilClass     ; :nil
         when String       ; :string

data/app/models/effective/resources/relation.rb

@@ -22,31 +22,31 @@ module Effective
         case sql_type
         when :belongs_to
           relation
-            .order("#{is_null(sql_column)} ASC")
+            .order(Arel.sql("#{is_null(sql_column)} ASC"))
             .order(order_by_associated_conditions(association, sort: sort, direction: direction, limit: limit))
         when :belongs_to_polymorphic
           relation
-            .order("#{sql_column}_type #{sql_direction}")
-            .order("#{sql_column}_id #{sql_direction}")
+            .order(Arel.sql("#{sql_column}_type #{sql_direction}"))
+            .order(Arel.sql("#{sql_column}_id #{sql_direction}"))
         when :has_and_belongs_to_many, :has_many, :has_one
           relation
             .order(order_by_associated_conditions(association, sort: sort, direction: direction, limit: limit))
-            .order("#{sql_column(klass.primary_key)} #{sql_direction}")
+            .order(Arel.sql("#{sql_column(klass.primary_key)} #{sql_direction}"))
         when :effective_addresses
           relation
             .order(order_by_associated_conditions(associated(:addresses), sort: sort, direction: direction, limit: limit))
-            .order("#{sql_column(klass.primary_key)} #{sql_direction}")
+            .order(Arel.sql("#{sql_column(klass.primary_key)} #{sql_direction}"))
         when :effective_roles
-          relation.order("#{sql_column(:roles_mask)} #{sql_direction}")
+          relation.order(Arel.sql("#{sql_column(:roles_mask)} #{sql_direction}"))
         when :string, :text
           relation
-            .order(("ISNULL(#{sql_column}), " if mysql?).to_s + "#{sql_column}='' ASC, #{sql_column} #{sql_direction}" + (" NULLS LAST" if postgres?).to_s)
+            .order(Arel.sql(("ISNULL(#{sql_column}), " if mysql?).to_s + "#{sql_column}='' ASC, #{sql_column} #{sql_direction}" + (" NULLS LAST" if postgres?).to_s))
           when :time
             relation
-              .order(("ISNULL(#{sql_column}), " if mysql?).to_s + "EXTRACT(hour from #{sql_column}) #{sql_direction}, EXTRACT(minute from #{sql_column}) #{sql_direction}" + (" NULLS LAST" if postgres?).to_s)
+              .order(Arel.sql(("ISNULL(#{sql_column}), " if mysql?).to_s + "EXTRACT(hour from #{sql_column}) #{sql_direction}, EXTRACT(minute from #{sql_column}) #{sql_direction}" + (" NULLS LAST" if postgres?).to_s))
         else
           relation
-            .order(("ISNULL(#{sql_column}), " if mysql?).to_s + "#{sql_column} #{sql_direction}" + (" NULLS LAST" if postgres?).to_s)
+            .order(Arel.sql(("ISNULL(#{sql_column}), " if mysql?).to_s + "#{sql_column} #{sql_direction}" + (" NULLS LAST" if postgres?).to_s))
         end
       end
 

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '0.7.10'.freeze
+  VERSION = '0.7.11'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 0.7.10
+  version: 0.7.11
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-25 00:00:00.000000000 Z
+date: 2018-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -37,7 +37,6 @@ 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

data/app/helpers/effective_bootstrap3_helper.rb

@@ -1,75 +0,0 @@
-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, panel: {}, list: {}, content: {}, &block)
-    raise 'expected a block' unless block_given?
-
-    @_tab_mode = :panel
-    @_tab_active = (active || :first)
-
-    content_tag(:div, {role: 'tabpanel'}.merge(panel)) do
-      content_tag(:ul, {class: 'nav nav-tabs', role: 'tablist'}.merge(list)) { yield } # Yield to tab the first time
-    end + content_tag(:div, {class: 'tab-content'}.merge(content)) do
-      @_tab_mode = :content
-      @_tab_active = (active || :first)
-      yield # Yield tot ab the second time
-    end
-  end
-
-  def tab(label, controls = nil, &block)
-    controls ||= label.to_s.parameterize.gsub('_', '-')
-    controls = controls[1..-1] if controls[0] == '#'
-
-    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