can_camel 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7327da083e2094e5ec46012cd8d677fa1d580a3
-  data.tar.gz: de42690b702c3cf0be312f3a284efdd7d2a8b9da
+  metadata.gz: 597db731eda1993d1204d7735b945635f5200f7d
+  data.tar.gz: b9dd5fb704e2a6ccecd98c4bb2d36c09d458ac22
 SHA512:
-  metadata.gz: d990335cb5d604df985bb522370aabe0ac0750e516a51570c9d1485309bfec14acad9d254cc450e02f570766b01311db060fe682da20a353f3fd53a41fbda428
-  data.tar.gz: d43fd37f23f2cdcfcf28e63281b312ab7d9e714e79412a78a3d90547261e256c5886fc08a5c5e648719d753f8f8d94beae5bc02fad7c56e2207291b8ad878cf4
+  metadata.gz: 36d14e9c45ad4a068544834930f1431cf0a9b349ca0de18fdaa4e7ec4c013cbeabb32b076df349c84a3d5750971617cdcc49c2434afb1b16fe2e37b774aa776e
+  data.tar.gz: 29e688f12ddf23d6a5a41e415420d1fb78252050241b899917c31ae5c9d89031a1ca5f09721e4d203867efa6e7839b6ac4d5cdfe3b0eb406b8c27411fb9b4ffd

data/lib/can_camel.rb

@@ -1,7 +1,7 @@
 module CanCamel
   extend ActiveSupport::Autoload
   %i(Base Node SubjectNode ActionNode GroupNode ConcernNode Linter Filters
-     Validators Cache Filter)
+     Validators Cache Filter Root)
     .each { |x| autoload(x) }
 
   extend CanCamel::Base

data/lib/can_camel/action_node.rb

@@ -1,7 +1,6 @@
 module CanCamel
   class ActionNode < Node
     has_many :groups, foreign_key: :parent_id, class_name: "CanCamel::GroupNode"
-    validates_presence_of :parent_id
 
     def rank
       2

data/lib/can_camel/base.rb

@@ -8,8 +8,8 @@ module CanCamel
     # @param action [Symbol] symbol relied to action node name
     # @param subject [Symbol] symbol relied to subject node name
     # @return [Hash, nil] hash with specific params or nil
-    def can?(user, action, subject, **args)
-      Cache[[user.send(GROUP_METHOD).to_sym, action, subject]]
+    def can?(user, *path, **args)
+      Cache[[user.send(GROUP_METHOD).to_sym, *path]]
         .try(:can?, user: user, **args)
     end
 

data/lib/can_camel/cache.rb

@@ -9,6 +9,7 @@ module CanCamel
       end
 
       def children_of(node)
+        return [] unless node
         cache.select do |path, _value|
           _, *subpath = path
           node.path == subpath
@@ -17,8 +18,16 @@ module CanCamel
 
       def append(node, path)
         path = [node.name, *path]
-        @cache[path] = node
-        children_of(node).each { |child| append child, path }
+        old = @cache[path]
+
+        if old
+          old.inherit! node
+        else
+          new = node.dup
+          new.path = path
+          @cache[path] = new
+          children_of(node).each { |child| append child, path }
+        end
       end
 
       private
@@ -37,7 +46,7 @@ module CanCamel
       def build_cache
         Node.all.each_with_object({}) do |node, object|
           object[node.path] = node
-        end
+        end.merge([] => Root.new)
       end
 
       def inherit_all!

data/lib/can_camel/concern_node.rb

@@ -1,9 +1,9 @@
 module CanCamel
   class ConcernNode < Node
     validates :parent_id, absence: true
-  end
 
-  def rank
-    0
+    def rank
+      0
+    end
   end
 end

data/lib/can_camel/group_node.rb

@@ -1,7 +1,5 @@
 module CanCamel
   class GroupNode < Node
-    validates_presence_of :parent_id
-
     def can?(**additional_params)
       condition.each_with_object(result.dup.merge(additional_params)) do |(method, args), result|
         args = args.symbolize_keys

data/lib/can_camel/node.rb

@@ -30,15 +30,16 @@ module CanCamel
     end
 
     def inherit!(source = nil)
-      return if inherited
-
       raise 'inherit nodes only after cache built' unless Cache[path]
+      inherit_source! source
+
+      return if inherited
 
       @inherited = true
-      return inherit_source! source if source
 
       inherit_source! cached_parent
       inherit_source! cached_inherited_node
+      # inherit_source! cached_uncle
     end
 
     validates! :inherited, absence: { message: "You should not save inherited nodes!" }
@@ -51,6 +52,10 @@ module CanCamel
       super.symbolize_keys
     end
 
+    def cached_uncle
+      Cache.children_of(cached_parent.cached_parent).select { |x| x.name == name }.first
+    end
+
     attr_writer :path
 
     def path
@@ -61,22 +66,33 @@ module CanCamel
 
     attr_reader :inherited
 
-    def inherit_source!(source)
-      return unless source
-
-      source.inherit!
-
+    def inherit_neighbours!(source)
       Cache.children_of(source).each do |child|
-        next unless child.rank > rank
-        next if child == self
-        Cache.append child, path
+        Cache.append child, path if child.rank > rank
       end
+    end
 
+    def inherit_fields!(source)
       inherit_field(source, :description) { |x| self.description ||= x }
       inherit_field(source, :result) { |x| result.merge!(x) { |_k, l, _r| l } }
       inherit_field(source, :condition) { |x| self.condition = x.merge(condition) }
     end
 
+    def inherit_source!(source)
+      return unless source
+
+      source.inherit!
+
+      # WTF: if we inherit neighbours only once, it fails. Two times should be fine enought,
+      # but we have to do find a way to understand when it enought in code
+      # TODO: Refactor
+      # FIXME: Refactor
+      inherit_neighbours!(source)
+      inherit_neighbours!(source)
+
+      inherit_fields!(source) unless source.is_a? Root
+    end
+
     def inherit_field(source, field)
       return if override_fields.include?(field.to_s)
       yield source.send(field)

data/lib/can_camel/root.rb

@@ -0,0 +1,17 @@
+class Root
+  def inherit!; end
+
+  def cached_parent; end
+
+  def path
+    []
+  end
+
+  def rank
+    0
+  end
+
+  def name
+    :root
+  end
+end

data/lib/can_camel/subject_node.rb

@@ -1,7 +1,5 @@
 module CanCamel
   class SubjectNode < Node
-    validates :parent_id, absence: true
-
     def rank
       1
     end

data/lib/can_camel/version.rb

@@ -1,3 +1,3 @@
 module CanCamel
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: can_camel
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Alexander Smirnov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-18 00:00:00.000000000 Z
+date: 2015-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -24,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4'
-- !ruby/object:Gem::Dependency
-  name: pg
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
 description: |2
    CanCamel allows to manage access levels with all the power of cancan style (saving semantics). It means, that you can use `can?` method anywhere you want to check privileges of a selected user to access something in some way. See readme file at https://github.com/JelF/can_camel/blob/master/README.md to learn more
 email:
@@ -63,6 +49,7 @@ files:
 - lib/can_camel/group_node.rb
 - lib/can_camel/linter.rb
 - lib/can_camel/node.rb
+- lib/can_camel/root.rb
 - lib/can_camel/subject_node.rb
 - lib/can_camel/validators.rb
 - lib/can_camel/validators/general_validators.rb