controlist 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 865e5bff5b151ade402fd35e38acd252bdf5e901
-  data.tar.gz: 02524edfe03062a87bf1fec159ec6903ceaf715b
+  metadata.gz: f952bb9c279383c0c30a716bb5a4a9167d58ced5
+  data.tar.gz: 651d13a9012be605fb85c8a05c6f1098b2976f12
 SHA512:
-  metadata.gz: 219e463aae3771abe5bb1f1ce92354c63aca4fad5b134f6617dfd12ef4cccb9978e8b4a337bcfd75677c9b4c065cc4d367cc70eb2e09187e2b9c69a4329c51c5
-  data.tar.gz: 02c56861870bf5ac7a06c91fae55830dc6d2984bd05bb7ea50779a5181e8859a6e84d8fa90897843063ca4a8db436b662ac253e8990c498bc3b7f0a4eeeca314
+  metadata.gz: a2543d58024a8a29a0da1307d78b130335cbf8db9a286f32d8f32b7f06e7fe7c9bc2554d519ddd129ae1b357ce31e0c0e678bfe15400348db8ec84fc761c7ffd
+  data.tar.gz: f4f8b61d1f6b2497c45408588172af1448494f14075c5c77272c0c5df7ff3d4a86c2cdbebc52e85583c2fba51f1e58183139af0fbb738bf6a6ab64b7c40076f1

data/lib/controlist/interceptor.rb

@@ -82,9 +82,10 @@ module Controlist
                     end
                   end
                 end
-            #{method}_without_controlist(*args)
-          end
-          alias_method_chain :#{method}, :controlist unless method_defined? :#{method}_without_controlist
+                # Avoid effect fetching arel in original update method
+                Controlist.skip { #{method}_without_controlist(*args) }
+              end
+              alias_method_chain :#{method}, :controlist unless method_defined? :#{method}_without_controlist
             }
         end
       end
@@ -97,6 +98,7 @@ module Controlist
             self.select_values += Array.wrap(value)
           end
         end
+        #Avoid id based cache
         ActiveRecord::IdentityMap.module_eval do
           def self.enabled?
             false

data/lib/controlist/version.rb

@@ -1,3 +1,3 @@
 module Controlist
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/lib/controlist.rb

@@ -43,9 +43,10 @@ module Controlist
     #        assert_equal "SELECT \"users\".* FROM \"users\"", sql.strip
     #      end
     def skip
+      is_skip = @permission_manager.skip?
       @permission_manager.enable_skip
       result = yield
-      @permission_manager.disable_skip
+      @permission_manager.disable_skip unless is_skip
       result
     end
 

data/test/feature_test.rb

@@ -10,6 +10,7 @@ class FeatureTest < ActiveSupport::TestCase
         load "test/migrate.rb"
         Clazz.create id: 1, name: "Grade 1"
         Clazz.create id: 2, name: "Grade 2"
+        Clazz.create id: 3, name: "Grade 3"
         User.create id: 1, name: "Tom", clazz_id: 1, age: 1
         User.create id: 2, name: "Jerry", clazz_id: 1, age: 1
         User.create id: 3, name: "Henry", clazz_id: 2, age: 1
@@ -36,6 +37,7 @@ class FeatureTest < ActiveSupport::TestCase
     sql = relation.to_sql.gsub(/ +/, " ")
     puts sql
     assert_equal true, sql.include?("((users.name = 'Tom') and (clazzs.name in ('Grade 1','Grade 2')) and (users.age >= 5) and (users.age is null) and (users.age in (1,2,3)) and (users.clazz_id in (1,2,3)) and (age != 100)) ORDER BY id DESC LIMIT 3")
+
   end
 
   def test_permission_empty

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: controlist
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Leon Li
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-01 00:00:00.000000000 Z
+date: 2015-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler