rails_optimizer 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07471bbbc0f17cc67af8e6a2aa3ca044ae3c3583
-  data.tar.gz: 542301109d50edcc8312f6b15f63ce0549dc41ee
+  metadata.gz: db80c5f0e72c9cb288873b9f318e5dc3baafdd67
+  data.tar.gz: 0a101ae1ad6cb41b9243aebbd8760ed61c74ce7b
 SHA512:
-  metadata.gz: 50a778ca853bf9f22c62c58c64de441b9d66f0ca69038137f6f54175878ea9f791f84f699f1cea384fc26434eb568922e22bcfd030ff94e3acdbc94a0d4ccf1f
-  data.tar.gz: 5752120565190145cbadcb7336045f28c9345504a1571e2b2b8a342cc1886fa4f6107714779234b491b274237f7785b0158e2045798cbaa207e7ba837e3a115e
+  metadata.gz: 76a6df566e037c10afd6c2b79567ae9bb1fcebbc440a3cbad10ea66cf5cb0512faf3f53ba1aab51049736c6af69588eaf2646400f3ebaf9cb10bb01d850690b4
+  data.tar.gz: 8fec9fdae029505fdfd1d4814ea618a751649d69f643619310236704df2081a668ad809bcce459c5f8c1be88419993e5fc10910df63364e67915da800b05c408

data/Gemfile.lock

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

data/lib/rails_optimizer.rb

@@ -1,5 +1,7 @@
 require "rails_optimizer/version"
+require "rails_optimizer/association"
 require "rails_optimizer/belongs_to"
+require "rails_optimizer/has_one"
 require "rails_optimizer/reflection"
 
 module RailsOptimizer
@@ -17,14 +19,7 @@ module RailsOptimizer
 
 		def self.has_one(name, scope = nil, **options)
 			super
-			define_method name.to_s do |*args|
-				fk = self.class.foreign_key(name).to_sym
-				if args.empty?
-					name.to_s.classify.constantize.select("*").scoped(scope).find_by(fk => id)
-				else
-					name.to_s.classify.constantize.select(:id, *args).scoped(scope).find_by(fk => id)
-				end
-			end
+			RailsOptimizer::HasOne._define(self,name)
 		end
 
 		def self.belongs_to(name, scope = nil, **options)
@@ -32,8 +27,9 @@ module RailsOptimizer
 			RailsOptimizer::BelongsTo._define(self, name)
 		end
 
-		def self.execute(&block)
-			block.call(self) || all 
+		def self.execute(&method)
+			return all unless block_given?
+			class_eval(&method)
 		end
 	  	
 	end

data/lib/rails_optimizer/association.rb

@@ -0,0 +1,23 @@
+module RailsOptimizer
+	class Association
+		attr_accessor :klass, :name, :args, :reflection, :owner
+
+		def initialize(owner, name, *args)
+			@owner = owner
+			@name  = name.to_s
+			@args  = *args
+		end
+
+		def reflection
+			@reflection ||= RailsOptimizer::Reflection.new(owner, name)
+		end
+
+		def klass
+			reflection.klass
+		end
+
+		def reflection_scope
+			reflection.scope
+		end
+	end
+end

data/lib/rails_optimizer/belongs_to.rb

@@ -1,12 +1,5 @@
 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
+	class BelongsTo < Association
 
 		def self._define(owner, name )
 			owner.__send__(:define_method, name) do |*args|
@@ -20,25 +13,15 @@ module RailsOptimizer
 			else
 				klass.select(*args)
 			end
-				.execute{reflection_scope}
-				.execute{ |obj| finded(obj)}
+				.execute(&reflection_scope)
+				.execute(&finded)
 		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) )
+			
+			def finded
+				id = owner.read_attribute(foreign_key)
+				proc { send(:find, id) }
 			end
 
 			def foreign_key

data/lib/rails_optimizer/has_one.rb

@@ -0,0 +1,35 @@
+module RailsOptimizer
+	class HasOne < Association
+
+
+		def self._define(owner, name )
+			owner.__send__(:define_method, name) do |*args|
+				return RailsOptimizer::HasOne.new(self, name, *args).get_target
+			end
+		end
+
+		def get_target
+			if args.empty?
+				klass
+			else
+				klass.select(*args)
+			end.execute(&reflection_scope).execute(&finded)
+		end
+
+		private
+
+			def finded
+				finder = {reflection.foreign_key.to_sym => owner.id}
+				proc { send(:find_by, **finder) }
+			end
+	end
+
+	define_method name.to_s do |*args|
+				fk = self.class.foreign_key(name).to_sym
+				if args.empty?
+					name.to_s.classify.constantize.select("*").scoped(scope).find_by(fk => id)
+				else
+					name.to_s.classify.constantize.select(:id, *args).scoped(scope).find_by(fk => id)
+				end
+			end
+end

data/lib/rails_optimizer/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_optimizer
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Facundo A. Díaz Martínez
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-01-09 00:00:00.000000000 Z
+date: 2021-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -57,7 +57,9 @@ files:
 - bin/console
 - bin/setup
 - lib/rails_optimizer.rb
+- lib/rails_optimizer/association.rb
 - lib/rails_optimizer/belongs_to.rb
+- lib/rails_optimizer/has_one.rb
 - lib/rails_optimizer/reflection.rb
 - lib/rails_optimizer/version.rb
 - rails_optimizer.gemspec