pragma 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3011120ae28ea10f9c9c287c23c6b3644d139bff0850ef7cb94d0353b01807fb
-  data.tar.gz: d2bf641611df5b41a3f57264872e30e4e45d28c17b3fe7978693d412fa2c7e47
+  metadata.gz: 474ef14673089ce28a581b260a0c8913b3e1afe462eeb7cb840c406a29195316
+  data.tar.gz: 15174e9df88e96007f15475464d023eab01c92e3b791f8c0289382f65a01c279
 SHA512:
-  metadata.gz: e8c89a042285a28cf7abb1c79bf1f7d083b0b306badfb50d536944b246c6402f19459bcbe9962f35e9197c709f211fae0913a52578b2e29421f8e8e9a440990b
-  data.tar.gz: 6eaf14f5241b3dd29bc96c6a4de261f10f45899f8a5a79361e30b3e847eb50c27cd8fbfc7abd973f62e7208f0ee31401f8af13d667dce0135f352df43ff6c05b
+  metadata.gz: b1a710dd54c3a2aff7fa789293d160e0061c61e9d3fd86d3b00c8360efa6171de79719803c89a352ac6059895d3e1b4fdfe5d6c54e5e73e6ea0cbcdf68e0bc8c
+  data.tar.gz: 62440fa3450e7e40314e92d6a771c072657130cfd785b05cabf2becf736fb2429be7f012882308572791c2e6e113f52a206f199b5b549cc7385ac91d8d79748d

data/.rubocop.yml

@@ -5,6 +5,7 @@ AllCops:
   Include:
     - '**/Gemfile'
     - '**/Rakefile'
+    - '**/*.rb'
   Exclude:
    - 'bin/*'
    - 'db/**/*'
@@ -13,8 +14,6 @@ AllCops:
    - 'spec/rails_helper.rb'
    - 'spec/support/**/*'
    - 'config/**/*'
-   - '**/Rakefile'
-   - '**/Gemfile'
 
 RSpec/DescribeClass:
   Exclude:
@@ -52,7 +51,7 @@ Style/SignalException:
 Style/BracesAroundHashParameters:
   EnforcedStyle: context_dependent
 
-Lint/EndAlignment:
+Layout/EndAlignment:
   EnforcedStyleAlignWith: variable
   AutoCorrect: true
 

data/CHANGELOG.md

@@ -5,11 +5,25 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [Unreleased]
+
+## [2.4.0]
+
+### Added
+
+- Implemented `Boolean` scope
+- Added support for additional policy context via `policy.context`
+
+### Fixed
+
+- Added support for different capitalizations of API namespace
+- Fixed an issue where each filter would override the previous one
+ 
 ## [2.3.0]
 
 ### Added
 
-- Add support for Kaminari in `Pagination` macro
+- Added support for Kaminari in `Pagination` macro
 
 ### Changed
 
@@ -62,7 +76,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 First Pragma 2 release.
 
-[Unreleased]: https://github.com/pragmarb/pragma/compare/v2.3.0...HEAD
+[Unreleased]: https://github.com/pragmarb/pragma/compare/v2.4.0...HEAD
+[2.4.0]: https://github.com/pragmarb/pragma/compare/v2.3.0...v2.4.0
 [2.3.0]: https://github.com/pragmarb/pragma/compare/v2.2.0...v2.3.0
 [2.2.0]: https://github.com/pragmarb/pragma/compare/v2.1.1...v2.2.0
 [2.1.1]: https://github.com/pragmarb/pragma/compare/v2.1.0...v2.1.1

data/Gemfile

@@ -1,11 +1,8 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in pragma.gemspec
 gemspec
 
 gem 'pry'
-
-gem 'pragma-policy', github: 'pragmarb/pragma-policy'
-gem 'pragma-operation', github: 'pragmarb/pragma-operation'
-gem 'pragma-contract', github: 'pragmarb/pragma-contract'
-gem 'pragma-decorator', github: 'pragmarb/pragma-decorator'

data/README.md

@@ -1,7 +1,6 @@
 # Pragma
 
 [![Build Status](https://travis-ci.org/pragmarb/pragma.svg?branch=master)](https://travis-ci.org/pragmarb/pragma)
-[![Dependency Status](https://gemnasium.com/badges/github.com/pragmarb/pragma.svg)](https://gemnasium.com/github.com/pragmarb/pragma)
 [![Coverage Status](https://coveralls.io/repos/github/pragmarb/pragma/badge.svg?branch=master)](https://coveralls.io/github/pragmarb/pragma?branch=master)
 [![Maintainability](https://api.codeclimate.com/v1/badges/e51e8d7489eb72ab97ba/maintainability)](https://codeclimate.com/github/pragmarb/pragma/maintainability)
 
@@ -296,6 +295,11 @@ If the user is not authorized to perform the operation (i.e. if the policy's `#s
 to override the error handling logic, you can remove the `fail_fast` option and instead implement 
 your own `failure` step.
 
+The macro accepts the following options, which can be defined on the operation or at runtime:
+
+- `policy.context`: the context to use for the policy (optional, `current_user` is used if not
+  provided).
+
 ### Filtering
 
 **Used in:** Index
@@ -338,7 +342,8 @@ The following filters are available for ActiveRecord currently:
 - `Where`: adds a generic `WHERE` clause (requires `:condition` and passes the parameter's value as 
    `:value`).
 - `Scope`: calls a method on the collection (requires `:scope` and passes the parameter's value as 
-   the first argument).
+   the first argument);
+- `Boolean`: calls a method on the collection (requires `:scope` and doesn't pass any arguments).
 
 Support for more clauses as well as more ORMs will come soon.
 

data/Rakefile

@@ -1,6 +1,8 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+# frozen_string_literal: true
+
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec

data/lib/pragma.rb

@@ -15,6 +15,7 @@ require 'pragma/filter/like'
 require 'pragma/filter/ilike'
 require 'pragma/filter/where'
 require 'pragma/filter/scope'
+require 'pragma/filter/boolean'
 
 require 'pragma/operation/filter'
 

data/lib/pragma/filter/boolean.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Pragma
+  module Filter
+    class Boolean < Base
+      attr_reader :scope
+
+      def initialize(scope:, **other)
+        super(**other)
+        @scope = scope
+      end
+
+      def apply(relation:, **)
+        relation.public_send(scope)
+      end
+    end
+  end
+end

data/lib/pragma/macro/classes.rb

@@ -47,8 +47,9 @@ module Pragma
 
         def root_namespace(input, options)
           resource_namespace = resource_namespace(input, options)
-          return [] if resource_namespace.first == 'API'
-          resource_namespace[0..((resource_namespace.index('API') || 1) - 1)]
+          return [] if %w[API Api].include?(resource_namespace.first)
+          api_index = (resource_namespace.index('API') || resource_namespace.index('Api') || 1)
+          resource_namespace[0..(api_index - 1)]
         end
 
         def expected_model_class(input, options)

data/lib/pragma/macro/filtering.rb

@@ -34,7 +34,7 @@ module Pragma
             value = options['params'][filter.param]
             next unless value.present?
 
-            relation = filter.apply(relation: options['model'], value: value)
+            relation = filter.apply(relation: relation, value: value)
           end
 
           relation

data/lib/pragma/macro/pagination.rb

@@ -50,9 +50,7 @@ module Pragma
           # can't distinguish. Maybe there's a better way to do it?
           options['params'].tap do |p|
             %w[pagination.page_param pagination.per_page_param].each do |key|
-              if p[options[key]] && p[options[key]].respond_to?(:to_i)
-                p[options[key]] = p[options[key]].to_i
-              end
+              p[options[key]] = p[options[key]].to_i if p[options[key]]&.respond_to?(:to_i)
             end
           end
         end

data/lib/pragma/macro/policy.rb

@@ -10,7 +10,10 @@ module Pragma
     module Policy
       class << self
         def for(input, name, options, action = nil)
-          policy = options["policy.#{name}.class"].new(options['current_user'], options['model'])
+          policy = options["policy.#{name}.class"].new(
+            options['policy.context'] || options['current_user'],
+            options['model']
+          )
 
           action_name = action.is_a?(Proc) ? action.call(options) : action
           action_name ||= input.class.operation_name

data/lib/pragma/operation/index.rb

@@ -20,8 +20,12 @@ module Pragma
         options['model'] = options['model.class'].all
       end
 
-      def scope!(options, current_user:, model:, **)
-        options['model'] = options['policy.default.scope.class'].new(current_user, model).resolve
+      # TODO: Turn this into a macro.
+      def scope!(options, model:, **)
+        options['model'] = options['policy.default.scope.class'].new(
+          options['policy.context'] || options['current_user'],
+          model
+        ).resolve
       end
 
       def respond!(options, **)

data/lib/pragma/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Pragma
-  VERSION = '2.3.0'
+  VERSION = '2.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pragma
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Alessandro Desantis
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-28 00:00:00.000000000 Z
+date: 2018-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pragma-contract
@@ -199,6 +199,7 @@ files:
 - lib/pragma.rb
 - lib/pragma/decorator/error.rb
 - lib/pragma/filter/base.rb
+- lib/pragma/filter/boolean.rb
 - lib/pragma/filter/equals.rb
 - lib/pragma/filter/ilike.rb
 - lib/pragma/filter/like.rb