glasses 1.6.2 → 1.7.0

data/spec/tests/sanitized_search_test.rb

@@ -1,22 +1,34 @@
-describe Glasses do 
-
 	describe '.sanitized_search()' do
 
 		it 'is vulnerable to SQL injection when totally unprotected' do
-			results = Glasses.search(Player, {first_name: "' OR 1 = 1 ) --"})
+			results = Glasses.raw_search(Player, {first_name: "' OR 1 = 1 ) --"})
 			(results.size).should == 10
 		end
 
 		it 'is not vulnerable to SQL injection when protected' do
-			results = Glasses.sanitized_search(Player, {first_name: "' OR 1 = 1 ) --"})
+			results = Glasses.search(Player, {first_name: "' OR 1 = 1 ) --"})
 			(results.size).should == 0
 		end
 
 		it 'correctly searches for a result in a sanitized_search' do
-			results = Glasses.sanitized_search(Player, {first_name: "Jane"})
+			results = Glasses.search(Player, {first_name: "Jane"})
 			(results.size).should == 1
 		end
 
-	end
+		#it 'ensures that search has best performance than sanitized_search' do
+		#	start1 = Time.now
+		#		Glasses.search(Player, {first_name: "Jane"})
+		#	end1 = Time.now
+		#	start2 = Time.now
+		#		Glasses.sanitized_search(Player, {first_name: "Jane"})
+		#	end2 = Time.now
+		#	puts (end1.to_f * 1000.0).to_i
+		#	puts ((start1.to_f) * 1000.0).to_i
+		#	puts (end2.to_f * 1000.0).to_i
+		#	puts ((start2.to_f) * 1000.0).to_i
+		#	puts ((end1 - start1) * 1000).to_i
+		#	puts ((end2.to_f - start2.to_f) * 1000.0).to_i
+		#	((end1 - start1) < (end2 - start2)).should == true
+		#end
 
-end
+	end

data/spec/tests/search_test.rb

@@ -1,23 +1,33 @@
-describe Glasses do
-
   describe 'search' do
 
     it 'should search for an ActiveRecord model' do
-
       ((Glasses.search(Player,{first_name: "Jane"})).size).should == 1
-
     end
 
     it 'should search for an ActiveRecord model when input is only partial' do
-
       ((Glasses.search(Player,{first_name: "J"})).size).should == 2 # Jane & Jessica
-
     end
 
     it 'should return an empty array if no matches are found' do
       (Glasses.search(Player,{first_name: "HELLOOOOOOO IZE A PLAYAH"})).should == []
     end
 
-  end
+    it 'should return an empty array if no matches are found' do
+      (Glasses.search(Player,{first_name: "                 "})).should == []
+    end
+
+    context 'search with boolean' do
+      it 'should search for an ActiveRecord model' do
+        ((Glasses.search(Player,{first_name: "Jane", is_virgin_bool: '1'})).size).should == 1
+      end
+
+      it 'should search for an ActiveRecord model when input is only partial' do
+        ((Glasses.search(Player,{first_name: "J", is_virgin_bool: '1'})).size).should == 2 # Jane & Jessica
+      end
+
+      it 'should return an empty array if no matches are found' do
+        (Glasses.search(Player,{first_name: "Bobby", is_virgin_bool: '1'}).size).should == 0
+      end
+    end
 
-end
+  end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glasses
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 1.7.0
 platform: ruby
 authors:
 - Otávio Monteagudo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-26 00:00:00.000000000 Z
+date: 2015-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -163,7 +163,13 @@ files:
 - spec/dummy/app/models/player.rb
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/app/views/search/controller_sanitized_simple_search.html.erb
+- spec/dummy/app/views/search/full_raw_search_range.html.erb
+- spec/dummy/app/views/search/full_search.html.erb
+- spec/dummy/app/views/search/full_search_range.html.erb
 - spec/dummy/app/views/search/method_sanitized_simple_search.html.erb
+- spec/dummy/app/views/search/range_search.html.erb
+- spec/dummy/app/views/search/raw_full_search.html.erb
+- spec/dummy/app/views/search/raw_range_search.html.erb
 - spec/dummy/app/views/search/simple_search.html.erb
 - spec/dummy/bin/bundle
 - spec/dummy/bin/rails
@@ -202,6 +208,30 @@ files:
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
 - spec/dummy/test/test_helper.rb
+- spec/dummy/tmp/cache/assets/development/sprockets/v3.0/-n4kyDOdRxiiiIJEFA9cId9azJmW5g6hmwbs8SJ4qRg.cache
+- spec/dummy/tmp/cache/assets/development/sprockets/v3.0/2SBt5E86bhaTcl7TkcrIXPVQyQtH9yIRArRC_UxPck4.cache
+- spec/dummy/tmp/cache/assets/development/sprockets/v3.0/2Tqd0MZWTPMTu8CoqlOCudnpF2UapAVb-1Qd3gZnzWs.cache
+- spec/dummy/tmp/cache/assets/development/sprockets/v3.0/4m7rzZ6NLrCLYY8Klx2qByvjsF9EwTrhkqhffC_ddIU.cache
+- spec/dummy/tmp/cache/assets/development/sprockets/v3.0/4wucpOHsDYdErjU4sC9i1FT33L-WRugEHtfQdiz-CXY.cache
+- spec/dummy/tmp/cache/assets/development/sprockets/v3.0/AE40Tp96RkdOo7EhY00dhAOG17GUBn6QkZxp0HQVRQA.cache
+- spec/dummy/tmp/cache/assets/development/sprockets/v3.0/CtIOdYL64ZUZ8_1ALDOZWNEis9WeBXUYTZ95MGCwJxk.cache
+- spec/dummy/tmp/cache/assets/development/sprockets/v3.0/DMb_4zR5zBmQGRtZlXIrUCrkOrY-Wzw_ESjc3NoXX6s.cache
+- spec/dummy/tmp/cache/assets/development/sprockets/v3.0/FfRbjoX7fHHQqnXiehqlD233T1kj4rzNPybfmQ_GUWI.cache
+- spec/dummy/tmp/cache/assets/development/sprockets/v3.0/JlLKJj3SMeXmPLYJvdO955A6OPH9wSTWF3QFOvbaT0k.cache
+- spec/dummy/tmp/cache/assets/development/sprockets/v3.0/Mo_r4nJu9qt0iEhVH0CXGZkIh_SCKfu3LoDU6GlMT-U.cache
+- spec/dummy/tmp/cache/assets/development/sprockets/v3.0/PjzZwmbYJUPXBPEKfYAIld32mtAk3H0hBz7ONWVqza4.cache
+- spec/dummy/tmp/cache/assets/development/sprockets/v3.0/QYBC6SiWic96YuGP27vORM8frM2yoCxYATSeAuu3q3s.cache
+- spec/dummy/tmp/cache/assets/development/sprockets/v3.0/QfZ4TPv_vTZ6WmGKJEhbsZ0Ou73XHsnuUlsaYV3ZQEY.cache
+- spec/dummy/tmp/cache/assets/development/sprockets/v3.0/XIp7H1NvI9qObEEUnVrJoJ0TgF9dsNRmdw7bkMLyf64.cache
+- spec/dummy/tmp/cache/assets/development/sprockets/v3.0/aCkopDHgOZcXcLJcYI3sgc_SuAZhhr9RkRQshzmldF8.cache
+- spec/dummy/tmp/cache/assets/development/sprockets/v3.0/bkZWDwb871tTLoM-W80twc_qhQ_ziPfInIfbzCcLnpE.cache
+- spec/dummy/tmp/cache/assets/development/sprockets/v3.0/gLJlx0p_IOKb7r9m3hjLdN2jGSicQ_Ns4SS1jWlFDAQ.cache
+- spec/dummy/tmp/cache/assets/development/sprockets/v3.0/i9TsnRfu6oqRsV9V2v_6Ulubst2IVveepQEkimUU6QE.cache
+- spec/dummy/tmp/cache/assets/development/sprockets/v3.0/iEVE5Kzzv15cyQWfQGEbgnKSSO0xiblZzP-sO26AYGQ.cache
+- spec/dummy/tmp/cache/assets/development/sprockets/v3.0/rRXYm5yDdh2lrn8etfERia5zGqWg3_cJ3siQQG6h9UU.cache
+- spec/dummy/tmp/cache/assets/development/sprockets/v3.0/t3hd5M5Qs7xWqz8gFCvXf781-4lYaem1SZCLRh47qCc.cache
+- spec/dummy/tmp/cache/assets/development/sprockets/v3.0/yHIJ2OseWB_qclWx7fwHLHPAVYOch64QqS8Y07WHhRk.cache
+- spec/dummy/tmp/cache/assets/development/sprockets/v3.0/yuW5Zfj9wAku7kLsnPBHwLsetLDeWKm9ju_dm_GLgf0.cache
 - spec/dummy/tmp/cache/assets/test/sprockets/v3.0/-5YHHhQNSe7DP0Orvh4Yznxx2tNs_gqpFgGw2aG9Z3Y.cache
 - spec/dummy/tmp/cache/assets/test/sprockets/v3.0/2SBt5E86bhaTcl7TkcrIXPVQyQtH9yIRArRC_UxPck4.cache
 - spec/dummy/tmp/cache/assets/test/sprockets/v3.0/2ee3JgN3SAjy0F6JxKIJ62QtBkcq6xfUvl5vonKpKTg.cache
@@ -226,11 +256,18 @@ files:
 - spec/dummy/tmp/cache/assets/test/sprockets/v3.0/sgE7MzZJ_2ApXbjrysAQ5U9UYLG-4cF-A1PgntMu8M4.cache
 - spec/dummy/tmp/cache/assets/test/sprockets/v3.0/x3uq8L9bH8xLwZLDYY0PVDTSeV-I_7g0rsm9W5RIBR4.cache
 - spec/dummy/tmp/cache/assets/test/sprockets/v3.0/yuW5Zfj9wAku7kLsnPBHwLsetLDeWKm9ju_dm_GLgf0.cache
+- spec/features/full_search_form_test.rb
+- spec/features/range_search_form_test.rb
+- spec/features/search_performance_test_in_app.rb
 - spec/features/simple_search_form_test.rb
 - spec/glasses_spec.rb
-- spec/scratches/example_only_methods.rb
 - spec/spec_helper.rb
 - spec/tasks/rspec.rake
+- spec/test_only_methods/example_only_methods.rb
+- spec/tests/full_search_test.rb
+- spec/tests/parameters_priority_test.rb
+- spec/tests/performance_test.rb
+- spec/tests/range_search_test.rb
 - spec/tests/sanitized_search_test.rb
 - spec/tests/search_test.rb
 homepage: https://github.com/otamm/Glasses
@@ -271,7 +308,13 @@ test_files:
 - spec/dummy/app/models/player.rb
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/app/views/search/controller_sanitized_simple_search.html.erb
+- spec/dummy/app/views/search/full_raw_search_range.html.erb
+- spec/dummy/app/views/search/full_search.html.erb
+- spec/dummy/app/views/search/full_search_range.html.erb
 - spec/dummy/app/views/search/method_sanitized_simple_search.html.erb
+- spec/dummy/app/views/search/range_search.html.erb
+- spec/dummy/app/views/search/raw_full_search.html.erb
+- spec/dummy/app/views/search/raw_range_search.html.erb
 - spec/dummy/app/views/search/simple_search.html.erb
 - spec/dummy/bin/bundle
 - spec/dummy/bin/rails
@@ -311,6 +354,30 @@ test_files:
 - spec/dummy/public/favicon.ico
 - spec/dummy/Rakefile
 - spec/dummy/test/test_helper.rb
+- spec/dummy/tmp/cache/assets/development/sprockets/v3.0/-n4kyDOdRxiiiIJEFA9cId9azJmW5g6hmwbs8SJ4qRg.cache
+- spec/dummy/tmp/cache/assets/development/sprockets/v3.0/2SBt5E86bhaTcl7TkcrIXPVQyQtH9yIRArRC_UxPck4.cache
+- spec/dummy/tmp/cache/assets/development/sprockets/v3.0/2Tqd0MZWTPMTu8CoqlOCudnpF2UapAVb-1Qd3gZnzWs.cache
+- spec/dummy/tmp/cache/assets/development/sprockets/v3.0/4m7rzZ6NLrCLYY8Klx2qByvjsF9EwTrhkqhffC_ddIU.cache
+- spec/dummy/tmp/cache/assets/development/sprockets/v3.0/4wucpOHsDYdErjU4sC9i1FT33L-WRugEHtfQdiz-CXY.cache
+- spec/dummy/tmp/cache/assets/development/sprockets/v3.0/aCkopDHgOZcXcLJcYI3sgc_SuAZhhr9RkRQshzmldF8.cache
+- spec/dummy/tmp/cache/assets/development/sprockets/v3.0/AE40Tp96RkdOo7EhY00dhAOG17GUBn6QkZxp0HQVRQA.cache
+- spec/dummy/tmp/cache/assets/development/sprockets/v3.0/bkZWDwb871tTLoM-W80twc_qhQ_ziPfInIfbzCcLnpE.cache
+- spec/dummy/tmp/cache/assets/development/sprockets/v3.0/CtIOdYL64ZUZ8_1ALDOZWNEis9WeBXUYTZ95MGCwJxk.cache
+- spec/dummy/tmp/cache/assets/development/sprockets/v3.0/DMb_4zR5zBmQGRtZlXIrUCrkOrY-Wzw_ESjc3NoXX6s.cache
+- spec/dummy/tmp/cache/assets/development/sprockets/v3.0/FfRbjoX7fHHQqnXiehqlD233T1kj4rzNPybfmQ_GUWI.cache
+- spec/dummy/tmp/cache/assets/development/sprockets/v3.0/gLJlx0p_IOKb7r9m3hjLdN2jGSicQ_Ns4SS1jWlFDAQ.cache
+- spec/dummy/tmp/cache/assets/development/sprockets/v3.0/i9TsnRfu6oqRsV9V2v_6Ulubst2IVveepQEkimUU6QE.cache
+- spec/dummy/tmp/cache/assets/development/sprockets/v3.0/iEVE5Kzzv15cyQWfQGEbgnKSSO0xiblZzP-sO26AYGQ.cache
+- spec/dummy/tmp/cache/assets/development/sprockets/v3.0/JlLKJj3SMeXmPLYJvdO955A6OPH9wSTWF3QFOvbaT0k.cache
+- spec/dummy/tmp/cache/assets/development/sprockets/v3.0/Mo_r4nJu9qt0iEhVH0CXGZkIh_SCKfu3LoDU6GlMT-U.cache
+- spec/dummy/tmp/cache/assets/development/sprockets/v3.0/PjzZwmbYJUPXBPEKfYAIld32mtAk3H0hBz7ONWVqza4.cache
+- spec/dummy/tmp/cache/assets/development/sprockets/v3.0/QfZ4TPv_vTZ6WmGKJEhbsZ0Ou73XHsnuUlsaYV3ZQEY.cache
+- spec/dummy/tmp/cache/assets/development/sprockets/v3.0/QYBC6SiWic96YuGP27vORM8frM2yoCxYATSeAuu3q3s.cache
+- spec/dummy/tmp/cache/assets/development/sprockets/v3.0/rRXYm5yDdh2lrn8etfERia5zGqWg3_cJ3siQQG6h9UU.cache
+- spec/dummy/tmp/cache/assets/development/sprockets/v3.0/t3hd5M5Qs7xWqz8gFCvXf781-4lYaem1SZCLRh47qCc.cache
+- spec/dummy/tmp/cache/assets/development/sprockets/v3.0/XIp7H1NvI9qObEEUnVrJoJ0TgF9dsNRmdw7bkMLyf64.cache
+- spec/dummy/tmp/cache/assets/development/sprockets/v3.0/yHIJ2OseWB_qclWx7fwHLHPAVYOch64QqS8Y07WHhRk.cache
+- spec/dummy/tmp/cache/assets/development/sprockets/v3.0/yuW5Zfj9wAku7kLsnPBHwLsetLDeWKm9ju_dm_GLgf0.cache
 - spec/dummy/tmp/cache/assets/test/sprockets/v3.0/-5YHHhQNSe7DP0Orvh4Yznxx2tNs_gqpFgGw2aG9Z3Y.cache
 - spec/dummy/tmp/cache/assets/test/sprockets/v3.0/2ee3JgN3SAjy0F6JxKIJ62QtBkcq6xfUvl5vonKpKTg.cache
 - spec/dummy/tmp/cache/assets/test/sprockets/v3.0/2SBt5E86bhaTcl7TkcrIXPVQyQtH9yIRArRC_UxPck4.cache
@@ -335,10 +402,17 @@ test_files:
 - spec/dummy/tmp/cache/assets/test/sprockets/v3.0/VQW8knFSHAGZ-SwN_2c-9i5SVI9s_5RKDO7GLW7A_yM.cache
 - spec/dummy/tmp/cache/assets/test/sprockets/v3.0/x3uq8L9bH8xLwZLDYY0PVDTSeV-I_7g0rsm9W5RIBR4.cache
 - spec/dummy/tmp/cache/assets/test/sprockets/v3.0/yuW5Zfj9wAku7kLsnPBHwLsetLDeWKm9ju_dm_GLgf0.cache
+- spec/features/full_search_form_test.rb
+- spec/features/range_search_form_test.rb
+- spec/features/search_performance_test_in_app.rb
 - spec/features/simple_search_form_test.rb
 - spec/glasses_spec.rb
-- spec/scratches/example_only_methods.rb
 - spec/spec_helper.rb
 - spec/tasks/rspec.rake
+- spec/test_only_methods/example_only_methods.rb
+- spec/tests/full_search_test.rb
+- spec/tests/parameters_priority_test.rb
+- spec/tests/performance_test.rb
+- spec/tests/range_search_test.rb
 - spec/tests/sanitized_search_test.rb
 - spec/tests/search_test.rb

data/spec/scratches/example_only_methods.rb

@@ -1,26 +0,0 @@
-  def search_within_range(model_to_search,params_hash)
-    params_array = params_hash.to_a
-    query = ""
-    consecutive_ints = 0
-    params_array.each_with_index do |pair, index|
-      if !pair[1].empty?
-        if pair[0].to_s[key.size-3,key.size] == "_id" || pair[] ~= /\A[-+]?[0-9]+\z/ # checks if value is basically an integer within quotes
-
-          possible_query = "#{key} = #{val} AND "
-          consecutive_ints += 1
-          if consecutive_ints % 2 == 0 #check if the case is of an integer field followed by another
-
-          end
-          query += possible_query
-        else
-          query += "#{key} LIKE '#{val}%' AND " # percent sign matches any string of 0 or more chars.
-        end
-      end
-    end
-    if !query.empty?
-      query = query[0,query.size-5]
-      model_to_search.where(query)
-    else
-      []
-    end
-  end