jive-tile 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c76114bed4cd8a488494306e87d3cddd3a7fa13e
-  data.tar.gz: 94722ef33dd1b1b85cd2ce67adaaddea2e651d5f
+  metadata.gz: 1cdb4849328f76b637ca7f261d0fe0ad5e8f1457
+  data.tar.gz: 4c9fbc5ba1a645146d7ddf89c5291c40c064fd92
 SHA512:
-  metadata.gz: 3f78a0628b42e53c0d36ccedb455f6af475d72c390a8ff183c265d0bfe1f3ecb20ec2253fe6f01da6bcb6031708ba0d4da1ed0bdcac4ad2c979fa007553eade4
-  data.tar.gz: 20a7f8f2ddd5475e6ddc005345653b7b716d7fa4ecf84e7e98aa2ddac94aaf792a5d9958de99b278461a825e0d7acf27256acee3c6dd7660615d5aa37f876da8
+  metadata.gz: 88e062d55550b42255f2e7b92d5bce2627ca37107dcf96bca1ac7319d2b92d756825644996c11de3943018329d43da184c9320c9004911f2c06aff921807215b
+  data.tar.gz: 0d9fb1d69da46e5026b043c11dc04d7f7922ab0e3811463c5baf1415ae96485ee278a34b7fe90500cc30c3ef8953bb457633cf8ca441203ba7451a91ae762adf

data/Gemfile

@@ -2,3 +2,5 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in jive-tile.gemspec
 gemspec
+
+gem "jive-oauth_token", :path => "../ruby-jive-oauth_token"

data/jive-tile.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |spec|
 
 	# Tiles require association with an AddOn
 	spec.add_dependency "jive-add_on"
+	spec.add_dependency "jive-oauth_token"
 
 	if RUBY_PLATFORM == 'java'
 		spec.add_development_dependency "jdbc-sqlite3", "> 0"

data/lib/jive/tile/model.rb

@@ -3,7 +3,7 @@ module Jive
 		class Model < ActiveRecord::Base
 			self.table_name = :jive_tiles
 			belongs_to :add_on, :class_name => "Jive::AddOn::Model", :foreign_key => :jive_add_on_id
-			belongs_to :oauth_token, :class_name => "Jive::Tile::OAuthToken", :foreign_key => :jive_tiles_oauth_token_id
+			has_one :oauth_token, :class_name => "Jive::OauthToken::Model", :as => :owner
 			serialize :config, Hash
 
 			after_create :fetch_oauth_token
@@ -14,6 +14,8 @@ module Jive
 					require "net/http"
 					require "openssl"
 
+					return if self.add_on.nil?
+
 					uri = URI.parse("#{self.add_on.jive_url}/oauth2/token")
 					http = Net::HTTP.new(uri.host, uri.port)
 					http.use_ssl = true
@@ -35,8 +37,8 @@ module Jive
 						json_body = JSON.parse(response.body)
 
 						# Create
-						Jive::Tile::OauthToken.create(
-							:tile => self,
+						Jive::OauthToken::Model.create(
+							:owner => self,
 							:scope => json_body["scope"],
 							:token_type => json_body["token_type"],
 							:expires_in => json_body["expires_in"],

data/lib/jive/tile/version.rb

@@ -1,5 +1,5 @@
 module Jive
 	module Tile
-		VERSION = "0.0.5"
+		VERSION = "0.0.6"
 	end
 end

data/lib/jive/tile.rb

@@ -2,14 +2,13 @@ require "active_support"
 require "active_support/dependencies"
 require "active_record"
 
+require "jive/oauth_token"
 require "jive/add_on"
 require "jive/tile/add_on/class_methods"
 
 require "jive/tile/version"
 require "jive/tile/compatibility"
 require "jive/tile/model"
-require "jive/tile/oauth_token"
-
 
 module Jive
 	module Tile

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jive-tile
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Butch Marshall
@@ -44,6 +44,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: jive-oauth_token
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  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
@@ -168,7 +182,6 @@ files:
 - lib/jive/tile/add_on/class_methods.rb
 - lib/jive/tile/compatibility.rb
 - lib/jive/tile/model.rb
-- lib/jive/tile/oauth_token.rb
 - lib/jive/tile/version.rb
 homepage: https://github.com/butchmarshall/ruby-jive-tile
 licenses:

data/lib/jive/tile/oauth_token.rb

@@ -1,8 +0,0 @@
-module Jive
-	module Tile
-		class OauthToken < ActiveRecord::Base
-			self.table_name = :jive_tiles_oauth_tokens
-			has_one :tile, :class_name => "Jive::Tile::Model", :foreign_key => :jive_tiles_oauth_token_id
-		end
-	end
-end