milia 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bbee764da49ec653dec3714f567a518a160d5e42
-  data.tar.gz: e4835d8ffd9cf753e2cff72fa09798f1af1011e7
+  metadata.gz: 0b71b49e31631befa25024acdb042e14b7fecd82
+  data.tar.gz: f1dc1e95c35498437ff078e891077f11fad242ab
 SHA512:
-  metadata.gz: b324efa804d1bd08fd7e49818019fd7bbe8fd924106b22cee933073a8346a7e35a6e5f0d48809db9d393708a13c923708f68aaffc23ba79ce853e70bbfe55bdc
-  data.tar.gz: 04cffd9a266f822467ee296a72a7cf319eecbeb5e61e19cc3d2f1d257c45e313fb50fdea4494461c24f6a48f061eaf11032c54e271e1bd739a2b4e5585a0f11d
+  metadata.gz: 7ed0849673efa710d2ef2feb3d703ced0a40cce297e41ed75c03ad88bef99941103792329c3310189f6c172fa9c63f8cc71c77f0b6ade96c57f7e2bd0321d3fc
+  data.tar.gz: 0be4c74efdca4c1ab2b561342d1f5c1c9d35d2d76e3649abe027809fcc785a4c6cb5cdb3d8c4e9de161304f52a1c160bfb7192c2943695103335f6b96594e624

data/README.md

@@ -37,13 +37,14 @@ by invitation. New tenants are not created for every new user.
 
 ## Version
 
-milia v1.0.0 is the release version for Rails 4.0.x and is now available for usage.
+milia v1.0.1 is the release version for Rails 4.0.x and is now available for usage.
 
 The last previous release version for Rails 3.2.x can be found in the git branch 'v0.3', but
 it is essentially obsolete. Go with v1.0.x
 
 ## What's changed?
 
+* fixes Issue #42: Redirect loop (sign up & activate with email1; trying to sign up again with email1 fails but immediately signing in with email1 caused a redirect loop).
 * Rails 4.0.x adapted (changes to terms, strong_parameters, default_scope, etc)
 * Devise 3.2.x adapted
 * All the changes which version 0.3.x advised to be inserted in applications_controller.rb are now automatically loaded into ActionController by milia.
@@ -59,8 +60,15 @@ it is essentially obsolete. Go with v1.0.x
 
 There were numerous requests for me to provide a complete sample web application
 which uses milia and devise. I have done this. This README will have a brief section
-on creating and installing the sample application. Further details about this process
-can be found via the sources listed below:
+on creating and installing the sample application. 
+
+This sample app is now running on heroku and you may test it out here:
+http://sample-milia.herokuapp.com
+Instructions for deploying to heroku can be found in doc/sample.sh STEP 6 
+within the milia gem.
+
+
+Further details about this process can be found via the sources listed below:
 
 * see doc/sample.sh for easy generator usage for setting up and creating a working app.
   Although all the same information is here in this README, it's perhaps clearer, and
@@ -149,7 +157,7 @@ Kibali is primarily oriented for functioning as a before_action role authenticat
 * necessary migrations: user, tenant, tenants_users (join table)
 
 You must understand which of your apps models will be tenanted ( <i>acts_as_tenant</i> ) 
-and which will be universal ( <i>cts_as_universal</i>). Universal data NEVER has critical user/company
+and which will be universal ( <i>acts_as_universal</i>). Universal data NEVER has critical user/company
 information in the table. It is usually only for system-wide constants. For example, if you've put
 too much user information in the users table, you'll need to seperate it out. by definition, the devise 
 user table MUST be universal and should only contain email, encrypted password, and devise-required data.

data/app/controllers/sessions_controller.rb

@@ -1,13 +1,10 @@
 module Milia
 
   class SessionsController < Devise::SessionsController
-
+       # skip need for authentication
     skip_before_action :authenticate_tenant!, :only => [:new, :create, :destroy]
-
-    def destroy
-      __milia_reset_tenant!   # clear tenanting
-      super
-    end
+       # clear tenanting
+    before_action :__milia_reset_tenant!, :only => [:create, :destroy]
 
   end  # class
 end # module

data/doc/sample.sh

@@ -225,5 +225,52 @@ export RECAPTCHA_PRIVATE_KEY=6LeBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBgQBv
 # stop/restart foreman
 # ^c stops foreman; foreman start  restarts it; F5 refreshes the browser page
 # 
+# *********************************************************************
+# STEP 5 - DEPLOYING SAMPLE-MILIA-APP TO HEROKU
+# *********************************************************************
+
+#  Make sure that you've installed the heroku toolbelt, as shown in STEP 0.
+#  Make sure that you've setup git repository for you app, as shown in STEP 1.
+#  Open a terminal window and make sure you've cd to your project within the projectspace.
+#  Make sure that you've setup your heroku credentials on your machine using
+  $ heroku login
+
+#  Create your project (we'll call it "sample-milia" in the examples here).
+  $ heroku create sample-milia
+
+#  Now setup the various add-ons we'll need:
+  $ heroku addons:add sendgrid
+
+#  Now setup any needed configurations variables
+  $ heroku config:add BUNDLE_WITHOUT="development:test:linux:mac"
+  $ heroku config:add RECAPTCHA_PUBLIC_KEY='<your public key>'
+  $ heroku config:add RECAPTCHA_PRIVATE_KEY='<your private key>'
+
+# edit config/initializers/secret_token.rb
+# duplicate the secret_key_base line and rename it to secret_token
+
+# edit config/environments/production.rb  line 4
+# put in the correct path for the hostname, and remove the https protocol if not needed
+
+# edit Gemfile and replace the sqlite3 line with the following:
+  # Use sqlite3 as the dev/test database for Active Record
+  gem 'sqlite3', :group => [:development, :test]
+
+  # Use pg as the production database for heroku
+  gem 'pg', :group => :production
+
+# then run bundle install, and commit to the repository
+  $ bundle install
+  $ git commit -am 'ready for heroku deploy'; git push origin master
+
+# now deploy to heroku
+  $ git push heroku master
+
+# now migrate the database
+  $ heroku run rake db:migrate
+  $ heroku restart
+
+# go to browser and put in the correct address for your app on heroku:
 
+  http://sample-milia.herokuapp.com
 

data/lib/milia/version.rb

@@ -1,3 +1,3 @@
 module Milia
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

metadata

@@ -1,111 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: milia
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - daudi amani
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-20 00:00:00.000000000 Z
+date: 2015-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   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: sqlite3
   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: shoulda
   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: turn
   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'
 description: Multi-tenanting gem for hosted Rails/Ruby/devise applications
@@ -115,12 +115,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .document
-- .gitignore
-- .project
-- .ruby-gemset
-- .ruby-version
-- .slugignore
+- ".document"
+- ".gitignore"
+- ".project"
+- ".ruby-gemset"
+- ".ruby-version"
+- ".slugignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -227,17 +227,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.10
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Transparent multi-tenanting for hosted rails/ruby/devise web applications