jive-tile 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0530c49f3d8a99281b23f5121c0080e179dd2d47
-  data.tar.gz: 8b62f6260ae0cd1dc662760ee70585e363c78429
+  metadata.gz: a8209f623b40e109f3874a53e58a503442e2685d
+  data.tar.gz: 435667c040a6b8d447a7da9a790ce79cc8071e2b
 SHA512:
-  metadata.gz: 5939b964b337e7a0f04a5d54404be2c49a0a7cd621aa888fe412ab158ba444f4cc6b16ed1369496559317e9a4210e8e71a7f4f1f75c96e922a3d92ac40872751
-  data.tar.gz: 5abfec8d65450a2d209b605f0861fdeb4cd22a299a4b29758b1457893f475b5f94481d12aafc1ea1e986dfa4e4223af41ba82030337e8e76de3cc01474b13697
+  metadata.gz: a4151cc1c0fbfac04cd24faaf782b3a1d851b053ac37a7a466791f6d51fbb3c1d776ed5193a98805fda0f5b424f5b5062c803b0721a648fae40df2de4ceac4c3
+  data.tar.gz: 07c994110178561a815eba80fe4d6e8ab66fb57e30496d5231db8bb1782beb0d2807026739828efbe5794ad91cca2b351efc11f9e9dbe68efc954f5122e4214e

data/README.md

@@ -33,7 +33,7 @@ rails generate jive:tile:active_record
 To the ActiveRecord model:
 
 ```ruby
-Jive::Tile::Model.new(...)
+Jive::Tile.new(...)
 ```
 
 ## Contributing

data/jive-tile.gemspec

@@ -21,8 +21,8 @@ Gem::Specification.new do |spec|
 	spec.add_dependency "activerecord", [">= 3.0", "< 5.0"]
 
 	# Tiles require association with an AddOn
-	spec.add_dependency "jive-add_on"
-	spec.add_dependency "jive-oauth_token"
+	spec.add_dependency "jive-add_on", ">= 0.0.2"
+	spec.add_dependency "jive-oauth_token", ">= 0.0.3"
 
 	if RUBY_PLATFORM == 'java'
 		spec.add_development_dependency "jdbc-sqlite3", "> 0"

data/lib/generators/jive/tile/active_record_generator.rb

@@ -5,7 +5,7 @@ require "rails/generators/active_record"
 
 # Extend the HasDynamicColumnsGenerator so that it creates an AR migration
 module Jive
-	module Tile
+	class Tile < ActiveRecord::Base
 		class ActiveRecordGenerator < ::Jive::Tile::Generator
 			include Rails::Generators::Migration
 			extend NextMigrationVersion

data/lib/generators/jive/tile/next_migration_version.rb

@@ -1,5 +1,5 @@
 module Jive
-	module Tile
+	class Tile < ActiveRecord::Base
 		module NextMigrationVersion
 			# while methods have moved around this has been the implementation
 			# since ActiveRecord 3.0

data/lib/generators/jive/tile/tile_generator.rb

@@ -2,7 +2,7 @@ require 'rails/generators/base'
 require 'jive/tile/compatibility'
 
 module Jive
-	module Tile
+	class Tile < ActiveRecord::Base
 		class Generator < Rails::Generators::Base
 			source_paths << File.join(File.dirname(__FILE__), 'templates')
 		end

data/lib/jive/tile.rb

@@ -8,12 +8,16 @@ require "jive/tile/add_on/class_methods"
 
 require "jive/tile/version"
 require "jive/tile/compatibility"
-require "jive/tile/model"
+require "jive/tile/class_methods"
+require "jive/tile/instance_methods"
 
 module Jive
-	module Tile
+	class Tile < ActiveRecord::Base
 	end
 end
 
+Jive::Tile.send :include, Jive::Tile::InstanceMethods
+Jive::Tile.send :extend, Jive::Tile::ClassMethods
+
 # We want add-ons to know they can now associate with Tiles
-Jive::AddOn::Model.send :include, Jive::Tile::AddOn::Model::ClassMethods
+Jive::AddOn.send :include, Jive::Tile::AddOn::ClassMethods

data/lib/jive/tile/add_on/class_methods.rb

@@ -1,12 +1,10 @@
 module Jive
-	module Tile
+	class Tile < ActiveRecord::Base
 		module AddOn
-			module Model
-				module ClassMethods
-					def self.included(base)
-						base.class_eval do
-							has_many :tiles, :class_name => "Jive::Tile::Model", :foreign_key => :jive_add_on_id
-						end
+			module ClassMethods
+				def self.included(base)
+					base.class_eval do
+						has_many :tiles, :class_name => "Jive::Tile", :foreign_key => :jive_add_on_id
 					end
 				end
 			end

data/lib/jive/tile/class_methods.rb

@@ -0,0 +1,13 @@
+module Jive
+	class Tile < ActiveRecord::Base
+		module ClassMethods
+			def self.extended(base)
+				base.belongs_to :add_on, :class_name => "Jive::AddOn", :foreign_key => :jive_add_on_id
+				base.validates :jive_add_on_id, :presence => true
+				base.has_one :oauth_token, :class_name => "Jive::OauthToken", :as => :owner
+				base.serialize :config, Hash
+				base.after_create :fetch_oauth_token
+			end
+		end
+	end
+end

data/lib/jive/tile/compatibility.rb

@@ -1,7 +1,7 @@
 require 'jive/tile/version'
 
 module Jive
-	module Tile
+	class Tile < ActiveRecord::Base
 		module Compatibility
 			if ActiveSupport::VERSION::MAJOR >= 4
 				require 'active_support/proxy_object'

data/lib/jive/tile/{model.rb → instance_methods.rb}

@@ -1,12 +1,9 @@
 module Jive
-	module Tile
-		class Model < ActiveRecord::Base
-			self.table_name = :jive_tiles
-			belongs_to :add_on, :class_name => "Jive::AddOn::Model", :foreign_key => :jive_add_on_id
-			has_one :oauth_token, :class_name => "Jive::OauthToken::Model", :as => :owner
-			serialize :config, Hash
-
-			after_create :fetch_oauth_token
+	class Tile < ActiveRecord::Base
+		module InstanceMethods
+			def self.included(base)
+				base.table_name = "jive_tiles"
+			end
 
 			private
 				def fetch_oauth_token
@@ -37,7 +34,7 @@ module Jive
 						json_body = JSON.parse(response.body)
 
 						# Create
-						Jive::OauthToken::Model.create(
+						Jive::OauthToken.create(
 							:owner => self,
 							:scope => json_body["scope"],
 							:token_type => json_body["token_type"],

data/lib/jive/tile/version.rb

@@ -1,5 +1,7 @@
+require "active_record"
+
 module Jive
-	module Tile
-		VERSION = "0.0.7"
+	class Tile < ActiveRecord::Base
+		VERSION = "0.0.8"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jive-tile
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Butch Marshall
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-01 00:00:00.000000000 Z
+date: 2016-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -36,28 +36,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.2
 - !ruby/object:Gem::Dependency
   name: jive-oauth_token
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.3
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -180,8 +180,9 @@ files:
 - lib/generators/jive/tile/tile_generator.rb
 - lib/jive/tile.rb
 - lib/jive/tile/add_on/class_methods.rb
+- lib/jive/tile/class_methods.rb
 - lib/jive/tile/compatibility.rb
-- lib/jive/tile/model.rb
+- lib/jive/tile/instance_methods.rb
 - lib/jive/tile/version.rb
 homepage: https://github.com/butchmarshall/ruby-jive-tile
 licenses: