rails_optimizer 0.1.5 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 13f77501d80e64390517d2db18dfc1a3fb81616e
-  data.tar.gz: 997d8440d4c375a378d48275bdcc63f683e3fa39
+SHA256:
+  metadata.gz: 2a70969d26fb8c6f7e10d076d0d773a85f8c196c09e56494c5cc7707a6861222
+  data.tar.gz: 7a3d74687e69d53d289582128bf14e1092467ecaafa094a29add6c7cfcaab1a4
 SHA512:
-  metadata.gz: 2380df7b3ed1dd6c38ce960b16f05212b41ec64d5a9f9de3aa24de8e6eeb97d7c71198a0fe1a13c59b2a3fb09404599e9fe560a289e4db51d9142a31624dc4bf
-  data.tar.gz: '08656e5c75acf0e1cf2a6acfd631ae245fce975681e69a23dc1ea36209c8c3c5c586d97f9ada4c4a160743b0a7a4d79aa96860028d47ec185e049745d962e991'
+  metadata.gz: cd2be7a17816296ad15d5677c25b701abf437f77df5046e14182a96916e90931d668cbfa1759e55cd2bb972c4b4811dd914c912462f0f8ea43a05785dae81b84
+  data.tar.gz: 82c0eae0f03d3d14cddc0f57e592be30a0bb05be5ca2b81d1d3269f0dac4528f39beecd2db4c49808403874f326bc5612d3eec5eefff03bb6483140022a80b51

data/Gemfile.lock

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

data/lib/rails_optimizer.rb

@@ -1,4 +1,8 @@
 require "rails_optimizer/version"
+require "rails_optimizer/association"
+require "rails_optimizer/belongs_to"
+require "rails_optimizer/has_one"
+require "rails_optimizer/reflection"
 
 module RailsOptimizer
   class Error < StandardError; end
@@ -13,42 +17,20 @@ 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
+		def self.has_one(name, scope = nil, **options)
+			super
+			RailsOptimizer::HasOne._define(self,name)
 		end
 
 		def self.belongs_to(name, scope = nil, **options)
 			super
-			define_method name.to_s do |*args|
-				super if arsg.empty?
-				klass = if options[:polymorphic]
-					read_attribute("#{name}_type".to_sym)
-				else
-					name.to_s
-				end.classify.constantize.select(*args).scoped(scope).finded(self, name)
-			end
+			RailsOptimizer::BelongsTo._define(self, name)
 		end
 
-	  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
+		def self.execute(&method)
+			return all unless block_given?
+			class_eval(&method)
 		end
+	  	
 	end
 end

data/lib/rails_optimizer/association.rb

@@ -0,0 +1,28 @@
+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
+
+		def get_target
+			return owner.association(name.to_sym).target if owner.association(name.to_sym).loaded?
+			yield if block_given?
+		end
+	end
+end

data/lib/rails_optimizer/belongs_to.rb

@@ -0,0 +1,34 @@
+module RailsOptimizer
+	class BelongsTo < Association
+
+		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
+			super do
+				if args.empty?
+					klass
+				else
+					klass.select(*args)
+				end
+					.execute(&reflection_scope)
+					.execute(&finded)
+			end
+		end
+
+		private
+			
+			def finded
+				id = owner.read_attribute(foreign_key)
+				proc { send(:find_by, {id: id}) }
+			end
+
+			def foreign_key
+				reflection.foreign_key.to_sym
+			end
+
+	end
+end

data/lib/rails_optimizer/has_one.rb

@@ -0,0 +1,29 @@
+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
+			super do
+				if args.empty?
+					klass
+				else
+					klass.select(*args)
+				end.execute(&reflection_scope).execute(&finded)
+			end
+		end
+
+		private
+
+			def finded
+				finder = {reflection.foreign_key.to_sym => owner.id}
+				proc { send(:find_by, **finder) }
+			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.5"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_optimizer
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors:
 - Facundo A. Díaz Martínez
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-01-08 00:00:00.000000000 Z
+date: 2021-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -57,6 +57,10 @@ 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
 homepage: https://github.com/ITSesocio/rails_optimizer
@@ -66,7 +70,7 @@ metadata:
   allowed_push_host: https://rubygems.org
   homepage_uri: https://github.com/ITSesocio/rails_optimizer
   source_code_uri: https://github.com/ITSesocio/rails_optimizer
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -81,9 +85,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.6.14.1
-signing_key:
+rubygems_version: 3.0.3
+signing_key: 
 specification_version: 4
 summary: Optimze some rails methods
 test_files: []