lazy_model 0.0.4 → 0.0.5

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/lazy_model.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "lazy_model"
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Aaron Scruggs"]
-  s.date = "2011-12-08"
+  s.date = "2011-12-09"
   s.description = "write common active_record methods in shorthand"
   s.email = "ascruggs@academicworks.com"
   s.extra_rdoc_files = [
@@ -27,10 +27,8 @@ Gem::Specification.new do |s|
     "lazy_model.gemspec",
     "lib/lazy_model.rb",
     "lib/lazy_model/lazy_boolean.rb",
-    "lib/lazy_model/lazy_model.rb",
     "lib/lazy_model/lazy_model_support.rb",
-    "lib/lazy_model/lazy_string.rb",
-    "lib/lazy_model/lazy_text.rb",
+    "lib/lazy_model/lazy_state.rb",
     "test/helper.rb",
     "test/lazy_model.sqlite3",
     "test/support/data.rb",

data/lib/lazy_model/lazy_model_support.rb

@@ -2,12 +2,21 @@ module LazyModelSupport
 	extend ActiveSupport::Concern
 	
 	included do
-		attr_accessor :lazy_model
-		delegate :model, :attribute, :enumerables, :custom_finders, :column, :to => :lazy_model	
+		attr_accessor :attribute, :enumerables, :custom_finders, :column, :model
+	end
+	
+	def initialize(model, attribute, enumerables = nil, custom_finders = {})
+		self.model 			= model
+		self.attribute 		= attribute
+		self.enumerables 	= format_enumerables(enumerables)
+		self.custom_finders = custom_finders
 	end
 
-	def initialize(lazy_model)
-		self.lazy_model = lazy_model
+	private
+
+	def format_enumerables(enumerables)
+		Array(enumerables).map{|enumerable| enumerable.underscore}
 	end
 
+
 end

data/lib/lazy_model/{lazy_string.rb → lazy_state.rb}

@@ -1,6 +1,6 @@
 module LazyModel
 	
-	class LazyString
+	class LazyState
 
 		include LazyModelSupport
 

data/lib/lazy_model.rb

@@ -2,20 +2,23 @@ require 'active_record'
 require 'active_support'
 require 'active_support/core_ext/module/delegation'
 
-require File.dirname(__FILE__) + '/lazy_model/lazy_model.rb'
 require File.dirname(__FILE__) + '/lazy_model/lazy_model_support.rb'
 
 require File.dirname(__FILE__) + '/lazy_model/lazy_boolean.rb'
-require File.dirname(__FILE__) + '/lazy_model/lazy_string.rb'
-require File.dirname(__FILE__) + '/lazy_model/lazy_text.rb'
+require File.dirname(__FILE__) + '/lazy_model/lazy_state.rb'
 
 
 module LazyModel
 
-	def lazy_model(attribute, enumerables = nil, custom_finders = {})
-		LazyModel.new(self, attribute, enumerables, custom_finders).define_methods
+	def lazy_boolean(attribute)
+		LazyBoolean.new(self, attribute).define_methods
 	end
 
+	def lazy_state(attribute, enumerables = nil, custom_finders = {})
+		LazyState.new(self, attribute, enumerables, custom_finders).define_methods
+	end
+
+
 end
 
 ActiveRecord::Base.extend LazyModel

data/test/support/models.rb

@@ -3,8 +3,8 @@ class Post < ActiveRecord::Base
 	CHOICES = ["one", "two", "three"]
 	TYPES = ["OldClass"]
 
-	lazy_model :archived #boolean
-	lazy_model :choice, Post::CHOICES, {:prime => ["one", "three"]} #string
-	lazy_model :old_type, Post::TYPES
+	lazy_boolean :archived #boolean
+	lazy_state :choice, Post::CHOICES, {:prime => ["one", "three"]} #string
+	lazy_state :old_type, Post::TYPES
 
 end

data/test/support/schema.rb

@@ -3,7 +3,7 @@ ActiveRecord::Schema.define do
 
   create_table :posts, :force => true do |t|
     t.string :choice
-    t.string :old_type
+    t.text :old_type
     t.boolean :archived
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lazy_model
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-08 00:00:00.000000000 Z
+date: 2011-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70148791015580 !ruby/object:Gem::Requirement
+  requirement: &70266500318760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70148791015580
+  version_requirements: *70266500318760
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70148791013840 !ruby/object:Gem::Requirement
+  requirement: &70266500317660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70148791013840
+  version_requirements: *70266500317660
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70148791013060 !ruby/object:Gem::Requirement
+  requirement: &70266512218180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70148791013060
+  version_requirements: *70266512218180
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70148791012400 !ruby/object:Gem::Requirement
+  requirement: &70266512217000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70148791012400
+  version_requirements: *70266512217000
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70148791011220 !ruby/object:Gem::Requirement
+  requirement: &70266512214900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70148791011220
+  version_requirements: *70266512214900
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &70148791022680 !ruby/object:Gem::Requirement
+  requirement: &70266512213580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70148791022680
+  version_requirements: *70266512213580
 description: write common active_record methods in shorthand
 email: ascruggs@academicworks.com
 executables: []
@@ -95,10 +95,8 @@ files:
 - lazy_model.gemspec
 - lib/lazy_model.rb
 - lib/lazy_model/lazy_boolean.rb
-- lib/lazy_model/lazy_model.rb
 - lib/lazy_model/lazy_model_support.rb
-- lib/lazy_model/lazy_string.rb
-- lib/lazy_model/lazy_text.rb
+- lib/lazy_model/lazy_state.rb
 - test/helper.rb
 - test/lazy_model.sqlite3
 - test/support/data.rb
@@ -120,7 +118,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1764777521422338466
+      hash: -4507813331034137999
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/lazy_model/lazy_model.rb

@@ -1,37 +0,0 @@
-module LazyModel
-	
-	class LazyModel
-
-		attr_accessor :model, :attribute, :enumerables, :custom_finders, :column
-	
-		def initialize(model, attribute, enumerables = nil, custom_finders = {})
-			self.model 			= model
-			self.attribute 		= attribute
-			self.enumerables 	= format_enumerables(enumerables)
-			self.custom_finders = custom_finders
-		end
-
-		def define_methods
-			#make sure the column exists
-			if self.column = model.columns_hash[attribute.to_s]
-				#pass to lazy class id supported
-				begin
-					klass = "LazyModel::Lazy#{column.type.to_s.camelize}".constantize
-					klass.new(self).define_methods
-				rescue NameError
-					warn " attribute type \'#{column.type}\'' on \'#{attribute}\' is not supported "				
-				end
-			else
-				warn "\'#{attribute}\' is not an attribute for \'#{model.to_s}\' model"
-			end
-		end
-
-		private
-
-		def format_enumerables(enumerables)
-			Array(enumerables).map{|enumerable| enumerable.underscore}
-		end
-
-	end
-
-end

data/lib/lazy_model/lazy_text.rb

@@ -1 +0,0 @@
-LazyModel::LazyText = LazyModel::LazyString