lazy_model 0.0.6 → 0.0.7

data/VERSION

@@ -1 +1 @@
-0.0.6
+0.0.7

data/lazy_model.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "lazy_model"
-  s.version = "0.0.6"
+  s.version = "0.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Aaron Scruggs"]
-  s.date = "2011-12-09"
+  s.date = "2011-12-11"
   s.description = "write common active_record methods in shorthand"
   s.email = "ascruggs@academicworks.com"
   s.extra_rdoc_files = [

data/lib/lazy_model/lazy_model_support.rb

@@ -2,18 +2,30 @@ module LazyModelSupport
 	extend ActiveSupport::Concern
 	
 	included do
-		attr_accessor :attribute, :enumerables, :custom_finders, :column, :model
+		attr_accessor :raw_attribute, :enumerables, :custom_finders, :column, :model, :attribute, :belongs_to
 	end
 	
-	def initialize(model, attribute, enumerables = nil, custom_finders = {})
+	def initialize(model, raw_attribute, enumerables = nil, custom_finders = {})
 		self.model 			= model
-		self.attribute 		= attribute
+		self.raw_attribute 	= raw_attribute
 		self.enumerables 	= enumerables
 		self.custom_finders = custom_finders
+		calculate_atttribute_and_belongs_to
 	end
 
 	def to_method_name(any_string_or_symbol)
 		any_string_or_symbol.to_s.underscore
 	end
 
+	private
+
+	def calculate_atttribute_and_belongs_to
+		if raw_attribute.is_a?(Hash)
+			self.attribute 	= raw_attribute.keys.first
+			self.belongs_to = raw_attribute[attribute]
+		else
+			self.attribute = raw_attribute
+		end
+	end
+
 end

data/lib/lazy_model/lazy_state.rb

@@ -22,7 +22,7 @@ module LazyModel
 			enumerables.each do |enumerable|
 				model.class_eval <<-LZY
 					def #{to_method_name(enumerable)}?
-						#{attribute} == "#{enumerable}"
+						#{belongs_to_attribute} == "#{enumerable}"
 					end
 				LZY
 			end
@@ -32,27 +32,44 @@ module LazyModel
 			custom_finders.each do |custom_finder, values|
 				model.class_eval <<-LZY
 					def #{to_method_name(custom_finder)}?
-						#{values}.include?(#{attribute})
+						#{values}.include?(#{belongs_to_attribute})
 					end
 				LZY
 			end
 		end
 
+		def belongs_to_attribute
+			belongs_to ? "#{belongs_to}.#{attribute}" : attribute
+		end
+
 
 		##### CLASS METHODS ##########
 
 		def define_class_methods
+			define_join_finder_method
 			define_core_class_finder_methods
 			define_enumerables_class_finder_methods
 			define_custom_class_finder_methods
 		end
 
+		def define_join_finder_method
+			if belongs_to
+				model.class_eval <<-LZY
+					class << self
+						def #{joins_method_name}
+							"joins(:#{belongs_to})"
+						end
+					end
+				LZY
+			end
+		end
+
 		def define_core_class_finder_methods
 			model.class_eval <<-LZY
 				class << self
 
 					def #{to_method_name(attribute)}(value = nil)
-						table = self.arel_table[:#{attribute}]
+						table = #{klass}.arel_table[:#{attribute}]
 						
 						filter = case value.class.to_s
 							when 'Array' 			then	table.in(value)
@@ -61,11 +78,11 @@ module LazyModel
 							else raise "\'" + value + "\' with class \'"+value.class.to_s+ "\' is not valid comparitor"
 						end
 
-						where(filter)
+						#{joins}where(filter)
 					end
 
 					def not_#{to_method_name(attribute)}(value = nil)
-						table = self.arel_table[:#{attribute}]
+						table = #{klass}.arel_table[:#{attribute}]
 
 						filter = case value.class.to_s
 							when 'Array' 			then	table.not_in(value)
@@ -74,7 +91,7 @@ module LazyModel
 							else raise "\'" + value + "\' with class \'"+value.class.to_s+ "\' is not valid comparitor"
 						end
 
-						where(filter)
+						#{joins}where(filter)
 					end
 
 				end
@@ -113,7 +130,18 @@ module LazyModel
 					end
 				LZY
 			end
+		end
+
+		def klass
+			belongs_to ? "#{belongs_to.to_s.camelize}" : "self"
+		end
+
+		def joins_method_name
+			"with_#{belongs_to}"
+		end
 
+		def joins
+			belongs_to ? "#{joins_method_name}." : nil
 		end
 
 	end

data/lib/lazy_model.rb

@@ -18,7 +18,6 @@ module LazyModel
 		LazyState.new(self, attribute, enumerables, custom_finders).define_methods
 	end
 
-
 end
 
 ActiveRecord::Base.extend LazyModel

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lazy_model
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-09 00:00:00.000000000 Z
+date: 2011-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70308384302440 !ruby/object:Gem::Requirement
+  requirement: &70309235756960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70308384302440
+  version_requirements: *70309235756960
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70308384301360 !ruby/object:Gem::Requirement
+  requirement: &70309235771440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70308384301360
+  version_requirements: *70309235771440
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70308384299280 !ruby/object:Gem::Requirement
+  requirement: &70309235770600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70308384299280
+  version_requirements: *70309235770600
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70308384298300 !ruby/object:Gem::Requirement
+  requirement: &70309235768520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70308384298300
+  version_requirements: *70309235768520
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70308384356860 !ruby/object:Gem::Requirement
+  requirement: &70309235766560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70308384356860
+  version_requirements: *70309235766560
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &70308384355900 !ruby/object:Gem::Requirement
+  requirement: &70309235765260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70308384355900
+  version_requirements: *70309235765260
 description: write common active_record methods in shorthand
 email: ascruggs@academicworks.com
 executables: []
@@ -118,7 +118,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4577784084993632056
+      hash: -2967426173384193686
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: