mtwarden 3.3.4 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fff168bb91433f28bf12d5016b32045f8c47674f
-  data.tar.gz: f7bc4fc7e591d9aa8bd28a0ffacf4a13f6cb5e9e
+  metadata.gz: 8d37cc59e45bf84e85f885dabf6b88b7fe2efeaf
+  data.tar.gz: a1b20a9628d3e635a094e221915ac60a4024d2c9
 SHA512:
-  metadata.gz: dbb737105d0d33bd20aab12b3fe95beaeeff49c6f79f2b964f69d7eb3688a63f0f288806e2e855ce5943c4845e2c76a3036591832e0c2c10aac5cca7b0ae7552
-  data.tar.gz: 40b91e25aa41dd08d34b919a3fbffdf4795b252faeada284859f2a2a8faee5a5a4f9ad0d33c86292a520d5185512774e91d740ecd2b7546f2ff3b8cd7b47ccc2
+  metadata.gz: cb383d404a8f3ece74d20147e2eca1e45490e91ffb23b375bd33f5179f1723694a6ccef21fb5aa36f2de5eeaad83c3d03c620fadcd7454616202713111343e3f
+  data.tar.gz: 443eb09580be98fa6ba3c4351eaf2b674be3f2a652cb4d6f36a123400a72a0f7a18b51878202455d15e94d0a014d4d63a6195c0db39e209305a0fbde4be8c589

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2016 Brad Potts
+Copyright 2016-2017 BradPotts - PHCNetworks
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -4,7 +4,7 @@
 [![Gem Version](https://badge.fury.io/rb/mtwarden.svg)](https://badge.fury.io/rb/mtwarden)
   
 ### Mtwarden(MultiTenancyWarden) Documentation  
-PHC mtwarden-warden gem adds a separate multi-tenant layer that handles all user registrations, multi-tenancy app functions and login through subdomains using Warden authentication gem.  
+PHC mtwarden gem adds a separate multi-tenant layer that handles all user registrations, multi-tenancy app functions, and login through subdomains using Warden authentication gem.  
   
 #### Step 1 - Add Mtwarden to your gemfile and run command   
   
@@ -12,6 +12,7 @@ PHC mtwarden-warden gem adds a separate multi-tenant layer that handles all user
 	bundle exec install  
   
 #### Step 2 - Add and migrate mtwarden database tables  
+
 	rake railties:install:migrations  
 	rake db:migrate  
 

data/Rakefile

@@ -1,30 +1,33 @@
 begin
-	require 'bundler/setup'
+  require 'bundler/setup'
 
 rescue LoadError
-	puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
+  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
 
 require 'rdoc/task'
+
 RDoc::Task.new(:rdoc) do |rdoc|
-	rdoc.rdoc_dir = 'rdoc'
-	rdoc.title    = 'Mtwarden'
-	rdoc.options << '--line-numbers'
-	rdoc.rdoc_files.include('README.md')
-	rdoc.rdoc_files.include('lib/**/*.rb')
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title    = 'Mtwarden'
+  rdoc.options << '--line-numbers'
+  rdoc.rdoc_files.include('README.md')
+  rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
 APP_RAKEFILE = File.expand_path("../spec/testapp/Rakefile", __FILE__)
+
 load 'rails/tasks/engine.rake'
 load 'rails/tasks/statistics.rake'
+
 require 'bundler/gem_tasks'
 require 'rake/testtask'
 
 Rake::TestTask.new(:test) do |t|
-	t.libs << 'lib'
-	t.libs << 'test'
-	t.pattern = 'test/**/*_test.rb'
-	t.verbose = false
+  t.libs << 'lib'
+  t.libs << 'test'
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = false
 end
 
 task default: :test

data/config/initializers/braintree.rb

@@ -1,4 +0,0 @@
-Braintree::Configuration.environment = :sandbox
-Braintree::Configuration.merchant_id = "rjyzvq7k53n45sph"
-Braintree::Configuration.public_key = "4dhtq8cmjvsnzvjv"
-Braintree::Configuration.private_key = "d76f2378fa72b6f3a7af797ce6f6222f"

data/config/initializers/warden/strategies/password.rb

@@ -1,16 +1,18 @@
 Warden::Strategies.add(:password) do
-	def subdomain
-		ActionDispatch::Http::URL.extract_subdomains(request.host, 1)
-	end
 
-	def valid?
-		subdomain.present? && params["user"]
-	end
+  def subdomain
+    ActionDispatch::Http::URL.extract_subdomains(request.host, 1)
+  end
+  
+  def valid?
+    subdomain.present? && params["user"]
+  end
+  
+  def authenticate!
+    return fail! unless account = Mtwarden::Account.find_by(subdomain: subdomain)
+    return fail! unless user = account.users.find_by(email: params["user"]["email"])
+    return fail! unless user.authenticate(params["user"]["password"])
+    success! user
+  end
 
-	def authenticate!
-		return fail! unless account = Mtwarden::Account.find_by(subdomain: subdomain)
-		return fail! unless user = account.users.find_by(email: params["user"]["email"])
-		return fail! unless user.authenticate(params["user"]["password"])
-		success! user
-	end
-end
+end

data/config/routes.rb

@@ -1,29 +1,30 @@
 require "mtwarden/constraints/subdomain_required"
 
 Mtwarden::Engine.routes.draw do
-	constraints(Mtwarden::Constraints::SubdomainRequired) do
-		scope :module => "account" do
-			root :to => "dashboard#index", :as => :account_root
-			get "/sign_in", :to => "sessions#new", :as => :sign_in
-			post "/sign_in", :to => "sessions#create", :as => :sessions
-			get "/sign_up", :to => "users#new", :as => :user_sign_up
-			post "/sign_up", :to => "users#create", :as => :do_user_sign_up
-			get "/account", :to => "accounts#edit", :as => :edit_account
-			patch "/account", :to => "accounts#update"
-			get "/account/plan/:plan_id",
-				:to => "accounts#plan",
-				:as => :plan_account
-			get "/account/subscribe",
-				:to => "accounts#subscribe",
-				:as => :subscribe_account
-			post "/account/confirm_plan",
-				:to => "accounts#confirm_plan",
-				:as => :confirm_plan_account
-		end
-	end
 
-	root "dashboard#index"
-	get "/sign_up", :to => "accounts#new", :as => :sign_up
-	post "/accounts", :to => "accounts#create", :as => :accounts
+  constraints(Mtwarden::Constraints::SubdomainRequired) do
+    scope :module => "account" do
+      root :to => "dashboard#index", :as => :account_root
+      get "/sign_in", :to => "sessions#new", :as => :sign_in
+      post "/sign_in", :to => "sessions#create", :as => :sessions
+      get "/sign_up", :to => "users#new", :as => :user_sign_up
+      post "/sign_up", :to => "users#create", :as => :do_user_sign_up
+      get "/account", :to => "accounts#edit", :as => :edit_account
+      patch "/account", :to => "accounts#update"
+      get "/account/plan/:plan_id",
+      :to => "accounts#plan",
+      :as => :plan_account
+      get "/account/subscribe",
+      :to => "accounts#subscribe",
+      :as => :subscribe_account
+      post "/account/confirm_plan",
+      :to => "accounts#confirm_plan",
+      :as => :confirm_plan_account
+    end
+  end
+  
+  root "dashboard#index"
+  get "/sign_up", :to => "accounts#new", :as => :sign_up
+  post "/accounts", :to => "accounts#create", :as => :accounts
 
 end

data/db/migrate/20140621030847_create_mtwarden_accounts.rb

@@ -1,9 +1,11 @@
 class CreateMtwardenAccounts < ActiveRecord::Migration[5.0]
-	def change
-		create_table :mtwarden_accounts do |t|
-			t.string :name
+  def change
+    create_table :mtwarden_accounts do |t|
 
-			t.timestamps
-		end
-	end
-end
+      t.string :name
+      
+      t.timestamps
+
+    end
+  end
+end

data/db/migrate/20140621114149_add_owner_id_to_mtwarden_accounts.rb

@@ -1,5 +1,7 @@
 class AddOwnerIdToMtwardenAccounts < ActiveRecord::Migration[5.0]
-	def change
-		add_column :mtwarden_accounts, :owner_id, :integer
-	end
-end
+  def change
+
+    add_column :mtwarden_accounts, :owner_id, :integer
+
+  end
+end

data/db/migrate/20140621114231_create_mtwarden_users.rb

@@ -1,10 +1,12 @@
 class CreateMtwardenUsers < ActiveRecord::Migration[5.0]
-	def change
-		create_table :mtwarden_users do |t|
-			t.string :email
-			t.string :password_digest
+  def change
+     create_table :mtwarden_users do |t|
 
-			t.timestamps
-		end
-	end
-end
+        t.string :email
+        t.string :password_digest
+        
+        t.timestamps
+
+    end
+  end
+end

data/db/migrate/20140621114308_create_mtwarden_members.rb

@@ -1,10 +1,12 @@
 class CreateMtwardenMembers < ActiveRecord::Migration[5.0]
-	def change
-		create_table :mtwarden_members do |t|
-			t.integer :account_id
-			t.integer :user_id
+  def change
+  create_table :mtwarden_members do |t|
 
-			t.timestamps
-		end
-	end
-end
+      t.integer :account_id
+      t.integer :user_id
+      
+      t.timestamps
+
+    end
+  end
+end

data/db/migrate/20140621114417_add_subdomain_to_mtwarden_accounts.rb

@@ -1,6 +1,8 @@
 class AddSubdomainToMtwardenAccounts < ActiveRecord::Migration[5.0]
-	def change
-		add_column :mtwarden_accounts, :subdomain, :string
-		add_index :mtwarden_accounts, :subdomain
-	end
-end
+  def change
+
+    add_column :mtwarden_accounts, :subdomain, :string
+    add_index :mtwarden_accounts, :subdomain
+
+  end
+end

data/db/migrate/20140829231923_create_mtwarden_plans.rb

@@ -1,11 +1,13 @@
 class CreateMtwardenPlans < ActiveRecord::Migration[5.0]
-	def change
-		create_table :mtwarden_plans do |t|
-			t.string :name
-			t.float :price
-			t.string :braintree_id
+  def change
+  create_table :mtwarden_plans do |t|
 
-			t.timestamps
-		end
-	end
-end
+      t.string :name
+      t.float :price
+      t.string :braintree_id
+      
+      t.timestamps
+
+    end
+  end
+end

data/db/migrate/20140830011033_add_plan_id_to_mtwarden_accounts.rb

@@ -1,5 +1,7 @@
 class AddPlanIdToMtwardenAccounts < ActiveRecord::Migration[5.0]
-	def change
-		add_column :mtwarden_accounts, :plan_id, :integer
-	end
-end
+  def change
+
+    add_column :mtwarden_accounts, :plan_id, :integer
+
+  end
+end

data/db/migrate/20140830020346_add_braintree_subscription_id_to_mtwarden_accounts.rb

@@ -1,5 +1,7 @@
 class AddBraintreeSubscriptionIdToMtwardenAccounts < ActiveRecord::Migration[5.0]
-	def change
-		add_column :mtwarden_accounts, :braintree_subscription_id, :string
-	end
-end
+  def change
+
+    add_column :mtwarden_accounts, :braintree_subscription_id, :string
+
+  end
+end

data/lib/mtwarden/braintree_plan_fetcher.rb

@@ -1,20 +1,22 @@
 module Mtwarden
-	class BraintreePlanFetcher
-		def self.store_locally
-			Braintree::Plan.all.each do |plan|
-				if local_plan = Mtwarden::Plan.find_by(braintree_id: plan.id)
-					local_plan.update_attributes({
-					:name => plan.name,
-					:price => plan.price
-				})
-				else
-					Mtwarden::Plan.create({
-						:name => plan.name,
-						:price => plan.price,
-						:braintree_id => plan.id
-					})
-				end
-			end
-		end
-	end
-end
+  class BraintreePlanFetcher
+
+    def self.store_locally
+      Braintree::Plan.all.each do |plan|
+          if local_plan = Mtwarden::Plan.find_by(braintree_id: plan.id)
+          local_plan.update_attributes({
+          :name => plan.name,
+          :price => plan.price
+        })
+        else
+          Mtwarden::Plan.create({
+            :name => plan.name,
+            :price => plan.price,
+            :braintree_id => plan.id
+          })
+        end
+      end
+    end
+
+  end
+end

data/lib/mtwarden/constraints/subdomain_required.rb

@@ -1,9 +1,9 @@
 module Mtwarden
-	module Constraints
-		class SubdomainRequired
-			def self.matches?(request)
-				request.subdomain.present? && request.subdomain != "www"
-			end
-		end
-	end
+  module Constraints
+    class SubdomainRequired
+      def self.matches?(request)
+        request.subdomain.present? && request.subdomain != "www"
+      end
+    end
+  end
 end

data/lib/mtwarden/engine.rb

@@ -6,46 +6,48 @@ require "dynamic_form"
 require "braintree"
 
 module Mtwarden
-	class Engine < ::Rails::Engine
-		isolate_namespace Mtwarden
-
-		config.generators do |g|
-			g.test_framework :rspec, :view_specs => false
-		end
-
-		initializer "mtwarden.middleware.warden" do
-			Rails.application.config.middleware.use Warden::Manager do |manager|
-				manager.default_strategies :password
-				manager.serialize_into_session do |user|
-					user.id
-				end
-
-				manager.serialize_from_session do |id|
-					Mtwarden::User.find(id)
-				end
-			end
-		end
-
-		initializer "mtwarden.middleware.fake_braintree_redirect" do
-			if Rails.env.test?
-				require "fake_braintree_redirect"
-				Rails.application.config.middleware.insert_before \
-				Warden::Manager,
-				FakeBraintreeRedirect
-			end
-		end
-
-		config.to_prepare do
-			root = Mtwarden::Engine.root
-			extenders_path = root + "app/extenders/**/*.rb"
-			Dir.glob(extenders_path) do |file|
-				Rails.configuration.cache_classes ? require(file) : load(file)
-			end
-		end
-
-		initializer 'mtwarden.middleware.houser' do
-			Rails.application.config.middleware.use Houser::Middleware,
-			:class_name => 'Mtwarden::Account'
-		end
-	end
+  class Engine < ::Rails::Engine
+
+    isolate_namespace Mtwarden
+    
+    config.generators do |g|
+      g.test_framework :rspec, :view_specs => false
+    end
+    
+    initializer "mtwarden.middleware.warden" do
+      Rails.application.config.middleware.use Warden::Manager do |manager|
+        manager.default_strategies :password
+        manager.serialize_into_session do |user|
+          user.id
+        end
+        manager.serialize_from_session do |id|
+          Mtwarden::User.find(id)
+        end
+      end
+    end
+    
+    initializer "mtwarden.middleware.fake_braintree_redirect" do
+      if Rails.env.test?
+        require "fake_braintree_redirect"
+        Rails.application.config.middleware.insert_before \
+        Warden::Manager,
+         FakeBraintreeRedirect
+      end
+    end
+    
+    config.to_prepare do
+      root = Mtwarden::Engine.root
+      extenders_path = root + "app/extenders/**/*.rb"
+      Dir.glob(extenders_path) do |file|
+        Rails.configuration.cache_classes ? require(file) : load(file)
+      end
+    end
+    
+    initializer 'mtwarden.middleware.houser' do
+      Rails.application.config.middleware.use Houser::Middleware,
+      :class_name => 'Mtwarden::Account'
+    end
+
+  end
 end
+

data/lib/mtwarden/scoped_to.rb

@@ -1,7 +1,9 @@
 module Mtwarden
-	module ScopedTo
-		def scoped_to(account)
-			where(:account_id => account.id)
-		end
-	end
-end
+  module ScopedTo
+
+    def scoped_to(account)
+      where(:account_id => account.id)
+    end
+
+  end
+end

data/lib/mtwarden/testing_support/authentication_helpers.rb

@@ -1,17 +1,21 @@
 module Mtwarden
-	module TestingSupport
-		module AuthenticationHelpers
-			include Warden::Test::Helpers
-			def self.included(base)
-				base.after do
-					logout
-				end
-			end
-			def sign_in_as(options={}) 
-				options.each do |scope, object|
-					login_as(object, :scope => scope)
-				end
-			end
-		end
-	end
+  module TestingSupport
+    module AuthenticationHelpers
+
+      include Warden::Test::Helpers
+
+      def self.included(base)
+        base.after do
+          logout
+        end
+      end
+
+      def sign_in_as(options={}) 
+        options.each do |scope, object|
+          login_as(object, :scope => scope)
+        end
+      end
+
+    end
+  end
 end

data/lib/mtwarden/testing_support/factories/account_factory.rb

@@ -1,13 +1,14 @@
 require "mtwarden/testing_support/factories/user_factory"
 
 FactoryGirl.define do
-	factory :account, :class => Mtwarden::Account do
-		sequence(:name) { |n| "Test Account ##{n}" }
-		sequence(:subdomain) { |n| "test#{n}" }
-		association :owner, :factory => :user 
+  factory :account, :class => Mtwarden::Account do
+    sequence(:name) { |n| "Test Account ##{n}" }
+    sequence(:subdomain) { |n| "test#{n}" }
+    association :owner, :factory => :user 
 
-		after(:create) do |account|
-			account.users << account.owner
-		end
-	end
+    after(:create) do |account|
+      account.users << account.owner
+    end
+
+  end
 end

data/lib/mtwarden/testing_support/factories/user_factory.rb

@@ -1,7 +1,7 @@
 FactoryGirl.define do
-	factory :user, :class => Mtwarden::User do
-		sequence(:email) { |n| "test#{n}@example.com" }
-		password "password"
-		password_confirmation "password"
-	end
+  factory :user, :class => Mtwarden::User do
+    sequence(:email) { |n| "test#{n}@example.com" }
+    password "password"
+    password_confirmation "password"
+  end
 end

data/lib/mtwarden/testing_support/subdomain_helpers.rb

@@ -1,14 +1,16 @@
 module Mtwarden
-	module TestingSupport
-		module SubdomainHelpers
-			def within_account_subdomain(&block)
-				context "within a subdomain" do
-					let(:subdomain_url) { "http://#{account.subdomain}.example.com" }
-					before { Capybara.default_host = subdomain_url } 
-					after { Capybara.default_host = "http://example.com" }
-				yield
-				end
-			end
-		end
-	end
+  module TestingSupport
+    module SubdomainHelpers
+
+      def within_account_subdomain(&block)
+        context "within a subdomain" do
+          let(:subdomain_url) { "http://#{account.subdomain}.example.com" }
+          before { Capybara.default_host = subdomain_url } 
+          after { Capybara.default_host = "http://example.com" }
+          yield
+        end
+      end
+
+    end
+  end
 end

data/lib/mtwarden/version.rb

@@ -1,3 +1,3 @@
 module Mtwarden
-	VERSION = '3.3.4'
+  VERSION = '3.5.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mtwarden
 version: !ruby/object:Gem::Version
-  version: 3.3.4
+  version: 3.5.0
 platform: ruby
 authors:
 - BradPotts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-12 00:00:00.000000000 Z
+date: 2017-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -70,60 +70,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.3.4
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.3.4
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: phctitleseo
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.6.3
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.6.3
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: phcnotifi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.6.3
+        version: '3.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.6.3
+        version: '3.8'
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -504,14 +486,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.11'
+        version: '2.12'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.12.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.11'
+        version: '2.12'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.12.1
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -618,20 +606,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.8
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.8
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -790,7 +772,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Multi-Tenant Rails Engine Using Warden