effective_resources 0.2.4 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b55e4948a32a2526cc0ce43230a6bee620c09a14
-  data.tar.gz: d0b8bf59119514d156e4b63428cc068960cb779e
+  metadata.gz: c8670335e749c4dfd51af3948b37cbdb7b4051ee
+  data.tar.gz: 82ee3513ad299bee24a8bf6e76893224f2fb85d9
 SHA512:
-  metadata.gz: 508301a27e166a14290d8085066c773d584ab2e39c294106b7361d973219712f359e227178904f7f58f9849e551204d317d042d49de594f85c2417e896f818e4
-  data.tar.gz: c96b6875d7685e62b288fef2e8892eb7a1c664cfd6839ac0e491e876e103224e75d1fcced5ba2c83d427ec98322767f61fb99915ebc4f3bfd18b0da0aee9cfe5
+  metadata.gz: e96e5c5b6b876e9389b44d6778958200b363d29d16a70a628c5c9ef1eb1eaad9f2349aa84cd92eb0757ce1fafc7e8c107352c9f1b6ea225d6a405c547121100e
+  data.tar.gz: 076396560c96b7c4d9951dc3ceff5a2864ac749703d604b6d1e9a09c5d41838a96eca592f832d1b5b2fb148c43a60c0857dfda64cfbae879df0973bf3a6ec83a

data/app/controllers/concerns/effective/crud_controller.rb

@@ -25,7 +25,7 @@ module Effective
       self.resources ||= resource_class.all
 
       if resource_datatable_class
-        @datatable ||= resource_datatable_class.new(resource_datatable_attributes, params[:scopes])
+        @datatable ||= resource_datatable_class.new(self, resource_datatable_attributes)
       end
     end
 

data/app/helpers/effective_resources_helper.rb

@@ -17,4 +17,59 @@ module EffectiveResourcesHelper
     end
   end
 
+  def number_to_duration(duration)
+    duration = duration.to_i
+    value = duration.abs
+
+    [
+      ('-' if duration < 0),
+      ("#{value / 60}h " if value >= 60),
+      ("#{'%0.2d' % (value % 60)}m" if value > 0),
+      ('0m' if value == 0),
+    ].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_to(icon, path, options = {})
+    content_tag(:a, options.merge(href: path)) do
+      if icon.start_with?('glyphicon-')
+        content_tag(:span, '', class: "glyphicon #{icon}")
+      else
+        content_tag(:span, '', class: "glyphicon glyphicon-#{icon}")
+      end
+    end
+  end
+  alias_method :bootstrap_icon_to, :glyphicon_to
+  alias_method :glyph_icon_to, :glyphicon_to
+
+
 end

data/app/models/effective/attribute.rb

@@ -26,21 +26,28 @@ module Effective
 
       @type ||= (
         case obj
-        when :boolean   ; :boolean
-        when :date      ; :date
-        when :datetime  ; :datetime
-        when :decimal   ; :decimal
-        when :integer   ; :integer
-        when :price     ; :price
-        when :nil       ; :nil
-        when :string    ; :string
-        when FalseClass ; :boolean
-        when Fixnum     ; :integer
-        when Float      ; :decimal
-        when NilClass   ; :nil
-        when String     ; :string
-        when TrueClass  ; :boolean
+        when :boolean     ; :boolean
+        when :currency    ; :currency
+        when :date        ; :date
+        when :datetime    ; :datetime
+        when :decimal     ; :decimal
+        when :duration    ; :duration
+        when :email       ; :email
+        when :integer     ; :integer
+        when :percentage  ; :percentage
+        when :price       ; :price
+        when :nil         ; :nil
+        when :resource    ; :resource
+        when :string      ; :string
+        when :text        ; :text
+        when FalseClass   ; :boolean
+        when Fixnum       ; :integer
+        when Float        ; :decimal
+        when NilClass     ; :nil
+        when String       ; :string
+        when TrueClass    ; :boolean
         when ActiveSupport::TimeWithZone  ; :datetime
+        when ActiveRecord::Base           ; :resource
         when :belongs_to                  ; :belongs_to
         when :belongs_to_polymorphic      ; :belongs_to_polymorphic
         when :has_many                    ; :has_many
@@ -50,7 +57,7 @@ module Effective
         when :effective_obfuscation       ; :effective_obfuscation
         when :effective_roles             ; :effective_roles
         else
-          raise 'unsupported type'
+          raise "unsupported type for #{obj}"
         end
       )
     end
@@ -62,36 +69,41 @@ module Effective
       when :date, :datetime
         date = Time.zone.local(*value.to_s.scan(/(\d+)/).flatten)
         name.to_s.start_with?('end_') ? date.end_of_day : date
-      when :decimal
-        (value.kind_of?(String) ? value.gsub(/[^0-9|\.]/, '') : value).to_f
+      when :decimal, :currency
+        (value.kind_of?(String) ? value.gsub(/[^0-9|\-|\.]/, '') : value).to_f
+      when :duration
+        if value.to_s.include?('h')
+          (hours, minutes) = (value.to_s.gsub(/[^0-9|\-|h]/, '').split('h'))
+          (hours.to_i * 60) + ((hours.to_i < 0) ? -(minutes.to_i) : minutes.to_i)
+        else
+          value.to_s.gsub(/[^0-9|\-|h]/, '').to_i
+        end
       when :effective_obfuscation
         klass.respond_to?(:deobfuscate) ? klass.deobfuscate(value) : value.to_s
       when :effective_roles
-        EffectiveRoles.roles_for(value)
-      when :integer
+        EffectiveRoles.roles.include?(value.to_sym) ? value : EffectiveRoles.roles_for(value)
+      when :integer, :percentage
         (value.kind_of?(String) ? value.gsub(/\D/, '') : value).to_i
       when :nil
         value.presence
       when :price
-        (value.kind_of?(Integer) ? value : (value.to_s.gsub(/[^0-9|\.]/, '').to_f * 100.0)).to_i
-      when :string
+        (value.kind_of?(Integer) ? value : (value.to_s.gsub(/[^0-9|\-|\.]/, '').to_f * 100.0)).to_i
+      when :string, :text, :email
         value.to_s
       when :belongs_to_polymorphic
         value.to_s
-      when :belongs_to, :has_many, :has_and_belongs_to_many, :has_one  # Returns an Array of ints, an Int or String
+      when :belongs_to, :has_many, :has_and_belongs_to_many, :has_one, :resource  # Returns an Array of ints, an Int or String
         if value.kind_of?(Integer) || value.kind_of?(Array)
           value
         else
           digits = value.to_s.gsub(/[^0-9|,]/, '') # '87' or '87,254,300' or 'something'
 
-          if digits == value && digits.index(',').present?
+          if digits == value || digits.length == 10
             if klass.respond_to?(:deobfuscate)
               digits.split(',').map { |str| klass.deobfuscate(str).to_i }
             else
               digits.split(',').map { |str| str.to_i }
             end
-          elsif digits == value
-            klass.respond_to?(:deobfuscate) ? klass.deobfuscate(digits).to_i : digits.to_i
           else
             value.to_s
           end

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

@@ -61,7 +61,7 @@ module Effective
 
       def has_one(name)
         name = name.to_sym
-        has_ones.find { |ho| ass.name == name }
+        has_ones.find { |ass| ass.name == name }
       end
 
       def nested_resource(name)

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

@@ -6,15 +6,15 @@ module Effective
       def search_form_field(name, type = nil)
         case (type || sql_type(name))
         when :belongs_to
-          { as: :select }.merge(associated_search_collection(belongs_to(name)))
+          { as: :select }.merge(search_form_field_collection(belongs_to(name)))
         when :belongs_to_polymorphic
           { as: :grouped_select, polymorphic: true, collection: nil}
         when :has_and_belongs_to_many
-          { as: :select }.merge(associated_search_collection(has_and_belongs_to_many(name)))
+          { as: :select }.merge(search_form_field_collection(has_and_belongs_to_many(name)))
         when :has_many
-          { as: :select, multiple: true }.merge(associated_search_collection(has_many(name)))
+          { as: :select, multiple: true }.merge(search_form_field_collection(has_many(name)))
         when :has_one
-          { as: :select, multiple: true }.merge(associated_search_collection(has_one(name)))
+          { as: :select, multiple: true }.merge(search_form_field_collection(has_one(name)))
         when :effective_addresses
           { as: :string }
         when :effective_roles
@@ -31,15 +31,15 @@ module Effective
           { as: :number }
         when :text
           { as: :text }
+        when ActiveRecord::Base
+          { as: :select }.merge(Effective::Resource.new(type).search_form_field_collection)
         else
           { as: :string }
         end
       end
 
-      private
-
-      def associated_search_collection(association, max_id = 1000)
-        res = Effective::Resource.new(association)
+      def search_form_field_collection(association = nil, max_id = 1000)
+        res = (association.nil? ? self : Effective::Resource.new(association))
 
         if res.max_id > max_id
           { as: :string }

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

@@ -12,7 +12,7 @@ module Effective
 
       def _initialize_input_name(input)
         case input
-        when String ; input
+        when String ; input.start_with?('/') ? input[1..-1] : input
         when Symbol ; input
         when Class  ; input.name
         when ActiveRecord::Relation
@@ -52,7 +52,6 @@ module Effective
 
           if first && last
             @written_attributes = reader.select(from: first+1, to: last-1).map do |line|
-
               Effective::Attribute.parse_written(line).presence
             end.compact
           end

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

@@ -29,6 +29,10 @@ module Effective
         )
       end
 
+      def active_record?
+        klass.ancestors.include?(ActiveRecord::Base)
+      end
+
     end
   end
 end

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

@@ -33,9 +33,12 @@ module Effective
             .order("#{sql_column(klass.primary_key)} #{sql_direction}")
         when :effective_roles
           relation.order("#{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?))
         else
           relation
-            .order("#{sql_column} #{sql_direction}")
+            .order((("ISNULL(#{sql_column}}), ") if mysql?).to_s + "#{sql_column} #{sql_direction}" + (" NULLS LAST" if postgres?))
         end
       end
 
@@ -81,13 +84,33 @@ module Effective
             end
           )
           relation.where("#{sql_column} >= ? AND #{sql_column} <= ?", term, end_at)
-        when :decimal
-          relation.where("#{sql_column} = ?", term)
+        when :decimal, :currency
+          if fuzzy && (term.round(0) == term) && value.to_s.include?('.') == false
+            if term < 0
+              relation.where("#{sql_column} <= ? AND #{sql_column} > ?", term, term-1.0)
+            else
+              relation.where("#{sql_column} >= ? AND #{sql_column} < ?", term, term+1.0)
+            end
+          else
+            relation.where("#{sql_column} = ?", term)
+          end
+        when :duration
+          if fuzzy && (term % 60) == 0 && value.to_s.include?('m') == false
+            if term < 0
+              relation.where("#{sql_column} <= ? AND #{sql_column} > ?", term, term-60)
+            else
+              relation.where("#{sql_column} >= ? AND #{sql_column} < ?", term, term+60)
+            end
+          else
+            relation.where("#{sql_column} = ?", term)
+          end
         when :integer
           relation.where("#{sql_column} = ?", term)
+        when :percentage
+          relation.where("#{sql_column} = ?", term)
         when :price
           relation.where("#{sql_column} = ?", term)
-        when :string, :text
+        when :string, :text, :email
           if fuzzy
             relation.where("#{sql_column} #{ilike} ?", "%#{term}%")
           else
@@ -102,7 +125,7 @@ module Effective
         raise 'expected relation to be present' unless relation
 
         # Assume this is a set of IDs
-        if value.kind_of?(Integer) || value.kind_of?(Array)
+        if value.kind_of?(Integer) || value.kind_of?(Array) || (value.to_i.to_s == value)
           return relation.where(klass.primary_key => value)
         end
 

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '0.2.4'.freeze
+  VERSION = '0.3.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-10 00:00:00.000000000 Z
+date: 2017-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails