simon_says 0.0.27b6 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19de05c0bda5120ccdd27df9f861c3d436982c25
-  data.tar.gz: 21ff0c7d067c9edbfeabf8bfb83a6b9be301e183
+  metadata.gz: 685f3f8f7cedb32fba2e7b051480920658a8da7e
+  data.tar.gz: a09f1909ec655d6653737c4bf1fd78a9e3c7d8d8
 SHA512:
-  metadata.gz: 0fdb85e2380e4505ddcc07e0106f83260d41224021a96411b58bdd162a21c94c2cc2c5a2d97dfb144364ddb342c0e0873f5e7b9c1006d4a9cca16889cf22e558
-  data.tar.gz: 7ae83204bb804a8e9a0fbbe75582c57644a2e60c9a5fab752014c1ffdf011f292bd738f842152a2c65bdb5ae7c5e6baa214b1c7634397e6eb584d49407e644b6
+  metadata.gz: f4f436bc143a52f7ca03a90335fb227b1aa9794f1ed462c9c53cb5b26263538f603b23d37ec4cf4a5d7a7a8a192931d7b635d518bf5d28390b624cfca591ce08
+  data.tar.gz: 0f677b3f2830329eb4765e082321a787e5d2037bad8b72f79af7471bff238c8604b7fc1f0a0a0c631c15787f45fbcbfcffb76e28b18c88f4e8a98c920a1efc7b

data/.gitignore

@@ -12,5 +12,8 @@
 *.o
 *.a
 mkmf.log
+.ruby-version
+
+*.gem
 
 /test/rails_app/db/*.sqlite3

data/.travis.yml

@@ -1,3 +1,11 @@
 language: ruby
+cache: bundler
+install: bundle install --jobs=3 --retry=3
 rvm:
-  - 2.1.3
+  - "2.2.2"
+before_script:
+  - cd test/rails_app/
+  - RAILS_ENV=test bundle exec rake db:migrate db:fixtures:load
+  - cd ../..
+script:
+  - bundle exec rake test

data/Gemfile

@@ -1,4 +1,5 @@
 source 'https://rubygems.org'
+ruby '2.2.3'
 
 # Specify your gem's dependencies in auth_lib.gemspec
 gemspec
@@ -9,5 +10,9 @@ group :development do
   gem 'rdoc'
 
   gem 'guard'
-  gem 'guard-minitest'
+  gem 'guard-minitest', "2.3.2"
+end
+
+group :test do
+  gem "codeclimate-test-reporter", require: false
 end

data/README.md

@@ -4,152 +4,10 @@
 Logo](https://raw.githubusercontent.com/SimplyBuilt/SimonSays/master/SimonSays.png)
 
 This gem is a simple, declarative, role-based access control system for Rails that
-works great with devise! Take a look at the
-[docs](http://simplybuilt.github.io/SimonSays) for more details!
+works great with devise! Take a look at the [website](http://simonsays.onsimplybuilt.com) or
+[docs](http://www.rubydoc.info/github/SimplyBuilt/SimonSays/) for more details!
 
-## Installation
-
-Add this line to your application's Gemfile:
-
-```ruby
-gem 'simon_says'
-```
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install simon_says
-
-## Usage
-
-SimonSays consists of two parts. One is a model concern called
-`Roleable`. The other is a controller concern called `Authorizer`. The
-idea is that you give users some set of roles and find and authorize
-against those roles on a controller (and action) basis.
-
-### Roleable
-
-First, we need to define roles. Generally speaking roles will exist on
-either User models or on relationship models (like a through model linking a
-User to another resource).
-
-Here's a quick example:
-
-    class User < ActiveRecord::Base
-      include SimonSays::Roleable
-
-      has_roles :add, :edit, :delete
-    end
-
-User can now have none or one more roles:
-
-    User.new.roles
-    => []
-
-    User.new.tap { |u| u.roles = :add, :edit }.roles
-    => [:add, :edit]
-
-The roles are stored as an integer. When using `Roleable` you need add a
-`roles_mask` column. Note that we do not have any generators for this yet.
-Feel free to fork add them!
-
-You can customize this attribute using the `:as` option. For example:
-
-    class Admin < ActiveRecord::Base
-      include SimonSays::Roleable
-
-      has_roles :design, :support, :moderator, as: :access
-    end
-
-    Admin.new.access
-    => []
-
-    Admin.new(access: :support).access
-    => [:support]
-
-You can also use `Roleable` on through models. For example:
-
-    class Membership < ActiveRecord::Base
-      include SimonSays::Roleable
-
-      belongs_to :user
-      belongs_to :document
-
-      has_roles :download, :edit, :delete,
-    end
-
-There will be several methods as well as a scope generated by
-calling `has_roles`.  See below for more details on the methods
-generated by `Roleable`. Be sure to also checkout the
-[docs](http://simplybuilt.github.io/SimonSays/SimonSays/Roleable/ClassMethods.html)
-for more details!
-
-### Authorizer
-
-Next up is the `Authorizer`. This concern provides several methods that
-can be used within your controllers to declaratively find resources and
-ensuring certain role-based conditions are met.
-
-*Please note*, certain assumptions are made with `Authorizer`. Building
-upon the above `User` and `Admin` models, `Authorizer` would assume
-there is a `current_user` and `current_admin`. If these models
-correspond to devise scopes this would be the case by default.
-Additionally there would need to a be an `authenticate_user!` and
-`authenticate_admin!` method, which devise provides as well.
-
-Eventually, we would like to see better customization around the
-authentication aspects. This library is intended to solve the problem of
-authorization and access control. It is not an authentication library.
-
-The first step is to include the concern within the
-`ApplicationController` and to configure the default authorization
-method:
-
-    class ApplicationController < ActionController::Base
-      include SimonSays::Authorizer
-    end
-
-Let's start with an example; here we'll create a reports resource that
-only Admin's with support access to use. The roles are supplied within
-the `authorize_resource` method. Note that, multiple roles can be
-supplied; access is granted if one or more are met.
-
-    # routes.rb
-    # Reports resource for Admins
-    resources :reports
-
-    # app/controllers/reports_controller.rb
-    class ReportsController < ApplicationController
-      authorize_resource :admin, :support
-      find_resource :report, except: [:index, :new, :create]
-    end
-
-Here's another example using the `Membership` through model.
-
-    # routes.rb
-    resources :documents
-
-    # app/controllers/documents_controller.rb
-    class DocumentsController < ApplicationController
-      authenticate :user
-
-      find_and_authorize :documents, :edit, through: :memberships, only: [:edit, :update]
-      find_and_authorize :documents, :delete, through: :memberships, only: :destroy
-    end
-
-The document model will not be found if the membership relationship does
-not exist and an `ActiveRecord::NotFound` exception will be raised.
-
-If the membership record exists, but the role conditions are not met,
-`Authorizer` will raise a `Denied` exception.
-
-If the document is found and the user has the access to it. It will be
-set as the `@document` instance variable. Make sure to checkout the
-[docs](http://simplybuilt.github.io/SimonSays/SimonSays/Authorizer/ClassMethods.html)
-for more details!
+![Build Status](https://travis-ci.org/SimplyBuilt/SimonSays.svg)
 
 ## Contributing
 

data/lib/simon_says/authorizer.rb

@@ -2,7 +2,7 @@ module SimonSays
   module Authorizer
     extend ActiveSupport::Concern
 
-    class Denied < Exception
+    class Denied < StandardError
       def initialize(as, required, actual)
         # TODO i18n for err message (as should be singluarized with 1 flag)
         super "Access denied; #{required * ', '} role is required. Current access is #{actual * ', '}"
@@ -17,7 +17,7 @@ module SimonSays
     # available to your controllers.
     module ClassMethods
       # Authentication convenience method (to keep things declarative).
-      # This method just setups a +before_filter+
+      # This method just setups a +before_action+
       #
       # * +scope+ is a symbol or string and should correspond to some sort
       #   of authentication scope (ie: +authenticate_user!+)
@@ -28,7 +28,7 @@ module SimonSays
       #    authenticate :user, expect: :index
       #
       def authenticate(scope, opts = {})
-        before_filter :"authenticate_#{scope}!", filter_options(opts)
+        before_action :"authenticate_#{scope}!", filter_options(opts)
       end
 
       # Find and authorize a resource.
@@ -43,7 +43,7 @@ module SimonSays
       def find_and_authorize(resource, *roles)
         opts = roles.extract_options!
 
-        before_filter(filter_options(opts)) do
+        before_action(filter_options(opts)) do
           find_resource resource, opts
 
           authorize roles, opts unless roles.empty?
@@ -55,7 +55,7 @@ module SimonSays
       # * +resource+ the name of the resource to find
       # * +opts+ filter options
       def find_resource(resource, opts = {})
-        before_filter(filter_options(opts)) do
+        before_action(filter_options(opts)) do
           find_resource resource, opts
         end
       end
@@ -70,13 +70,13 @@ module SimonSays
       # * +roles+ one or more role symbols
       # * the last argument may also be a filter options hash
       def authorize_resource(resource, *roles)
-        before_filter(filter_options(roles.extract_options!)) do
+        before_action(filter_options(roles.extract_options!)) do
           authorize(roles, { resource: resource })
         end
       end
 
       def filter_options(options) # :nodoc:
-        { except: options.delete(:except), only: options.delete(:only) }
+        { except: options.delete(:except), only: options.delete(:only), prepend: options.delete(:prepend) }
       end
     end
 
@@ -138,7 +138,8 @@ module SimonSays
         scope = send(self.class.default_authorization_scope)
 
       elsif options[:from]
-        scope = instance_variable_get("@#{options[:from]}")
+        scope = instance_variable_get("@#{options[:from]}") || send(options[:from])
+
       else
         klass = (options[:class_name] || resource).to_s
         # TODO support array of namespaces?

data/lib/simon_says/roleable.rb

@@ -76,6 +76,8 @@ module SimonSays
 
           def #{name}=(args)
             args = [args] unless Array === args
+
+            args.compact!
             args.map!(&:to_sym)
 
             self[:#{name}_mask] = (args & #{const}).map { |i| 2 ** #{const}.index(i) }.sum
@@ -99,7 +101,7 @@ module SimonSays
         # Declare a scope for finding records with a given role set
         # TODO support an array roles (must match ALL)
         scope "with_#{name}", ->(role) {
-          where("(#{name}_mask & ?) > 0", 2**roles.index(role))
+          where("(#{name}_mask & ?) > 0", 2**roles.index(role.to_sym))
         }
       end
     end

data/lib/simon_says/version.rb

@@ -1,3 +1,3 @@
 module SimonSays
-  VERSION = "0.0.27b6"
+  VERSION = "0.1.0"
 end

data/simon_says.gemspec

@@ -6,7 +6,7 @@ require 'simon_says/version'
 Gem::Specification.new do |spec|
   spec.name          = "simon_says"
   spec.version       = SimonSays::VERSION
-  spec.authors       = ["Michael Coyne"]
+  spec.authors       = ["Michael Coyne", "Cameron Craig", "SimplyBuilt"]
   spec.email         = ["mikeycgto@gmail.com"]
   spec.summary       = %q{Light-weight, declarative authorization and access control for Rails}
   spec.description   = %q{This gem is a simple, easy-to-use declarative role-based access control system for Rails}
@@ -18,10 +18,11 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "activesupport", "~> 4.0"
+  spec.add_dependency "activesupport", ">= 4.0", "< 5.1"
 
-  spec.add_development_dependency "bundler", "~> 1.7"
+  spec.add_development_dependency "bundler", "~> 1.9"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rails", "~> 4.1"
+  spec.add_development_dependency "rails", ">= 4.0", "< 5.1"
+  spec.add_development_dependency "responders", "~> 2.0"
   spec.add_development_dependency "mocha", "~> 1.1"
 end

data/test/controllers/admin/reports_controller_test.rb

@@ -9,7 +9,7 @@ class Admin::ReportsControllerTest < ActionController::TestCase
   test "index with access" do
     @controller.current_admin = @support
 
-    get :index, format: :json
+    get :index, params: { format: :json }
 
     assert_response :success
   end
@@ -18,7 +18,7 @@ class Admin::ReportsControllerTest < ActionController::TestCase
     @controller.current_admin = @marketing
 
     assert_raises SimonSays::Authorizer::Denied do
-      get :index, format: :json
+      get :index, params: { format: :json }
     end
   end
 
@@ -26,7 +26,7 @@ class Admin::ReportsControllerTest < ActionController::TestCase
     @controller.current_admin = @support
 
     assert_difference 'Admin::Report.count' do
-      post :create, report: { title: 'Test' }, format: :json
+      post :create, params: { report: { title: 'Test' }, format: :json }
     end
   end
 
@@ -34,16 +34,15 @@ class Admin::ReportsControllerTest < ActionController::TestCase
     @controller.current_admin = @marketing
 
     assert_raises SimonSays::Authorizer::Denied do
-      post :create, report: { title: 'Test' }, format: :json
+      post :create, params: { report: { title: 'Test' }, format: :json }
     end
   end
 
   test "show with access" do
     @controller.current_admin = @support
 
-    get :show, id: admin_reports(:report_one), format: :json
+    get :show, params: { id: admin_reports(:report_one), format: :json }
 
-    refute_nil assigns(:report)
     assert_response :success
   end
 
@@ -51,16 +50,15 @@ class Admin::ReportsControllerTest < ActionController::TestCase
     @controller.current_admin = @marketing
 
     assert_raises SimonSays::Authorizer::Denied do
-      get :show, id: admin_reports(:report_one), format: :json
+      get :show, params: { id: admin_reports(:report_one), format: :json }
     end
   end
 
   test "update with access" do
     @controller.current_admin = @support
 
-    patch :show, id: admin_reports(:report_one), report: { title: 'Test' }, format: :json
+    patch :show, params: { id: admin_reports(:report_one), report: { title: 'Test' }, format: :json }
 
-    refute_nil assigns(:report)
     assert_response :success
   end
 
@@ -68,7 +66,7 @@ class Admin::ReportsControllerTest < ActionController::TestCase
     @controller.current_admin = @marketing
 
     assert_raises SimonSays::Authorizer::Denied do
-      patch :show, id: admin_reports(:report_one), report: { title: 'Test' }, format: :json
+      patch :show, params: { id: admin_reports(:report_one), report: { title: 'Test' }, format: :json }
     end
   end
 
@@ -76,17 +74,15 @@ class Admin::ReportsControllerTest < ActionController::TestCase
     @controller.current_admin = @support
 
     assert_difference 'Admin::Report.count', -1 do
-      delete :destroy, id: admin_reports(:report_one), format: :json
+      delete :destroy, params: { id: admin_reports(:report_one), format: :json }
     end
-
-    refute_nil assigns(:report)
   end
 
   test "destroy without access" do
     @controller.current_admin = @marketing
 
     assert_raises SimonSays::Authorizer::Denied do
-      delete :destroy, id: admin_reports(:report_one), format: :json
+      delete :destroy, params: { id: admin_reports(:report_one), format: :json }
     end
   end
 end

data/test/controllers/documents_controller_test.rb

@@ -1,5 +1,5 @@
 require 'test_helper'
-
+require 'pry'
 class DocumentsControllerTest < ActionController::TestCase
   setup do
     @alpha = documents(:alpha)
@@ -20,9 +20,8 @@ class DocumentsControllerTest < ActionController::TestCase
   test "show" do
     as_bob!
 
-    get :show, id: @alpha.id, format: :json
+    get :show, params: { id: @alpha.id, format: "json" }
 
-    refute_nil assigns(:document)
     assert_response :success
   end
 
@@ -30,16 +29,15 @@ class DocumentsControllerTest < ActionController::TestCase
     as_jim!
 
     assert_raises ActiveRecord::RecordNotFound do
-      get :show, id: @alpha.id, format: :json
+      get :show, params: { id: @alpha.id, format: :json }
     end
   end
 
   test "update with access" do
     as_bob!
 
-    patch :update, id: @alpha.id, document: { title: 'Test' }, format: :json
+    patch :update, params: { id: @alpha.id, document: { title: 'Test' }, format: :json }
 
-    refute_nil assigns(:document)
     assert_response :success
   end
 
@@ -47,7 +45,7 @@ class DocumentsControllerTest < ActionController::TestCase
     as_bob!
 
     assert_raises SimonSays::Authorizer::Denied do
-      patch :update, id: @beta.id, document: { title: 'Test' }, format: :json
+      patch :update, params: { id: @beta.id, document: { title: 'Test' }, format: :json }
     end
   end
 
@@ -55,7 +53,7 @@ class DocumentsControllerTest < ActionController::TestCase
     as_jim!
 
     assert_raises ActiveRecord::RecordNotFound do
-      patch :update, id: @alpha.id, document: { title: 'Test' }, format: :json
+      patch :update, params: { id: @alpha.id, document: { title: 'Test' }, format: :json }
     end
   end
 
@@ -63,17 +61,15 @@ class DocumentsControllerTest < ActionController::TestCase
     as_bob!
 
     assert_difference 'Document.count', -1 do
-      delete :destroy, id: @alpha.id, format: :json
+      delete :destroy, params: { id: @alpha.id, format: :json }
     end
-
-    refute_nil assigns(:document)
   end
 
   test "destroy without access" do
     as_bob!
 
     assert_raises SimonSays::Authorizer::Denied do
-      delete :destroy, id: @beta.id, format: :json
+      delete :destroy, params: { id: @beta.id, format: :json }
     end
   end
 
@@ -81,7 +77,7 @@ class DocumentsControllerTest < ActionController::TestCase
     as_jim!
 
     assert_raises ActiveRecord::RecordNotFound do
-      delete :destroy, id: @beta.id, format: :json
+      delete :destroy, params: { id: @beta.id, format: :json }
     end
   end
 end

data/test/rails_app/config/application.rb

@@ -1,6 +1,7 @@
 require File.expand_path('../boot', __FILE__)
 
 require 'rails/all'
+require 'responders'
 
 # Require the gems listed in Gemfile, including any gems
 # you've limited to :test, :development, or :production.
@@ -8,17 +9,6 @@ Bundler.require(*Rails.groups)
 
 module RailsApp
   class Application < Rails::Application
-    # Settings in config/environments/* take precedence over those specified here.
-    # Application configuration should go into files in config/initializers
-    # -- all .rb files in that directory are automatically loaded.
-
-    # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
-    # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
-    # config.time_zone = 'Central Time (US & Canada)'
-
-    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
-    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
-    # config.i18n.default_locale = :de
   end
 end
 

data/test/rails_app/config/environments/test.rb

@@ -13,8 +13,10 @@ Rails.application.configure do
   config.eager_load = true
 
   # Configure static asset server for tests with Cache-Control for performance.
-  config.serve_static_assets  = true
-  config.static_cache_control = 'public, max-age=3600'
+  config.public_file_server.enabled  = true
+  config.public_file_server.headers =  { 'Cache-Control' => 'public, max-age=3600' }
+
+  config.active_support.test_order = :random
 
   # Show full error reports and disable caching.
   config.consider_all_requests_local       = true
@@ -36,4 +38,8 @@ Rails.application.configure do
 
   # Raises error for missing translations
   # config.action_view.raise_on_missing_translations = true
+
+  # Use transactional fixtures
+  config.use_transactional_fixtures = true
+
 end

data/test/rails_app/db/schema.rb

@@ -13,25 +13,25 @@
 
 ActiveRecord::Schema.define(version: 20141017140833) do
 
-  create_table "admin_reports", force: true do |t|
-    t.string   "title"
+  create_table "admin_reports", force: :cascade do |t|
+    t.string   "title",      limit: 255
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
-  create_table "admins", force: true do |t|
+  create_table "admins", force: :cascade do |t|
     t.integer  "access_mask"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
-  create_table "documents", force: true do |t|
-    t.string   "title"
+  create_table "documents", force: :cascade do |t|
+    t.string   "title",      limit: 255
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
-  create_table "memberships", force: true do |t|
+  create_table "memberships", force: :cascade do |t|
     t.integer  "user_id"
     t.integer  "document_id"
     t.integer  "roles_mask",  default: 0
@@ -39,7 +39,7 @@ ActiveRecord::Schema.define(version: 20141017140833) do
     t.datetime "updated_at"
   end
 
-  create_table "users", force: true do |t|
+  create_table "users", force: :cascade do |t|
     t.datetime "created_at"
     t.datetime "updated_at"
   end

data/test/rails_app/test/fixtures/admins.yml

@@ -8,4 +8,4 @@ marketing:
   access_mask: 4
 
 all:
-  access_mask: <%= Admin::ACCESS.size.times.map { |n| n ** 2 }.sum %>
+  access_mask: <%= (0..Admin::ACCESS.size - 1).map { |n| 2 ** n }.sum %>

data/test/rails_app/test/fixtures/memberships.yml

@@ -1,7 +1,7 @@
 mb1:
   user: bob
   document: alpha
-  roles_mask: <%= Membership::ROLES.size.times.map { |n| 2 ** n }.sum %>
+  roles_mask: <%= (0..Membership::ROLES.size - 1).map { |n| 2 ** n }.sum %>
 
 mb2:
   user: bob

data/test/simon_says/roleable_test.rb

@@ -1,197 +1,151 @@
 require 'test_helper'
 
 class RoleableTest < ActiveSupport::TestCase
-  setup do
-    create_test_table :test_widgets do |t|
-      t.integer :roles_mask, default: 0
-      t.integer :access_mask, default: 0
-    end
-
-    @klass = Class.new(ActiveRecord::Base) do
-      self.table_name = 'test_widgets'
-
-      def self.name
-        'User'
-      end
-
-      include SimonSays::Roleable
-
-      has_roles :read, :write
-    end
-
-    @as_klass = Class.new(ActiveRecord::Base) do
-      self.table_name = 'test_widgets'
-
-      def self.name
-        'Admin'
-      end
-
-      include SimonSays::Roleable
-
-      has_roles :moderator, :support, :editor, as: :access
-    end
-
-    @instance = @klass.new
-    @as_instance = @as_klass.new
-  end
-
   test "adds constant" do
-    assert_equal [:read, :write], @klass::ROLES
+    assert_equal [:download, :fork, :edit, :delete], Membership::ROLES
   end
 
   test "adds constant with :as option" do
-    assert_equal [:moderator, :support, :editor], @as_klass::ACCESS
+    assert_equal [:support, :content, :marketing], Admin::ACCESS
   end
 
   test "adds roles method" do
-    assert @instance.respond_to?(:roles)
-  end
-
-  test "adds roles= method" do
-    assert @instance.respond_to?(:roles=)
+    assert_equal Membership::ROLES, memberships(:mb1).roles
   end
 
   test "adds reader method with :as option" do
-    assert @as_instance.respond_to?(:access)
-  end
-
-  test "adds writer method with :as option" do
-    assert @as_instance.respond_to?(:access=)
-  end
-
-  test 'roles returns array of symbols' do
-    @instance.roles_mask = 3
-
-    assert_equal [:read, :write], @instance.roles
-  end
-
-  test 'roles returns array of symbols with :as option' do
-    @as_instance.access_mask = 6
-
-    assert_equal [:support, :editor], @as_instance.access
+    assert_equal Admin::ACCESS, admins(:all).access
   end
 
-  test "set single symbol" do
-    @instance.roles = :read
+  test "set roles with multiple symbols" do
+    mbr = memberships(:mb2)
+    mbr.roles = :download, :fork
 
-    assert_equal 1, @instance.roles_mask
+    assert_equal [:download, :fork], mbr.roles
   end
 
-  test "set single symbol with :as option" do
-    @as_instance.access = :moderator
+  test "set roles with multiple symbols with :as option" do
+    adm = admins(:support)
+    adm.access = :support, :marketing
 
-    assert_equal 1, @as_instance.access_mask
+    assert_equal [:support, :marketing], adm.access
   end
 
-  test "set single string" do
-    @instance.roles = 'write'
+  test "set roles with single symbol" do
+    mbr = memberships(:mb2)
+    mbr.roles = :download
 
-    assert_equal 2, @instance.roles_mask
+    assert_equal [:download], mbr.roles
   end
 
-  test "set single string with :as option" do
-    @as_instance.access = 'support'
+  test "set roles with single symbol with :as option" do
+    adm = admins(:support)
+    adm.access = :marketing
 
-    assert_equal 2, @as_instance.access_mask
+    assert_equal [:marketing], adm.access
   end
 
-  test "set with multi symbols" do
-    @instance.roles = :read, :write
+  test "set roles with single string" do
+    mbr = memberships(:mb2)
+    mbr.roles = 'download'
 
-    assert_equal 3, @instance.roles_mask
+    assert_equal [:download], mbr.roles
   end
 
-  test "set with multi symbols with :as option" do
-    @as_instance.access = :support, :editor
+  test "set roles with single string with :as option" do
+    adm = admins(:support)
+    adm.access = 'marketing'
 
-    assert_equal 6, @as_instance.access_mask
+    assert_equal [:marketing], adm.access
   end
 
-  test "set with multi strings" do
-    @instance.roles = 'read', 'write'
+  test "set roles with multiple strings" do
+    mbr = memberships(:mb2)
+    mbr.roles = 'download', 'fork'
 
-    assert_equal 3, @instance.roles_mask
+    assert_equal [:download, :fork], mbr.roles
   end
 
-  test "set with multi strings with :as option" do
-    @as_instance.access = 'support', 'editor'
+  test "set roles with multiples strings with :as option" do
+    adm = admins(:support)
+    adm.access = 'marketing', 'content'
 
-    assert_equal 6, @as_instance.access_mask
+    assert_equal [:content, :marketing], adm.access
   end
 
-  test 'set with array of strings' do
-    @instance.roles = ['read', 'write']
+  test 'ignores unknown roles' do
+    mbr = memberships(:mb2)
+    mbr.roles = :download, :unknown
 
-    assert_equal 3, @instance.roles_mask
+    assert_equal [:download], mbr.roles
   end
 
-  test 'set with array of strings with :as option' do
-    @as_instance.access = ['support', 'editor']
+  test 'handles out of order roles' do
+    mbr = memberships(:mb2)
+    mbr.roles = Membership::ROLES.reverse
 
-    assert_equal 6, @as_instance.access_mask
-  end
-
-  test "set out order" do
-    @as_instance.access = :editor, :moderator, :support
-
-    assert_equal 7, @as_instance.access_mask
+    assert_equal Membership::ROLES, mbr.roles
   end
 
   test "has_roles? without any roles" do
-    assert_equal false, @instance.has_roles?(:read)
+    mbr = memberships(:mb1)
+    mbr.roles = nil
+
+    assert_equal false, mbr.has_roles?(:download)
   end
 
   test "has_roles? with one role" do
-    @instance.roles = :read
+    mbr = memberships(:mb1)
+    mbr.roles = :download
 
-    assert_equal true, @instance.has_roles?(:read)
+    assert_equal true, mbr.has_roles?(:download)
   end
 
   test "has_roles? with multiple role" do
-    @instance.roles = :read, :write
+    mbr = memberships(:mb1)
+    mbr.roles = :download, :fork, :edit
 
-    assert_equal true, @instance.has_roles?(:read, :write)
+    assert_equal true, mbr.has_roles?(:download, :fork, :edit)
   end
 
   test "has_access? without any roles" do
-    assert_equal false, @as_instance.has_access?(:support)
+    adm = admins(:support)
+    adm.access = nil
+
+    assert_equal false, adm.has_access?(:support)
   end
 
   test "has_access? with one role" do
-    @as_instance.access = :editor
+    adm = admins(:support)
+    adm.access = :marketing
 
-    assert_equal true, @as_instance.has_access?(:editor)
+    assert_equal true, adm.has_access?(:marketing)
   end
 
   test "has_access? with multiple role" do
-    @as_instance.access = :moderator, :support
+    adm = admins(:support)
+    adm.access = :support, :content, :marketing
 
-    assert_equal true, @as_instance.has_access?(:moderator, :support)
+    assert_equal true, adm.has_access?(:support, :content, :marketing)
   end
 
-  test "named scope" do
-    @klass.create roles: :read
-    @klass.create roles: :write
-
-    assert_equal [1, 1], [
-      @klass.with_roles(:read).count,
-      @klass.with_roles(:write).count
+  test "named scope with_roles" do
+    assert_equal [2, 1], [
+      Membership.with_roles(:download).count,
+      Membership.with_roles(:delete).count
     ]
   end
 
-  test "named scope with :as option" do
-    @as_klass.create access: :moderator
-    @as_klass.create access: [:support, :editor]
-
-    assert_equal [1, 1, 1], [
-      @as_klass.with_access(:moderator).count,
-      @as_klass.with_access(:editor).count,
-      @as_klass.with_access(:support).count,
+  test "named scope with_access" do
+    assert_equal [2, 2, 2], [
+      Admin.with_access(:marketing).count,
+      Admin.with_access(:content).count,
+      Admin.with_access(:support).count
     ]
   end
 
-  test "User is added to registry" do
-    assert_includes SimonSays::Roleable.registry, :user
+  test "Membership is added to registry" do
+    assert_includes SimonSays::Roleable.registry, :membership
   end
 
   test "Admin is added to registry" do

data/test/test_helper.rb

@@ -1,3 +1,8 @@
+require "codeclimate-test-reporter"
+CodeClimate::TestReporter.start
+
+require 'mocha/mini_test'
+
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 require 'simon_says' # HELLO SIMON
 
@@ -26,7 +31,7 @@ ActiveRecord::Migrator.migrate(File.expand_path("../rails_app/db/migrate/", __FI
 class ActiveSupport::TestCase
   include ActiveRecord::TestFixtures
 
-  fixtures :users, :admins, :documents, :'admin/reports'
+  fixtures :all
 
   def create_test_table(name, &block)
     with_migration { |m| m.create_table name, &block }

metadata

@@ -1,43 +1,51 @@
 --- !ruby/object:Gem::Specification
 name: simon_says
 version: !ruby/object:Gem::Version
-  version: 0.0.27b6
+  version: 0.1.0
 platform: ruby
 authors:
 - Michael Coyne
+- Cameron Craig
+- SimplyBuilt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-12 00:00:00.000000000 Z
+date: 2016-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.9'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -54,18 +62,38 @@ dependencies:
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.1'
+- !ruby/object:Gem::Dependency
+  name: responders
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -105,11 +133,7 @@ files:
 - simon_says.gemspec
 - test/controllers/admin/reports_controller_test.rb
 - test/controllers/documents_controller_test.rb
-- test/models/admin_test.rb
-- test/models/membership_test.rb
 - test/rails_app/.gitignore
-- test/rails_app/Gemfile
-- test/rails_app/Gemfile.lock
 - test/rails_app/README.rdoc
 - test/rails_app/Rakefile
 - test/rails_app/app/assets/images/.keep
@@ -204,23 +228,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Light-weight, declarative authorization and access control for Rails
 test_files:
 - test/controllers/admin/reports_controller_test.rb
 - test/controllers/documents_controller_test.rb
-- test/models/admin_test.rb
-- test/models/membership_test.rb
 - test/rails_app/.gitignore
-- test/rails_app/Gemfile
-- test/rails_app/Gemfile.lock
 - test/rails_app/README.rdoc
 - test/rails_app/Rakefile
 - test/rails_app/app/assets/images/.keep

data/test/models/admin_test.rb

@@ -1,7 +0,0 @@
-require 'test_helper'
-
-class AdminModelTest < ActiveSupport::TestCase
-  test "Admin is in registry" do
-    assert_includes SimonSays::Roleable.registry, :admin
-  end
-end

data/test/models/membership_test.rb

@@ -1,7 +0,0 @@
-require 'test_helper'
-
-class MembershipModelTest < ActiveSupport::TestCase
-  test "Membership is in registry" do
-    assert_includes SimonSays::Roleable.registry, :membership
-  end
-end

data/test/rails_app/Gemfile

@@ -1,40 +0,0 @@
-source 'https://rubygems.org'
-
-
-# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '4.1.6'
-# Use sqlite3 as the database for Active Record
-gem 'sqlite3'
-# Use SCSS for stylesheets
-gem 'sass-rails', '~> 4.0.3'
-# Use Uglifier as compressor for JavaScript assets
-gem 'uglifier', '>= 1.3.0'
-# Use CoffeeScript for .js.coffee assets and views
-gem 'coffee-rails', '~> 4.0.0'
-# See https://github.com/sstephenson/execjs#readme for more supported runtimes
-# gem 'therubyracer',  platforms: :ruby
-
-# Use jquery as the JavaScript library
-gem 'jquery-rails'
-# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
-gem 'turbolinks'
-# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
-gem 'jbuilder', '~> 2.0'
-# bundle exec rake doc:rails generates the API under doc/api.
-gem 'sdoc', '~> 0.4.0',          group: :doc
-
-# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
-gem 'spring',        group: :development
-
-# Use ActiveModel has_secure_password
-# gem 'bcrypt', '~> 3.1.7'
-
-# Use unicorn as the app server
-# gem 'unicorn'
-
-# Use Capistrano for deployment
-# gem 'capistrano-rails', group: :development
-
-# Use debugger
-# gem 'debugger', group: [:development, :test]
-

data/test/rails_app/Gemfile.lock

@@ -1,120 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actionmailer (4.1.6)
-      actionpack (= 4.1.6)
-      actionview (= 4.1.6)
-      mail (~> 2.5, >= 2.5.4)
-    actionpack (4.1.6)
-      actionview (= 4.1.6)
-      activesupport (= 4.1.6)
-      rack (~> 1.5.2)
-      rack-test (~> 0.6.2)
-    actionview (4.1.6)
-      activesupport (= 4.1.6)
-      builder (~> 3.1)
-      erubis (~> 2.7.0)
-    activemodel (4.1.6)
-      activesupport (= 4.1.6)
-      builder (~> 3.1)
-    activerecord (4.1.6)
-      activemodel (= 4.1.6)
-      activesupport (= 4.1.6)
-      arel (~> 5.0.0)
-    activesupport (4.1.6)
-      i18n (~> 0.6, >= 0.6.9)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.1)
-      tzinfo (~> 1.1)
-    arel (5.0.1.20140414130214)
-    builder (3.2.2)
-    coffee-rails (4.0.1)
-      coffee-script (>= 2.2.0)
-      railties (>= 4.0.0, < 5.0)
-    coffee-script (2.3.0)
-      coffee-script-source
-      execjs
-    coffee-script-source (1.8.0)
-    erubis (2.7.0)
-    execjs (2.2.2)
-    hike (1.2.3)
-    i18n (0.6.11)
-    jbuilder (2.2.2)
-      activesupport (>= 3.0.0, < 5)
-      multi_json (~> 1.2)
-    jquery-rails (3.1.2)
-      railties (>= 3.0, < 5.0)
-      thor (>= 0.14, < 2.0)
-    json (1.8.1)
-    mail (2.6.1)
-      mime-types (>= 1.16, < 3)
-    mime-types (2.4.2)
-    minitest (5.4.2)
-    multi_json (1.10.1)
-    rack (1.5.2)
-    rack-test (0.6.2)
-      rack (>= 1.0)
-    rails (4.1.6)
-      actionmailer (= 4.1.6)
-      actionpack (= 4.1.6)
-      actionview (= 4.1.6)
-      activemodel (= 4.1.6)
-      activerecord (= 4.1.6)
-      activesupport (= 4.1.6)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 4.1.6)
-      sprockets-rails (~> 2.0)
-    railties (4.1.6)
-      actionpack (= 4.1.6)
-      activesupport (= 4.1.6)
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rake (10.3.2)
-    rdoc (4.1.2)
-      json (~> 1.4)
-    sass (3.2.19)
-    sass-rails (4.0.3)
-      railties (>= 4.0.0, < 5.0)
-      sass (~> 3.2.0)
-      sprockets (~> 2.8, <= 2.11.0)
-      sprockets-rails (~> 2.0)
-    sdoc (0.4.1)
-      json (~> 1.7, >= 1.7.7)
-      rdoc (~> 4.0)
-    spring (1.1.3)
-    sprockets (2.11.0)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.2.0)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      sprockets (>= 2.8, < 4.0)
-    sqlite3 (1.3.9)
-    thor (0.19.1)
-    thread_safe (0.3.4)
-    tilt (1.4.1)
-    turbolinks (2.4.0)
-      coffee-rails
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
-    uglifier (2.5.3)
-      execjs (>= 0.3.0)
-      json (>= 1.8.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  coffee-rails (~> 4.0.0)
-  jbuilder (~> 2.0)
-  jquery-rails
-  rails (= 4.1.6)
-  sass-rails (~> 4.0.3)
-  sdoc (~> 0.4.0)
-  spring
-  sqlite3
-  turbolinks
-  uglifier (>= 1.3.0)