dm-unlazy 0.0.1.2 → 0.0.1.3

data/lib/dm-unlazy/collection.rb

@@ -30,13 +30,19 @@ class Collection
 	end
 
 	def method_missing (id, *args, &block)
+		collection = @collection
+
 		if (Array.instance_method(id) rescue false)
 			reload unless @resources
 
-			return @resources.__send__ id, *args, &block
+			if @resources.is_a?(Array)
+				return @resources.__send__ id, *args, &block
+			end
+
+			collection = @resources
 		end
 
-		result = @collection.__send__ id, *args, &block
+		result = collection.__send__ id, *args, &block
 
 		if result.is_a?(DataMapper::Collection)
 			Collection.new(result)
@@ -54,17 +60,22 @@ class Collection
 	end
 
 	def reload
-		adapter   = repository.adapter
-		query     = @collection.all(:fields => @fields || model.properties.map(&:field)).query
-		statement = adapter.send(:select_statement, query).flatten(1)
-
-		@resources = adapter.select(*statement).map {|data|
-			if data.is_a?(Struct)
-				Unlazy::Model.new(model, data)
-			else
-				Unlazy::Model.new(model, Struct.new(@fields.first).new(data))
-			end
-		}
+		adapter    = repository.adapter
+		collection = @collection.all(:fields => @fields || model.properties.map(&:field))
+
+		if adapter.respond_to? :select
+			statement = adapter.send(:select_statement, collection.query).flatten(1)
+
+			@resources = adapter.select(*statement).map {|data|
+				if data.is_a?(Struct)
+					Unlazy::Model.new(model, data)
+				else
+					Unlazy::Model.new(model, Struct.new(@fields.first).new(data))
+				end
+			}
+		else
+			@resources = collection
+		end
 
 		self
 	end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dm-unlazy
 version: !ruby/object:Gem::Version
-  version: 0.0.1.2
+  version: 0.0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dm-core
-  requirement: &19570140 !ruby/object:Gem::Requirement
+  requirement: &10648440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19570140
+  version_requirements: *10648440
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &19569000 !ruby/object:Gem::Requirement
+  requirement: &10647700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19569000
+  version_requirements: *10647700
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &19568000 !ruby/object:Gem::Requirement
+  requirement: &10647000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19568000
+  version_requirements: *10647000
 description: 
 email: meh@paranoici.org
 executables: []