rails-add_ons 1.3.3 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa600481e76f58c25aea6a93bb80f70bcd1845a9
-  data.tar.gz: 0b314e097c797f75228322786fc2882d84222cdf
+  metadata.gz: 449356a6b4fac0c361ae4f4b755a2c4a62e29d1d
+  data.tar.gz: 67af84110efbd44dd2e499cb6d0c1b64e29e750a
 SHA512:
-  metadata.gz: 3ea81f37024d1678037788defdb1a5c779609de4ead34931a0b0296b004e45612daa20864cb475633cff5631e3ac9289be28b33f4d13059d55cdf77e4f1d129e
-  data.tar.gz: 991223a04acf8ba4394fd9922462875be52e60077b7b7a2fecffe77c1a41dab320edf4e95a7a229b47b3ec32633c650c83ee5954bc11dd2a17f690848936c0b5
+  metadata.gz: 103d8c59f45cd43a48f505dfce1f0df18da14e2779db0b36f8add1f161ba174ef809fb859dd786ea9742621912385f575b23a8eed051c29ef707f5694be15b5a
+  data.tar.gz: a66526f49e753c367b74deb2f420c3b3cfa843425714ae9e8daab3f7ea38208de036ea2a468b5af344ebd613668963a49d15ec57d3a38022e8278e3e9d18fb22

data/app/components/component/collection_table.rb

@@ -67,7 +67,7 @@ module Component
     end
 
     def table_css_classes
-      classes = ['table', 'collection-table', @resource_class.name.underscore.pluralize]
+      classes = ['table', 'collection-table', @resource_class.name.underscore.pluralize.gsub('/', '-')]
       classes << 'table-bordered'   if bordered?
       classes << 'table-hover'      if hover?
       classes << 'table-inverse'    if inverse?

data/app/concerns/controller/query_conditions.rb

@@ -0,0 +1,23 @@
+module Controller::QueryConditions
+  private
+
+  def add_conditions_from_query(scope)
+    request.query_parameters.each do |field, condition|
+      case field
+      when 'sort_by', 'sort_direction', 'utf8', 'commit', 'page'
+      when 'limit'
+        scope = scope.limit(condition.to_i)
+      when 'offset'
+        scope = scope.offset(condition.to_i)
+      when 'order'
+        scope = scope.order(condition)
+      when 'includes'
+        scope = scope.includes(condition.map(&:to_sym))
+      else
+        condition_statement = ::Api::ResourcesController::ConditionParser.new(scope, field, condition).condition_statement
+        scope = scope.where(condition_statement)
+      end
+    end
+    scope
+  end
+end

data/app/concerns/resources_controller/sorting.rb

@@ -7,9 +7,19 @@ module ResourcesController::Sorting
 
   def add_order_scope(base_scope)
     if params[:sort_by].present?
-      base_scope.order(params[:sort_by] => (params[:sort_direction] || :asc))
+      if params[:sort_by].include?(' ') || params[:sort_direction].include?(' ')
+        raise "Possible SQL Injection attempt while trying to sort by #{params[:sort_by]} #{params[:sort_direction]}"
+      end
+
+      sort_direction = (params[:sort_direction] || :asc)
+
+      if Rails.version < '4.0.0'
+        base_scope.order("#{params[:sort_by]} #{sort_direction}")
+      else
+        base_scope.order(params[:sort_by] => sort_direction)
+      end
     else
       base_scope
     end
   end
-end
+end

data/app/controllers/resources_controller/base.rb

@@ -7,5 +7,12 @@ module ResourcesController
     include RestResourceUrls
     include ResourceInflections
     include LocationHistory
+    include ::Controller::QueryConditions
+
+    private
+
+    def load_collection_scope
+      add_conditions_from_query(resource_class)
+    end
   end
 end

data/app/parsers/api/resources_controller/condition_parser.rb

@@ -7,7 +7,9 @@ module Api
         eq:       :'=',
         not_eq:   :'<>',
         lt_or_eq: :<=,
-        lt:       :<
+        lt:       :<,
+        null:     :is_null,
+        not_null: :is_not_null
       }
 
       def initialize(scope, field, condition)
@@ -23,6 +25,7 @@ module Api
       def build_condition_statement(parent_key, condition, nested = false)
         if is_a_condition?(parent_key) && !nested
           column, operator = extract_column_and_operator(parent_key)
+          return handle_null_condition(column, operator) if is_null_operator?(operator)
           if column_is_boolean?(column)
             ["#{column} = ?", to_boolean(condition)]
           else
@@ -38,6 +41,19 @@ module Api
         end
       end
 
+      def is_null_operator?(operator)
+        %w(null not_null).include?(operator)
+      end
+
+      def handle_null_condition(column, operator)
+        case operator.to_sym
+        when :null
+          "#{column} IS NULL"
+        when :not_null
+          "#{column} IS NOT NULL"
+        end
+      end
+
       def is_a_condition?(obj)
         !!extract_operator(obj)
       end
@@ -65,7 +81,18 @@ module Api
       end
 
       def column_is_boolean?(column_name)
-        @scope.columns_hash[column_name].type == :boolean
+        scope, column = get_scope_and_column_from_column_name(column_name)
+        scope.columns_hash[column].type == :boolean
+      end
+
+      def get_scope_and_column_from_column_name(column_name)
+        if column_name =~ /(.*)\.(.*)/
+          tables_and_classes = @scope.reflect_on_all_associations.each_with_object({}) { |a, memo| memo[a.table_name] = a.klass }
+          scope = tables_and_classes[$~[1]]
+          return scope, $~[2]
+        else
+          return @scope, column_name
+        end
       end
 
       def to_boolean(string)

data/app/views/component/_collection_table.haml

@@ -14,11 +14,11 @@
           %td= title
   %tbody
     - collection.each do |resource|
-      - tr_options = { class: resource_class.name.underscore }
+      - tr_options = { class: resource_class.name.underscore.gsub('/', '-') }
       - if resource.respond_to?(:model_name)
         - tr_options[:id] = dom_id(resource)
       - else
-        - tr_options[:id] = "#{resource.class.name.underscore}-#{resource.object_id}"
+        - tr_options[:id] = "#{resource.class.name.underscore.gsub('/', '-')}-#{resource.object_id}"
       %tr{ tr_options }
         - columns.each do |name, options|
           - td_options = { class: "attribute-#{name}", id: "#{tr_options[:id]}-#{name}"}

data/app/views/layouts/rails/add_ons/application.haml

@@ -24,4 +24,7 @@
         = bootstrap_flash
         = yield
     / /.container
-    = render 'after_body'
+    %script{:crossorigin => "anonymous", :integrity => "sha384-A7FZj7v+d/sdmMqp/nOQwliLvUsJfDHW+k9Omg/a/EheAdgtzNs3hpfag6Ed950n", :src => "https://code.jquery.com/jquery-3.1.1.slim.min.js"}
+    %script{:crossorigin => "anonymous", :integrity => "sha384-DztdAPBWPRXSA/3eYEEUWrWCy7G5KFbe8fFjk5JAIxUYHKkDx6Qin1DkWx51bBrb", :src => "https://cdnjs.cloudflare.com/ajax/libs/tether/1.4.0/js/tether.min.js"}
+    %script{:crossorigin => "anonymous", :integrity => "sha384-vBWWzlZJ8ea9aCX4pEW3rVHjgjt7zpkNpZk+02D9phzyeVkE+jo0ieGizqPLForn", :src => "https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/js/bootstrap.min.js"}
+    = render 'after_body'

data/app/views/resources_controller/base/index.haml

@@ -6,8 +6,10 @@
       = fa_icon(:plus)
       = t('.new')
 
+= render 'before_index_table', collection: @collection
+
 = collection_table(collection: @collection, resource_class: resource_class) do |t|
   = render 'table',         table: t
   = render 'table_actions', table: t
 
-= render 'pagination' if respond_to?(:paginate?) && paginate?
+= render 'pagination' if respond_to?(:paginate?) && paginate?

data/lib/rails/add_ons/version.rb

@@ -1,5 +1,5 @@
 module Rails
   module AddOns
-    VERSION = '1.3.3'
+    VERSION = '1.4.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-add_ons
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.4.0
 platform: ruby
 authors:
 - Roberto Vasquez Angel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-03 00:00:00.000000000 Z
+date: 2018-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -190,6 +190,7 @@ files:
 - app/components/component/collection_table.rb
 - app/components/component/resource_table.rb
 - app/concerns/api_controller_concerns/exception_handling.rb
+- app/concerns/controller/query_conditions.rb
 - app/concerns/resources_controller/location_history.rb
 - app/concerns/resources_controller/pagination.rb
 - app/concerns/resources_controller/resource_inflections.rb
@@ -220,6 +221,7 @@ files:
 - app/views/frontend/_navbar.haml
 - app/views/layouts/rails/add_ons/application.haml
 - app/views/resources_controller/base/_after_show_table.haml
+- app/views/resources_controller/base/_before_index_table.haml
 - app/views/resources_controller/base/_before_show_table.haml
 - app/views/resources_controller/base/_form.haml
 - app/views/resources_controller/base/_form_buttons.haml