representable_resources 0.0.1 → 0.0.2

data/lib/representable_resources/base.rb

@@ -1,55 +1,15 @@
+require 'representable/resource'
+require 'representable/collection'
+require 'errors/invalid_resource_error'
 
 module Representable
-	
-	def property(property_attr)
-    self.representable_fields << property_attr
-  end
-
-  def representable_fields
-    @representable_fields ||= []
-  end
-
-  def collection(collection, klass)
-		self.representable_collections << [ klass, collection]
-  end
-
-  def representable_collections
-    @representable_collections ||= []
-  end
-
 	class Base
-		extend Representable
+		extend Representable::Resource
+		include Representable::Collection
 		
 		def initialize(object)
 	    @object = object
 	  end
-
-	  def to_hash
-	    property_hash = {}
-	    self.class.representable_fields.each do |field|
-				field = field.to_sym
-				property_hash.merge!(field => @object.send(field))
-	    end
-			property_hash.merge!(:target_class => @object.class.to_s)
-			get_collections.each do |collection|
-				property_hash.merge!(collection)
-			end
-			property_hash
-	  end
-
-		protected
-
-		def get_collections
-			collections = []
-			self.class.representable_collections.each do |r|
-				objects = []
-				@object.send(r[1]).each do |obj|
-					objects << r[0].new(obj).to_hash
-				end
-				collections << {r[1] => objects}
-			end
-			collections
-		end
 		
 	end
 end

data/lib/representable_resources/errors/invalid_resource_error.rb

@@ -0,0 +1,2 @@
+class InvalidResourceError < Exception
+end

data/lib/representable_resources/representable/collection.rb

@@ -0,0 +1,43 @@
+module Representable
+	module Collection
+		
+		def to_hash
+	    @property_hash ||= build_hash
+	  end
+		protected
+
+		def build_hash
+			property_hash = {}
+			if @object
+	    	self.class.representable_fields.each do |field|
+					field = field.to_sym
+					property_hash.merge!(field => object_for(field))
+		    end
+				property_hash.merge!(:target_class => @object.class.to_s)
+				add_collections_to!(property_hash)
+				add_resources_to!(property_hash)
+			end
+			property_hash
+		end
+
+		def add_collections_to!(hash)
+			self.class.representable_collections.each do |r|
+				objects = []
+				object_for(r[1]).each do |obj|
+					objects << r[0].new(obj).to_hash
+				end
+				hash.merge!(r[1] => objects)
+			end
+		end
+
+		def add_resources_to!(hash)
+			self.class.representable_resources.each do |r|
+				hash.merge!(r[1] => r[0].new(object_for(r[1])).to_hash)
+			end
+		end
+
+		def object_for(property)
+			@object.send(property) if @object
+		end
+	end
+end

data/lib/representable_resources/representable/resource.rb

@@ -0,0 +1,27 @@
+module Representable
+	module Resource
+		def property(property_attr)
+	    self.representable_fields << property_attr
+	  end
+
+	  def representable_fields
+	    @representable_fields ||= []
+	  end
+
+	  def collection(collection, klass)
+			self.representable_collections << [klass, collection]
+	  end
+
+		def resource(resource_attr, klass)
+			self.representable_resources << [klass, resource_attr]
+		end
+
+	  def representable_collections
+	    @representable_collections ||= []
+	  end
+
+		def representable_resources
+			@representable_resources ||= []
+		end
+	end
+end

data/lib/representable_resources/version.rb

@@ -1,3 +1,3 @@
 module RepresentableResources
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: representable_resources
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -39,6 +39,9 @@ files:
 - lib/generators/representer_generator.rb
 - lib/generators/templates/representer.rb
 - lib/representable_resources/base.rb
+- lib/representable_resources/errors/invalid_resource_error.rb
+- lib/representable_resources/representable/collection.rb
+- lib/representable_resources/representable/resource.rb
 - lib/representable_resources/version.rb
 - lib/representable_resources.rb
 homepage: ''