bsm_oa 0.3.1 → 0.4.0

data/spec/lib/bsm_oa/{application_mixin_spec.rb → application_spec.rb}

@@ -1,6 +1,12 @@
 require 'spec_helper'
 
-describe Doorkeeper::Application, type: :model do
+describe BsmOa::Application, type: :model do
+
+  it { is_expected.to be_kind_of(Doorkeeper::Application) }
+
+  it 'should a custom model name' do
+    expect(described_class.model_name.route_key).to eq("bsm_oa_applications")
+  end
 
   it { is_expected.to have_many(:authorizations).dependent(:destroy) }
   it { is_expected.to have_many(:roles).through(:authorizations) }
@@ -11,32 +17,30 @@ describe Doorkeeper::Application, type: :model do
     it { is_expected.to allow_value([val]).for(:permissions) }
   end
 
-  ['inv&lid', 'not valid'].each do |val|
+  ['inv&lid', 'not-valid'].each do |val|
     it { is_expected.not_to allow_value([val]).for(:permissions) }
   end
 
   it 'should have default secret and uid attributes' do
-    app = create(:application, secret: nil, uid: nil)
+    app = create :application, secret: nil, uid: nil
     expect(app.secret).to_not be_nil
     expect(app.uid).to_not be_nil
   end
 
   it 'should all secret and uid to be user set' do
-    app = create(:application, secret: 'secr3t', uid: 'nexusU1D')
+    app = create :application, secret: 'secr3t', uid: 'nexusU1D'
     expect(app.secret).to eq('secr3t')
     expect(app.uid).to eq('nexusU1D')
   end
 
   it 'should normalize permissions' do
-    app = create(:application, permissions: ['admin', 'Finance', ' employee ', ''])
+    app = create :application, permissions: ['admin', 'Finance', ' employee ', '']
     expect(app.permissions).to eq ['admin', 'finance', 'employee']
   end
 
-  it 'should set and return string of permissions' do
-    app = create(:application)
-    app.permissions_string = 'admin, finance, employee'
+  it 'should allow assigning permissions as string' do
+    app = build :application, permissions: 'admin, finance, employee'
     expect(app.permissions).to eq ['admin', 'finance', 'employee']
-    expect(app.permissions_string).to eq 'admin employee finance'
   end
 
   it 'should scope ordered' do

data/spec/lib/bsm_oa/authorization_spec.rb

@@ -17,17 +17,13 @@ RSpec.describe BsmOa::Authorization, type: :model do
 
   it { is_expected.to serialize(:permissions) }
 
-  it 'should set and return string of permissions' do
-    subject = create(:authorization)
-    subject.permissions_string = 'admin operations finance'
+  it 'should all to assign a string of permissions' do
+    subject = build(:authorization, permissions: 'admin operations finance')
     expect(subject.permissions).to eq ['admin', 'operations', 'finance']
-    expect(subject.permissions_string).to eq 'admin finance operations'
   end
 
   it 'should normalize permissions' do
-    subject = create(:authorization)
-    subject.permissions = ["admin ", "Finance", "operatiOns", "unknown"]
-    expect(subject).to be_valid
+    subject = create(:authorization, permissions: ["admin ", "Finance", "operatiOns", "unknown"])
     expect(subject.permissions).to eq ['admin', 'finance', 'operations']
   end
 
@@ -40,11 +36,11 @@ RSpec.describe BsmOa::Authorization, type: :model do
     let(:authorization) { create :authorization}
 
     it 'should toggle adding permissions' do
-      authorization.toggle('finance')
+      authorization.toggle_permission!('finance')
       expect(authorization.reload.permissions).to eq(['admin', 'finance'])
     end
     it 'should toggle removing permissions' do
-      authorization.toggle('admin')
+      authorization.toggle_permission!('admin')
       expect(authorization.reload.permissions).to eq([])
     end
   end

data/spec/lib/bsm_oa/role_spec.rb

@@ -7,7 +7,7 @@ RSpec.describe BsmOa::Role, type: :model do
 
   it { is_expected.to validate_presence_of(:name) }
   it { is_expected.to validate_length_of(:name).is_at_most(80) }
-  it { is_expected.to validate_uniqueness_of(:name).case_insensitive }
+  it { create(:role); is_expected.to validate_uniqueness_of(:name).case_insensitive }
 
   it 'should have ordered scope' do
     create(:role)

data/spec/spec_helper.rb

@@ -12,9 +12,6 @@ Combustion.initialize! :active_record do
     orm :active_record
   end
 
-  SimpleForm.setup do |_|
-  end
-
 end
 
 # Internal app
@@ -23,13 +20,17 @@ class User < ActiveRecord::Base
   has_many :authorizations, through: :roles, class_name: "BsmOa::Authorization"
 end
 
+# ApplicationController
+class ApplicationController < ActionController::Base
+end
+
 # Load rspec
 require 'rspec/rails'
 require 'shoulda-matchers'
-require 'json_spec'
 require 'factory_girl'
 require 'faker'
 require 'database_cleaner'
+require 'rails-controller-testing'
 
 RSpec.configure do |config|
   config.use_transactional_fixtures = true
@@ -37,9 +38,6 @@ RSpec.configure do |config|
   config.render_views
 
   config.before :suite do
-    silence_stream(STDOUT) do
-      ActiveRecord::Migrator.migrate(File.expand_path('../../db/migrate', __FILE__), nil)
-    end
     FactoryGirl.find_definitions
   end
 
@@ -60,5 +58,17 @@ RSpec.configure do |config|
   end
 
   config.include FactoryGirl::Syntax::Methods
-  config.include JsonSpec::Helpers
 end
+
+
+Shoulda::Matchers.configure do |config|
+  config.integrate do |with|
+    # Choose a test framework:
+    with.test_framework :rspec
+
+    # Or, choose the following (which implies all of the above):
+    with.library :rails
+  end
+end
+
+Rails::Controller::Testing.install

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bsm_oa
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Andy Born
@@ -9,26 +9,20 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-18 00:00:00.000000000 Z
+date: 2017-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.1'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.1'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
@@ -37,56 +31,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0.rc
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0.rc
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: responders
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: jbuilder
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.2'
-- !ruby/object:Gem::Dependency
-  name: bsm-models
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: has_scope
   requirement: !ruby/object:Gem::Requirement
@@ -101,62 +67,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
-- !ruby/object:Gem::Dependency
-  name: simple_form
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.1'
-- !ruby/object:Gem::Dependency
-  name: jquery-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: combustion
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: 0.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -185,20 +123,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: json_spec
-  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'
 - !ruby/object:Gem::Dependency
   name: faker
   requirement: !ruby/object:Gem::Requirement
@@ -214,7 +138,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: shoulda-matchers
+  name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -228,7 +152,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: database_cleaner
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -242,7 +166,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: rails-controller-testing
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -267,28 +191,22 @@ files:
 - Gemfile.lock
 - Rakefile
 - app/controllers/bsm_oa/accounts_controller.rb
+- app/controllers/bsm_oa/admin_controller.rb
 - app/controllers/bsm_oa/applications_controller.rb
 - app/controllers/bsm_oa/authorizations_controller.rb
+- app/controllers/bsm_oa/base_controller.rb
 - app/controllers/bsm_oa/roles_controller.rb
-- app/views/bsm_oa/accounts/show.json.jbuilder
 - app/views/bsm_oa/applications/_application.html.erb
-- app/views/bsm_oa/applications/_application.json.jbuilder
 - app/views/bsm_oa/applications/_inputs.html.erb
-- app/views/bsm_oa/applications/create.json.jbuilder
 - app/views/bsm_oa/applications/edit.html.erb
 - app/views/bsm_oa/applications/index.html.erb
-- app/views/bsm_oa/applications/index.json.jbuilder
 - app/views/bsm_oa/applications/new.html.erb
-- app/views/bsm_oa/applications/show.json.jbuilder
-- app/views/bsm_oa/applications/update.json.jbuilder
-- app/views/bsm_oa/authorizations/_authorization.json.jbuilder
+- app/views/bsm_oa/applications/show.html.erb
 - app/views/bsm_oa/authorizations/_inputs.html.erb
 - app/views/bsm_oa/authorizations/edit.html.erb
 - app/views/bsm_oa/authorizations/index.html.erb
-- app/views/bsm_oa/authorizations/index.json.jbuilder
 - app/views/bsm_oa/authorizations/new.html.erb
 - app/views/bsm_oa/authorizations/toggle.js.erb
-- app/views/bsm_oa/authorizations/toggle.json.jbuilder
 - app/views/bsm_oa/roles/_authorization.html.erb
 - app/views/bsm_oa/roles/_inputs.html.erb
 - app/views/bsm_oa/roles/_role.html.erb
@@ -306,7 +224,7 @@ files:
 - db/migrate/20150507113313_bsm_oa_create_doorkeeper_tables.rb
 - db/migrate/20150513155732_bsm_oa_create_tables.rb
 - lib/bsm_oa.rb
-- lib/bsm_oa/application_mixin.rb
+- lib/bsm_oa/application.rb
 - lib/bsm_oa/authorization.rb
 - lib/bsm_oa/config.rb
 - lib/bsm_oa/engine.rb
@@ -324,7 +242,7 @@ files:
 - spec/internal/db/schema.rb
 - spec/internal/log/.gitignore
 - spec/internal/public/favicon.ico
-- spec/lib/bsm_oa/application_mixin_spec.rb
+- spec/lib/bsm_oa/application_spec.rb
 - spec/lib/bsm_oa/authorization_spec.rb
 - spec/lib/bsm_oa/config_spec.rb
 - spec/lib/bsm_oa/role_spec.rb
@@ -349,7 +267,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Rails Open Authority engine
@@ -365,7 +283,7 @@ test_files:
 - spec/internal/db/schema.rb
 - spec/internal/log/.gitignore
 - spec/internal/public/favicon.ico
-- spec/lib/bsm_oa/application_mixin_spec.rb
+- spec/lib/bsm_oa/application_spec.rb
 - spec/lib/bsm_oa/authorization_spec.rb
 - spec/lib/bsm_oa/config_spec.rb
 - spec/lib/bsm_oa/role_spec.rb

data/app/views/bsm_oa/accounts/show.json.jbuilder

@@ -1,7 +0,0 @@
-json.(@account, *BsmOa.config.user_attrs)
-
-json.authorizations @account.authorizations.includes(:application) do |auth|
-  json.uid auth.application.uid
-  json.permissions auth.permissions
-end if @account.respond_to?(:authorizations)
-

data/app/views/bsm_oa/applications/_application.json.jbuilder

@@ -1 +0,0 @@
-json.(application, :id, :name, :uid, :secret, :redirect_uri, :scopes)

data/app/views/bsm_oa/applications/create.json.jbuilder

@@ -1 +0,0 @@
-json.partial! 'application', application: @application

data/app/views/bsm_oa/applications/index.json.jbuilder

@@ -1 +0,0 @@
-json.array! @applications, :id, :name

data/app/views/bsm_oa/applications/show.json.jbuilder

@@ -1 +0,0 @@
-json.partial! 'application', application: @application