sinatra_more 0.0.8 → 0.0.9

data/README.rdoc

@@ -53,7 +53,46 @@ This component provides a great deal of view helpers related to html markup gene
 There are helpers for generating tags, forms, links, images, and more. Most of the basic
 methods should be very familiar to anyone who has used rails view helpers.
 
-...list methods here...
+==== Output Helpers
+
+* capture_html(*args, &block)
+  * Captures the html from a block of template code for erb or haml
+  * capture_html(&block) => "...html..."
+* concat_content(text="")
+  * Outputs the given text to the templates buffer directly
+  * concat_content("This will be output to the template buffer in erb or haml")
+
+==== Tag Helpers
+
+* tag(name, options={})
+* content_tag(name, content, options={})
+* input_tag(type, options = {})
+
+==== Asset Helpers
+
+* flash_tag(kind, options={})
+* link_to(*args, &block)
+* image_tag(url, options={})
+* stylesheet_link_tag(*sources)
+* javascript_include_tag(*sources)
+
+==== Form Helpers
+
+* form_for(object, url, settings={}, &block)
+* form_tag(url, options={}, &block)
+* field_set_tag(*args, &block)
+* error_messages_for(record, options={})
+* label_tag(name, options={}, &block)
+* text_field_tag(name, options={})
+* text_area_tag(name, options={})
+* password_field_tag(name, options={})
+* file_field_tag(name, options={})
+* submit_tag(caption, options={})
+
+==== Format Helpers
+
+* relative_time_ago(date)
+* escape_javascript(html_content)
 
 === RenderPlugin
 
@@ -61,7 +100,10 @@ This component provides a number of rendering helpers for sinatra, making the pr
 of displaying templates far smoother. This plugin also has support for useful additions
 such as partials (with support for :collection) into the templating system.
 
-...list methods here...
+* erb_template(template_path, options={})
+* haml_template(template_path, options={})
+* render_template(template_path, options={})
+* partial(template, *args)
 
 === WardenPlugin
 
@@ -69,7 +111,12 @@ This component provides out-of-the-box support for Warden authentication. With t
 plugin registered, warden will be automatically required, configured and helpers will be
 provided to make interacting with warden dead simple.
 
-...list methods here...
+* current_user
+* authenticate_user!
+* logout_user!
+* logged_in?
+* authenticated?(&block)
+* must_be_authorized!(failure_path=nil)
 
 == Acknowledgements
 

data/VERSION

@@ -1 +1 @@
-0.0.8
+0.0.9

data/lib/sinatra_more/markup_plugin/form_builder/standard_form_builder.rb

@@ -8,7 +8,7 @@ class StandardFormBuilder < AbstractFormBuilder
     class_eval <<-EOF
     def #{field_type}_block(field, options={}, label_options={})
       label_options.reverse_merge!(:caption => options.delete(:caption)) if options[:caption]
-      @template.content_block_tag(:p) do
+      @template.content_block_tag(:p, :concat => false) do
         html =  label(field, label_options)
         html << #{field_type}(field, options)
       end
@@ -18,7 +18,7 @@ class StandardFormBuilder < AbstractFormBuilder
 
   # submit_block("Update")
   def submit_block(caption)
-    @template.content_block_tag(:p) do
+    @template.content_block_tag(:p, :concat => false) do
       @template.submit_tag(caption)
     end
   end

data/lib/sinatra_more/markup_plugin/tag_helpers.rb

@@ -6,16 +6,20 @@ module SinatraMore
       tag(:input, options)
     end
 
-    # content_block_tag(:p, :class => 'dark') do ... end
-    def content_block_tag(name, options={}, &block)
-      options.merge!(:content => capture_html(&block))
-      tag(name, options)
-    end
-
     # content_tag(:p, "hello", :class => 'light')
-    def content_tag(name, content, options={})
-      tag(name, options.merge(:content => content))
+    # content_tag(:p, :class => 'dark') do ... end
+    # parameters: content_tag(name, content=nil, options={})
+    # options = { :concat => true/false }
+    def content_tag(*args, &block)
+      name = args.first
+      options = args.extract_options!
+      options.reverse_merge!(:concat => true) if block_given?
+      should_concat = options.delete(:concat)
+      tag_html = block_given? ? capture_html(&block) : args[1]
+      tag_result = tag(name, options.merge(:content => tag_html))
+      should_concat ? concat_content(tag_result) : tag_result
     end
+    alias content_block_tag content_tag
 
     # tag(:br, :style => 'clear:both')
     # tag(:p, :content => "hello", :class => 'large')

data/sinatra_more.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sinatra_more}
-  s.version = "0.0.8"
+  s.version = "0.0.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nathan Esquenazi"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra_more
 version: !ruby/object:Gem::Version 
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors: 
 - Nathan Esquenazi