lazy_model 0.0.10 → 0.0.11

data/VERSION

@@ -1 +1 @@
-0.0.10
+0.0.11

data/lazy_model.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "lazy_model"
-  s.version = "0.0.10"
+  s.version = "0.0.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Aaron Scruggs"]

data/lib/lazy_model/lazy_boolean.rb

@@ -5,25 +5,36 @@ module LazyModel
 		include LazyModelSupport
 
 		def define_methods
+			define_instance_methods
 			define_class_methods
 		end
 
 		private
 
+		def define_instance_methods
+			if belongs_to
+				model.class_eval <<-LZY
+					def #{attribute}?
+						#{belongs_to_attribute}?
+					end
+				LZY
+			end
+		end
+
 		def define_class_methods
 			model.class_eval <<-LZY
 				class << self
 	
 					def #{attribute}
-						where(self.arel_table[:#{attribute}].eq(true))
+						#{joins}where(#{klass}.arel_table[:#{attribute}].eq(true))
 					end
 
 					def not_#{attribute}
-						where(self.arel_table[:#{attribute}].eq(false))
+						#{joins}where(#{klass}.arel_table[:#{attribute}].eq(false))
 					end
 
 					def nil_#{attribute}
-						where(self.arel_table[:#{attribute}].eq(nil))
+						#{joins}where(#{klass}.arel_table[:#{attribute}].eq(nil))
 					end
 
 				end

data/lib/lazy_model/lazy_model_support.rb

@@ -28,4 +28,33 @@ module LazyModelSupport
 		end
 	end
 
+	def belongs_to_attribute
+		belongs_to ? "#{belongs_to}.#{attribute}" : attribute
+	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 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/lazy_state.rb

@@ -38,10 +38,6 @@ module LazyModel
 			end
 		end
 
-		def belongs_to_attribute
-			belongs_to ? "#{belongs_to}.#{attribute}" : attribute
-		end
-
 
 		##### CLASS METHODS ##########
 
@@ -52,18 +48,6 @@ module LazyModel
 			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
@@ -132,18 +116,6 @@ module LazyModel
 			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
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lazy_model
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70102402087040 !ruby/object:Gem::Requirement
+  requirement: &70162079173960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70102402087040
+  version_requirements: *70162079173960
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70102402085980 !ruby/object:Gem::Requirement
+  requirement: &70162079173260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70102402085980
+  version_requirements: *70162079173260
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70102402084940 !ruby/object:Gem::Requirement
+  requirement: &70162079172560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70102402084940
+  version_requirements: *70162079172560
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70102402242760 !ruby/object:Gem::Requirement
+  requirement: &70162079171940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70102402242760
+  version_requirements: *70162079171940
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70102402240800 !ruby/object:Gem::Requirement
+  requirement: &70162079171260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70102402240800
+  version_requirements: *70162079171260
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &70102402239280 !ruby/object:Gem::Requirement
+  requirement: &70162095145360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70102402239280
+  version_requirements: *70162095145360
 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: 2880373122746519887
+      hash: 3814367771333126419
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: