eitil 1.1.22 → 1.1.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e42a5a3d86d85421291822209dfe66ee5f12d70cf25abf2faa21a80a53ccc5e1
-  data.tar.gz: 2c267374fb18f64fd63766704936acf41df313e27cc3b8be92e993a2ad229bf4
+  metadata.gz: 2898766e78bb6b5706c24111deb28ee19f479a45f7d475d05d096843eb1cb748
+  data.tar.gz: 6240c052572bd8d9cf269c266863e5556e601f360ca99b8aaecc3a002daf7365
 SHA512:
-  metadata.gz: de0c459606a7d746f3b68a15db80033cd41790ea9d24f3fc0b2db4a23986de9e82fef4a36bfd7daadc832b694acd85333ded21847958b988449c27623b5a1adc
-  data.tar.gz: 8637f56a686e47d6e89020b68ecb3535a7094f87ed5023b89870e711970db80971eb1f93818e899c29d3181f4184462b17c27e136f9e56ca2934636807542db9
+  metadata.gz: 738bff100d4821b81d50a4f3b64bdd41b7d39ebc8dab0ee49a4124c51e6a35428f50f44a9c8cc14aaa5a8998edbc5446b517b09ccf47dafb44e2d64569a9d1ac
+  data.tar.gz: 40fb5472c8dafdf3e63e7ecea76f904467997100ee78e080cf8e384544bb8a9e488d1f0a0adb293a67fe182072fa2e144acf201b259db7f293fad006c457def2

data/eitil_core/README.md

@@ -15,11 +15,14 @@ require "eitil_core/active_record"
 ```
 
 ```ruby
-# require "eitil_core/active_record/hash_to_relation"
+# require "eitil_core/active_record/array_to_relation"
 
-[].to_relation
+[].to_relation(fallback_class = ApplicationRecord)
 # converts an array of ActiveRecord instances to an ActiveRecord_Relation instance
 # call as: [#<instance1>,<instance2>].to_relation
+
+# if the object is an empty array, the intended class cannot be derived from the object, so in order to 
+# prevent NoMethodError's you can optionally pass a fallback class which will be used to create an empty association 
 ```
 
 ## ApplicationController

data/eitil_core/lib/eitil_core/active_record.rb

@@ -1,2 +1,2 @@
 
-require "eitil_core/active_record/hash_to_relation"
+require "eitil_core/active_record/array_to_relation"

data/eitil_core/lib/eitil_core/active_record/{hash_to_relation.rb → array_to_relation.rb}

@@ -1,18 +1,18 @@
 
-# require "eitil_core/active_record/hash_to_relation"
+# require "eitil_core/active_record/array_to_relation"
 
 require "eitil_core/errors/raise_error"
 
 class Array
 
-  def to_relation
+  def to_relation(fallback_class = ApplicationRecord)
     
     # Return an empty ActiveRecord_Relation instance when no objects are present,
     # instead of returning the empty array itself. The reason being, that when you
     # always return an association, you won't run into problems with undefined methods
     # called later on, expecting an association instead of an array.
 
-    return ApplicationRecord.none unless self.present?
+    return fallback_class.none unless self.present?
 
     unless self.all? { |item| item.class.ancestors.include? ApplicationRecord }
       raise_error "InvalidArrayError", ".to_relation requires that all array items are model instances"

data/eitil_wrapper/lib/eitil_wrapper/decorators/controller_decorator.rb

@@ -5,7 +5,7 @@ module EitilWrapper
 
     def decorate(dec_item, dec_method: nil, dec_class: nil, **dec_kwargs)
       all_args_to_ivars binding
-      set_ivars :dec_class, :dec_method, :decorator
+      set_ivars :dec_class, :decorator, :dec_method
       send_to_decorator
     end
 
@@ -29,9 +29,9 @@ module EitilWrapper
     end
 
     def derived_dec_method
-      return unless respond_to? :params
-      return :app if params["isMobile"]
-      return :web if params["isWeb"]
+      return unless respond_to? :params      
+      return :app if @decorator.respond_to?(:app) && params["isMobile"]
+      return :web if @decorator.respond_to?(:web) && params["isWeb"]
     end
 
     def set_dec_class
@@ -47,7 +47,7 @@ module EitilWrapper
     end
 
     def set_decorator
-      @decorator = @dec_class.new controller_ivars
+      @dec_class.new ivars
     end
 
     def controller_ivars
@@ -56,5 +56,9 @@ module EitilWrapper
       end.inject &:merge
     end
 
+    def ivars
+       @dec_kwargs ? controller_ivars.merge(@dec_kwargs) : controller_ivars
+    end
+
   end
 end

data/lib/eitil/railtie.rb

@@ -29,6 +29,8 @@ module Eitil
 
   mattr_accessor :controller_ivars
 
+  self.controller_ivars ||= []
+
   def self.set_config(&block)
     yield self
   end

data/lib/eitil/version.rb

@@ -1,5 +1,5 @@
 module Eitil
   
-  VERSION = '1.1.22'
+  VERSION = '1.1.23'
   
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eitil
 version: !ruby/object:Gem::Version
-  version: 1.1.22
+  version: 1.1.23
 platform: ruby
 authors:
 - Jurriaan Schrofer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-03 00:00:00.000000000 Z
+date: 2021-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -83,7 +83,7 @@ files:
 - eitil_core/README.md
 - eitil_core/lib/eitil_core.rb
 - eitil_core/lib/eitil_core/active_record.rb
-- eitil_core/lib/eitil_core/active_record/hash_to_relation.rb
+- eitil_core/lib/eitil_core/active_record/array_to_relation.rb
 - eitil_core/lib/eitil_core/application_controller.rb
 - eitil_core/lib/eitil_core/application_controller/permit_model_atts.rb
 - eitil_core/lib/eitil_core/application_controller/slice_params.rb