rollout_admin 0.0.3 → 0.0.4

data/README.md

@@ -22,17 +22,24 @@ To mount the engine within your project add the following line to your routes.rb
 
 	mount RolloutAdmin::Engine => "/rollout_admin"
 
-You will be asked for a username and password when accessing the page for the first time. This is "foo/bar".
+You will be asked for a username and password when accessing the page. The default username, password is foo/bar. You can configure them to be anything you like with the intializer options:
+
+	RolloutAdmin.auth_name		= "myuser"
+	RolloutAdmin.auth_password	= "secret"
 
 **Special hint when using an API**
 
 It turned out that in one of our own projects we wrapped the users object to be accessed via an API. Within our main application controller the API calls got some additional headers for API Key which where not accessable within the rollout_admin engine. Therefor there is an option RolloutAdmin.user_url you can configure to provide the URL used for getting a users list within the RolloutAdmin interface.
 
+Furthermore if you don't have the fields name and email present in your User Model or if they are named differently. You can override the User Model attributes rollout_admin should use to display user information.
+
 Just define an initializer and paste the following:
 
 	# Rollout Admin configuration
 	#
 	RolloutAdmin.user_url = "/just/something/boring.json"
+	RolloutAdmin.user_name_attribute	= "first_name"
+	RolloutAdmin.user_email_attribute	= "email"
 
 ## TODO
 

data/app/assets/javascripts/rollout_admin/admin.js.erb

@@ -76,7 +76,7 @@ $(function(){
 			$.getJSON('<%= user_url%>', function(json) {
 					userlist='<h5>Select users to add</h5><form id="userlist"><ul class="unstyled">';
 					$.each(json, function() {
-					    userlist += '<li><input type="checkbox", value="'+this.id+'" data-username="'+this.Name+'"> '+this.Name+', '+this.email+'</li>';
+					    userlist += '<li><input type="checkbox", value="'+this.id+'" data-username="'+this.<%=RolloutAdmin.user_name_attribute%>+'"> '+this.<%=RolloutAdmin.user_name_attribute%>+', '+this.<%=RolloutAdmin.user_email_attribute%>+'</li>';
 					  });
 					userlist +='</ul></form>';
 

data/app/controllers/rollout_admin/admin_controller.rb

@@ -59,7 +59,7 @@ module RolloutAdmin
 
   def remove 
     if params[:object_type] == "user"
-      @user=User.where(:name => params[:user]).first
+      @user=User.where(RolloutAdmin.user_name_attribute.to_sym  => params[:user]).first
       if @user
         $rollout.deactivate_user(params[:feature], @user)
       end
@@ -86,7 +86,7 @@ module RolloutAdmin
 
   def authenticate
     authenticate_or_request_with_http_basic do |username, password|
-      username == "foo" && password == "bar"
+      username == RolloutAdmin.auth_name && password == RolloutAdmin.auth_password
     end
   end
 

data/app/views/rollout_admin/admin/_feature.html.erb

@@ -11,11 +11,11 @@
 		  	<% if feature.users.count > 0 %>
 			  	<% feature.users.each {|user| %>
 			  		<li><i class="icon-minus delete_user"></i>
-			  			<%if Object.const_defined?('User') %>
-			  				<%=User.find(user.to_i).Name%>
-			  			<% else %>
-			  				no User model defined
-			  			<% end %>
+		  			 	<% if User.find(user.to_i).nil? %>
+		  			 		<%= user %>
+		  			 	<% else %>
+		  			 		<%=User.find(user.to_i).send(RolloutAdmin.user_name_attribute) %>
+		  			 	<% end %>
 			  		</li>
 				<% } %>
 			<% else %>

data/lib/rollout_admin/version.rb

@@ -1,3 +1,3 @@
 module RolloutAdmin
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/rollout_admin.rb

@@ -3,4 +3,15 @@ require "rollout_admin/engine"
 module RolloutAdmin
     mattr_accessor :user_url
 
+    mattr_accessor :user_name_attribute
+    @@user_name_attribute = "Name"
+
+    mattr_accessor :user_email_attribute
+	@@user_email_attribute = "email"    
+
+	mattr_accessor :auth_name
+	@@auth_name = "foo"
+
+	mattr_accessor :auth_password
+	@@auth_password = "bar"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rollout_admin
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors: