eaco 1.0.0 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 342302faeb4d72f36078ceb1566c2701481e2005
-  data.tar.gz: b6986e43c743934700e081dfe5a497e5a49a5632
+  metadata.gz: 956832fb8b74408d7ced40a87cd50c0e0ec92f41
+  data.tar.gz: 5dc7cc945adff2ceb6ced5c780be61f149ad95a8
 SHA512:
-  metadata.gz: 7aae3bdd2fe862f8c5185b7cd774d1a0e55d2c7592d687d5b40aef388cc14d468c6eea4fbff0648b3ef8ca73bd2a487d05bf50afa3d252380a1074762be5c8a8
-  data.tar.gz: 0306f78ebe3b7197dda0afcb44250a56c93e5471af163c6d9d262196c798cb6f0e5e5a42ba52f7bd092cfbc0c50205ef828c7d616b4c4290b3e16d31867d8b9c
+  metadata.gz: adf19b59716224cd22e09e703bf1535a2b9443df77b2d6c8e42294785af8bb8a12c5f6c82c6b58e7fcaa9cc79ae5425faf3417c94940a972c0f179572ef50927
+  data.tar.gz: 56c7b99cb00d0f4bb36bd646abf1ad000ba6a82a9d3f52747aa1743ee59ebf88aa6fd99a1f3390a4871ebbed53789d451712ef5a619126db53dce7e5a4e079e6

data/.travis.yml

@@ -1,13 +1,41 @@
 rvm:
-  - 2.1
-  - 2.2
-  - 2.3.1
+  - 2.1.10
+  - 2.2.7
+  - 2.3.4
+  - 2.4.1
 
 gemfile:
   - gemfiles/rails_3.2.gemfile
   - gemfiles/rails_4.0.gemfile
   - gemfiles/rails_4.1.gemfile
   - gemfiles/rails_4.2.gemfile
+  - gemfiles/rails_5.0.gemfile
+  - gemfiles/rails_5.1.gemfile
+
+matrix:
+  exclude:
+    - rvm: 2.1.10
+      gemfile: gemfiles/rails_5.0.gemfile
+    - rvm: 2.1.10
+      gemfile: gemfiles/rails_5.1.gemfile
+
+    - rvm: 2.3.4
+      gemfile: gemfiles/rails_3.2.gemfile
+    - rvm: 2.3.4
+      gemfile: gemfiles/rails_4.0.gemfile
+    - rvm: 2.3.4
+      gemfile: gemfiles/rails_4.1.gemfile
+    - rvm: 2.3.4
+      gemfile: gemfiles/rails_4.2.gemfile
+
+    - rvm: 2.4.1
+      gemfile: gemfiles/rails_3.2.gemfile
+    - rvm: 2.4.1
+      gemfile: gemfiles/rails_4.0.gemfile
+    - rvm: 2.4.1
+      gemfile: gemfiles/rails_4.1.gemfile
+    - rvm: 2.4.1
+      gemfile: gemfiles/rails_4.2.gemfile
 
 sudo: false
 

data/Appraisals

@@ -1,4 +1,4 @@
-# Test against 3.2 -> 4.2
+# Test against 3.2 -> 5.1
 #
 appraise 'rails-3.2' do
   gem 'rails', '~> 3.2.0'
@@ -20,3 +20,13 @@ appraise 'rails-4.2' do
   gem 'rails', '~> 4.2.0'
   gem 'pg'
 end
+
+appraise 'rails-5.0' do
+  gem 'rails', '~> 5.0.0'
+  gem 'pg'
+end
+
+appraise 'rails-5.1' do
+  gem 'rails', '~> 5.1.0'
+  gem 'pg'
+end

data/CHANGELOG.md

@@ -0,0 +1,17 @@
+# Change Log
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](http://keepachangelog.com/) and this
+project adheres to [Semantic Versioning](http://semver.org/)
+
+## 1.1.1 - 2017-03-08
+
+### Fixed
+* Fix ActionDispatch::Reloader.to_prepare deprecation
+
+## 1.1.0 - 2016-09-27
+
+### Changed
+
+* Add support for Rails 5.

data/features/enterprise_authorization.feature

@@ -199,7 +199,11 @@ Feature: Role-based, flexible authorization
   Scenario: Authorizing a controller
     When I have an authorized Controller defined as
     """
-      before_filter :find_document
+      if ActionPack::VERSION::MAJOR == 5
+        before_action :find_document
+      else
+        before_filter :find_document
+      end
 
       authorize :show, [:document, :read ]
       authorize :edit, [:document, :write]

data/features/step_definitions/controller_steps.rb

@@ -14,9 +14,17 @@ When(/I invoke the Controller "(.+?)" action with query string "(.+?)"$/) do |ac
 
   @controller.current_user = @current_user
 
-  @controller.request = ActionDispatch::TestRequest.new('QUERY_STRING' => query).tap do |request|
-    request.params.update('action' => @action_name)
+  #:nocov:
+  if Rails::VERSION::MAJOR < 5
+    @controller.request = ActionDispatch::TestRequest.new('QUERY_STRING' => query).tap do |request|
+      request.params.update('action' => @action_name)
+    end
+  else
+    @controller.request = ActionDispatch::TestRequest.create('QUERY_STRING' => query).tap do |request|
+      request.action = @action_name
+    end
   end
+  #:nocov:
 
   @controller.response = ActionDispatch::TestResponse.new
 end

data/features/support/env.rb

@@ -1,4 +1,5 @@
 require 'bundler/setup'
+require 'rails'
 require 'byebug'
 
 require 'eaco/coverage'

data/gemfiles/rails_3.2.gemfile

@@ -4,6 +4,6 @@ source "https://rubygems.org"
 
 gem "rails", "~> 3.2.0"
 gem "pg"
-gem "activerecord-postgres-json", :require => false
+gem "activerecord-postgres-json"
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/rails_4.0.gemfile

@@ -5,4 +5,4 @@ source "https://rubygems.org"
 gem "rails", "~> 4.0.0"
 gem "pg"
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/rails_4.1.gemfile

@@ -5,4 +5,4 @@ source "https://rubygems.org"
 gem "rails", "~> 4.1.0"
 gem "pg"
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/rails_4.2.gemfile

@@ -5,4 +5,4 @@ source "https://rubygems.org"
 gem "rails", "~> 4.2.0"
 gem "pg"
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/rails_5.0.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 5.0.0"
+gem "pg"
+
+gemspec path: "../"

data/gemfiles/rails_5.1.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 5.1.0"
+gem "pg"
+
+gemspec path: "../"

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

@@ -10,8 +10,11 @@ module Eaco
         autoload :V40, 'eaco/adapters/active_record/compatibility/v40.rb'
         autoload :V41, 'eaco/adapters/active_record/compatibility/v41.rb'
         autoload :V42, 'eaco/adapters/active_record/compatibility/v42.rb'
+        autoload :V50, 'eaco/adapters/active_record/compatibility/v50.rb'
+        autoload :V51, 'eaco/adapters/active_record/compatibility/v51.rb'
 
-        autoload :Scoped, 'eaco/adapters/active_record/compatibility/scoped.rb'
+        autoload :Scoped,    'eaco/adapters/active_record/compatibility/scoped.rb'
+        autoload :Sanitized, 'eaco/adapters/active_record/compatibility/sanitized.rb'
 
         ##
         # Memoizes the given +model+ for later {#check!} calls.
@@ -23,7 +26,7 @@ module Eaco
         end
 
         ##
-        # Checks whether the target model is compatible.
+        # Checks whether ActiveRecord::Base is compatible.
         # Looks up the {#support_module} and includes it.
         #
         # @see #support_module
@@ -32,26 +35,21 @@ module Eaco
         #
         def check!
           layer = support_module
-          target.instance_eval { include layer }
+          ::ActiveRecord::Base.instance_eval { include layer }
         end
 
         private
 
-        ##
-        # @return [ActiveRecord::Base] associated with the model
-        #
-        def target
-          @model.base_class.superclass
-        end
-
         ##
         # @return [String] the +ActiveRecord+ major and minor version numbers
         #
         # Example: "42" for 4.2
         #
         def active_record_version
-          ver = target.parent.const_get(:VERSION)
-          [ver.const_get(:MAJOR), ver.const_get(:MINOR)].join
+          [
+            ::ActiveRecord::VERSION::MAJOR,
+            ::ActiveRecord::VERSION::MINOR
+          ].join
         end
 
         ##

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

@@ -0,0 +1,22 @@
+module Eaco
+  module Adapters
+    module ActiveRecord
+      class Compatibility
+
+        ##
+        # Aliases `sanitize` as `connection.quote` for ActiveRecord >= 5.1.
+        #
+        module Sanitized
+
+          ##
+          # Just returns +ActiveRecord::Base.connection.quote+.
+          #
+          def sanitize(d)
+            self.connection.quote(d)
+          end
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,25 @@
+module Eaco
+  module Adapters
+    module ActiveRecord
+      class Compatibility
+
+        ##
+        # Rails 5.0 support module.
+        #
+        # JSONB works correctly, but we need +.scoped+ so we revive it through
+        # the {Scoped} support module.
+        #
+        # @see Scoped
+        #
+        module V50
+          extend ActiveSupport::Concern
+
+          included do
+            extend Scoped
+          end
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,30 @@
+module Eaco
+  module Adapters
+    module ActiveRecord
+      class Compatibility
+
+        ##
+        # Rails 5.1 support module.
+        #
+        # JSONB works correctly, but we need +.scoped+ so we revive it through
+        # the {Scoped} support module.
+        #
+        # @see Scoped
+        #
+        # Sanitize has dissapeared in favour of quote.
+        #
+        # @see Sanitized
+        #
+        module V51
+          extend ActiveSupport::Concern
+
+          included do
+            extend Scoped
+            extend Sanitized
+          end
+        end
+
+      end
+    end
+  end
+end

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

@@ -25,7 +25,7 @@ module Eaco
         def accessible_by(actor)
           return scoped if actor.is_admin?
 
-          designators = actor.designators.map {|d| quote_value(d, nil) }
+          designators = actor.designators.map {|d| sanitize(d) }
 
           column = "#{connection.quote_table_name(table_name)}.acl"
 

data/lib/eaco/controller.rb

@@ -54,7 +54,12 @@ module Eaco
         actions.each {|action| authorization_permissions.update(action => target)}
 
         @_eaco_filter_installed ||= begin
-          before_filter :confront_eaco
+          if ActionPack::VERSION::MAJOR == 5
+            before_action :confront_eaco
+          else
+            before_filter :confront_eaco
+          end
+
           true
         end
       end

data/lib/eaco/cucumber/active_record.rb

@@ -95,11 +95,13 @@ module Eaco
       #
       # @raise [Errno::ENOENT] if the configuration file is not found.
       #
+      # :nocov:
+      # This isn't ran by Travis as we set EACO_AR_CONFIG, so Coveralls raises
+      # a false positive.
       def default_config_file
         Pathname.new('features/active_record.yml').realpath
 
       rescue Errno::ENOENT => error
-        # :nocov:
         raise error.class.new, <<-EOF.squeeze(' ')
 
           #{error.message}.
@@ -108,8 +110,8 @@ module Eaco
           default location, or specify your configuration file location by
           passing the `EACO_AR_CONFIG' environment variable.
         EOF
-        # :nocov:
       end
+      # :nocov:
 
       ##
       # Establish ActiveRecord connection using the given configuration hash

data/lib/eaco/dsl/acl.rb

@@ -167,8 +167,8 @@ module Eaco
       # @return [Class] the ORM base class.
       #
       def orm
-        if target.respond_to?(:base_class)
-          target.base_class.superclass # Active Record
+        if defined?(ActiveRecord::Base) && target.ancestors.include?(ActiveRecord::Base)
+          ActiveRecord::Base
         else
           target.superclass # Naive
         end

data/lib/eaco/railtie.rb

@@ -18,13 +18,17 @@ module Eaco
     # @!method parse_rules
     #
     initializer 'eaco.parse_rules' do
+      # :nocov:
       Eaco.parse_default_rules_file!
 
       unless Rails.configuration.cache_classes
-        ActionDispatch::Reloader.to_prepare do
-          Eaco.parse_default_rules_file!
+        if defined? ActiveSupport::Reloader
+          ActiveSupport::Reloader.to_prepare { Eaco.parse_default_rules_file! }
+        else
+          ActionDispatch::Reloader.to_prepare { Eaco.parse_default_rules_file! }
         end
       end
+      # :nocov:
     end
 
     ##
@@ -33,6 +37,7 @@ module Eaco
     # @!method install_controller_runtime
     #
     initializer 'eaco.install_controller_runtime' do
+      # :nocov:
       ActiveSupport.on_load :action_controller do
 
         ActionController::Base.instance_eval do
@@ -40,6 +45,7 @@ module Eaco
         end
 
       end
+      # :nocov:
     end
   end
 

data/lib/eaco/rake/default_task.rb

@@ -40,7 +40,6 @@ module Eaco
             run_specs
             run_cucumber
             report_coverage
-            generate_documentation
           end
 
         else

data/lib/eaco/rspec.rb

@@ -0,0 +1,13 @@
+RSpec::Matchers.define :be_able_to do |*args|
+  match do |actor|
+    actor.can?(*args)
+  end
+
+  failure_message do |actor|
+    "expected to be able to #{args.map(&:inspect).join(" ")}"
+  end
+
+  failure_message_when_negated do |actor|
+    "expected not to be able to #{args.map(&:inspect).join(" ")}"
+  end
+end

data/lib/eaco/version.rb

@@ -2,6 +2,6 @@ module Eaco
 
   # Current version
   #
-  VERSION = '1.0.0'
+  VERSION = '1.1.2'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eaco
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.2
 platform: ruby
 authors:
 - Marcello Barnaba
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-05 00:00:00.000000000 Z
+date: 2017-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -233,6 +233,7 @@ files:
 - ".travis.yml"
 - ".yardopts"
 - Appraisals
+- CHANGELOG.md
 - Gemfile
 - Guardfile
 - LICENSE.txt
@@ -256,17 +257,22 @@ files:
 - gemfiles/rails_4.0.gemfile
 - gemfiles/rails_4.1.gemfile
 - gemfiles/rails_4.2.gemfile
+- gemfiles/rails_5.0.gemfile
+- gemfiles/rails_5.1.gemfile
 - lib/eaco.rb
 - lib/eaco/acl.rb
 - lib/eaco/actor.rb
 - lib/eaco/adapters.rb
 - lib/eaco/adapters/active_record.rb
 - lib/eaco/adapters/active_record/compatibility.rb
+- lib/eaco/adapters/active_record/compatibility/sanitized.rb
 - lib/eaco/adapters/active_record/compatibility/scoped.rb
 - lib/eaco/adapters/active_record/compatibility/v32.rb
 - lib/eaco/adapters/active_record/compatibility/v40.rb
 - lib/eaco/adapters/active_record/compatibility/v41.rb
 - lib/eaco/adapters/active_record/compatibility/v42.rb
+- lib/eaco/adapters/active_record/compatibility/v50.rb
+- lib/eaco/adapters/active_record/compatibility/v51.rb
 - lib/eaco/adapters/active_record/postgres_jsonb.rb
 - lib/eaco/adapters/couchrest_model.rb
 - lib/eaco/adapters/couchrest_model/couchdb_lucene.rb
@@ -299,6 +305,7 @@ files:
 - lib/eaco/rake/default_task.rb
 - lib/eaco/rake/utils.rb
 - lib/eaco/resource.rb
+- lib/eaco/rspec.rb
 - lib/eaco/version.rb
 - spec/eaco/acl_spec.rb
 - spec/eaco/actor_spec.rb
@@ -333,7 +340,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Authorization framework
@@ -364,4 +371,3 @@ test_files:
 - spec/eaco/resource_spec.rb
 - spec/eaco_spec.rb
 - spec/spec_helper.rb
-has_rdoc: