controlist 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0fe714a3aad4e99f1f5939eaeb793a6b61c485cf
-  data.tar.gz: 99b51da4fc36bd7c17f92d3de8c4c0afbace75dc
+  metadata.gz: 869f2a6dde29f0147539df3d68e2ac711cc13455
+  data.tar.gz: bdc0da9ca4091b91573da88c9fbf42082e20869f
 SHA512:
-  metadata.gz: 5791061e742d2fd3f2dd9ae8fdd3cbb7ef211cdf9ddd5689e36b51ff650dae29b6202371125994a8d32cb8be1c74c839fdb68855bafe0925279778960bce6afc
-  data.tar.gz: b9fbeedd4de2e2c92f01fd5fdc1b9e7171dc8977a7bcbf9a594a596001a78b4b6a28fee60b095985e3646340f8061f4be21b732d9a77e5fa4a424c6f46ab0e39
+  metadata.gz: 6d0ec5252374ad3c4f564520f762640fd3e33e397e75f3f6fb72fe501c3143ea66e1db258ae4e03847c5c04a9171eb3e7bc379340262737acbba4d3ab0be8d02
+  data.tar.gz: 9669e13a1bc8fc97a7f1c85862cae8a1f15471c3d2451293222b83c7bc8997ddbf2a54e1b13b761515e053df836ad2d6d1f625334b1dcc96abf0fa01c7c86191

data/lib/controlist/permissions/advanced_constrain.rb

@@ -4,7 +4,7 @@ module Controlist
     class AdvancedConstrain < Constrain
 
       def initialize(hash)
-        self.property = hash[:property]
+        self.property = hash[:property].to_s
         self.value = hash[:value]
         self.relation = hash[:relation]
         self.table_name = hash[:table_name]

data/lib/controlist/permissions/simple_constrain.rb

@@ -3,11 +3,9 @@ module Controlist
 
     class SimpleConstrain < Constrain
 
-      def initialize(property, value, hash={})
+      def initialize(property, value)
         self.property = property.to_s
         self.value = value
-        self.relation = hash[:relation]
-        self.table_name = hash[:table_name]
       end
 
     end

data/lib/controlist/version.rb

@@ -1,3 +1,3 @@
 module Controlist
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/test/feature_test.rb

@@ -23,7 +23,7 @@ class FeatureTest < ActiveSupport::TestCase
     Controlist.permission_provider.set_permission_package(OrderedPackage.new(
       Controlist::Permission.new(User, READ, true, [
         SimpleConstrain.new("name", "Tom"),
-        SimpleConstrain.new("name", ["Grade 1", "Grade 2"], relation: "clazz"),
+        AdvancedConstrain.new(property: "name", value: ["Grade 1", "Grade 2"], relation: "clazz"),
         AdvancedConstrain.new(property: "age", value: 5, operator: ">="),
         SimpleConstrain.new("age", "null"),
         SimpleConstrain.new("age", [1,2,3]),
@@ -96,15 +96,15 @@ class FeatureTest < ActiveSupport::TestCase
       Controlist::Permission.new(Clazz, READ),
       Controlist::Permission.new(User, READ),
       Controlist::Permission.new(User, UPDATE, false, AdvancedConstrain.new(property: "name", value: "To", operator: "include?")),
-      Controlist.is_activerecord3? ?  nil : Controlist::Permission.new(User, UPDATE, false, AdvancedConstrain.new(proc_persistence: lambda{|object, operation| object.name == 'Block'})),
-      Controlist::Permission.new(User, [UPDATE, DELETE], false, SimpleConstrain.new("name", "Grade 1", relation: 'clazz')),
+      Controlist.is_activerecord3? ?  nil : Controlist::Permission.new(User, UPDATE, false, AdvancedConstrain.new(proc_persistence: lambda{|object, operation| object.name == "Block"})),
+      Controlist::Permission.new(User, [UPDATE, DELETE], false, AdvancedConstrain.new(property: "name", value: "Grade 1", relation: "clazz")),
       Controlist::Permission.new(User, UPDATE)
     ))
 
     user = User.find 3
     assert_not_equal "Tom", user.name
     assert_not_equal "Grade 1", user.clazz.name
-    user.name = 'Test'
+    user.name = "Test"
     assert_equal true, user.save
 
     unless Controlist.is_activerecord3?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: controlist
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Leon Li
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-02 00:00:00.000000000 Z
+date: 2015-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler