tawork 0.0.46 → 0.0.47

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzI1NjY1ZmY2NDZiOTBjZDAxMWM4MmJiYTE5ODJhMThiMjQ0MWUxMA==
+    YzA4MzU5NjFmNTljNTFjY2YyOTM5MzM3YzNlNjMwMzhlNjMyMDgwMg==
   data.tar.gz: !binary |-
-    YjhhZTFiZWU3YzljMzhmY2M5NzZlNmMxYjY3YTQ3YzA1ZjZiYjhiMA==
+    OWNkMjg5NmRiYzU1M2I3M2JjOTFhYzJhZWI5YWIwMDY5OTAxZWRmNQ==
 SHA512:
   metadata.gz: !binary |-
-    ZWI4M2ZiYzYyNTVmNjQxODY2MWU0ZmQxMzU2ZjJmNzYzODU4MDMxYmIwYmYz
-    ZWM3OWIyZmY3YTE3ZDZhNzNlZTM5NzBkZTNiYWQzYzA0NTg4M2MxZGYxNWI5
-    ODA2ZGUwYjZmZGE1OWY0YjE4ZDIzYmE0N2Y5ZmJlNWFiMDZiZmY=
+    OTZlZjMwYzE5ZTIxOGFmOGJmYjZhNGUzZjc4NDJhYzRkZjgwYjM1M2I1Yzc0
+    ZjJkZjVmOGVhNDkxMmFmNTdmYTY5M2ZjMWNiYzRjYTAyNmYyMjIwNTFiNTVj
+    ODRjNmYzYjJiNGQ2ODYzZGE4OGQ5ZDljMWM4Njk3OTcwOGY3ZjQ=
   data.tar.gz: !binary |-
-    ZTliMzA0YmQwYWIyN2U2YjU1M2IyNTcxYjkzMTU0ZTA0OTUxZjdiOGY3OGNl
-    OWU4ZTgyMGZkMjM5NTI0M2EzNGZjMDk3ZGM4MGUzOGVhZTMwYjllNGQ2NGIx
-    Y2E5MjU5NDIzMDRiMDlkZDcwMGIzNDNmZTVmODZmOWUwNjBjZDc=
+    NTIyODFmNzJiYzMxYmFhNWY2ODA4NjgyMzZlOGY0NTYxN2Q0MzhlZDZlZmU2
+    YTg3OWE5YTgwODE0MTA1NjgyYjRlNDQ4ZjVhNzkwMzE4ZThlN2VhYzM0MDI2
+    MjhiMGE5YjY0MDg5YTY1YzY3YzQxZDg5YjViNjE5MjNiMjc5M2E=

data/.gitignore

@@ -18,3 +18,6 @@ tawork.git
 vendor/bundle
 bin/*
 tawork*.gem
+
+# Ignore application configuration
+/config/application.yml

data/Gemfile

@@ -3,7 +3,7 @@ source 'https://rails-assets.org'
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 # gem 'rails', '4.1.0.beta1'
-gem 'rails', "4.1.0.rc1"
+gem 'rails', "4.2.1"
 
 # Use mysql as the database for Active Record
 gem 'mysql2'
@@ -21,6 +21,8 @@ gem 'haml-contrib'
 gem 'ancestry'
 gem 'devise'
 gem 'omniauth-openid'
+gem "omniauth-google-oauth2"
+gem "figaro"
 gem 'simple_form'
 gem 'aasm'
 gem 'acts_as_list', git: "git@github.com:swanandp/acts_as_list.git"
@@ -66,7 +68,7 @@ gem 'coffee-rails', '~> 4.0.0'
 gem 'jquery-rails'
 
 # Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
-gem 'turbolinks'
+# gem 'turbolinks'
 
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
 gem 'jbuilder', '~> 1.2'
@@ -79,6 +81,7 @@ end
 gem 'pry-rails'
 
 group :development do
+  gem 'web-console', '~> 2.0'
   gem "better_errors"
   gem "binding_of_caller"
   # gem 'rack-mini-profiler'

data/Gemfile.lock

@@ -38,9 +38,9 @@ GIT
 
 GIT
   remote: git@github.com:swanandp/acts_as_list.git
-  revision: 7390b48ae2cb419d60f0509d80647b5b10845780
+  revision: 84325ede9ad528acbf68a97c5070cff113ee6a17
   specs:
-    acts_as_list (0.4.0)
+    acts_as_list (0.6.0)
       activerecord (>= 3.0)
 
 GEM
@@ -49,42 +49,48 @@ GEM
   specs:
     RedCloth (4.2.9)
     aasm (3.1.1)
-    actionmailer (4.1.0.rc1)
-      actionpack (= 4.1.0.rc1)
-      actionview (= 4.1.0.rc1)
-      mail (~> 2.5.4)
-    actionpack (4.1.0.rc1)
-      actionview (= 4.1.0.rc1)
-      activesupport (= 4.1.0.rc1)
-      rack (~> 1.5.2)
+    actionmailer (4.2.1)
+      actionpack (= 4.2.1)
+      actionview (= 4.2.1)
+      activejob (= 4.2.1)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (4.2.1)
+      actionview (= 4.2.1)
+      activesupport (= 4.2.1)
+      rack (~> 1.6)
       rack-test (~> 0.6.2)
-    actionview (4.1.0.rc1)
-      activesupport (= 4.1.0.rc1)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.1)
+    actionview (4.2.1)
+      activesupport (= 4.2.1)
       builder (~> 3.1)
       erubis (~> 2.7.0)
-    activemodel (4.1.0.rc1)
-      activesupport (= 4.1.0.rc1)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.1)
+    activejob (4.2.1)
+      activesupport (= 4.2.1)
+      globalid (>= 0.3.0)
+    activemodel (4.2.1)
+      activesupport (= 4.2.1)
       builder (~> 3.1)
-    activerecord (4.1.0.rc1)
-      activemodel (= 4.1.0.rc1)
-      activesupport (= 4.1.0.rc1)
-      arel (~> 5.0.0)
-    activesupport (4.1.0.rc1)
-      i18n (~> 0.6, >= 0.6.9)
+    activerecord (4.2.1)
+      activemodel (= 4.2.1)
+      activesupport (= 4.2.1)
+      arel (~> 6.0)
+    activesupport (4.2.1)
+      i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.1)
+      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     acts-as-taggable-on (3.0.2)
       rails (>= 3, < 5)
     ancestry (2.0.0)
       activerecord (>= 3.0.0)
-    arel (5.0.0)
-    atomic (1.1.15)
+    arel (6.0.0)
     awesome_print (1.2.0)
-    bcrypt (3.1.7)
-    bcrypt-ruby (3.1.5)
-      bcrypt (>= 3.1.3)
+    bcrypt (3.1.10)
     better_errors (1.1.0)
       coderay (>= 1.0.0)
       erubis (>= 2.6.6)
@@ -119,10 +125,11 @@ GEM
       debugger-ruby_core_source (~> 1.3.2)
     debugger-linecache (1.2.0)
     debugger-ruby_core_source (1.3.2)
-    devise (3.2.3)
-      bcrypt-ruby (~> 3.0)
+    devise (3.4.1)
+      bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 3.2.6, < 5)
+      responders
       thread_safe (~> 0.1)
       warden (~> 1.2.3)
     diff-lcs (1.2.5)
@@ -134,6 +141,8 @@ GEM
     execjs (2.0.2)
     faraday (0.9.0)
       multipart-post (>= 1.2, < 3)
+    figaro (1.1.1)
+      thor (~> 0.14)
     font-awesome-rails (4.0.3.1)
       railties (>= 3.2, < 5.0)
     foreman (0.63.0)
@@ -146,6 +155,8 @@ GEM
       diff-lcs (~> 1.1)
       mime-types (~> 1.15)
       posix-spawn (~> 0.3.6)
+    globalid (0.3.5)
+      activesupport (>= 4.1.0)
     gollum-lib (2.0.0)
       github-markup (>= 0.7.5, < 1.0.0)
       gitlab-grit (= 2.6.0)
@@ -169,7 +180,7 @@ GEM
     hashie (2.0.5)
     hike (1.2.3)
     hirb (0.7.1)
-    i18n (0.6.9)
+    i18n (0.7.0)
     jazz_hands (0.5.2)
       awesome_print (~> 1.2)
       coolline (>= 0.4.2)
@@ -188,33 +199,47 @@ GEM
     jquery-rails (3.1.0)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-    json (1.8.1)
+    json (1.8.2)
+    jwt (1.4.1)
     kaminari (0.15.1)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
     kramdown (1.3.2)
-    mail (2.5.4)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
+    loofah (2.0.2)
+      nokogiri (>= 1.5.9)
+    mail (2.6.3)
+      mime-types (>= 1.16, < 3)
     method_source (0.8.2)
     mime-types (1.25.1)
-    mini_portile (0.5.2)
-    minitest (5.3.0)
-    multi_json (1.9.0)
+    mini_portile (0.6.2)
+    minitest (5.6.1)
+    multi_json (1.11.0)
+    multi_xml (0.5.5)
     multipart-post (2.0.0)
     mysql2 (0.3.15)
-    nokogiri (1.6.1)
-      mini_portile (~> 0.5.0)
+    nokogiri (1.6.6.2)
+      mini_portile (~> 0.6.0)
+    oauth2 (1.0.0)
+      faraday (>= 0.8, < 0.10)
+      jwt (~> 1.0)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (~> 1.2)
     omniauth (1.2.1)
       hashie (>= 1.2, < 3)
       rack (~> 1.0)
+    omniauth-google-oauth2 (0.2.6)
+      omniauth (> 1.0)
+      omniauth-oauth2 (~> 1.1)
+    omniauth-oauth2 (1.3.0)
+      oauth2 (~> 1.0)
+      omniauth (~> 1.2)
     omniauth-openid (1.0.1)
       omniauth (~> 1.0)
       rack-openid (~> 1.3.1)
     orm_adapter (0.5.0)
     plupload-rails (1.2.1)
       rails (>= 3.1)
-    polyglot (0.3.4)
     posix-spawn (0.3.8)
     pry (0.9.12.6)
       coderay (~> 1.0)
@@ -243,22 +268,23 @@ GEM
       activerecord (>= 3.0)
       i18n (>= 0.5.0)
       railties (>= 3.0.0)
-    rack (1.5.2)
+    rack (1.6.1)
     rack-openid (1.3.1)
       rack (>= 1.1.0)
       ruby-openid (>= 2.1.8)
-    rack-test (0.6.2)
+    rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.1.0.rc1)
-      actionmailer (= 4.1.0.rc1)
-      actionpack (= 4.1.0.rc1)
-      actionview (= 4.1.0.rc1)
-      activemodel (= 4.1.0.rc1)
-      activerecord (= 4.1.0.rc1)
-      activesupport (= 4.1.0.rc1)
+    rails (4.2.1)
+      actionmailer (= 4.2.1)
+      actionpack (= 4.2.1)
+      actionview (= 4.2.1)
+      activejob (= 4.2.1)
+      activemodel (= 4.2.1)
+      activerecord (= 4.2.1)
+      activesupport (= 4.2.1)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.1.0.rc1)
-      sprockets-rails (~> 2.0.0)
+      railties (= 4.2.1)
+      sprockets-rails
     rails-assets-backbone (1.1.2)
       rails-assets-underscore (>= 1.5.0)
     rails-assets-highlightjs (8.0.0)
@@ -270,18 +296,28 @@ GEM
     rails-assets-jquery.scrollTo (1.4.11)
       rails-assets-jquery (>= 1.8)
     rails-assets-underscore (1.6.0)
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.6)
+      activesupport (>= 4.2.0.beta, < 5.0)
+      nokogiri (~> 1.6.0)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.0.2)
+      loofah (~> 2.0)
     rails-timeago (2.9.0)
       actionpack (>= 3.1)
       activesupport (>= 3.1)
-    railties (4.1.0.rc1)
-      actionpack (= 4.1.0.rc1)
-      activesupport (= 4.1.0.rc1)
+    railties (4.2.1)
+      actionpack (= 4.2.1)
+      activesupport (= 4.2.1)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.1.1)
+    rake (10.4.2)
     rdoc (4.1.1)
       json (~> 1.4)
     redcarpet (3.1.1)
+    responders (2.1.0)
+      railties (>= 4.2.0, < 5)
     rouge (1.3.3)
     ruby-openid (2.5.0)
     sanitize (2.0.6)
@@ -295,9 +331,9 @@ GEM
     sdoc (0.4.0)
       json (~> 1.8)
       rdoc (~> 4.0, < 5.0)
-    simple_form (3.0.1)
-      actionpack (>= 4.0.0, < 4.1)
-      activemodel (>= 4.0.0, < 4.1)
+    simple_form (3.1.0)
+      actionpack (~> 4.0)
+      activemodel (~> 4.0)
     slop (3.5.0)
     spring (1.1.2)
     sprockets (2.11.0)
@@ -314,22 +350,21 @@ GEM
       daemons (>= 1.0.9)
       eventmachine (>= 1.0.0)
       rack (>= 1.0.0)
-    thor (0.18.1)
-    thread_safe (0.2.0)
-      atomic (>= 1.1.7, < 2)
+    thor (0.19.1)
+    thread_safe (0.3.5)
     tilt (1.4.1)
-    treetop (1.4.15)
-      polyglot
-      polyglot (>= 0.3.1)
-    turbolinks (2.2.1)
-      coffee-rails
-    tzinfo (1.1.0)
+    tzinfo (1.2.2)
       thread_safe (~> 0.1)
     uglifier (2.4.0)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
     warden (1.2.3)
       rack (>= 1.0)
+    web-console (2.1.2)
+      activemodel (>= 4.0)
+      binding_of_caller (>= 0.7.2)
+      railties (>= 4.0)
+      sprockets-rails (>= 2.0, < 4.0)
     yard (0.8.7.3)
 
 PLATFORMS
@@ -353,6 +388,7 @@ DEPENDENCIES
   elasticsearch!
   elasticsearch-model!
   elasticsearch-rails!
+  figaro
   font-awesome-rails
   foreman
   github-markdown
@@ -365,11 +401,12 @@ DEPENDENCIES
   kaminari
   kramdown
   mysql2
+  omniauth-google-oauth2
   omniauth-openid
   plupload-rails
   pry-rails
   public_activity
-  rails (= 4.1.0.rc1)
+  rails (= 4.2.1)
   rails-assets-backbone
   rails-assets-highlightjs
   rails-assets-jquery-autosize
@@ -384,5 +421,5 @@ DEPENDENCIES
   spring
   thin
   tinymce-rails!
-  turbolinks
   uglifier (>= 1.3.0)
+  web-console (~> 2.0)

data/app/controllers/users/omniauth_callbacks_controller.rb

@@ -1,5 +1,5 @@
 class Users::OmniauthCallbacksController < Devise::OmniauthCallbacksController
-  skip_before_filter :verify_authenticity_token, only: [:google_apps]
+  skip_before_filter :verify_authenticity_token, only: [:google_apps, :google_oauth2]
 
   def google_apps
     if UserVerifier.respond_to?(:verified?)
@@ -20,4 +20,8 @@ class Users::OmniauthCallbacksController < Devise::OmniauthCallbacksController
       redirect_to new_user_registration_url
     end
   end
+
+  def google_oauth2
+    google_apps
+  end
 end

data/app/models/user.rb

@@ -6,7 +6,7 @@ class User < ActiveRecord::Base
   # :confirmable, :lockable, :timeoutable and :omniauthable
   devise :database_authenticatable, :registerable,
          :recoverable, :rememberable, :trackable, :validatable
-  devise :omniauthable, omniauth_providers: [:google_apps]
+  devise :omniauthable, omniauth_providers: [:google_apps, :google_oauth2]
 
   has_many :tickets, foreign_key: 'creator_id'
   has_many :projects, foreign_key: 'creator_id', class_name: "Project"

data/config/initializers/devise.rb

@@ -231,6 +231,10 @@ Devise.setup do |config|
   # up on your models and hooks.
   # config.omniauth :github, 'APP_ID', 'APP_SECRET', :scope => 'user,public_repo'
   config.omniauth :open_id, store: OpenID::Store::Filesystem.new('/tmp'), name: 'google_apps', identifier: 'https://www.google.com/accounts/o8/id', require: 'omniauth-openid'
+  if Figaro.env.enable_google_oauth2
+    config.omniauth :google_oauth2, Figaro.env.google_client_id!, Figaro.env.google_client_secret!, { access_type: "offline", approval_prompt: "" }
+  end
+
 
   # ==> Warden configuration
   # If you want to use other strategies, that are not supported by Devise, or

data/lib/tawork/version.rb

@@ -1,3 +1,3 @@
 module Tawork
-  VERSION = '0.0.46'
+  VERSION = '0.0.47'
 end

data/tawork.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.executables   = s.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   s.test_files    = s.files.grep(%r{^(test|spec|features)/})
 
-  s.add_dependency "rails", "4.1.0.rc1"
+  s.add_dependency "rails", "4.2.1"
 
   s.require_paths = ['lib']
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tawork
 version: !ruby/object:Gem::Version
-  version: 0.0.46
+  version: 0.0.47
 platform: ruby
 authors:
 - Adnan Ali
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-10 00:00:00.000000000 Z
+date: 2015-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.0.rc1
+        version: 4.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.0.rc1
+        version: 4.2.1
 description: Wiki and Tickets
 email:
 - adnan.ali@gmail.com
@@ -328,7 +328,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Wiki and Tickets