rails_optimizer 0.1.3 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4dbcf811feb6eb7b70788be32435558802e7a318
-  data.tar.gz: 11a915e895561996d898497b4de9cb0ff98b89e3
+  metadata.gz: 07471bbbc0f17cc67af8e6a2aa3ca044ae3c3583
+  data.tar.gz: 542301109d50edcc8312f6b15f63ce0549dc41ee
 SHA512:
-  metadata.gz: aee3b50dfd806091de19ce996854a7a05029f97f4e6fc72d0ed54f322a3f77ed07284f652a9576fdc8ef5fc6ce237f2172080e1729ae17223340b2830a8d1afc
-  data.tar.gz: 4fc5b1d865a4dbb59987dd6b36c9c8f900a3c5c7e856643f8bb1fbccf45f6efe5c514a1a50adc29531658d8e87219d3db36695fc293e311e63a0f0f8dceca6f7
+  metadata.gz: 50a778ca853bf9f22c62c58c64de441b9d66f0ca69038137f6f54175878ea9f791f84f699f1cea384fc26434eb568922e22bcfd030ff94e3acdbc94a0d4ccf1f
+  data.tar.gz: 5752120565190145cbadcb7336045f28c9345504a1571e2b2b8a342cc1886fa4f6107714779234b491b274237f7785b0158e2045798cbaa207e7ba837e3a115e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rails_optimizer (0.1.2)
+    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
@@ -13,33 +15,7 @@ module RailsOptimizer
 			end
 		end
 
-		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.belongs_to(name, scope = nil, **options)
-			super
-			define_method name.to_s do |*args|
-				super if args.empty?
-				if options[:polymorphic]
-					read_attribute("#{name}_type".to_sym).classify
-				else
-					name.to_s.classify
-				end.constantize.select(*args).scoped(scope).finded(self, name)
-			end
-		end
-
-	  def self.has_one(name, scope = nil, **options)
+		def self.has_one(name, scope = nil, **options)
 			super
 			define_method name.to_s do |*args|
 				fk = self.class.foreign_key(name).to_sym
@@ -50,5 +26,15 @@ module RailsOptimizer
 				end
 			end
 		end
+
+		def self.belongs_to(name, scope = nil, **options)
+			super
+			RailsOptimizer::BelongsTo._define(self, name)
+		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.3"
+  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.3
+  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