rails_optimizer 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0dc3f68cf2eb84764efca80777738c551537ee33
-  data.tar.gz: beb196f15f49ee0c8c48d37e6950c490ed4fcbbd
+  metadata.gz: 07471bbbc0f17cc67af8e6a2aa3ca044ae3c3583
+  data.tar.gz: 542301109d50edcc8312f6b15f63ce0549dc41ee
 SHA512:
-  metadata.gz: a35ebf74d2a112055ec3b33b68411a6ff714710b85c44add6d1851980e17346fb2795cb7e94e42f03bb09fd2fc0786122fd2a57454e0282fa40756bdf55b2e43
-  data.tar.gz: 1850a36c5e5532467bc65da93beae6bdb6deccb66c94aeb7d3ac6e215d7914f7c0ce44b98726557e902b96dce0aba391fd93190becdb6958a98b2b3bf657bb39
+  metadata.gz: 50a778ca853bf9f22c62c58c64de441b9d66f0ca69038137f6f54175878ea9f791f84f699f1cea384fc26434eb568922e22bcfd030ff94e3acdbc94a0d4ccf1f
+  data.tar.gz: 5752120565190145cbadcb7336045f28c9345504a1571e2b2b8a342cc1886fa4f6107714779234b491b274237f7785b0158e2045798cbaa207e7ba837e3a115e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rails_optimizer (0.1.6)
+    rails_optimizer (0.1.7)
       activerecord
       activesupport
 

data/lib/rails_optimizer.rb

@@ -1,4 +1,6 @@
 require "rails_optimizer/version"
+require "rails_optimizer/belongs_to"
+require "rails_optimizer/reflection"
 
 module RailsOptimizer
   class Error < StandardError; end
@@ -27,41 +29,12 @@ module RailsOptimizer
 
 		def self.belongs_to(name, scope = nil, **options)
 			super
-			_define(name, scope, options)
+			RailsOptimizer::BelongsTo._define(self, name)
 		end
 
-		private
-
-			def self.scoped proc
-				return proc.call if proc
-				all
-			end
-
-			def self.finded obj, relation_name
-				fk = foreign_key(obj, relation_name)
-				find(obj.read_attribute(fk.to_sym)) unless obj.read_attribute(fk.to_sym).blank?
-			end
-
-			def self.foreign_key(obj, relation_name)
-				obj.class.reflections[relation_name.to_s].foreign_key
-			end
-
-			
-
-			def self._define(name, scope=nil, **options)
-				define_method name.to_s do |*args|
-					klass = if options[:polymorphic]
-						read_attribute("#{name}_type".to_sym).constantize
-					else
-						_reflections[name.to_s].klass
-					end
-					if args.empty?
-						klass.select('*').scoped(scope).finded(self, name)
-					else
-						klass.select(*args).scoped(scope).finded(self, name)
-					end
-				end
-			end
+		def self.execute(&block)
+			block.call(self) || all 
+		end
 	  	
 	end
 end

data/lib/rails_optimizer/belongs_to.rb

@@ -0,0 +1,49 @@
+module RailsOptimizer
+	class BelongsTo
+		attr_accessor :klass, :name, :args, :reflection, :owner
+
+		def initialize(owner, name, *args)
+			@owner = owner
+			@name  = name.to_s
+			@args  = *args
+		end
+
+		def self._define(owner, name )
+			owner.__send__(:define_method, name) do |*args|
+				return RailsOptimizer::BelongsTo.new(self, name, *args).get_target
+			end
+		end
+
+		def get_target
+			if args.empty?
+				klass
+			else
+				klass.select(*args)
+			end
+				.execute{reflection_scope}
+				.execute{ |obj| finded(obj)}
+		end
+
+		private
+			def reflection
+				@reflection ||= RailsOptimizer::Reflection.new(owner, name)
+			end
+
+			def klass
+				reflection.klass
+			end
+
+			def reflection_scope
+				reflection.scope
+			end
+
+			def finded(obj)
+				obj.find( owner.read_attribute(foreign_key) )
+			end
+
+			def foreign_key
+				reflection.foreign_key.to_sym
+			end
+
+	end
+end

data/lib/rails_optimizer/reflection.rb

@@ -0,0 +1,34 @@
+module RailsOptimizer
+	class Reflection
+		attr_accessor :owner, :name, :foreign_key
+		
+		def initialize(owner, name)
+			@owner = owner
+			@name = name
+		end
+
+		def klass
+			if reflection.polymorphic?
+				owner.read_attribute(foreign_type).constantize
+			else
+				reflection.klass
+			end
+		end
+
+		def scope
+			reflection.scope
+		end
+
+		def reflection
+			@reflection ||= owner._reflections[name]
+		end
+
+		def foreign_type
+			reflection.foreign_type
+		end
+
+		def foreign_key
+			reflection.foreign_key
+		end
+	end
+end

data/lib/rails_optimizer/version.rb

@@ -1,3 +1,3 @@
 module RailsOptimizer
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_optimizer
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Facundo A. Díaz Martínez
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-01-08 00:00:00.000000000 Z
+date: 2021-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -57,6 +57,8 @@ files:
 - bin/console
 - bin/setup
 - lib/rails_optimizer.rb
+- lib/rails_optimizer/belongs_to.rb
+- lib/rails_optimizer/reflection.rb
 - lib/rails_optimizer/version.rb
 - rails_optimizer.gemspec
 homepage: https://github.com/ITSesocio/rails_optimizer