ixtlan-guard 0.8.3 → 0.9.0

data/README.md

@@ -1,5 +1,9 @@
 # ixtlan guard #
 
+* [![Build Status](https://secure.travis-ci.org/mkristian/ixtlan-guard.png)](http://travis-ci.org/mkristian/ixtlan-guard)
+* [![Dependency Status](https://gemnasium.com/mkristian/ixtlan-guard.png)](https://gemnasium.com/mkristian/ixtlan-guard)
+* [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/mkristian/ixtlan-guard)
+
 it is an simple authorization framework for restful rails especially using rails as API server.
 
 the idea is simple: 

data/lib/ixtlan/guard/guard.rb

@@ -1,5 +1,5 @@
 require 'ixtlan/guard/guard_config'
-
+require 'ixtlan/guard/models'
 module Ixtlan
   module Guard
     class Guard
@@ -103,9 +103,9 @@ module Ixtlan
         m = @config.map_of_all
         m.each do |resource, actions|
           nodes = []
-          perm = Node.new(:permission)
-          perm[:resource] = resource
-          perm[:actions] = nodes
+          perm = Permission.new #Node.new(:permission)
+          perm.resource = resource
+          perm.actions = []#nodes
 
           # setup default_groups
           default_groups = actions.delete('defaults') || []
@@ -122,11 +122,11 @@ module Ixtlan
                    # deny = true : default_groups.member?('*')
                    default_groups.size != 0 || default_groups.member?('*')
                  end
-          perm[:deny] = deny
+          perm.deny = deny
 
           actions.each do |action, groups|
             group_names = groups.collect { |g| g.is_a?(Hash) ? g.keys : g }.flatten if groups
-            node = Node.new(:action)
+            node = Action.new #Node.new(:action)
             allowed_groups = 
               if groups && group_names.member?('*')
                 group_map.values
@@ -134,53 +134,33 @@ module Ixtlan
                 names = group_map.keys & ((group_names || []) + @superuser)
                 names.collect { |name| group_map[name] }
               end
-
             if (deny && allowed_groups.size == 0) || (!deny && allowed_groups.size > 0)
-              node[:name] = action
+              node.name = action
               if block
                 if allowed_groups.size > 0
                   assos = block.call(resource, allowed_groups)
-                  node[:associations] = assos if assos && assos.size > 0
+                  node.associations = assos if assos && assos.size > 0
                 else
                   assos = block.call(resource, group_map.values)
-                  perm[:associations] = assos if assos && assos.size > 0
+                  perm.associations = assos if assos && assos.size > 0
                 end
               end
-              nodes << node
+              perm.actions << node
             elsif deny && allowed_groups.size > 0 && block
               assos = block.call(resource, group_map.values)
-              perm[:associations] = assos if assos && assos.size > 0
+              perm.associations = assos if assos && assos.size > 0
             end
           end
           # TODO is that right like this ?
           # only default_groups, i.e. no actions !!!
           if block && actions.size == 0 && deny
             assos = block.call(resource, group_map.values)
-            perm[:associations] = assos if assos && assos.size > 0
+            perm.associations = assos if assos && assos.size > 0
           end
           perms << perm
         end
         perms
       end
     end
-    class Node < Hash
-
-      attr_reader :content
-
-      def initialize(name)
-        map = super
-        @content = {}
-        merge!({ name => @content })
-      end
-
-      def []=(k,v)
-        @content[k] = v
-      end
-      def [](k)
-        @content[k]
-      end
-    end
-    class GuardException < Exception; end
-    class PermissionDenied < GuardException; end
   end
 end

data/lib/ixtlan/guard/guard_rails.rb

@@ -116,7 +116,7 @@ module Ixtlan
             end
 
             def self.guard
-              Rails.application.config.guard
+              ::Rails.application.config.guard
             end
 
             def self.allowed?(action, current_groups, reference = nil)

data/lib/ixtlan/guard/models.rb

@@ -0,0 +1,22 @@
+require 'virtus'
+module Ixtlan
+  module Guard
+    class Action   
+      include Virtus
+
+      attribute :name, String
+      attribute :associations, Array[String]
+    end
+    class Permission   
+      include Virtus
+
+      attribute :resource, String
+      attribute :actions, Array[Action], :default => []
+      attribute :deny, Boolean, :default => false
+      attribute :associations, Array[String]
+    end
+    #TODO
+    class GuardException < Exception; end
+    class PermissionDenied < GuardException; end
+  end
+end

data/lib/ixtlan/guard/models.rb~

@@ -0,0 +1,22 @@
+require 'virtus'
+module Ixtlan
+  module Guard
+    class Action   
+      include Virtus
+
+      attribute :name, String
+      attribute :associations, Array[String]
+    end
+    class Permission   
+      include Virtus
+
+      attribute :resource, String
+      attribute :actions, Array[Action], :default => []
+      attribute :deny, Boolean, :deafult => false
+      attribute :associations, Array[String]
+    end
+    #TODO
+    class GuardException < Exception; end
+    class PermissionDenied < GuardException; end
+  end
+end

data/lib/ixtlan/guard/railtie.rb

@@ -1,4 +1,4 @@
-require 'rails'
+require 'rails/railtie'
 require 'ixtlan/guard/guard'
 require 'ixtlan/guard/guard_rails'
 require 'logger'

data/spec/guard_export_spec.rb

@@ -7,16 +7,21 @@ describe Ixtlan::Guard::Guard do
   def assert(expected, perms)
     map = {}
     expected.each do |e|
-      map[e[:permission][:resource]] = e
-      if e[:permission][:actions]
-        e[:permission][:actions].sort!{ |n,m| n[:action][:name] <=> m[:action][:name] }
+      map[(e[:permission] || e)[:resource]] = e
+      if (e[:permission] || e)[:actions]
+        (e[:permission] || e)[:actions].sort!{ |n,m| n[:action][:name] <=> m[:action][:name] }
       end
     end
     perms.each do |perm|
-      if perm[:actions]
-        perm[:actions].sort!{ |n,m| n.content[:name] <=> m.content[:name] }
+      attr = perm.attributes
+      attr[ :actions ] = perm.actions.collect do |a| 
+        aa = a.attributes
+        aa.delete( :associations ) if aa[ :associations ].nil? || aa[ :associations ].empty?
+        {:action => aa}
       end
-      map[perm[:resource].to_s].should == perm
+      attr[:actions].sort!{ |n,m| n[:action][:name] <=> m[:action][:name] }
+      attr.delete( :associations ) if attr[ :associations ].nil? || attr[ :associations ].empty?
+      map[perm[:resource]][:permission].should == attr
     end
   end
 
@@ -184,7 +189,7 @@ describe Ixtlan::Guard::Guard do
       end
       perm = subject.permissions([group])do |resource, groups|
         if resource == 'regions'
-          [:europe, :asia]
+          ["europe", "asia"]
         end
       end
       expected = [
@@ -219,8 +224,8 @@ describe Ixtlan::Guard::Guard do
          {:permission=>
           {:resource=>"regions",
            :actions=>
-            [{:action=>{:name=>"show", :associations=>[:europe, :asia]}},
-             {:action=>{:name=>"create", :associations=>[:europe, :asia]}}],
+            [{:action=>{:name=>"show", :associations=>["europe", "asia"]}},
+             {:action=>{:name=>"create", :associations=>["europe", "asia"]}}],
            :deny=>false}},
          #allow nothing
          {:permission=>{:resource=>"users", :actions=>[], :deny=>false}}]

data/spec/guard_with_associations_spec.rb

@@ -47,7 +47,7 @@ describe Ixtlan::Guard::Guard do
   end
 
   it 'should add associations to node' do
-    perms = subject.permissions([Group.new('admin', [:german, :french])]) do |resource, groups|
+    perms = subject.permissions([Group.new('admin', ["german", "french"])]) do |resource, groups|
       if groups && groups.first && groups.first.name == 'admin'
         groups.first.domains
       else
@@ -61,7 +61,7 @@ describe Ixtlan::Guard::Guard do
         :resource=>"accounts", 
         :actions=>[{:action=>{ 
                        :name=>"destroy",
-                       :associations=>[:german, :french]}}], 
+                       :associations=>["german", "french"]}}], 
         :deny=>false}
     }
     expected[:allow_all_defaults] = {
@@ -69,14 +69,14 @@ describe Ixtlan::Guard::Guard do
         :resource=>"allow_all_defaults",
         :actions=>[{:action=>{:name=>"index"}}], 
         :deny=>true, 
-        :associations=>[:german, :french]}
+        :associations=>["german", "french"]}
     }
     expected[:defaults] = {
       :permission=>{
         :resource=>"defaults", 
         :actions=>[{:action=>{
                        :name=>"index",
-                       :associations=>[:german, :french]}}], 
+                       :associations=>["german", "french"]}}], 
         :deny=>false}
     }
     expected[:no_defaults] = {
@@ -84,14 +84,14 @@ describe Ixtlan::Guard::Guard do
         :resource=>"no_defaults", 
         :actions=>[{:action=>{
                        :name=>"index",
-                       :associations=>[:german, :french]}}], 
+                       :associations=>["german", "french"]}}], 
         :deny=>false}
     } 
     expected[:only_defaults] = {
       :permission=>{
         :resource=>"only_defaults", 
         :actions=>[],
-        :associations=>[:german, :french],
+        :associations=>["german", "french"],
         :deny=>true}
     }
     expected[:person]= {
@@ -99,18 +99,18 @@ describe Ixtlan::Guard::Guard do
         :resource=>"person", 
         :actions=> [{:action=>{ 
                         :name=>"destroy",
-                        :associations=>[:german, :french]}}, 
+                        :associations=>["german", "french"]}}, 
                     {:action=>{ 
                         :name=>"index",
-                        :associations=>[:german, :french]}}], 
+                        :associations=>["german", "french"]}}], 
         :deny=>false}
     }
     expected[:regions] = {
       :permission=>{
         :resource=>"regions",
         :actions=>[
-                   {:action=>{:name=>"create", :associations=>[:german, :french]}},
-                   {:action=>{:name=>"show", :associations=>[:german, :french]}}
+                   {:action=>{:name=>"create", :associations=>["german", "french"]}},
+                   {:action=>{:name=>"show", :associations=>["german", "french"]}}
                   ],
         :deny=>false}
     }
@@ -119,12 +119,17 @@ describe Ixtlan::Guard::Guard do
         :resource=>"users", 
         :actions=>[], 
         :deny=>false}
-    } 
+    }
     perms.each do |perm|
-      if perm[:actions]
-        perm[:actions].sort!{ |n,m| n.content[:name] <=> m.content[:name] }
+      attr = perm.attributes
+      attr[ :actions ] = perm.actions.collect do |a| 
+        aa = a.attributes
+        aa.delete( :associations ) if aa[ :associations ].nil? || aa[ :associations ].empty?
+        {:action => aa}
       end
-      expected[perm[:resource].to_sym].should == perm
+      attr[:actions].sort!{ |n,m| n[:action][:name] <=> m[:action][:name] }
+      attr.delete( :associations ) if attr[ :associations ].nil? || attr[ :associations ].empty?
+      expected[perm[:resource].to_sym][:permission].should == attr
     end
   end
 end

metadata

@@ -1,86 +1,87 @@
 --- !ruby/object:Gem::Specification 
 name: ixtlan-guard
 version: !ruby/object:Gem::Version 
+  hash: 59
   prerelease: 
-  version: 0.8.3
+  segments: 
+  - 0
+  - 9
+  - 0
+  version: 0.9.0
 platform: ruby
 authors: 
-  - mkristian
+- mkristian
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2012-07-04 00:00:00 Z
+date: 2012-12-29 00:00:00 Z
 dependencies: 
-  - !ruby/object:Gem::Dependency 
-    name: ixtlan-core
-    prerelease: false
-    requirement: &id001 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ~>
-          - !ruby/object:Gem::Version 
-            version: 0.7.0
-    type: :runtime
-    version_requirements: *id001
-  - !ruby/object:Gem::Dependency 
-    name: rails
-    prerelease: false
-    requirement: &id002 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - "="
-          - !ruby/object:Gem::Version 
-            version: 3.0.9
-    type: :development
-    version_requirements: *id002
-  - !ruby/object:Gem::Dependency 
-    name: rspec
-    prerelease: false
-    requirement: &id003 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - "="
-          - !ruby/object:Gem::Version 
-            version: 2.6.0
-    type: :development
-    version_requirements: *id003
-  - !ruby/object:Gem::Dependency 
-    name: cucumber
-    prerelease: false
-    requirement: &id004 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - "="
-          - !ruby/object:Gem::Version 
-            version: 0.9.4
-    type: :development
-    version_requirements: *id004
-  - !ruby/object:Gem::Dependency 
-    name: rake
-    prerelease: false
-    requirement: &id005 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - "="
-          - !ruby/object:Gem::Version 
-            version: 0.8.7
-    type: :development
-    version_requirements: *id005
-  - !ruby/object:Gem::Dependency 
-    name: ruby-maven
-    prerelease: false
-    requirement: &id006 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - "="
-          - !ruby/object:Gem::Version 
-            version: 3.0.4.0.29.0
-    type: :development
-    version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: virtus
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 0
+        - 5
+        version: "0.5"
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: railties
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 29
+        segments: 
+        - 3
+        - 2
+        - 9
+        version: 3.2.9
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 2
+        - 7
+        version: "2.7"
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 73
+        segments: 
+        - 10
+        - 0
+        - 3
+        version: 10.0.3
+  type: :development
+  version_requirements: *id004
 description: simple authorization framework for rails controllers
 email: 
-  - m.kristian@web.de
+- m.kristian@web.de
 executables: []
 
 extensions: []
@@ -88,97 +89,105 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-  - MIT-LICENSE
-  - README.md
-  - lib/ixtlan-guard.rb
-  - lib/generators/guard/controller/USAGE
-  - lib/generators/guard/controller/controller_generator.rb
-  - lib/generators/guard/controller/controller_generator.rb~
-  - lib/generators/guard/scaffold/USAGE
-  - lib/generators/guard/scaffold/scaffold_generator.rb
-  - lib/generators/guard/templates/guard.yml
-  - lib/generators/guard/templates/guard.yml~
-  - lib/ixtlan/guard.rb
-  - lib/ixtlan/guard/abstract_session.rb
-  - lib/ixtlan/guard/abstract_session.rb~
-  - lib/ixtlan/guard/guard_rails.rb~
-  - lib/ixtlan/guard/guard.rb
-  - lib/ixtlan/guard/permission_builder.rb~
-  - lib/ixtlan/guard/guard_ng.rb~
-  - lib/ixtlan/guard/guard_config.rb
-  - lib/ixtlan/guard/guard_rails.rb
-  - lib/ixtlan/guard/guard_config.rb~
-  - lib/ixtlan/guard/guard.rb~
-  - lib/ixtlan/guard/railtie.rb
-  - spec/guard_export_spec.rb~
-  - spec/guard_with_associations_spec.rb
-  - spec/guard_with_associations_spec.rb~
-  - spec/guard_export_spec.rb
-  - spec/spec_helper.rb
-  - spec/guard_cache_spec.rb
-  - spec/guard_rails_spec.rb~
-  - spec/guard_cache_spec.rb~
-  - spec/guard_spec.rb
-  - spec/railtie_spec.rb
-  - spec/guard_rails_spec.rb
-  - spec/guards/accounts1_guard.yml~
-  - spec/guards/users_guard.yml
-  - spec/guards/users2_guard.yml
-  - spec/guards/only_defaults_guard.yml
-  - spec/guards/allow_alldefaults.yml~
-  - spec/guards/accounts2_guard.yml~
-  - spec/guards/users2_guard.yml~
-  - spec/guards/only_defaults_guard.yml~
-  - spec/guards/users_guard.yml~
-  - spec/guards/users1_guard.yml~
-  - spec/guards/tools_guard.yml~
-  - spec/guards/re_users_guard.yaml~
-  - spec/guards/no_defaults_guard.yml
-  - spec/guards/regions_guard.yml~
-  - spec/guards/defaults_guard.yml
-  - spec/guards/users1_guard.yml
-  - spec/guards/person_guard.yml
-  - spec/guards/accounts_guard.yml
-  - spec/guards/no_defaults_guard.yml~
-  - spec/guards/regions_guard.yml
-  - spec/guards/allow_all_defaults_guard.yml
-  - spec/guards/allow_all_defaults_guard.yml~
-  - spec/guards/defaults_guard.yml~
-  - features/step_definitions/simple_steps.rb
-  - features/generators.feature
+- MIT-LICENSE
+- README.md
+- lib/ixtlan-guard.rb
+- lib/generators/guard/controller/USAGE
+- lib/generators/guard/controller/controller_generator.rb
+- lib/generators/guard/controller/controller_generator.rb~
+- lib/generators/guard/scaffold/USAGE
+- lib/generators/guard/scaffold/scaffold_generator.rb
+- lib/generators/guard/templates/guard.yml
+- lib/generators/guard/templates/guard.yml~
+- lib/ixtlan/guard.rb
+- lib/ixtlan/guard/abstract_session.rb
+- lib/ixtlan/guard/abstract_session.rb~
+- lib/ixtlan/guard/guard_rails.rb~
+- lib/ixtlan/guard/guard.rb
+- lib/ixtlan/guard/models.rb~
+- lib/ixtlan/guard/permission_builder.rb~
+- lib/ixtlan/guard/guard_ng.rb~
+- lib/ixtlan/guard/guard_config.rb
+- lib/ixtlan/guard/guard_rails.rb
+- lib/ixtlan/guard/guard_config.rb~
+- lib/ixtlan/guard/guard.rb~
+- lib/ixtlan/guard/models.rb
+- lib/ixtlan/guard/railtie.rb
+- spec/guards/accounts1_guard.yml~
+- spec/guards/users_guard.yml
+- spec/guards/users2_guard.yml
+- spec/guards/only_defaults_guard.yml
+- spec/guards/allow_alldefaults.yml~
+- spec/guards/accounts2_guard.yml~
+- spec/guards/users2_guard.yml~
+- spec/guards/only_defaults_guard.yml~
+- spec/guards/users_guard.yml~
+- spec/guards/users1_guard.yml~
+- spec/guards/tools_guard.yml~
+- spec/guards/re_users_guard.yaml~
+- spec/guards/no_defaults_guard.yml
+- spec/guards/regions_guard.yml~
+- spec/guards/defaults_guard.yml
+- spec/guards/users1_guard.yml
+- spec/guards/person_guard.yml
+- spec/guards/accounts_guard.yml
+- spec/guards/no_defaults_guard.yml~
+- spec/guards/regions_guard.yml
+- spec/guards/allow_all_defaults_guard.yml
+- spec/guards/allow_all_defaults_guard.yml~
+- spec/guards/defaults_guard.yml~
+- spec/guard_export_spec.rb~
+- spec/guard_with_associations_spec.rb
+- spec/guard_with_associations_spec.rb~
+- spec/guard_export_spec.rb
+- spec/spec_helper.rb
+- spec/guard_cache_spec.rb
+- spec/guard_rails_spec.rb~
+- spec/guard_cache_spec.rb~
+- spec/guard_spec.rb
+- spec/railtie_spec.rb
+- spec/guard_rails_spec.rb
+- features/step_definitions/simple_steps.rb
+- features/generators.feature
 homepage: http://github.com/mkristian/ixtlan-guard
 licenses: 
-  - MIT-LICENSE
+- MIT-LICENSE
 post_install_message: 
 rdoc_options: []
 
 require_paths: 
-  - lib
+- lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: guard your controller actions
 test_files: 
-  - spec/guard_with_associations_spec.rb
-  - spec/guard_export_spec.rb
-  - spec/guard_cache_spec.rb
-  - spec/guard_spec.rb
-  - spec/railtie_spec.rb
-  - spec/guard_rails_spec.rb
-  - features/generators.feature
-  - features/step_definitions/simple_steps.rb
+- spec/guard_with_associations_spec.rb
+- spec/guard_export_spec.rb
+- spec/guard_cache_spec.rb
+- spec/guard_spec.rb
+- spec/railtie_spec.rb
+- spec/guard_rails_spec.rb
+- features/generators.feature
+- features/step_definitions/simple_steps.rb