rails_optimizer 0.1.6 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 251bda842b9bd7397e47653d3295e8870df5e98f
-  data.tar.gz: 9fb57d460e2d263244106de84543738c2e2464db
+SHA256:
+  metadata.gz: f0950368003afb31089440263fe41c35e9d2ca1ecff7119cd641bc7600a92fc9
+  data.tar.gz: 650fce0a5ae8c75796ae48a9d87df9470bef6004fe6ce378d84eeebf76cdd584
 SHA512:
-  metadata.gz: 6c156ac6ca99836791406c79d3e9b0615caf1f469d4e0b49ca20b39906cb555eb91ed69008dcf70d57aebd0da87a97386ea84fae0ac1f82945bf4995589f9940
-  data.tar.gz: 80610029667cf7451440ddf7505f4d0dcb2f8dfbfd7db37379d075d56f3fa5cccada3771cbe863ce291edd14c0cc507a8e80945f9882da41c07f80e4f1d52396
+  metadata.gz: 46008ac6b5c00fc23b61a0471ef5b04885466e94a1c6d210e74a133c27afc8c9754620520e4be6e167a9c08063691da5b644d4fcb60c161122f2600a3e8d20c4
+  data.tar.gz: 2902d6dd2f78496c3ffd261dcc9ab182818e0487554c3b8224e72312a9188728a5196cb20a61ff77c34d30f5e04db896c58b7b216432e0281b524f42eb0ca176

data/Gemfile.lock

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

data/lib/rails_optimizer.rb

@@ -1,54 +1,36 @@
 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
   extend ActiveSupport::Concern
 
   included do
-		def save
+		def save(args=nil)
 			if has_changes_to_save?
-				super
+				super(args)
 			else
 				true
 			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 args.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.6"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_optimizer
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.1
 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: []