showbuilder 0.0.10 → 0.0.11

data/lib/showbuilder.rb

@@ -51,35 +51,6 @@ module Showbuilder
     self.controller_name.to_s.singularize
   end
 
-  def call_object_methods(object, methods)
-    unless object
-      return
-    end
-
-    methods = Array.wrap(methods)
-    if methods.count == 0
-      return
-    end
-
-    first_method = methods.first
-    unless first_method
-      return
-    end
-
-    unless object.respond_to?(first_method)
-      return
-    end
-
-    method_result = object.send(first_method)
-    if methods.count <= 1
-      return method_result
-    else
-      remaining_methods = methods.clone
-      remaining_methods.shift
-      return call_object_methods(method_result, remaining_methods)
-    end
-  end
-
   def show_model_link_to(name, object)
     self.link_to name, object
   end

data/lib/showbuilder/builders/form_builder.rb

@@ -14,13 +14,13 @@ module Showbuilder
       def show_text_input(method, options = {})
         options ||={}
         html_options = options[:html]
-        self.show_method_input(method) do
+        self.show_method_shell(method) do
           self.text_field_tag(method, nil, :class => 'xlarge', :id => 'xlInput')
         end
       end
 
       def show_email_input(method)
-        self.show_method_input(method) do
+        self.show_method_shell(method) do
           self.contents_tag(:div, :class => "input-append") do |contents|
             contents << self.email_field_tag(method, nil, :class => 'xlarge', :id => 'xlInput')
             contents << self.content_tag(:span, "@", :class => "add-on")
@@ -29,12 +29,12 @@ module Showbuilder
       end
 
       def show_password_input(method)
-        self.show_method_input(method) do
+        self.show_method_shell(method) do
           self.password_field_tag(method, nil, :class => 'xlarge', :id => 'xlInput')
         end
       end
 
-      def show_method_input(method)
+      def show_method_shell(method)
         self.contents_tag :div, :class => :clearfix do |contents|
           label_text = self.show_current_itext(method)
           contents << self.label(method, label_text)

data/lib/showbuilder/builders/model_form_builder.rb

@@ -9,9 +9,9 @@ module Showbuilder
 
       def show_text_input(method, options = {})
         options ||= {}
-        html_options = options[:html] || {}
-        input_options = options[:input_options] || {}
-        self.show_method_input(method, html_options) do
+        input_options = options[:input] || {}
+
+        self.show_method_shell(method, options) do
           self.text_field(method, input_options)
         end
       end
@@ -19,13 +19,13 @@ module Showbuilder
       def show_text_field(method)
         text = @object.send(method)
 
-        self.show_method_input(method) do
+        self.show_method_shell(method) do
           self.content_tag(:span, text, :class => "uneditable-input")
         end
       end
 
       def show_email_input(method)
-        self.show_method_input(method) do
+        self.show_method_shell(method) do
           self.contents_tag(:div, :class => "input-append") do |contents|
             contents << self.email_field(method)
             contents << self.content_tag(:span, :class => "add-on") do
@@ -36,45 +36,65 @@ module Showbuilder
       end
 
       def show_password_input(method)
-        self.show_method_input(method) do
+        self.show_method_shell(method) do
           self.password_field(method)
         end
       end
 
       def show_memo_input(method)
-        self.show_method_input(method) do
+        self.show_method_shell(method) do
           self.text_area(method, :rows => 5)
         end
       end
 
-      def show_select_input(method, choices, lable, options = {}, html_options = {})
-        self.show_method_input(method, :label_text => lable) do
-          self.select(method, choices, options, html_options)
+      def show_select_input(method, choices, options = {})
+        options ||= {}
+
+        select_options      = options[:select]      || {}
+        select_html_options = options[:select_html] || {}
+
+        show_method_shell method, options do
+          select method, choices, select_options, select_html_options
         end
       end
 
-      def show_method_input(method, options = {})
-        label_text = options[:label_text] || self.show_current_itext(method)
-        div_options = options[:class] || ''
+      def show_method_shell(method, options = {}, &block)
+        options ||= {}
 
-        if object.errors.count > 0 and object.errors[method].count > 0
-          div_options = " error"
-        end
+        shell_options   = options[:shell] || {}
+        label_options   = options[:shell_label] || {}
+        label_content   = options[:shell_title] || show_current_itext(method)
+        control_options = options[:shell_control] || {}
 
-        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
+        shell_options[:class]   = merge_class_option(shell_options[:class], 'control-group')
+        shell_options[:class]   = merge_class_option(shell_options[:class], 'error') if is_object_method_error(method)
+        label_options[:class]   = merge_class_option(label_options[:class], 'control-label')
+        control_options[:class] = merge_class_option(control_options[:class], 'controls')
+
+        contents_tag :div, shell_options do |contents|
+          contents << label(method, label_content, label_options)
+          contents << contents_tag(:div, control_options, &block)
         end
       end
 
-      protected
+      private
 
       def show_current_itext_base
-        self.object.class.to_s.underscore
+        object.class.to_s.underscore
+      end
+
+      def is_object_method_error(method)
+        if object.errors.count == 0
+          return false
+        end
+
+        if object.errors[method].count > 0
+          return true
+        else
+          return false
+        end
       end
 
     end
   end
-end
+end

data/lib/showbuilder/corekit.rb

@@ -1,6 +1,39 @@
 module Showbuilder
   module Corekit
 
+    def call_object_methods(object, methods)
+      unless object
+        return
+      end
+
+      methods = Array.wrap(methods)
+      if methods.count == 0
+        return
+      end
+
+      first_method = methods.first
+      unless first_method
+        return
+      end
+
+      unless object.respond_to?(first_method)
+        return
+      end
+
+      method_result = object.send(first_method)
+      if methods.count <= 1
+        return method_result
+      else
+        remaining_methods = methods.clone
+        remaining_methods.shift
+        return call_object_methods(method_result, remaining_methods)
+      end
+    end
+
+    def merge_class_option(original, another)
+      "#{original} #{another}".strip
+    end
+
     def html_contents
       contents = []
       result = yield contents

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: showbuilder
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 0
   - 0
-  - 10
-  version: 0.0.10
+  - 11
+  version: 0.0.11
 platform: ruby
 authors: 
 - Ery Wang, Mario Du