omniauth-canvas 0.0.3 → 0.0.4

data/.rvmrc

@@ -3,46 +3,68 @@
 # This is an RVM Project .rvmrc file, used to automatically load the ruby
 # development environment upon cd'ing into the directory
 
-# First we specify our desired <ruby>[@<gemset>], the @gemset name is optional,
-# Only full ruby name is supported here, for short names use:
-#     echo "rvm use 1.9.3" > .rvmrc
-environment_id="ruby-1.9.3-p194@omniauth-canvas"
-
-# Uncomment the following lines if you want to verify rvm version per project
-# rvmrc_rvm_version="1.12.4 ()" # 1.10.1 seams as a safe start
-# eval "$(echo ${rvm_version}.${rvmrc_rvm_version} | awk -F. '{print "[[ "$1*65536+$2*256+$3" -ge "$4*65536+$5*256+$6" ]]"}' )" || {
-#   echo "This .rvmrc file requires at least RVM ${rvmrc_rvm_version}, aborting loading."
-#   return 1
-# }
+# First we specify our desired <ruby>[@<gemset>], the @gemset name is optional.
+environment_id="ruby-1.9.3@omniauth-canvas"
 
+#
+# Uncomment following line if you want options to be set only for given project.
+#
+# PROJECT_JRUBY_OPTS=( --1.9 )
+#
+# The variable PROJECT_JRUBY_OPTS requires the following to be run in shell:
+#
+#    chmod +x ${rvm_path}/hooks/after_use_jruby_opts
+#
+
+#
 # First we attempt to load the desired environment directly from the environment
 # file. This is very fast and efficient compared to running through the entire
 # CLI and selector. If you want feedback on which environment was used then
 # insert the word 'use' after --create as this triggers verbose mode.
-if [[ -d "${rvm_path:-$HOME/.rvm}/environments"
+#
+if [[ -d "${rvm_path:-$HOME/.rvm}/environments" \
   && -s "${rvm_path:-$HOME/.rvm}/environments/$environment_id" ]]
 then
   \. "${rvm_path:-$HOME/.rvm}/environments/$environment_id"
-  [[ -s "${rvm_path:-$HOME/.rvm}/hooks/after_use" ]] &&
-    \. "${rvm_path:-$HOME/.rvm}/hooks/after_use" || true
+
+  if [[ -s "${rvm_path:-$HOME/.rvm}/hooks/after_use" ]]
+  then
+    . "${rvm_path:-$HOME/.rvm}/hooks/after_use"
+  fi
 else
   # If the environment file has not yet been created, use the RVM CLI to select.
-  rvm --create  "$environment_id" || {
+  if ! rvm --create  "$environment_id"
+  then
     echo "Failed to create RVM environment '${environment_id}'."
     return 1
-  }
+  fi
 fi
 
+#
+# If you use an RVM gemset file to install a list of gems (*.gems), you can have
+# it be automatically loaded. Uncomment the following and adjust the filename if
+# necessary.
+#
+# filename=".gems"
+# if [[ -s "$filename" ]]
+# then
+#   rvm gemset import "$filename" | grep -v already | grep -v listed | grep -v complete | sed '/^$/d'
+# fi
+
 # If you use bundler, this might be useful to you:
-# if [[ -s Gemfile ]] && {
-#   ! builtin command -v bundle >/dev/null ||
-#   builtin command -v bundle | grep $rvm_path/bin/bundle >/dev/null
-# }
+# if [[ -s Gemfile ]] && ! command -v bundle >/dev/null
 # then
-#   printf "%b" "The rubygem 'bundler' is not installed. Installing it now.\n"
+#   printf "The rubygem 'bundler' is not installed. Installing it now.\n"
 #   gem install bundler
 # fi
-# if [[ -s Gemfile ]] && builtin command -v bundle >/dev/null
+# if [[ -s Gemfile ]] && command -v bundle
 # then
-#   bundle install | grep -vE '^Using|Your bundle is complete'
+#   bundle install
 # fi
+
+if [[ $- == *i* ]] # check for interactive shells
+then
+    echo "Using: $(tput setaf 2)$GEM_HOME$(tput sgr0)" # show the user the ruby and gemset they are using in green
+else 
+  echo "Using: $GEM_HOME" # don't use colors in interactive shells
+fi

data/README.md

@@ -11,6 +11,8 @@ authenticate with http://canvas.instructure.com. To dynamically set the canvas s
 
 ## Standard setup:
 
+  # NOTE that you will need to set env['rack.session']['oauth_site'] to the current Canvas instance that you wish to OAuth with. By default this is https://canvas.instructure.com
+
   use OmniAuth::Builder do
     provider :canvas, :setup => lambda{|env|
       request = Rack::Request.new(env)

data/lib/omniauth-canvas/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module Canvas
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

data/lib/omniauth/strategies/canvas.rb

@@ -11,6 +11,9 @@ module OmniAuth
         :authorize_url  => "/login/oauth2/auth",
         :token_url      => "/login/oauth2/token"
       }
+
+      option :provider_ignores_state, true
+
       option :token_params, {
         :parse          => :json
       }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-canvas
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-18 00:00:00.000000000 Z
+date: 2013-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth