advanced_ar 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d811ccf8f4dbdc96a068b07d751a011652d955c0cd7acb6306c501f87556428
-  data.tar.gz: 54667691794d23f31b26071829b941fa0417a497aae6d9652fab464d805b8983
+  metadata.gz: fa3519ddfd34d9170d05d5c8634bf8f0b0d84ba38ebe1cef3bc7ddfe68760001
+  data.tar.gz: cc0d1fcfe9697bb909ea49ec4c73f794ceeba5331a1ae89aa4fb40ee7bf80d9d
 SHA512:
-  metadata.gz: 8a110c0b3ad7a972408a4c6f6cb857d23e3082575d90c0433e777d5f42be3a09ceb53cf4e86ea86d72976806a722a9fc1a26fbf31eb76d0891ecfc5d4da3c2bc
-  data.tar.gz: b02ffa63c01b932c06920ce04fd25fdb1dc9957b1d9fd1216b46c5fe32d4a3d36d96aa8df07316c6207230a74c0e74ee4d842b8aa75ae0ab1efb0171957b3bb8
+  metadata.gz: da83392565166dfe4567a8fe73e76a1847778522ff438beef27804320a4972f9e6d9a8fca5b5a4d3c04acb8d86a54d624b20a667d3a5d7ad418053ff04a7e5e0
+  data.tar.gz: 3bed49515c7ab10026e47f2d4b9688afca6b9da110e60c02b2e5ea087fada2fc54c4d4e361a0297d84609c0738925a18d7132a6ed3fa884f4181e8875c5a807b

data/lib/advanced_ar.rb

@@ -1,6 +1,6 @@
 
+Dir[File.dirname(__FILE__) +  "/advanced_ar/*.rb"].each { |file| require file }
+
 module AdvancedAR
 
 end
-
-Dir[File.dirname(__FILE__) + "/advanced_ar/*.rb"].each { |file| require file }

data/lib/advanced_ar/param_validator.rb

@@ -7,12 +7,20 @@ module AdvancedAR
     TIME_TYPES = [Date, DateTime, Time].freeze
 
     CHECKS = %i[type specified present default transform in block items pattern].freeze
-    NON_PREFIXED = %i[default transform type message].freeze
+    NON_PREFIXED = %i[default transform type message timezone].freeze
     PREFIXES = %i[all onem onep one none].freeze
     PREFIX_ALIASES = { any: :onep, not: :none }.freeze
     ALL_PREFIXES = (PREFIXES + PREFIX_ALIASES.keys).freeze
     VALID_FLAGS = %i[present specified].freeze
 
+    def self.record_type(model, key: :id)
+      Proc.new do |param, *args|
+        model.find_by!(key => param)
+      rescue ActiveRecord::RecordNotFound
+        raise ArgumentError
+      end
+    end
+
     def initialize(block, context, parameters = nil, options = nil)
       @block = block
       @context = context
@@ -229,6 +237,12 @@ module AdvancedAR
     def coerce_single_type(param, type, options)
       return param if (param.is_a?(type) rescue false)
 
+      if type.is_a?(Class) && type <= ActiveRecord::Base
+        type = self.class.record_type(type)
+      end
+
+      return type.call(param, options) if type.is_a?(Proc)
+
       if (param.is_a?(Array) && type != Array) || ((param.is_a?(Hash) || param.is_a?(ActionController::Parameters)) && type != Hash)
         raise ArgumentError
       end
@@ -242,10 +256,17 @@ module AdvancedAR
 
       # Date/Time
       if TIME_TYPES.include? type
-        if options[:format].present?
-          return type.strptime(param, options[:format])
+        if tz = options[:timezone]
+          tz = ActiveSupport::TimeZone[tz] if tz.is_a?(String)
+          dt = options[:format].present? ? tz.strptime(param, options[:format]) : tz.parse(param)
+          dt = dt.to_date if type == Date
+          return dt
         else
-          return type.parse(param)
+          if options[:format].present?
+            return type.strptime(param, options[:format])
+          else
+            return type.parse(param)
+          end
         end
       end
 

data/lib/advanced_ar/version.rb

@@ -1,3 +1,3 @@
 module AdvancedAR
-  VERSION = "0.1.1".freeze
+  VERSION = "0.1.3".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: advanced_ar
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Ethan Knapp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-25 00:00:00.000000000 Z
+date: 2021-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -256,10 +256,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - README.md
-- advanced_ar.gemspec
-- config/initializers/01_custom_preloaders.rb
-- config/initializers/arbitrary_prefetch.rb
-- config/initializers/cancancan.rb
 - lib/advanced_ar.rb
 - lib/advanced_ar/arbitrary_prefetch.rb
 - lib/advanced_ar/batch_matcher.rb

data/advanced_ar.gemspec

@@ -1,43 +0,0 @@
-# coding: utf-8
-lib = File.expand_path("../lib", __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-
-begin
-  require "advanced_ar/version"
-  VERSION = AdvancedAR::VERSION
-rescue LoadError
-  VERSION = "0.0.0.docker"
-end
-
-Gem::Specification.new do |spec|
-  spec.name          = "advanced_ar"
-  spec.version       = VERSION
-  spec.authors       = ["Ethan Knapp"]
-  spec.email         = ["eknapp@instructure.com"]
-
-  spec.summary       = "Gem for adding advanced features into ActiveRecord"
-  spec.homepage      = "https://instructure.com"
-
-  spec.files         = Dir.glob('{db,config,app,lib,spec}/**/*') + %w(README.md advanced_ar.gemspec)
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ['lib']
-
-  spec.add_development_dependency "bundler", "~> 1.15"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "rspec-rails"
-  spec.add_development_dependency "pg"
-  spec.add_development_dependency "factory"
-  spec.add_development_dependency "factory_girl_rails"
-  spec.add_development_dependency "timecop"
-  spec.add_development_dependency "webmock"
-  spec.add_development_dependency "sinatra", ">= 0"
-  spec.add_development_dependency "shoulda-matchers"
-  spec.add_development_dependency "yard"
-  spec.add_development_dependency "pry"
-  spec.add_development_dependency "pry-nav"
-  spec.add_development_dependency "rubocop"
-
-  spec.add_dependency "rails", ">= 5"
-  spec.add_dependency "activerecord-import"
-end

data/config/initializers/01_custom_preloaders.rb

@@ -1,2 +0,0 @@
-# This Preloader needs to run before any that will load Models
-AdvancedAR::CustomPreloaders.install

data/config/initializers/arbitrary_prefetch.rb

@@ -1 +0,0 @@
-AdvancedAR::ArbitraryPrefetch.install

data/config/initializers/cancancan.rb

@@ -1,34 +0,0 @@
-# This patch fixes an issue where CanCanCan wasn't properly handling
-# existence checks for AR Scopes - instead of do a DB Query, it loaded the entire relation
-module CanCan
-  module ConditionsMatcher
-    def condition_match?(attribute, value)
-      case value
-      when Hash
-        hash_condition_match?(attribute, value)
-      when Range
-        value.cover?(attribute)
-      when ActiveRecord::Relation
-        ar_condition_match?(attribute, value)
-      when Enumerable
-        value.include?(attribute)
-      else
-        attribute == value
-      end
-    end
-
-    def ar_condition_match?(attribute, value)
-      return false if attribute.nil?
-
-      if attribute.is_a?(Array) || (defined?(ActiveRecord) && attribute.is_a?(ActiveRecord::Relation) && attribute.loaded?)
-        value.where(id: attribute.pluck(:id)).exists?
-      elsif (defined?(ActiveRecord) && attribute.is_a?(ActiveRecord::Relation))
-        value.where(id: attribute.select(:id)).exists?
-      elsif (defined?(ActiveRecord) && attribute.is_a?(ActiveRecord::Base))
-        value.where(id: attribute.id).exists?
-      else
-        value.where(id: attribute).exists?
-      end
-    end
-  end
-end