rademade_admin 0.0.1 → 0.0.2

data/app/services/search/conditions/list.rb

@@ -1,35 +1,42 @@
+# -*- encoding : utf-8 -*-
+require 'search/conditions/abstract'
+
 module RademadeAdmin
   module Search
-    class ListConditions < Abstract
+    module Conditions
+      class List < Abstract
 
-      protected
+        protected
 
-      def where
-        where_conditions = super
-        where_conditions[:and] = @params.slice(*@origin_fields)
-        where_conditions
-      end
+        def where
+          where_conditions = Where.new(:and)
+          @params.slice(*@origin_fields).each do |field, value|
+            where_conditions.add(field, value)
+          end
+          where_conditions
+        end
 
-      def order
-        field = @params[:sort] || default_order_field
-        direction = @params[:direction] || :asc
-        [{field => direction}]
-      end
+        def order
+          field = @params[:sort] || default_order_field
+          direction = @params[:direction] || :asc
+          [{field => direction}]
+        end
 
-      def page
-        @params[:page] || 1
-      end
+        def page
+          @params[:page] || 1
+        end
 
-      def per_page
-        @params[:paginate] || 20
-      end
+        def per_page
+          @params[:paginate] || 20
+        end
 
-      private
+        private
 
-      def default_order_field
-        @origin_fields.include?('position') ? :position : :id
-      end
+        def default_order_field
+          @origin_fields.include?('position') ? :position : :id
+        end
 
+      end
     end
   end
-end
+end

data/app/services/search/conditions/part/where.rb

@@ -0,0 +1,28 @@
+# -*- encoding : utf-8 -*-
+module RademadeAdmin
+  module Search
+    module Conditions
+      class Where
+
+        attr_reader :type, :parts
+
+        def initialize(type)
+          @type = type
+          @parts = []
+        end
+
+        def add(field, value)
+          @parts << {
+            :field => field,
+            :value => value
+          }
+        end
+
+        def sub_add(where)
+          @parts << where
+        end
+
+      end
+    end
+  end
+end

data/app/services/search/conditions/related_list.rb

@@ -0,0 +1,54 @@
+# -*- encoding : utf-8 -*-
+require 'search/conditions/abstract'
+
+module RademadeAdmin
+  module Search
+    module Conditions
+      class RelatedList < Abstract
+
+        def base_condition(model)
+          model_related_name = model.to_s.tableize.gsub('/', '_').to_sym
+          @params[:parent].constantize.find(@params[:parent_id]).send(model_related_name)
+        end
+
+        protected
+
+        def where
+          where_conditions = Where.new(:and)
+          @params.slice(*@origin_fields).each do |field, value|
+            where_conditions.add(field, value)
+          end
+          where_conditions
+        end
+
+        def order
+          field = @params[:sort] || default_order_field
+          [{field => direction}]
+        end
+
+        def page
+          @params[:page] || 1
+        end
+
+        def per_page
+          @params[:paginate] || 20
+        end
+
+        private
+
+        def default_order_field
+          @origin_fields.include?('position') ? :position : :id
+        end
+
+        def direction
+          if @params[:direction].present?
+            @params[:direction].to_sym
+          else
+            :asc
+          end
+        end
+
+      end
+    end
+  end
+end

data/app/services/search/query_adapter/abstract.rb

@@ -1,54 +1,45 @@
+# -*- encoding : utf-8 -*-
 module RademadeAdmin
   module Search
-    class QueryAdapter
+    module QueryAdapter
+      class Abstract
 
-      def initialize(model)
-        @model = model
-      end
-
-      def apply_conditions(search_conditions, is_related_list)
-        # todo something with is_related_list
-        @params = search_conditions.params
-        @result = is_related_list ? related_base_condition : base_condition
-        search_conditions.conditions.each do |query_part, values|
-          @result = self.send(query_part, values) unless values.nil?
+        def initialize(model)
+          @model = model
         end
-        @result
-      end
 
-      protected
+        def apply_conditions(search_conditions)
+          @params = search_conditions.params
+          @result = search_conditions.base_condition(@model)
+          search_conditions.conditions.each do |query_part, values|
+            @result = self.send(query_part, values) unless values.nil?
+          end
+          @result
+        end
 
-      def base_condition
-        @model.unscoped
-      end
+        protected
 
-      def related_base_condition
-        parent_model = @params[:parent].constantize
-        parent_id = @params[:parent_id]
-        model_related_name = @model.to_s.demodulize.pluralize.downcase.to_sym
-        parent_model.find(parent_id).send(model_related_name).unscoped
-      end
+        def where(where_conditions)
+          @result
+        end
 
-      def where(where_conditions)
-        @result
-      end
+        def order(order_conditions)
+          @result
+        end
 
-      def order(order_conditions)
-        @result
-      end
+        def page(page_condition)
+          @result.page(page_condition)
+        end
 
-      def page(page_condition)
-        @result.page(page_condition)
-      end
+        def per_page(per_page_condition)
+          @result.per(per_page_condition)
+        end
 
-      def per_page(per_page_condition)
-        @result.per(per_page_condition)
-      end
+        def limit(limit_condition)
+          @result.limit(limit_condition)
+        end
 
-      def limit(limit_condition)
-        @result.limit(limit_condition)
       end
-
     end
   end
-end
+end

data/app/services/search/query_adapter/active_record.rb

@@ -1,33 +1,45 @@
+# -*- encoding : utf-8 -*-
+require 'search/query_adapter/abstract'
+
 module RademadeAdmin
   module Search
-    class ActiveRecord < Abstract
+    module QueryAdapter
+      class ActiveRecord < Abstract
+
+        protected
+
+        def where(where_conditions)
+          @values = []
+          condition = collect_where_conditions(where_conditions)
+          @result.where([condition, *@values])
+        end
 
-      protected
+        def order(order_conditions)
+          order_conditions.each do |order_condition|
+            @result = @result.order(order_condition)
+          end
+          @result
+        end
 
-      def where(where_conditions)
-        values = []
-        condition = ''
-        where_conditions.each do |type, conditions|
-          conditions.each do |field, value|
-            condition += " #{type.to_s.capitalize} " unless condition.empty?
-            if value.is_a? Array
-              condition += "#{field} IN (?)"
+        def collect_where_conditions(where_conditions)
+          condition = ''
+          where_conditions.parts.each do |part|
+            condition += " #{where_conditions.type.to_s.capitalize} " unless condition.empty?
+            if part.is_a? RademadeAdmin::Search::Conditions::Where
+              condition += "(#{collect_where_conditions(part)})"
             else
-              condition += "#{field} = ?"
+              if part[:value].is_a? Array
+                condition += "#{part[:field]} IN (?)"
+              else
+                condition += "#{part[:field]} = ?"
+              end
+              @values << part[:value]
             end
-            values << value
           end
+          condition
         end
-        @result.where([condition, *values])
-      end
 
-      def order(order_conditions)
-        order_conditions.each do |order_condition|
-          @result = @result.order(order_condition)
-        end
-        @result
       end
-      
     end
   end
-end
+end

data/app/services/search/query_adapter/mongoid.rb

@@ -1,33 +1,51 @@
+# -*- encoding : utf-8 -*-
+require 'search/query_adapter/abstract'
+
 module RademadeAdmin
   module Search
-    class Mongoid < Abstract
+    module QueryAdapter
+      class Mongoid < Abstract
+
+        protected
 
-      protected
+        WHERE_METHOD_MAP = { :or => :or, :and => :where }.freeze
 
-      def where(where_conditions)
-        # todo
-        if defined?(::Mongoid::Paranoia) and @model.ancestors.include? ::Mongoid::Paranoia
-          where_conditions[:and][:deleted_at] = nil
+        def where(where_conditions)
+          if defined?(::Mongoid::Paranoia) and @model.ancestors.include? ::Mongoid::Paranoia
+            where_condition = RademadeAdmin::Search::Conditions::Where.new(:and)
+            where_condition.add(:deleted_at, nil)
+            where_condition.sub_add(where_conditions) if where_conditions
+            where_conditions = where_condition
+          end
+          collect_where_condition(where_conditions, @result)
         end
-        method_map = { :or => :or, :and => :where }
-        where_conditions.each do |type, conditions|
-          conditions.each do |field, value|
-            if value.is_a? Array
-              field = field.in
+
+        def order(order_conditions)
+          order_conditions.each do |order_condition|
+            @result = @result.order_by(order_condition)
+          end
+          @result
+        end
+
+        def collect_where_condition(where_conditions, result)
+          where_method = WHERE_METHOD_MAP[where_conditions.type]
+          where_conditions.parts.each do |part|
+            if part.is_a? RademadeAdmin::Search::Conditions::Where
+              result = result.send(where_method, where_sub_condition(part))
+            else
+              field = part[:field]
+              field = field.in if part[:value].is_a? Array
+              result = result.send(where_method, field => part[:value])
             end
-            @result = @result.send(method_map[type], field => value)
           end
+          result
         end
-        @result
-      end
 
-      def order(order_conditions)
-        order_conditions.each do |order_condition|
-          @result = @result.order_by(order_condition)
+        def where_sub_condition(where_sub_conditions)
+          collect_where_condition(where_sub_conditions, @model.all).selector
         end
-        @result
+
       end
-      
     end
   end
-end
+end

data/app/services/search/searcher.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 module RademadeAdmin
   module Search
     class Searcher
@@ -6,14 +7,14 @@ module RademadeAdmin
         @model_info = model_info
       end
 
-      def search(search_conditions, is_related_list = false)
-        query_adapter.apply_conditions(search_conditions, is_related_list)
+      def search(search_conditions)
+        query_adapter.apply_conditions(search_conditions)
       end
 
       def query_adapter
-        @query_adapter ||= "RademadeAdmin::Search::#{@model_info.model_reflection.orm_type}".constantize.new(@model_info.model)
+        @query_adapter ||= "RademadeAdmin::Search::QueryAdapter::#{@model_info.model_reflection.orm_type}".constantize.new(@model_info.model)
       end
 
     end
   end
-end
+end

data/app/services/sortable_service.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 class RademadeAdmin::SortableService
 
   def initialize(model_info, params)
@@ -34,4 +35,4 @@ class RademadeAdmin::SortableService
     @model_info.has_field? 'position'
   end
 
-end
+end

data/app/services/video_service.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 class RademadeAdmin::VideoService
 
   def initialize(file_path)
@@ -19,4 +20,4 @@ class RademadeAdmin::VideoService
     end
   end
 
-end
+end

data/app/views/rademade_admin/_blocks/_menu.html.erb

@@ -31,7 +31,13 @@
                     </a><%
 
                     if has_sub_items
-                        concat render 'rademade_admin/_blocks/sub_menu', :menu_item => menu_item
+                        %><ul class="submenu"><%
+                            concat render 'rademade_admin/_blocks/sub_menu/link', {
+                                :uri => admin_list_uri(menu_item[:model_info]),
+                                :title => admin_list_name(menu_item[:model_info])
+                            }
+                            concat render 'rademade_admin/_blocks/sub_menu', :menu_item => menu_item
+                        %></ul><%
                     end
 
                 %></li><%

data/app/views/rademade_admin/_blocks/_sub_menu.html.erb

@@ -1,12 +1,4 @@
 <ul class="submenu"><%
-    concat render 'rademade_admin/_blocks/sub_menu/link', {
-        :uri => admin_list_uri(menu_item[:model_info]),
-        :title => admin_list_name(menu_item[:model_info])
-    }
-    concat render 'rademade_admin/_blocks/sub_menu/link', {
-        :uri => admin_new_uri(menu_item[:model_info]),
-        :title => admin_add_name(menu_item[:model_info])
-    }
     menu_item[:sub].each do |sub_item|
         concat render 'rademade_admin/_blocks/sub_menu/link', {
             :uri => admin_list_uri(sub_item[:model_info]),