th_simple_data_presentation 0.0.1 → 0.1.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NmYyOTExNDlkZjhkNzg1MmFhMjlhYWY5MGRkYzY3NjdhYjI4NDc0OQ==
+    NDM0MTkzMGNmNjlkYTZkMTRlOGI5NjA3MDMxNzYzODU3Y2RhNjUzMA==
   data.tar.gz: !binary |-
-    YmZkYTQ0MjhiNjNmMTNkNzQyYTA3NDY1NGYyMGUzOGQ4NWRkZWFmMA==
+    YTMxNjBkMTg4YWNjMTIzNjViNWQ4ZWFkMTNmOGY1MmY3YjdhY2YxOQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NTJhYWYyNTNhZmRkMTI2NmM4ZDU4Mjk2Yjg1OWM5YzM2ZDVmMzVkMTM0ZmU0
-    N2IzZjYxMWU2NjljOTRlOGJhNTRiMTk2Mjc4MTYyZmVhOTg3ZjI1NjE3Yzdj
-    NGIxM2IwNThhZDk3OGMyZjZkNjMxZTE1YWRhYjNkOGQ3MGQyZjc=
+    NDhjZDVkMzkyNDAzYzIxMmE0YTg2NTE2ZmNkZWVjOTE3YzljNTUwZjM5N2Zm
+    NGRiZjQyNjcyMTdmYzliZTcyNzg4MDI3MTRjMmFmMzkyMzlkNWQ2ZmIzNzUx
+    MDk4ZDc5NzQ1ZmI5ZjliM2QwZGU0YTczZDU4MTg0MTllNWVlYTc=
   data.tar.gz: !binary |-
-    MGZmOWM2MjQ5MzEyOTI5OWNjYjQyNGY5NjU3MTc3YTEwNmI0MjAxNmI3ZmJk
-    OTRjZDk5YWFlNjFhMTUwZjk2NGMzNGViMzZlMzA2NjZhOWI4OTA0OWQwMmRi
-    MTBmNDEyNWE5YmM1ZDBkOTAyNDg2ODJmZGZlOGJkMzVkOTY0NTM=
+    ZGIzMmU3ZTVlODcyMDQ0OWFlZDIxYTNhODY1NjI5MzFjOTcyMWViOTMxOTFl
+    YmIyNzY4YmY5MDllZjk0ZmQ5MDNmZjQyNTNhMGM2Nzg3ZDhlYTFhYTE2ZThl
+    ZWQyZDUwOTk0ZDdiYjJjNDk2ZDQ5MDVlNTdiMWM4YTFkZjAxN2Q=

data/lib/simple_data_presentation/simple_data_list/base.rb

@@ -1,12 +1,12 @@
 class SimpleDataPresentation::SimpleDataList::Base
-	def initialize(context, collection, options = {}, &content_block)
+	def initialize(context, resource, options = {}, &content_block)
 		@context = context
-		@collection = collection
+		@resource = resource
 		@options = options
 		@content_block = content_block
-		@resource_class = @options.delete(:resource_class) || @collection.first.class
+		@resource_class = @options.delete(:resource_class) || @resource.class
 		@html_options = SimpleDataPresentation::HtmlOptions.new(@options.delete(:html) || {})
-		@html_options[:class] = "list"
+		@html_options[:class] = "dl-horizontal"
 	end
 
 	def item(*args, &block)
@@ -26,7 +26,7 @@ class SimpleDataPresentation::SimpleDataList::Base
 				@resource_class.human_attribute_name args.join("_").to_sym
 			end
 		end
-		@context.content_tag :dt, content, options[:html]
+		@context.content_tag :dt, content, SimpleDataPresentation::HtmlOptions.new(options[:html] || {}).merge(options[:label_html] || {})
 	end
 
 	def value(*args, &block)
@@ -37,21 +37,18 @@ class SimpleDataPresentation::SimpleDataList::Base
 			content = value_for_method_chain *args
 			as_formatter = options[:as]
 			if as_formatter.present?
-				content = if as_formatter.respond_to?(:call)
-					case as_formatter.arity
-					when 1; as_formatter.call content
-					when 2; as_formatter.call @resource, content
-					end
-				elsif as_formatter.is_a?(Symbol) && @context.respond_to?(as_formatter)
-					@context.public_send as_formatter, content if !content.nil?
+				as_formatter = @context.method(as_formatter).to_proc if as_formatter.is_a?(Symbol)
+				content = case as_formatter.arity
+				when 1; as_formatter.call content
+				when 2; as_formatter.call @resource, content
 				end
 			end
 		end
-		@context.content_tag :td, content, options[:html]
+		@context.content_tag :dd, content, SimpleDataPresentation::HtmlOptions.new(options[:html] || {}).merge(options[:value_html] || {})
 	end
 
 	def render!
-		@context.raw @context.content_tag :dl, @context.capture(self, &@content_block), @html_options[:html]
+		@context.raw @context.content_tag :dl, @context.capture(self, &@content_block), @html_options
 	end
 
 	protected

data/lib/simple_data_presentation/simple_data_list/helper.rb

@@ -1,5 +1,5 @@
 module SimpleDataPresentation::SimpleDataList::Helper
-	def data_list_for(collection, options = {}, &content_block)
-		SimpleDataPresentation::SimpleDataList::Base.new(self, collection, options, &content_block).render!
+	def data_list_for(resource, options = {}, &content_block)
+		SimpleDataPresentation::SimpleDataList::Base.new(self, resource, options, &content_block).render!
 	end
 end

data/lib/simple_data_presentation/simple_table/base.rb

@@ -6,7 +6,7 @@ class SimpleDataPresentation::SimpleTable::Base
 		@content_block = content_block
 		@resource_class = @options.delete(:resource_class) || @collection.first.class
 		@html_options = SimpleDataPresentation::HtmlOptions.new(@options.delete(:html) || {})
-		@html_options[:class] = "list"
+		@html_options[:class] = "table"
 	end
 
 	def item(*args, &block)

data/lib/simple_data_presentation/simple_table/head.rb

@@ -11,13 +11,13 @@ class SimpleDataPresentation::SimpleTable::Head < SimpleDataPresentation::Simple
 		options = args.extract_options!
 		content = if block.present?
 			@context.capture(@resource_class, &block)
-		elsif args.any?
-			sort_attribute = args.join("_").to_sym
+		else
+			sort_attribute = options[:sort_by] || (args.any? ? args.join("_").to_sym : nil)
 			label = if options[:label].is_a?(Symbol)
 				@resource_class.human_attribute_name options[:label]
 			elsif !options[:label].nil?
 				options[:label]
-			else
+			elsif sort_attribute.present?
 				@resource_class.human_attribute_name sort_attribute
 			end
 			!@search.nil? && options[:sortable] != false ? @context.sort_link(@search, sort_attribute, label) : label

data/lib/simple_data_presentation/simple_table/row.rb

@@ -14,17 +14,14 @@ class SimpleDataPresentation::SimpleTable::Row < SimpleDataPresentation::SimpleT
 			content = value_for_method_chain *args
 			as_formatter = options[:as]
 			if as_formatter.present?
-				content = if as_formatter.respond_to?(:call)
-					case as_formatter.arity
-					when 1; as_formatter.call content
-					when 2; as_formatter.call @resource, content
-					end
-				elsif as_formatter.is_a?(Symbol) && @context.respond_to?(as_formatter)
-					@context.public_send as_formatter, content if !content.nil?
+				as_formatter = @context.method(as_formatter).to_proc if as_formatter.is_a?(Symbol)
+				content = case as_formatter.arity
+				when 1; as_formatter.call content
+				when 2; as_formatter.call @resource, content
 				end
 			end
 		end
-		@context.content_tag :td, content, options[:html]
+		@context.content_tag :td, content, (SimpleDataPresentation::HtmlOptions.new(options[:html] || {}).merge options[:row_html] || {})
 	end
 
 	def render!

data/lib/simple_data_presentation/version.rb

@@ -1,3 +1,3 @@
 module SimpleDataPresentation
-	VERSION = "0.0.1"
+	VERSION = "0.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: th_simple_data_presentation
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Toby Hinloopen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-26 00:00:00.000000000 Z
+date: 2013-04-15 00:00:00.000000000 Z
 dependencies: []
 description: Collection of visual helpers
 email: