showbuilder 0.0.2 → 0.0.3

data/lib/showbuilder.rb

@@ -17,21 +17,21 @@ module Showbuilder
     Showbuilder::ShowPaginateRenderer
   end
 
-  def show_form_button(text_id = nil)
-    text_id                       ||= 'commit'
-    text                          = I18n.t("form_button.#{text_id}")
-    text_loading                  = I18n.t("form_button.#{text_id}_loading")
-    options                       = {}
-    options['class']              = "form-button btn primary"
-    options['data-loading-text']  = text_loading
-    options['type']               = :button
+  def show_form_button(text_id = nil, options = {})
+    text_id                        ||= 'save'
+    text                           = show_itext("form_button.#{text_id}")
+    text_loading                   = show_itext("form_button.#{text_id}_loading")
+    options                        ||= {}
+    options[:class]                = "form-button btn #{options[:class]}"
+    options[:'data-loading-text']  ||= text_loading
+    options[:type]                 ||= :submit
     self.content_tag(:button, text, options)
   end
 
   def show_page_title
     self.content_tag :div, :class => 'page-header' do
       self.content_tag :h1 do
-        self.current_itext("title_#{self.action_name}")
+        self.show_current_itext("title_#{self.action_name}")
       end
     end
   end
@@ -47,7 +47,7 @@ module Showbuilder
     end
   end
 
-  def current_text_group
+  def show_current_itext_base
     self.controller_name.to_s.singularize
   end
 
@@ -80,5 +80,13 @@ module Showbuilder
     end
   end
 
+  def show_model_link_to(name, object)
+    self.link_to name, object
+  end
+
   ::ActionView::Base.send :include, self
+
+  ::ActionView::Base.field_error_proc = proc do |html_tag, instance_tag|
+    html_tag
+  end
 end

data/lib/showbuilder/builders/form_builder.rb

@@ -11,7 +11,9 @@ module Showbuilder
         @template = template
       end
 
-      def show_text_input(method)
+      def show_text_input(method, options = {})
+        options ||={}
+        html_options = options[:html]
         self.show_method_input(method) do
           self.text_field_tag(method, nil, :class => 'xlarge', :id => 'xlInput')
         end
@@ -34,7 +36,7 @@ module Showbuilder
 
       def show_method_input(method)
         self.contents_tag :div, :class => :clearfix do |contents|
-          label_text = self.current_itext(method)
+          label_text = self.show_current_itext(method)
           contents << self.label(method, label_text)
           contents << self.content_tag(:div, :class => :input) do
             yield
@@ -42,7 +44,7 @@ module Showbuilder
         end
       end
 
-      def current_text_group
+      def show_current_itext_base
         self.controller_name.to_s.singularize + '.form'
       end
     end

data/lib/showbuilder/builders/model_form_builder.rb

@@ -7,49 +7,66 @@ module Showbuilder
       include Showbuilder::Builders::TemplateMethods
       include Showbuilder::I18nText
 
-      def show_text_input(method)
+      def show_text_input(method, options = {})
+        options ||= {}
+        html_options = options[:html] || {}
+        input_options = options[:input_options] || {}
+        self.show_method_input(method, html_options) do
+          self.text_field(method, input_options)
+        end
+      end
+
+      def show_text_field(method)
+        text = @object.send(method)
+
         self.show_method_input(method) do
-          self.text_field(method, :class => 'xlarge', :id => 'xlInput')
+          self.content_tag(:span, text, :class => "uneditable-input")
         end
       end
 
       def show_email_input(method)
         self.show_method_input(method) do
-          self.contents_tag(:div, :class => "input-append") do |contents|
-            contents << self.email_field(method, :class => 'xlarge', :id => 'xlInput')
-            contents << self.content_tag(:span, "@", :class => "add-on")
+          self.contents_tag(:div, :class => "input-append") do |contents|          
+            contents << self.email_field(method, :class => :medium)
+            contents << self.content_tag(:span, content_tag(:i, '', :class =>"icon-envelope"), :class => "add-on")
           end
         end
       end
 
       def show_password_input(method)
         self.show_method_input(method) do
-          self.password_field(method, :class => 'xlarge', :id => 'xlInput')
+          self.password_field(method, :class => 'input-large changes')
         end
       end
 
       def show_memo_input(method)
         self.show_method_input(method) do
-          self.text_area(method, :class => 'xlarge', :id => 'xlInput', :rows => '5', :cols => '10')
+          self.text_area(method, :rows => 5)
         end
       end
 
-      def show_method_input(method)
-        self.contents_tag :div, :class => :clearfix do |contents|
-          label_text = self.current_itext(method)
-          contents << self.label(method, label_text)
-          contents << self.content_tag(:div, :class => :input) do
+      def show_method_input(method, options = {})
+        label_text = options[:label_text] || self.show_current_itext(method)
+        div_options = options[:class] || ''
+
+        if object.errors.count > 0 and object.errors[method].count > 0
+          div_options = " error"
+        end
+
+        self.contents_tag :div, :class => "control-group #{div_options}" do |contents|          
+          contents << self.label(method, label_text, :class => "control-label")
+          contents << self.content_tag(:div, :class => 'controls') do
             yield
           end
         end
       end
 
       protected
-      
-      def current_text_group
+
+      def show_current_itext_base
         self.object.class.to_s.underscore
       end
-      
+
     end
   end
 end

data/lib/showbuilder/builders/model_list_builder.rb

@@ -18,6 +18,8 @@ module Showbuilder
       attr_reader   :template
       attr_reader   :text_group
       attr_accessor :columns
+      attr_accessor :table_options
+      attr_accessor :body_row_options
 
       def initialize(template, text_group)
         @template = template
@@ -26,9 +28,12 @@ module Showbuilder
       end
 
       def build_model_list(models, &block)
-        block.call(self)
-        
-        contents_tag(:table, :class => 'bordered-table zebra-striped') do |contents|
+        block.call(self)        
+        self.table_options ||= {}
+        self.table_options[:class] ||= ""
+        self.table_options[:class] += " table table-bordered table-striped"
+
+        contents_tag(:table, self.table_options) do |contents|
           contents << self.build_header
           contents << self.build_body(models)
         end
@@ -53,8 +58,9 @@ module Showbuilder
           self.content_tag(:th) do 
             if column.methods            
               methods = Array.wrap(column.methods)
+              methods = filter_method_option(methods)
               text_id = methods.join('.')
-              self.current_itext(text_id)
+              self.show_current_itext(text_id)
             end
           end
         end
@@ -76,7 +82,7 @@ module Showbuilder
 
       def build_body_row(model)
         options = self.build_body_row_options
-        contents_tag(:tr, options)do |contents|
+        contents_tag(:tr, :class => "#{options}")do |contents|
           self.columns.each do |column|
             contents << self.build_body_column(column, model)
           end
@@ -85,14 +91,16 @@ module Showbuilder
 
       def build_body_row_options
         even = self.cycle('', 'even')
-        {:class => even}
+        self.body_row_options ||= {}
+        self.body_row_options[:class] ||= ""
+        self.body_row_options[:class] += " #{even}"
       end
 
       def build_body_row_for_no_record
         contents_tag :tr do |contents|
           self.columns.each_index do |index|
             contents << self.content_tag(:td) do
-              itext('no_record') if index == 0
+              show_itext('no_record') if index == 0
             end
           end
         end
@@ -106,7 +114,7 @@ module Showbuilder
         end
       end
 
-      def current_text_group
+      def show_current_itext_base
         @text_group || self.controller_name.to_s.singularize
       end
     end

data/lib/showbuilder/builders/model_list_builder/show_columns.rb

@@ -13,6 +13,9 @@ module Showbuilder
 
         # show_text_link_column :number
         # show_text_link_column :member, :number
+        # show_text_link_column :member, :number, :link => :member
+        # show_text_link_column :member, :number, :link => [:member, :department]
+        # show_text_link_column :member, :number, :link => [:member, :department], :class => 'member_list'
         def show_text_link_column(*methods)
           self.show_method_link_column(*methods) do |value|
             self.safe_html_string(value)
@@ -25,6 +28,12 @@ module Showbuilder
             self.time_string(value)
           end
         end
+        
+        def show_time_link_column(*methods)
+          self.show_method_link_column(*methods) do |value|
+            self.time_string(value)
+          end
+        end
 
         # show_date_column :created_at
         def show_date_column(*methods)
@@ -47,6 +56,12 @@ module Showbuilder
           end
         end
 
+        def show_currency_link_column(*methods)
+          self.show_method_link_column(*methods) do |value|
+            self.currency_string(value)
+          end
+        end
+
         # show_percent_column :percent
         def show_percent_column(*methods)
           self.show_method_column(methods) do |value|
@@ -56,7 +71,7 @@ module Showbuilder
 
         def show_method_column(methods, &block)
           self.show_column(methods) do |model|
-            self.content_tag(:td) do
+            self.content_tag(:td, :class => find_option_form_methods(methods, :class)) do
               method_value = self.call_object_methods(model, methods)
               if block
                 content = block.call(method_value)
@@ -74,24 +89,39 @@ module Showbuilder
           end
 
           self.show_column(methods) do |model|
-            self.content_tag(:td) do
+            self.content_tag(:td, :class => find_option_form_methods(methods, :class)) do
               link_object = self.show_method_link_column__get_link_object(model, methods)
               link_name   = self.show_method_link_column__get_link_name(model, methods, customize_link_name_block)
-              self.link_to link_name, link_object            
+              self.show_model_link_to link_name, link_object
             end
-          end        
+          end
         end
 
-        def show_method_link_column__get_link_object(model, methods)
-          case methods.count
-          when 1
-            model
+        def find_option_form_methods(methods, key)
+          last_item = methods.last
+          if last_item.is_a? Hash
+            return last_item[key]
           else
-            self.call_object_methods(model, methods.first)
+            return nil
+          end          
+        end
+
+        def show_method_link_column__get_link_object(model, methods)
+          if methods.count == 1
+            return model
+          end 
+                    
+          link_methods = find_option_form_methods(methods, :link)
+          if link_methods
+            link_object = self.call_object_methods(model, link_methods)                
+            return link_object
           end
+
+          return model
         end
 
         def show_method_link_column__get_link_name(model, methods, customize_link_name_block)
+          methods = filter_method_option(methods)        
           method_value = self.call_object_methods(model, methods)
           if customize_link_name_block
             link_name = customize_link_name_block.call(method_value)
@@ -109,6 +139,13 @@ module Showbuilder
           self.columns << column
         end
 
+        def filter_method_option(methods)
+          if methods.last.is_a? Hash
+            methods[0..-2]
+          else
+            methods
+          end
+        end
       end
     end
   end

data/lib/showbuilder/builders/model_view_builder.rb

@@ -18,27 +18,27 @@ module Showbuilder
         unless @model
           return
         end
-        self.content_tag(:table, :class => "bordered-table") do
+        self.content_tag(:table, :class => "table table-bordered nohead") do
           @template.capture(self, &block)
         end
       end
 
-      def show_text(method)
-        self.show_method_field(method) do |value|
+      def show_text(*methods)
+        self.show_method_field(*methods) do |value|
           self.safe_html_string(value)
         end
       end
 
       def show_text_link(link_method, text_method)
         methods      = [link_method, text_method]
-        method_label = self.current_itext(methods)
+        method_label = self.show_current_itext(methods)
         method_value = self.call_object_methods(model, methods)
         method_link  = self.call_object_methods(model, link_method)
         
         self.contents_tag :tr do |contents|
-          contents << self.content_tag(:td, method_label.to_s, :class => "span2")
-          contents << self.content_tag(:td, :class => "span2") do
-            link_to(method_value.to_s, method_link)            
+          contents << self.content_tag(:td, method_label.to_s, :class => "span2 left")
+          contents << self.content_tag(:td, :class => "span2 right") do
+            self.show_model_link_to(method_value.to_s, method_link)            
           end
         end
       end
@@ -67,22 +67,22 @@ module Showbuilder
         end
       end
 
-      def show_method_field(method, &block)
-        method_label = self.current_itext(method)
+      def show_method_field(*method, &block)
+        method_label = self.show_current_itext(method)
         method_value = self.call_object_methods(model, method)
         if block
           method_value = block.call(method_value) 
         end
 
         self.contents_tag :tr do |contents|
-          contents << self.content_tag(:td, method_label.to_s, :class => "span2")
-          contents << self.content_tag(:td, method_value.to_s, :class => "span2")
+          contents << self.content_tag(:td, method_label.to_s, :class => "span2 left")
+          contents << self.content_tag(:td, method_value.to_s, :class => "span2 right")
         end
       end
-    
+
       protected
 
-      def current_text_group
+      def show_current_itext_base
         self.model.class.to_s.underscore
       end
     end

data/lib/showbuilder/corekit.rb

@@ -2,8 +2,12 @@ module Showbuilder
   module Corekit
     def html_contents
       contents = []
-      yield contents
-      contents.join(' ').html_safe
+      result = yield contents
+      if contents.count > 0
+        contents.join(' ').html_safe
+      else
+        result
+      end
     end
 
     def contents_tag(tag_name, options = {}, &block)
@@ -11,7 +15,11 @@ module Showbuilder
         self.html_contents(&block)
       end
     end
-  
+    
+    def divc(option_class, &block)
+      contents_tag :div, :class => option_class , &block
+    end
+    
     def currency_string(number)
       if number
         number_to_currency(number)

data/lib/showbuilder/i18n_text.rb

@@ -1,25 +1,24 @@
 module Showbuilder
   module I18nText
-
-    def current_itext(text_id, *args)
+    def show_current_itext(text_id, *args)
       case text_id
       when Array
         text_id = text_id.join('.')
       end
 
-      if self.current_text_group
-        crrent_text_id = "#{self.current_text_group}.#{text_id}" 
+      if self.show_current_itext_base
+        current_text_id = "#{self.show_current_itext_base}.#{text_id}" 
       else
-        crrent_text_id = text_id
+        current_text_id = text_id
       end
       
-      self.itext(crrent_text_id, *args)
+      self.show_itext(current_text_id, *args)      
     end
 
-    def current_text_group
+    def show_current_itext_base
     end
 
-    def itext(id, *args)
+    def show_itext(id, *args)
       I18n.t(id, *args)
     end
   end

data/lib/showbuilder/show_form.rb

@@ -2,8 +2,10 @@ require 'showbuilder/builders/form_builder'
 
 module Showbuilder
   module ShowForm
-    def show_form(url, &block)
-      self.form_tag url do
+    def show_form(url, options = {}, &block)
+      options         = options || {}
+      options[:class] = "#{options[:class]} form-horizontal"
+      self.form_tag url, options do
         builder = Showbuilder::Builders::FormBuilder.new(self)
         self.capture(builder, &block)
       end

data/lib/showbuilder/show_model_form.rb

@@ -16,38 +16,31 @@ module Showbuilder
     # I18n.t("customer.email')
     # I18n.t('customer.password')
     #
-    def show_model_form(model, options ={}, &block)
-      options.merge!(:builder => Showbuilder::Builders::ModelFormBuilder)
-
-      self.html_contents do |contents|
-        contents << self.error_messages_for(model)
-        contents << self.form_for(model, options) do |form|
-          capture(form, &block)
+    def show_model_form(models, options ={}, &block)
+      models                 = Array.wrap(models)
+      options                = options || {}
+      options[:builder]      = options[:builder] || Showbuilder::Builders::ModelFormBuilder
+      options[:html]         = options[:html] || {}
+      options[:html][:class] = "#{options[:html][:class]} form-horizontal"
+
+      self.form_for(models, options) do |form|
+        self.html_contents do |contents|
+          contents << self.model_error_messages(models.last)
+          contents << capture(form, &block)
         end
       end
     end
-
-    def error_messages_for(*objects)
-      options = objects.extract_options!
-      options[:header_message] ||= I18n.t(:"activerecord.errors.header", :default => "Invalid Fields")
-      options[:message] ||= I18n.t(:"activerecord.errors.message", :default => "Correct the following errors and try again.")
-
-      messages = objects.compact.map do |object| 
-        object.errors.messages.map do |key, value|
-          value
-        end
+    
+    def model_error_messages(object)
+      messages = object.errors.messages.map do |key, value|
+        value
       end
       messages.flatten!
+      return if messages.empty?
 
-      if messages.empty?
-        return
-      end
-
-      contents_tag(:div, :class => "alert-message block-message error") do |contents|
-        contents << content_tag(:a, 'x', :class=>'close', :href=>"#")
-        contents << content_tag(:p) do
-          content_tag(:strong, options[:header_message]) + options[:message]
-        end
+      contents_tag(:div, :class => "alert alert-error") do |contents|
+        contents << content_tag(:a, '&times'.html_safe, :class=>'close' , "data-dismiss" => :alert)
+        contents << content_tag(:strong, flash[:error], :class => "alert-heading") if flash[:error]
         contents << content_tag(:ul) do
           list_items = messages.map do |msg|
             content_tag(:li, msg)
@@ -55,7 +48,6 @@ module Showbuilder
           list_items.join.html_safe
         end
       end
-
     end
   end
 end

data/lib/showbuilder/show_model_list.rb

@@ -4,17 +4,17 @@ module Showbuilder
   module ShowModelList  
     #
     # show_model_list @products do |list|
-    #   list.show_column                :x_field
-    #   list.show_text_column           :x_field
-    #   list.show_currency_column       :x_field
-    #   list.show_percent_column        :x_field
-    #   list.show_date_column           :x_field
-    #   list.show_time_column           :x_field
-    #   list.show_text_link_column      :x_field
-    #   list.show_currency_link_column  :x_field
-    #   list.show_percent_link_column   :x_field
-    #   list.show_date_link_column      :x_field
-    #   list.show_time_link_column      :x_field
+    #   list.show_column                :some_field
+    #   list.show_text_column           :some_field
+    #   list.show_currency_column       :some_field
+    #   list.show_percent_column        :some_field
+    #   list.show_date_column           :some_field
+    #   list.show_time_column           :some_field
+    #   list.show_text_link_column      :some_field
+    #   list.show_currency_link_column  :some_field
+    #   list.show_percent_link_column   :some_field
+    #   list.show_date_link_column      :some_field
+    #   list.show_time_link_column      :some_field
     # end
     #
     def show_model_list(models, text_group = nil, &block)

data/lib/showbuilder/show_paginate_renderer.rb

@@ -30,7 +30,8 @@ module Showbuilder
       end
       if page && page != current_page && page != :gap
         page_link(page, text, :class => span_class)
-      else if page == current_page || page == :gap
+      else
+        if page == current_page || page == :gap
           page_span(page, text, :class => span_class)
         else
           previous_or_next_page(page)

metadata

@@ -1,38 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: showbuilder
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
-- Ery wang
+- Ery Wang, Mario Du
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-07 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: actionpack
-  requirement: &73874240 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *73874240
-- !ruby/object:Gem::Dependency
-  name: will_paginate
-  requirement: &73873910 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *73873910
+date: 2011-12-07 00:00:00.000000000 Z
+dependencies: []
 description: A Rails View Helper. Show model/s as view, form, list.
 email: ery@baoleihang.com
 executables: []
@@ -73,8 +51,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.13
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: A Rails View Helper.
 test_files: []
+has_rdoc: