horse_power 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b72736abd78cb7ff9706a8f549283f235eee80e
-  data.tar.gz: 65eee83cc5fda53765b3d17bbe4a83c66ae8dcfb
+  metadata.gz: 0318e08773e2a4da887ee861e658cac4b0c0939a
+  data.tar.gz: 6ef59dd2a72a957bca385175ffa63020d3b6c861
 SHA512:
-  metadata.gz: 32b829f3f15785646553fba5af81a24a8fc1bd519da3b181b647dd9132b506622d1502b1a0bc23d0a4aea3615b91e86b07a92032350550b6019bd021bb77e905
-  data.tar.gz: 547d006fa5d19159c446c335448fe5faeff4ebdda158bfb165274436d6b2c788cdad594999206f3fc6340bb3f6432056e59f41f096dc2434e8021391ecfb6ed8
+  metadata.gz: 352a461ae393325ec4164c812b9e9292517b110fd9bb61d1ebc316417153fef5675f3cc0819a050a32e97e062ed1ef3248a70f6f4810bfe5f5710d9505e78f17
+  data.tar.gz: 5e399bba9f7b9a16ef58907332a170b2fa0a6f8362da67a18b753fe18a85a056d23a02d40f15a30447e5aa5d24b6d42d4a67ac9dd91f7b1683df19ea5d7917f9

data/lib/generators/horse_power/user/templates/controller.rb.erb

@@ -100,21 +100,6 @@ class Api::V1::UsersController < Api::V1::ApplicationController
       render :json => {user: userHash,token: tokenHash}
     end
 
-    def get_id(fb_api,long_token,short_token)
-      response = fb_api.get_user_id(long_token)
-      if response.code == 200
-        @token = long_token
-        return JSON.parse(response.body)["id"]
-      end
-      #Lets try it with the short token now
-      response = fb_api.get_user_id(short_token)
-      if response.code == 200
-        @token = short_token
-        return JSON.parse(response.body)["id"]
-      end
-      return nil
-    end
-
     # Authorizations below here
 
     def index_authorize

data/lib/generators/horse_power/user/templates/facebook.rb

@@ -35,6 +35,21 @@ class Facebook
   	return response
   end
 
+  def self.get_id(fb_api,long_token,short_token)
+    response = fb_api.get_user_id(long_token)
+    if response.code == 200
+      @token = long_token
+      return JSON.parse(response.body)["id"]
+    end
+    #Lets try it with the short token now
+    response = fb_api.get_user_id(short_token)
+    if response.code == 200
+      @token = short_token
+      return JSON.parse(response.body)["id"]
+    end
+    return nil
+  end
+
   private 
 
   	def parse_token(response)

data/lib/generators/horse_power/user/templates/model.rb.erb

@@ -55,7 +55,7 @@ class User < ActiveRecord::Base
     short_token = params[:token]
     fb_api = Facebook.new
     long_token = fb_api.get_long_token(short_token)
-    fb_user_id = get_id(fb_api,long_token,short_token)
+    fb_user_id = Facebook.get_id(fb_api,long_token,short_token)
     if fb_user_id.nil?
       #Couldn't retrieve the facebook user_id from token
       return nil;

data/lib/generators/horse_power/user/templates/specs/factory.rb.erb

@@ -6,7 +6,7 @@ FactoryGirl.define do
 		"username#{n}@email.com"
 	end
 	sequence :fb_user_id do |n|
-		n
+		"#{n}"
 	end
   factory :user_1, class: User do
 		username

data/lib/generators/horse_power/user/user_generator.rb

@@ -22,7 +22,7 @@ module HorsePower
 	  end
 
 	  def create_migration
-	  	run "rails g model user username:string:uniq email:string:uniq fb_user_id:integer:uniq password_digest:string --no-fixture --skip"
+	  	run "rails g model user username:string:uniq email:string:uniq fb_user_id:string:uniq password_digest:string --no-fixture --skip"
 	  	run "rm -rf app/models/user.rb"
 	  	run "rm -rf spec/models/user_spec.rb"
 	  	run "rm -rf spec/factories/users.rb"

data/lib/horse_power/version.rb

@@ -1,3 +1,3 @@
 module HorsePower
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: horse_power
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Cleophus Robinson IV
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-22 00:00:00.000000000 Z
+date: 2015-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails