simon_says 0.3.0.alpha.1 → 0.3.0.alpha.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c6bf629f417e1bd66bf820ee52c333aacfe0e25a
-  data.tar.gz: 340919dff4421094ec54d4b75e0446b54f522a10
+SHA256:
+  metadata.gz: ab60ddcb71d25abd747c76c6ab0758b7cb3e2e4bc7cc3fef23cab0b42abc1d1f
+  data.tar.gz: bd0e7a95fcf5669a560028034fcf4f15386b00d73d9170bdaab0cb328ee7099f
 SHA512:
-  metadata.gz: c2f679703c9bd5fb566ee181498131d069c6ad5e3de83957cb2e8a8a3777a6c194589a399a58e4272906c1e8e89f309101ad23103f1b5e515e7d747edc0c9055
-  data.tar.gz: 1aae317daf655c2dcbcf425ef2eeeff492212003a4256501f72c5278239aeb8f57b861051a407d8f35af5467e8f2f10466695e9a5eeaec887c3d050c02129ef4
+  metadata.gz: 176d279798d67b2ca54c014397766c79ccb735d35c5ff790eb0a57ae3f27be7c4920a1492a4823d7611d7ad3855dec84012a519d0c9a56ec7be97ff943970ff1
+  data.tar.gz: '098fb9a5b568ae853a9b7840910777a932a8aa0796a030281acc890b2bdb9006ba87df04b835c394350d2cac1d5d215faf2f139441d97a18ff7506a18e4b2303'

data/.travis.yml

@@ -1,8 +1,12 @@
 language: ruby
 cache: bundler
+before_install:
+  - gem update --system
+  - gem install bundler
 install: bundle install --jobs=3 --retry=3
 rvm:
-  - "2.3.3"
-  - "2.4.0"
+  - "2.6.3"
+  - "2.5.4"
+  - "2.4.6"
 script:
   - bundle exec rake test

data/lib/simon_says/roleable.rb

@@ -93,34 +93,27 @@ module SimonSays
           RUBY_EVAL
         end
 
-        # Try to declare ActiveRecord scopes or Sequel subsets for finding
-        # records with a given set of roles
+        Roleable.define_orm_scope self, "with_#{name}" do |*args|
+          clause = "#{name}_mask & ?"
+          values = Roleable.cast_roles_to_ints(roles, *args)
 
-        scope_method = respond_to?(:scope) ? :scope : respond_to?(:subset) ? :subset : nil
-
-        if scope_method
-          send scope_method, "with_#{name}", ->(*args) {
-            clause = "#{name}_mask & ?"
-            values = Roleable.roles2ints(roles, *args)
-
-            query = where(clause, values.shift)
-            query = query.or(where(clause, values.shift)) until values.empty?
-            query
-          }
+          query = where(clause, values.shift)
+          query = query.or(where(clause, values.shift)) until values.empty?
+          query
+        end
 
-          send scope_method, "with_all_#{name}", ->(*args) {
-            clause = "#{name}_mask & ?"
-            values = Roleable.roles2ints(roles, *args)
+        Roleable.define_orm_scope self, "with_all_#{name}" do |*args|
+          clause = "#{name}_mask & ?"
+          values = Roleable.cast_roles_to_ints(roles, *args)
 
-            query = where(clause, values.shift)
-            query = query.where(clause, values.shift) until values.empty?
-            query
-          }
+          query = where(clause, values.shift)
+          query = query.where(clause, values.shift) until values.empty?
+          query
         end
       end
     end
 
-    def self.roles2ints(defined_roles, *args)
+    def self.cast_roles_to_ints(defined_roles, *args)
       values = args.map do |arg|
         index = defined_roles.index(arg)
         index ? 2 ** index : nil
@@ -128,5 +121,13 @@ module SimonSays
 
       values.tap(&:flatten!)
     end
+
+    def self.define_orm_scope(model, name, &block)
+      if defined? ActiveRecord
+        model.scope name, block
+      elsif defined? Sequel
+        model.dataset_module { subset name, &block }
+      end
+    end
   end
 end

data/lib/simon_says/version.rb

@@ -1,3 +1,3 @@
 module SimonSays
-  VERSION = '0.3.0.alpha.1'
+  VERSION = '0.3.0.alpha.3'
 end

data/simon_says.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "activesupport", ">= 4.0"
 
-  spec.add_development_dependency "bundler", "~> 1.9"
+  spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rails", ">= 4.0", "< 5.2"
   spec.add_development_dependency "responders", "~> 2.0"

data/test/test_helper.rb

@@ -1,4 +1,5 @@
-require 'mocha/mini_test'
+require 'minitest/unit'
+require 'mocha/minitest'
 
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 require 'simon_says' # HELLO SIMON

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simon_says
 version: !ruby/object:Gem::Version
-  version: 0.3.0.alpha.1
+  version: 0.3.0.alpha.3
 platform: ruby
 authors:
 - Michael Coyne
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-26 00:00:00.000000000 Z
+date: 2019-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -32,14 +32,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -236,7 +236,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.9
 signing_key: 
 specification_version: 4
 summary: Light-weight, declarative authorization and access control for Rails