dynamic_controller 0.0.10 → 0.0.11

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+  - 1.9.2
+  - 1.9.3
+script: bundle exec rspec spec

data/README.md

@@ -1,5 +1,7 @@
 # DynamicController
 
+[![Build Status](https://travis-ci.org/gabynaiman/dynamic_controller.png?branch=master)](https://travis-ci.org/gabynaiman/dynamic_controller)
+
 Simple way to add CRUD actions into Rails controllers.
 
 Suppoted formats HTML and JSON.

data/dynamic_controller.gemspec

@@ -16,12 +16,12 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency 'ransack'
-  s.add_dependency 'kaminari'
-  s.add_dependency 'nql', '0.0.5'
+  s.add_dependency 'ransack', '~> 0.7'
+  s.add_dependency 'kaminari', '~> 0.13'
+  s.add_dependency 'nql', '~> 0.1'
 
-  s.add_development_dependency 'rails'
-  s.add_development_dependency 'sqlite3'
-  s.add_development_dependency 'rspec-rails'
-  s.add_development_dependency 'factory_girl_rails'
+  s.add_development_dependency 'rails', '~> 3.2'
+  s.add_development_dependency 'sqlite3', '~> 1.3'
+  s.add_development_dependency 'rspec-rails', '~> 2.12'
+  s.add_development_dependency 'factory_girl_rails', '~> 3.4'
 end

data/lib/dynamic_controller/helper_methods.rb

@@ -72,34 +72,5 @@ module DynamicController
                       end
     end
 
-    def ransack_query
-      search_query.is_a?(String) ? NQL.to_ransack(search_query) : search_query
-    end
-
-    def search_query_valid?
-      begin
-        search_node_valid? ransack_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

@@ -12,19 +12,12 @@ module DynamicController
             model = resource_class
           end
 
-          empty_collection = model.where('1=2').page(params[:page])
-
-          if search_query_valid?
-            begin
-              self.collection = model.search(ransack_query).result(distinct: true).page(params[:page])
-              self.collection.all #Force load to handle exception here
-            rescue ActiveRecord::StatementInvalid => ex
-              Rails.logger.debug "Invalid search query: #{params[:q]} | Error: #{ex.message}"
-              self.collection = empty_collection
-            end
-          else
-            self.collection = empty_collection
-          end
+          self.collection =
+              if search_query.is_a? String
+                model.nql(search_query, distinct: true).page(params[:page])
+              else
+                model.search(search_query).result(distinct: true).page(params[:page])
+              end
 
           Responder.new(self).index
         end

data/lib/dynamic_controller/version.rb

@@ -1,3 +1,3 @@
 module DynamicController
-  VERSION = '0.0.10'
+  VERSION = '0.0.11'
 end

data/spec/dummy/.gitignore

@@ -7,9 +7,6 @@
 # Ignore bundler config
 /.bundle
 
-# Ignore the default SQLite database.
-/db/*.sqlite3
-
 # Ignore all logfiles and tempfiles.
 /log/*.log
 /tmp

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynamic_controller
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,120 +9,120 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-15 00:00:00.000000000 Z
+date: 2013-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ransack
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.13'
 - !ruby/object:Gem::Dependency
   name: nql
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.12'
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.4'
 description: Simple way to add CRUD actions into Rails controllers
 email:
 - gabynaiman@gmail.com
@@ -131,6 +131,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - README.md
 - Rakefile
@@ -217,6 +218,7 @@ files:
 - spec/dummy/db/migrate/20120929185302_create_streets.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/db/seeds.rb
+- spec/dummy/db/test.sqlite3
 - spec/dummy/doc/README_FOR_APP
 - spec/dummy/lib/assets/.gitkeep
 - spec/dummy/lib/tasks/.gitkeep
@@ -248,7 +250,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 925622353
+      hash: -3382296632707607217
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -257,7 +259,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 925622353
+      hash: -3382296632707607217
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24