eaco 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 064c893c7bbedea1c0ef2d5b26e28e9595b1c195
-  data.tar.gz: b3113b80fbe9d98dd6a25d2581ff42ed984e7510
+  metadata.gz: 4d92e2ed7aceab41d46ba1f57fa2b75f9bb1b298
+  data.tar.gz: 32b88c52a4bf95262a6bd54524e60afa7ea802bd
 SHA512:
-  metadata.gz: 4673c887e41e8ce7df0b4886b4aa1a88f3eaa0b39f30d014cf74ba6524fdcd5f8d426bcc472ae5cbaf5314c23f39f8e0da978bdead17883f938dd825ac7b756f
-  data.tar.gz: bb14983548c641806fe0929ec99e7752fbf3391c24c872469f3f72f41ec627a26b17990622046d76365ac94e3262fa058fadf73ac1de68206f976e0dd65a96a8
+  metadata.gz: 2212422e25d4927512160f445e0a25060bbc88bb95040ad99f6b747317a4c09f57f2e29822ab14bb5d9759ace82901b95f6d8abae52a88a7d6a8afab77c7533a
+  data.tar.gz: 99f977abda6d1d732b9b804264d4691f01372e86bb0845a232b9c5a3f1fb344742e6c8bbe6ffd3985cb55e94558fa526752fa4a34ff6b40dec0dd0d8b06f972d

data/Guardfile

@@ -1,12 +1,16 @@
 # Eaco's Guardfile
+#
+unless ENV['BUNDLE_GEMFILE'] =~ %r{gemfiles/rails}
+  abort 'specs and features require appraisal. Try `appraisal rails-4.2 guard`'
+end
 
 # Watch lib/ and spec/
-directories %w(lib spec)
+directories %w(lib spec features)
 
 # Clear the screen before every task
 clearing :on
 
-guard :rspec, version: 3, cmd: 'rspec' do
+guard :rspec, version: 3, cmd: 'bundle exec rspec' do
   # When single specs change, run them.
   watch(%r{^spec/.+_spec\.rb$})
 
@@ -28,7 +32,7 @@ guard :cucumber do
   watch(%r{^features/step_definitions/(.+)_steps\.rb$}) { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'features' }
 end
 
-#guard :shell do
-#  # Rerun scenarios when source code changes
-#  watch(%r{^lib/.+\.rb$}) { 'cucumber' }
-#end
+guard :shell do
+  # Rerun scenarios when source code changes
+  watch(%r{^lib/.+\.rb$}) { system 'cucumber' }
+end

data/README.md

@@ -226,6 +226,6 @@ focus on a single release, use `appraisal rails-X.Y rake`, where `X.Y` can be
 
 ## Denominazione d'Origine Controllata
 
-This software is Made in :italy:.
+This software is Made in Italy :it: :smile:.
 
 [eaco-e-telamone]: http://upload.wikimedia.org/wikipedia/commons/7/70/Aeacus_telemon.jpg "Aeacus telemon by user Ravenous at en.wikipedia.org - Public domain through Wikimedia Commons - http://commons.wikimedia.org/wiki/File:Aeacus_telemon.jpg#mediaviewer/File:Aeacus_telemon.jpg"

data/eaco.gemspec

@@ -21,7 +21,8 @@ Gem::Specification.new do |spec|
     ["bundler", "~> 1.6"],
     "rake", "byebug", "guard", "yard", "appraisal",
     "rspec",  "guard-rspec", "yard-rspec",
-    "cucumber", "guard-cucumber", "coveralls"
+    "cucumber", "guard-cucumber", "coveralls",
+    "guard-shell"
 
   ].each {|gem| spec.add_development_dependency *gem }
 end

data/features/role_based_authorization.feature

@@ -26,8 +26,17 @@ Feature: Role-Based authorization
     Given I have an actor named Bob
       And I have an actor named Tom
 
-  Scenario:
-     And I have a confidential one named "Supa Dupa Fly"
-     And I grant Bob access as a reader in quality of user
-    Then Bob should be able to read it
-     And Tom should not be able to read it
+  Scenario: Discretionary access to a Resource
+    When I have a confidential Document named "Supa Dupa Fly"
+     And I grant Bob access to "Supa Dupa Fly" as a reader in quality of user
+    Then Bob should be able to read "Supa Dupa Fly"
+     And Tom should not be able to read "Supa Dupa Fly"
+
+  Scenario: Extraction of accessible Resources
+    When I have a confidential Document named "Strategic Plan"
+     And I grant Bob access to "Strategic Plan" as a reader in quality of user
+     And I have a confidential Document named "For Tom"
+     And I grant Tom access to "For Tom" as a reader in quality of user
+     And I have a confidential Document named "For no one"
+    Then Bob can see only "Strategic Plan" in the Document authorized list
+     And Tom can see only "For Tom" in the Document authorized list

data/features/step_definitions/actor_steps.rb

@@ -0,0 +1,37 @@
+Given(/I have an (\w+) actor defined as/) do |model_name, author_definition|
+  @actor_model = find_model(model_name)
+
+  eval_dsl author_definition, @actor_model
+end
+
+Given(/I have an actor named (\w+)/) do |actor_name|
+  actor = @actor_model.new
+  actor.name = actor_name
+  actor.save!
+
+  @actors ||= {}
+  @actors[actor_name] = actor
+end
+
+When(/I grant (\w+) access to "(.+?)" as a (\w+) in quality of (\w+)/) do |actor_name, resource_name, role_name, designator|
+  actor = @actors.fetch(actor_name)
+  @resources[resource_name].grant role_name, designator, actor
+  @resources[resource_name].save!
+end
+
+Then(/^(\w+) should be able to (\w+) "(.+?)"$/) do |actor_name, permission_name, resource_name|
+  actor = @actors.fetch(actor_name)
+  resource = @resources.fetch(resource_name)
+
+  unless actor.can? permission_name, resource
+    raise "Expected #{actor_name} to be able to #{permission_name} #{resource_name}"
+  end
+end
+
+Then(/^(\w+) should not be able to (\w+) "(.+?)"$/) do |actor_name, permission_name, resource_name|
+  actor = @actors.fetch(actor_name)
+  unless actor.cannot? permission_name, @resources.fetch(resource_name)
+    raise "Expected #{actor_name} to not be able to #{permission_name} #{resource_name}"
+  end
+end
+

data/features/step_definitions/resource_steps.rb

@@ -0,0 +1,40 @@
+When(/I have a (\w+) resource defined as/) do |model_name, resource_definition|
+  @resource_model = find_model(model_name)
+
+  eval_dsl resource_definition, @resource_model
+end
+
+When(/I have a confidential \w+ named "([\w\s]+)"/) do |name|
+  @resources ||= {}
+  @resources[name] = @resource_model.new(name: name)
+end
+
+Then(/I should be able to set an ACL on it/) do
+  instance = @resource_model.new
+
+  instance.acl = {"foo" => :bar}
+  instance.save!
+  instance = @resource_model.find(instance.id)
+
+  unless instance.acl == {"foo" => :bar}
+    raise %[Expecting {"foo"=> :bar} as an ACL but found #{instance.acl.inspect}]
+  end
+
+  unless instance.acl.kind_of?(@resource_model.acl)
+    raise "Expecting #{instance.acl.class} to be a #{@resource_model.acl}"
+  end
+end
+
+Then(/(\w+) can see only "(.*?)" in the (\w+) authorized list/) do |actor_name, resource_names, model_name|
+  actor = @actors[actor_name]
+
+  resource_names = resource_names.split(',')
+  resources = resource_names.map {|name| @resources.fetch(name)}
+
+  model = find_model(model_name)
+  accessible = model.accessible_by(actor).to_a
+
+  unless (accessible & resources) == resources
+    raise "Expected to have access to #{resources} but found only #{accessible}"
+  end
+end

data/lib/eaco/acl.rb

@@ -188,6 +188,7 @@ module Eaco
         [designator]
 
       elsif designator && actor_or_id.respond_to?(:designators)
+        designator = designator.to_sym
         actor_or_id.designators.select {|d| d.type == designator}
 
       elsif designator.is_a?(Symbol)

data/lib/eaco/actor.rb

@@ -48,7 +48,7 @@ module Eaco
     # @see Designator
     #
     def designators
-      @_designators ||= Set.new.tap do |ret|
+      Set.new.tap do |ret|
         self.class.designators.each do |_, designator|
           ret.merge designator.harvest(self)
         end

data/lib/eaco/adapters/active_record/compatibility/v40.rb

@@ -19,7 +19,7 @@ module Eaco
             adapter.class::OID.register_type 'jsonb', adapter.class::OID::Json.new
             adapter.send :reload_type_map
 
-            adapter.native_database_types.update(jsonb: {name: 'json'})
+            adapter.native_database_types.update(jsonb: {name: 'jsonb'})
 
             adapter.class.parent::PostgreSQLColumn.instance_eval do
               include Column

data/lib/eaco/adapters/active_record/postgres_jsonb.rb

@@ -25,9 +25,9 @@ module Eaco
         def accessible_by(actor)
           return scoped if actor.is_admin?
 
-          designators = actor.designators.map {|d| quote_value(d) }
+          designators = actor.designators.map {|d| quote_value(d, nil) }
 
-          where("acl ?| array[#{designators.join(',')}]")
+          where("acl ?| array[#{designators.join(',')}]::varchar[]")
         end
       end
 

data/lib/eaco/controller.rb

@@ -1,4 +1,9 @@
-require 'active_support/concern'
+begin
+  require 'active_support/concern'
+rescue LoadError
+  # This is falsely true during specs ran by Guard. FIXME.
+  abort 'Eaco::Controller requires activesupport. Please add it to Gemfile.'
+end
 
 module Eaco
 

data/lib/eaco/cucumber/active_record.rb

@@ -137,25 +137,29 @@ module Eaco
       # @return [nil]
       #
       def define_schema!
-        load 'eaco/cucumber/active_record/schema.rb'
+        log_stdout { load 'eaco/cucumber/active_record/schema.rb' }
       end
 
+      protected
+
       ##
-      # Drops and recreates the database specified in the {#configuration}.
-      #
-      # TODO untangle from postgres
+      # Captures stdout and logs it
       #
-      # @return [void]
+      # @return [nil]
       #
-      def recreate_database!
-        database = config.fetch(:database)
-        connect! config.merge(database: :postgres) # FIXME
+      def log_stdout
+        stdout, string = $stdout, StringIO.new
+        $stdout = string
 
-        connection.drop_database   database
-        connection.create_database database
-        connect! config
+        yield
+
+        string.tap(&:rewind).read.split("\n").each do |line|
+          logger.info line
+        end
 
-        logger.info "Connected to #{config}"
+        nil
+      ensure
+        $stdout = stdout
       end
     end
 

data/lib/eaco/designator.rb

@@ -108,7 +108,7 @@ module Eaco
       # @see Actor
       #
       def harvest(actor)
-        Array.new(actor.send(@method)||[]).map {|value| new(value) }
+        Array.new([actor.send(@method)].flatten).map! {|value| new(value) }
       end
 
       ##

data/lib/eaco/dsl/resource.rb

@@ -102,7 +102,7 @@ module Eaco
       #
       def roles(*keys)
         target_eval do
-          @_roles = Set.new(keys.flatten).freeze
+          @_roles = keys.flatten.freeze
         end
       end
 

data/lib/eaco/rake/default_task.rb

@@ -156,7 +156,13 @@ module Eaco
       # @return [String]
       #
       def fancy(msg)
-        "\n\033[1;32m>>>\n>>> EACO: \033[1;37m#{msg}\033[1;32m\n>>>\n\033[0m"
+        <<-EOF
+\033[0m
+\033[1;32m>>>
+\033[1;32m>>> EACO: \033[1;37m#{msg}
+\033[1;32m>>>
+\033[0m
+        EOF
       end
 
       ##

data/lib/eaco/resource.rb

@@ -61,7 +61,7 @@ module Eaco
         perms = permissions[role]
         return false unless perms
 
-        perms.include?(action)
+        perms.include?(action.to_sym)
       end
 
       ##
@@ -112,7 +112,7 @@ module Eaco
 
       # The defined roles.
       #
-      # @return [Set]
+      # @return [Array]
       #
       # @see DSL::Resource
       #

data/lib/eaco/version.rb

@@ -2,6 +2,6 @@ module Eaco
 
   # Current version
   #
-  VERSION = '0.6.0'
+  VERSION = '0.6.1'
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eaco
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Marcello Barnaba
@@ -178,6 +178,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-shell
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - vjt@openssl.it
@@ -200,8 +214,8 @@ files:
 - features/active_record.travis.yml
 - features/rails_integration.feature
 - features/role_based_authorization.feature
-- features/step_definitions/actor_definition.rb
-- features/step_definitions/resource_authorization.rb
+- features/step_definitions/actor_steps.rb
+- features/step_definitions/resource_steps.rb
 - features/support/env.rb
 - gemfiles/rails_3.2.gemfile
 - gemfiles/rails_4.0.gemfile
@@ -291,8 +305,8 @@ test_files:
 - features/active_record.travis.yml
 - features/rails_integration.feature
 - features/role_based_authorization.feature
-- features/step_definitions/actor_definition.rb
-- features/step_definitions/resource_authorization.rb
+- features/step_definitions/actor_steps.rb
+- features/step_definitions/resource_steps.rb
 - features/support/env.rb
 - spec/eaco/acl_spec.rb
 - spec/eaco/actor_spec.rb

data/features/step_definitions/actor_definition.rb

@@ -1,30 +0,0 @@
-Given(/I have an (\w+) actor defined as/) do |model_name, author_definition|
-  @actor_model = find_model(model_name)
-
-  eval_dsl author_definition, @actor_model
-end
-
-Given(/I have an actor named (\w+)/) do |actor_name|
-  actor = @actor_model.new
-  actor.name = actor_name
-
-  @actors ||= {}
-  @actors[actor_name] = actor
-end
-
-When(/I grant (\w+) access as a (\w+) in quality of (\w+)/) do |actor_name, role_name, designator|
-  actor = @actors.fetch(actor_name)
-  @resource.grant role_name, designator, actor
-  @resource.save!
-end
-
-Then(/(\w+) should be able to (\w+) it/) do |actor_name, permission_name|
-  actor = @actors.fetch(actor_name)
-  actor.can? permission_name, @resource
-end
-
-Then(/(\w+) should not be able to (\w+) it/) do |actor_name, permission_name|
-  actor = @actors.fetch(actor_name)
-  actor.cannot? permission_name, @resource
-end
-

data/features/step_definitions/resource_authorization.rb

@@ -1,19 +0,0 @@
-When(/I have a (\w+) resource defined as/) do |model_name, resource_definition|
-  @resource_model = find_model(model_name)
-
-  eval_dsl resource_definition, @resource_model
-end
-
-When(/I have a confidential one named "([\w\s]+)"/) do |name|
-  @resource = @resource_model.new(name: name)
-end
-
-Then(/I should be able to set an ACL on it/) do
-  instance = @resource_model.new
-
-  instance.acl = {foo: :bar}
-  instance.save!
-  instance = @resource_model.find(instance.id)
-
-  instance.acl == {foo: :bar} && instance.acl.class.kind_of?(@resource_model.acl)
-end