dynamic_controller 0.0.6 → 0.0.7

data/dynamic_controller.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'ransack'
   s.add_dependency 'kaminari'
-  s.add_dependency 'nql', '0.0.3'
+  s.add_dependency 'nql', '0.0.4'
 
   s.add_development_dependency 'rails'
   s.add_development_dependency 'sqlite3'

data/lib/dynamic_controller/helper_methods.rb

@@ -55,5 +55,38 @@ module DynamicController
       end
     end
 
+    def model_extended_attributes
+      resource_class.column_names | resource_class.reflections.map { |k, v| v.klass.column_names.map { |c| "#{k}_#{c}" } }.flatten
+    end
+
+    def search_query
+      params[:q].is_a?(String) ? NQL.to_ransack(params[:q]) : params[:q]
+    end
+
+    def search_query_valid?
+      begin
+        search_node_valid? search_query, model_extended_attributes
+      rescue NQL::InvalidExpressionError => ex
+        Rails.logger.debug "Invalid search query: #{params[:q]} | Error: #{ex.message}"
+        false
+      end
+    end
+
+    def search_node_valid?(node, valid_attributes)
+      return true unless node
+      node.deep_symbolize_keys.each do |k, v|
+        if k == :a
+          return false unless valid_attributes.include?(v['0'.to_sym][:name])
+        else
+          if v.is_a?(Hash)
+            return false unless search_node_valid?(v, valid_attributes)
+          elsif v.is_a?(Array)
+            v.select { |e| e.is_a?(Hash) }.each { |e| return false unless search_node_valid?(e, valid_attributes) }
+          end
+        end
+      end
+      true
+    end
+
   end
 end

data/lib/dynamic_controller/instance_methods.rb

@@ -6,21 +6,24 @@ module DynamicController
 
       if base.include_action?(:index)
         base.send :define_method, :index do
-          begin
-            query = params[:q].is_a?(String) ? NQL.to_ransack(params[:q]) : params[:q]
-            valid_query = true
-          rescue NQL::InvalidExpressionError => ex
-            Rails.logger.debug "Invalid search expression: #{params[:q]} | Error: #{ex.message}"
-            query = nil
-            valid_query = false
-          end
           if parent_model
-            @search = parent_model.send(controller_name).search(query)
+            model = parent_model.send(controller_name)
+          else
+            model = resource_class
+          end
+
+          empty_collection = model.where('1=2').page(params[:page])
+
+          if search_query_valid?
+            begin
+              self.collection = model.search(search_query).result(distinct: true).page(params[:page])
+            rescue ActiveRecord::StatementInvalid => ex
+              Rails.logger.error "Invalid search query: #{params[:q]} | Error: #{ex.message}"
+              self.collection = empty_collection
+            end
           else
-            @search = resource_class.search(query)
+            self.collection = empty_collection
           end
-          self.collection = @search.result(distinct: true).page(params[:page])
-          self.collection = self.collection.where('1=2') unless valid_query
 
           Responder.new(self).index
         end

data/lib/dynamic_controller/version.rb

@@ -1,3 +1,3 @@
 module DynamicController
-  VERSION = '0.0.6'
+  VERSION = '0.0.7'
 end

data/spec/controllers/crud_actions_html_spec.rb

@@ -11,7 +11,6 @@ describe CountriesController, '-> HTML', type: :controller do
     response.content_type.should eq 'text/html'
     response.should render_template :index
     assigns(:countries).should eq Country.all
-    assigns(:search).should be_a Ransack::Search
   end
 
   it 'Show -> GET /resources/:id' do

data/spec/controllers/nested_crud_actions_html_spec.rb

@@ -13,7 +13,6 @@ describe CitiesController, '-> HTML', type: :controller do
     response.should render_template :index
     assigns(:cities).should eq City.all
     assigns(:country).should eq country
-    assigns(:search).should be_a Ransack::Search
   end
 
   it 'Show -> GET /parent_resource/:parent_id/resources/:id' do

data/spec/controllers/ransack_spec.rb

@@ -0,0 +1,58 @@
+require 'spec_helper'
+
+describe CountriesController, '-> Ransack query search', type: :controller do
+
+  it 'Filter by q[name_eq]' do
+    3.times { create :country }
+
+    country = Country.first
+
+    get :index, q: {name_eq: country.name}
+
+    response.should be_success
+    assigns(:countries).should eq [country]
+  end
+
+  it 'Filter by attribute, predicate and value' do
+    3.times { create :country }
+
+    country = Country.first
+
+    get :index, q: {c: [{a: {'0' => {name: 'name'}}, p: 'eq', v: {'0' => {value: country.name}}}]}
+
+    response.should be_success
+    assigns(:countries).should eq [country]
+  end
+
+  it 'Filter by NQL' do
+    3.times { create :country }
+
+    country = Country.first
+
+    get :index, q: "name = #{country.name}"
+
+    response.should be_success
+    assigns(:countries).should eq [country]
+  end
+
+  it 'Filter by NQL with invalid field' do
+    3.times { create :country }
+
+    country = Country.first
+
+    get :index, q: "abcd = #{country.name}"
+
+    response.should be_success
+    assigns(:countries).should eq []
+  end
+
+  it 'Filter by NQL with invalid expression' do
+    3.times { create :country }
+
+    get :index, q: 'abcd = '
+
+    response.should be_success
+    assigns(:countries).should eq []
+  end
+
+end

data/spec/controllers/two_level_nested_crud_actions_html_spec.rb

@@ -14,7 +14,6 @@ describe StreetsController, '-> HTML', type: :controller do
     assigns(:streets).should eq Street.all
     assigns(:city).should eq city
     assigns(:country).should eq city.country
-    assigns(:search).should be_a Ransack::Search
   end
 
   it 'Show -> GET /first_resource/:first_id/second_resource/:second_id/resources/:id' do

data/spec/dummy/Gemfile

@@ -1,13 +1,14 @@
-source 'https://rubygems.org'
-
-gem 'rails', '3.2.8'
-gem 'sqlite3'
-gem 'dynamic_controller', path: "#{File.dirname(__FILE__)}../../../"
-
-group :assets do
-  gem 'sass-rails',   '~> 3.2.3'
-  gem 'coffee-rails', '~> 3.2.1'
-  gem 'uglifier', '>= 1.0.3'
-end
-
+source 'https://rubygems.org'
+
+gem 'rails', '3.2.8'
+gem 'sqlite3'
+gem 'dynamic_controller', path: "#{File.dirname(__FILE__)}../../../"
+
+group :assets do
+  gem 'sass-rails',   '~> 3.2.3'
+  gem 'coffee-rails', '~> 3.2.1'
+  gem 'uglifier', '>= 1.0.3'
+  gem 'therubyracer' if RUBY_PLATFORM.include? 'linux'
+end
+
 gem 'jquery-rails'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynamic_controller
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-09 00:00:00.000000000 Z
+date: 2012-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ransack
-  requirement: &29261412 !ruby/object:Gem::Requirement
+  requirement: &28077168 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *29261412
+  version_requirements: *28077168
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &29261148 !ruby/object:Gem::Requirement
+  requirement: &28076916 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,21 +32,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *29261148
+  version_requirements: *28076916
 - !ruby/object:Gem::Dependency
   name: nql
-  requirement: &29260836 !ruby/object:Gem::Requirement
+  requirement: &28076616 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *29260836
+  version_requirements: *28076616
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &29260572 !ruby/object:Gem::Requirement
+  requirement: &28076364 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *29260572
+  version_requirements: *28076364
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &29260272 !ruby/object:Gem::Requirement
+  requirement: &28076088 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *29260272
+  version_requirements: *28076088
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &29259996 !ruby/object:Gem::Requirement
+  requirement: &28075836 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *29259996
+  version_requirements: *28075836
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
-  requirement: &29259720 !ruby/object:Gem::Requirement
+  requirement: &28075584 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *29259720
+  version_requirements: *28075584
 description: Simple way to add CRUD actions into Rails controllers
 email:
 - gabynaiman@gmail.com
@@ -113,6 +113,7 @@ files:
 - spec/controllers/crud_actions_json_spec.rb
 - spec/controllers/nested_crud_actions_html_spec.rb
 - spec/controllers/nested_crud_actions_json_spec.rb
+- spec/controllers/ransack_spec.rb
 - spec/controllers/redefined_responders_html_spec.rb
 - spec/controllers/redefined_responders_json_spec.rb
 - spec/controllers/two_level_nested_crud_actions_html_spec.rb