xmppify 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f56cec8e851a8b6caf67db52a459bfad5f5f442b
-  data.tar.gz: 74d172a4059de199e11e6862284a6071c3a1d612
+  metadata.gz: 78335a6fdf9cd2e350b3616431e30d6590532424
+  data.tar.gz: c094c45779ef8fc7d9fb95d9457d9206272ce217
 SHA512:
-  metadata.gz: 406536d7ce71b6abe236f74adc8ea6f7454e454ba5db590c5fc1616485f5cb4eef2b523de01a5366610c9e2718a44a43c3fdf890718ec76fadb7e373d3d07779
-  data.tar.gz: 395b0e6b434da064f810ac0c4ac43ee5f2602d6c23abdce2a7ed226b88b4a3b730dcc99ec00178755d4866c055adbf954193f105986c65c21dcf80e0f6e5f8d6
+  metadata.gz: 80c5deeb5f8b52047032b09460d5341f637f604c014d92c8879d046af14b35a5d2fedce6357f8034f1eaf31362f709cb05f162bfeed8fc6dd77497fb3dbe53f7
+  data.tar.gz: 047b4c3d15495640c92eadb7543984f32c1c01c700ddc578f90a77da754bf8c18279a674b62dd0bde18cd9ff049b7e2a44a3d28755fb1c63edecdd952616a44f

data/app/controllers/application_controller.rb

@@ -0,0 +1,16 @@
+#
+class ApplicationController < ActionController::Base
+  protect_from_forgery
+  
+  def doorkeeper_oauth_client
+    @client ||= OAuth2::Client.new(DOORKEEPER_APP_ID, DOORKEEPER_APP_SECRET, :site => DOORKEEPER_APP_URL)
+  end
+
+  def doorkeeper_access_token
+    @token ||= OAuth2::AccessToken.new(doorkeeper_oauth_client, current_user.doorkeeper_access_token) if current_user
+  end
+
+  def new_session_path *args 
+    new_user_session_path *args
+  end
+end

data/db/migrate/20140329065635_create_users.rb

@@ -1,9 +1,10 @@
+# This migration comes from xmppify_engine (originally 20140329065635)
 class CreateUsers < ActiveRecord::Migration
   def change
     create_table :users do |t|
-      add_column :users,:doorkeeper_uid,:integer
-      add_column :users,:doorkeeper_access_token,:string
-      add_column :users,:encrypted_data,:string
+      t.integer :doorkeeper_uid
+      t.string :doorkeeper_access_token
+      t.string :encrypted_data
       t.timestamps
     end
   end

data/lib/xmppify/version.rb

@@ -1,3 +1,3 @@
 module Xmppify
-  VERSION = "0.0.12"
+  VERSION = "0.0.13"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xmppify
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Charlie
@@ -158,6 +158,7 @@ files:
 - app/assets/javascripts/xmpp/strophejs-plugins/vcard/strophe.vcard.coffee
 - app/assets/javascripts/xmpp/strophejs-plugins/vcard/strophe.vcard.js
 - app/assets/stylesheets/xmpp/index.css
+- app/controllers/application_controller.rb
 - app/controllers/omniauth_callbacks_controller.rb
 - app/controllers/ruby_bosh.rb
 - app/models/identity.rb