roles 0.0.2 → 0.0.3

data/CHANGELOG.rdoc

@@ -1,3 +1,6 @@
+= v0.0.3 (Aug 23, 2012)
+* fix generator error
+
 = v0.0.2 (Aug 19, 2012)
 * rename `user.resources` to `user.resources_with_role`
 

data/lib/generators/roles/role/role_generator.rb

@@ -8,19 +8,18 @@ module Roles
       source_root File.expand_path('../templates', __FILE__)
       argument :role_cname, :type => :string, :default => "Role"
       argument :user_cname, :type => :string, :default => "User"
-      argument :orm_adapter, :type => :string, :default => "active_record"
 
       desc "Generates a model with the given NAME and a migration file."
 
       def generate_role
-        template "role-#{orm_adapter}.rb", "app/models/#{role_cname.underscore}.rb"
+        template "role-active_record.rb", "app/models/#{role_cname.underscore}.rb"
         inject_into_file(model_path, :after => inject_roles_method) do
-          "  roles" + (role_cname == "Role" ? "" : " :role_cname => '#{role_cname.camelize}'") + "\n"
+          "  rolify" + (role_cname == "Role" ? "" : " :role_cname => '#{role_cname.camelize}'") + "\n"
         end
       end
 
       def copy_role_file
-        migration_template "migration.rb", "db/migrate/roles_create_#{role_cname.tableize}" if orm_adapter == "active_record"
+        migration_template "migration.rb", "db/migrate/roles_create_#{role_cname.tableize}"
       end
 
       def model_path
@@ -32,15 +31,11 @@ module Roles
       end
       
       def show_readme
-        readme "README-#{orm_adapter}" if behavior == :invoke
+        readme "README-active_record" if behavior == :invoke
       end
       
       def inject_roles_method
-        if orm_adapter == "active_record"
-          /class #{user_cname.camelize}\n|class #{user_cname.camelize} .*\n/
-        else
-          /include Mongoid::Document\n|include Mongoid::Document .*\n/
-        end
+        /class #{user_cname.camelize}\n|class #{user_cname.camelize} .*\n/
       end
     end
   end

data/lib/generators/roles/role/templates/role-active_record.rb

@@ -1,5 +1,5 @@
 class <%= role_cname.camelize %> < ActiveRecord::Base
-  belongs_to :<%= user_cname.tableize %>
+  belongs_to :<%= user_cname.tableize.singularize %>
   belongs_to :resource, :polymorphic => true
   
 end

data/lib/roles/version.rb

@@ -1,3 +1,3 @@
 module Roles
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roles
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-19 00:00:00.000000000 Z
+date: 2012-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3