effective_resources 0.3.8 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d1402ecc05965bee97bc9bc54cab706bac0fed5
-  data.tar.gz: 3f6b2afd4c260dc4ecd7460e0ab68043b778509c
+  metadata.gz: d0fa62c577020ee87d607427cf4910492d2437db
+  data.tar.gz: 710ec9d60171463f8e153d2525cdf66698ae9847
 SHA512:
-  metadata.gz: 4f8fcd372c81a61cf1592533a4914bf1bfff2a7a0ccfd83eb385a798fb4e81d7f157e876b0e61c99897bf510ce64b68cc69920d68061abddfddd79f25e84275c
-  data.tar.gz: 9f20ffeb34e900ba6e48d593613c8aeb4be46a8463cc4cd31c052b2b8aa2b9844dca83bb6fb5a1c4124dbd8708c72f734a8a8c715ae530d5db6f0f05a144fdf2
+  metadata.gz: c5d6c31a8f02deb548467e65dfaacbdc107216f33f4a63d2d71e2f415bc8c9d9c1f7674e63dfe651da7ece1e43a8871296fa760fc682190485ade203b2e4b06f
+  data.tar.gz: 404375d92f1b6675c61540856eb2ec0b210a076e2d1444085d081e9abe6ac0f87bc7ec8e6fca6d19a956e3d88b59b0966b9404b5953a47a3d51f67c027dbef97

data/app/models/effective/attribute.rb

@@ -85,6 +85,16 @@ module Effective
         klass.respond_to?(:deobfuscate) ? klass.deobfuscate(value) : value.to_s
       when :effective_roles
         EffectiveRoles.roles.include?(value.to_sym) ? value : EffectiveRoles.roles_for(value)
+      when :integer
+        (value.kind_of?(String) ? value.gsub(/\D/, '') : value).to_i
+      when :percentage
+        # We want this to return 0.81 when we type 81% or 0.81 or 81.5
+        if value.to_s.include?('.')
+          value = value.to_s.gsub(/[^0-9|\-|\.]/, '').to_f
+          value >= 1.0 ? (value / 100.0) : value
+        else
+          (value.to_s.gsub(/\D/, '').to_f / 100.0)
+        end
       when :integer, :percentage
         (value.kind_of?(String) ? value.gsub(/\D/, '') : value).to_i
       when :nil

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

@@ -61,7 +61,8 @@ module Effective
 
         term = Effective::Attribute.new(sql_type, klass: (association.try(:klass) rescue nil) || klass).parse(value, name: name)
 
-        if term == 'nil' && ![:has_and_belongs_to_many, :has_many, :has_one, :belongs_to_polymorphic, :effective_roles].include?(sql_type)
+        # term == 'nil' rescue false is a Rails 4.1 fix, where you can't compare a TimeWithZone to 'nil'
+        if (term == 'nil' rescue false) && ![:has_and_belongs_to_many, :has_many, :has_one, :belongs_to_polymorphic, :effective_roles].include?(sql_type)
           return relation.where("#{sql_column} IS NULL")
         end
 
@@ -122,7 +123,7 @@ module Effective
         when :integer
           relation.where("#{sql_column} = ?", term)
         when :percentage
-          relation.where("#{sql_column} = ?", term)
+          relation.where("#{sql_column} = ?", sql_type(name) == :integer ? (term * 100).to_i : term)
         when :price
           relation.where("#{sql_column} = ?", term)
         when :string, :text, :email

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '0.3.8'.freeze
+  VERSION = '0.3.9'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.3.9
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-12 00:00:00.000000000 Z
+date: 2017-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails