poodle-rb 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46cbbbe48bc7958f15aded22f185be127b0b88ea
-  data.tar.gz: 85b1020570c215a6f4bde307c13c98428da51259
+  metadata.gz: a9a04e19c29121aaa00b743aa062def280e1d2ce
+  data.tar.gz: ceb3dd427f68ec9942a6929d3c272d20179cf7eb
 SHA512:
-  metadata.gz: 7d43379cf0c3b58bb4ecdefdf146920be834818dd6d95324bf773f74cc0a3e1b736ba3a264177da456791d104c267ae859cc368b7a0a1e3b22b38999a9ab552e
-  data.tar.gz: f9c86b081919b448fba2c8d77fcdca2bb03e2ee1bc2506a9033809eee599a44b16ffd8124141c2f417e6c3aad21231ef5395d1e98d93f6fb89f3aa699912f5b8
+  metadata.gz: a37cf5f6cecac8aad4c472cbc252c44064c054b9c9edd75dfa2ce04c53f67197438cde5e96a01d330f17eebb0e05c1bd205befac0b45afa39004be928703ce0d
+  data.tar.gz: 28c503d4731298687758eb3cf149daff237cc4a6fd54fa330b8edf2b410788d5affd8920dbd240607eccf0eb1041dea64541e6a223555610d31b0abd45a3b781

data/app/helpers/poodle/admin_functionalities_helper.rb

@@ -0,0 +1,44 @@
+module Poodle
+  module AdminFunctionalitiesHelper
+    def get_collections(collection_name, **options)
+      options.reverse_merge!(
+        kls: collection_name.to_s.camelize.singularize.camelize.constantize
+      )
+      relation = options[:kls].where("")
+      @filters = {}
+
+      if params[:query]
+        @query = params[:query].strip
+        relation = relation.search(@query) if !@query.blank?
+      end
+      objects = relation.order("created_at desc").page(@current_page).per(@per_page)
+      instance_variable_set("@#{collection_name}", objects)
+      unless instance_variable_get("@#{collection_name.to_s.singularize}")
+        instance_variable_set("@#{collection_name.to_s.singularize}", objects.first)
+      end
+
+      return true
+    end
+
+    def render_list(collection_name, **options)
+      respond_to do |format|
+        format.html {
+          get_collections(collection_name, **options) and render :index }
+        format.js {}
+      end
+    end
+
+    def render_or_redirect(error, redirect_url, action)
+      respond_to do |format|
+        format.html {
+          if error
+            render action: action
+          else
+            redirect_to redirect_url, notice: @message
+          end
+        }
+        format.js {}
+      end
+    end
+  end
+end

data/lib/poodle/action_view/form_helper.rb

@@ -100,13 +100,20 @@ module Poodle
           object_name: object.class.name.underscore,
           label: field_name.to_s.gsub("_", " ").titleize,
           required: true,
-          error_class: "has-errors",
+          error_class: "has-error",
           html_options: {}
         )
         options.reverse_merge!(
           param_name: "#{options[:object_name]}[#{field_name}]"
         )
-        error_class = object.errors[field_name.to_s].any? ? options[:error_class] : ""
+
+        if object.errors[field_name.to_s].any?
+          error_class =  options[:error_class]
+          error_message = content_tag(:span, object.errors[field_name].first, class: "help-block")
+        else
+          error_class = ""
+          error_message = ""
+        end
 
         theme_form_group(options[:label], required: options[:required], error_class: error_class) do
           options[:html_options].reverse_merge!(
@@ -126,7 +133,7 @@ module Poodle
           when :checkbox
             options[:html_options][:class] = "checkbox mt-10"
             check_box_tag(options[:param_name], field_name, object.send(field_name.to_s), **options[:html_options])
-          end
+          end + error_message
         end
 
       end
@@ -165,17 +172,34 @@ module Poodle
           label: foreign_key.to_s.titleize,
           prompt: true,
           editable: true,
-          error_class: "has-errors"
+          error_class: "has-error"
         )
 
-        error_class = object.errors[foreign_key.to_s].any? ? options[:error_class] : ""
+        # Populating Errors
+        errors = object.errors[foreign_key.to_s]
+        # if foreign_key is an id, check errors for the association
+        # errors = project.errors[:client_id] + project.errors[:client]
+        if object.errors[foreign_key.to_s.gsub("_id", "")]
+          errors += object.errors[foreign_key.to_s.gsub("_id", "")]
+        end
+
+        error_class = errors.any? ? options[:error_class] : ""
+        if errors.any?
+          error_class =  options[:error_class]
+          error_message = content_tag(:span, errors.first, class: "help-block")
+        else
+          error_class = ""
+          error_message = ""
+        end
 
-        theme_form_group(options[:label], required: options[:required], error_class: options[:error_class]) do
+        selected_id = object.send(foreign_key)
+
+        theme_form_group(options[:label], required: options[:required], error_class: error_class) do
           if !options[:editable] && options[:assoc_object]
             raw(options[:assoc_object].send(options[:assoc_display_method]) + hidden_field_tag("#{options[:param_name]}[#{foreign_key}]", options[:assoc_object].id))
           else
-            collection_select(options[:object_name], foreign_key, options[:assoc_collection], :id, options[:assoc_display_method], {:prompt=>options[:prompt]}, {:class => 'form-control'})
-          end
+            collection_select(options[:object_name], foreign_key, options[:assoc_collection], :id, options[:assoc_display_method], {prompt: options[:prompt], selected: selected_id}, {:class => 'form-control'})
+          end + error_message
         end
 
       end
@@ -200,12 +224,20 @@ module Poodle
           label: "Label",
           param_name: "Param",
           prompt: true,
-          error_class: "has-errors",
+          error_class: "has-error",
           required: false
         )
         error_class = object.errors[field_name.to_s].any? ? options[:error_class] : ""
-        theme_form_group(options[:label], required: options[:required], error_class: options[:error_class]) do
-          form.select(options[:param_name], options_for_select(options_list, :selected => form.object.name), {:prompt=>options[:prompt]}, {:class => 'form-control'})
+        if object.errors[field_name.to_s].any?
+          error_class =  options[:error_class]
+          error_message = content_tag(:span, object.errors[field_name].first, class: "help-block")
+        else
+          error_class = ""
+          error_message = ""
+        end
+
+        theme_form_group(options[:label], required: options[:required], error_class: error_class) do
+          form.select(options[:param_name], options_for_select(options_list, :selected => form.object.name), {:prompt=>options[:prompt]}, {:class => 'form-control'}) + error_message
         end
       end
 
@@ -215,9 +247,9 @@ module Poodle
       # is equivalent to:
       # ---------------------------
       # submit_tag button_text, "data-reset-text"=>button_text, "data-loading-text"=>"Saving ...", :class=>"btn btn-primary ml-10"
-      def theme_form_button(object, button_text="", saving_message="Saving ...")
+      def theme_form_button(object, button_text="", saving_message="Saving ...", classes="btn btn-primary ml-10")
         button_text = "#{object.new_record? ? "Create" : "Update"}" if button_text.blank?
-        submit_tag(button_text, "data-reset-text"=>button_text, "data-loading-text"=>saving_message, :class=>"btn btn-primary ml-10")
+        submit_tag(button_text, "data-reset-text"=>button_text, "data-loading-text"=>saving_message, :class=>classes)
       end
     end
   end

data/lib/poodle/action_view/theme_helper.rb

@@ -125,7 +125,7 @@ module Poodle
       end
 
       def clear_tag(height)
-        content_tag(:div, "", class: "cl-#{height}")
+        content_tag(:div, "", class: "clearfix cl-#{height}")
       end
 
       # Example
@@ -170,8 +170,8 @@ module Poodle
       # is equivalent to:
       # ---------------------------
       #  <h3 class="panel-title">Team Members</h3>
-      def theme_panel_title(title)
-        content_tag(:h3, title, class: "panel-title")
+      def theme_panel_title(title, classes="")
+        content_tag(:h3, title, class: "panel-title #{classes}")
       end
 
       # Example
@@ -205,12 +205,22 @@ module Poodle
         content_tag(:div, description, class: classes)
       end
 
-      def theme_detail_box(collection)
+      def theme_detail_box(collection, **options)
+        options.reverse_merge!(
+          show_partial: "show",
+          new_partial: "form",
+          edit_partial: "form",
+          index_partial: "show",
+        )
         case params[:action]
         when "show"
-          render partial: params[:action]
+          render partial: options[:show_partial]
+        when "new"
+          render partial: options[:new_partial]
+        when "edit"
+          render partial: options[:edit_partial]
         when "index"
-          collection.empty? ? (theme_panel_message(I18n.translate("forms.no_results_found"))) : render(partial: "show")
+          collection.empty? ? (theme_panel_message(I18n.translate("forms.no_results_found"))) : render(partial: options[:index_partial])
         else
           theme_panel_message(I18n.translate("forms.no_results_found"))
         end

data/lib/poodle/engine.rb

@@ -17,6 +17,7 @@ module Poodle
         include Poodle::ParamsParserHelper
         include Poodle::TitleHelper
         include Poodle::UrlHelper
+        include Poodle::AdminFunctionalitiesHelper
         helper Poodle::DisplayHelper
         helper Poodle::FlashHelper
         helper Poodle::ImageHelper
@@ -25,6 +26,7 @@ module Poodle
         helper Poodle::ParamsParserHelper
         helper Poodle::TitleHelper
         helper Poodle::UrlHelper
+        helper Poodle::AdminFunctionalitiesHelper
       end
     end
   end

data/lib/poodle/version.rb

@@ -1,3 +1,3 @@
 module Poodle
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: poodle-rb
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Krishnaprasad Varma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-22 00:00:00.000000000 Z
+date: 2015-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -99,6 +99,7 @@ files:
 - app/assets/stylesheets/poodle/font-awesome.css
 - app/assets/stylesheets/poodle/poodle-theme.css
 - app/controllers/poodle/application_controller.rb
+- app/helpers/poodle/admin_functionalities_helper.rb
 - app/helpers/poodle/application_helper.rb
 - app/helpers/poodle/display_helper.rb
 - app/helpers/poodle/flash_helper.rb