avo-setup 0.0.32 → 0.0.33

data/lib/avo-setup/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "0.0.32"
+  VERSION = "0.0.33"
 end

data/lib/generators/avo/setup_generator.rb

@@ -16,7 +16,9 @@ module Avo
 				  gem("devise", :git => 'git://github.com/plataformatec/devise', :branch => 'master')
 					run('bundle update')					
 				  generate("devise:install")
-				  model_name = ask("What would you like the user model to be called? [user]")
+					template "user_token.rb", "app/models/user_token.rb"
+					template "user.rb", "app/models/user.rb"
+				
 				  model_name = "user" if model_name.blank?
 				  generate("devise", model_name)
 				  generate("devise:views")
@@ -28,11 +30,11 @@ module Avo
 				    copy_file "ability.rb", "models/ability.rb"
 						@single=model_name
 						#insert_into_file "config/environment.rb", "config.gem :thor", :after => "Rails::Initializer.run do |config|\n"
-						inject_into_class "app/models/"+@single.underscore+".rb", model_name.camelcase, "has_and_belongs_to_many :roles\n"
-						@plural=model_name.pluralize
+						inject_into_class "app/models/user.rb", model_name.camelcase, "has_and_belongs_to_many :roles\n"
+
+											
 						template "role.rb", "app/models/role.rb"
-						@migname=@plural+"_roles" if (@plural.casecmp "roles")<0
-						@migname="roles_"+@plural if (@plural.casecmp "roles")>=0
+						
 
 						migration_template 'create_roles_migration.rb', "db/migrate/create_roles.rb"
 					end

data/lib/generators/avo/templates/create_roles_migration.rb

@@ -4,16 +4,25 @@ class CreateRolesMigration < ActiveRecord::Migration
 		  t.string :title
 		  t.timestamps
 		end
-		create_table :roles_<%= @migname %>, :force => true do |t|
-		  t.integer :<%= @single %>_id
+		
+		create_table :user_tokens, :force => true do |t|
+		  t.string :provider
+		  t.string :uid
+			t.integer :user_id
+		  t.timestamps
+		end
+		create_table :roles_users, :force => true do |t|
+		  t.integer :user_id
 		  t.integer :role_id
 		  t.timestamps
 		end
 		
+		
   end
 
   def self.down
-		drop_table :<%= @migname %>
+		drop_table :user_tokens
+		drop_table :roles_users
 		drop_table :roles
   end
 end

data/lib/generators/avo/templates/role.rb

@@ -1,3 +1,3 @@
 class Role < ActiveRecord::Base
-  has_and_belongs_to_many :<%= @plural.underscore %>
+  has_and_belongs_to_many :users
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 32
-  version: 0.0.32
+  - 33
+  version: 0.0.33
 platform: ruby
 authors: 
 - Avocado