simple_roles 0.0.5 → 0.0.6

data/simple_roles.gemspec

@@ -4,19 +4,20 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{simple_roles}
-  s.version = "0.0.5"
+  s.name = "simple_roles"
+  s.version = "0.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = [%q{stanislaw}]
-  s.date = %q{2011-10-14}
-  s.description = %q{Simple Role System for Rails Apps}
-  s.email = %q{s.pankevich@gmail.com}
+  s.authors = ["stanislaw"]
+  s.date = "2012-06-27"
+  s.description = "Simple Role System for Rails Apps"
+  s.email = "s.pankevich@gmail.com"
   s.extra_rdoc_files = [
     "README.md"
   ]
   s.files = [
     ".rspec",
+    "CHANGELOG.md",
     "Gemfile",
     "MIT-LICENSE",
     "README.md",
@@ -36,11 +37,16 @@ Gem::Specification.new do |s|
     "db/migrate/001_create_user_roles.rb",
     "db/migrate/002_create_roles.rb",
     "lib/simple_roles.rb",
-    "lib/simple_roles/base.rb",
     "lib/simple_roles/configuration.rb",
     "lib/simple_roles/engine.rb",
     "lib/simple_roles/macros.rb",
-    "lib/simple_roles/roles_array.rb",
+    "lib/simple_roles/many.rb",
+    "lib/simple_roles/many/persistence.rb",
+    "lib/simple_roles/many/roles_methods.rb",
+    "lib/simple_roles/one.rb",
+    "lib/simple_roles/one/persistence.rb",
+    "lib/simple_roles/one/roles_methods.rb",
+    "lib/simple_roles/packager.rb",
     "lib/simple_roles/version.rb",
     "lib/tasks/simple_roles_tasks.rake",
     "script/rails",
@@ -125,25 +131,31 @@ Gem::Specification.new do |s|
     "spec/dummy/test/unit/user_test.rb",
     "spec/dummy_spec_helper.rb",
     "spec/integration/main_spec.rb",
-    "spec/integration/messages_spec.rb",
     "spec/integration/requests/main_spec.rb",
-    "spec/simple_roles/base_spec.rb",
+    "spec/simple_roles/configuration_spec.rb",
+    "spec/simple_roles/integration_many_spec.rb",
     "spec/simple_roles/macros_spec.rb",
+    "spec/simple_roles/many/persistence_spec.rb",
+    "spec/simple_roles/many_spec.rb",
+    "spec/simple_roles/one_spec.rb",
     "spec/spec_helper.rb",
-    "spec/support/aliases.rb",
     "spec/support/controller_macros.rb",
     "spec/support/database.yml",
     "spec/support/factories.rb",
-    "spec/support/fixtures/models/.gitkeep",
-    "spec/support/fixtures/models/user.rb",
-    "spec/support/migrations/010_create_users.rb",
-    "spec/support/rspec_helpers.rb"
+    "spec/support/migrations/010_create_one_users.rb",
+    "spec/support/migrations/011_create_users.rb",
+    "spec/support/models/.gitkeep",
+    "spec/support/models/one_user.rb",
+    "spec/support/models/user.rb",
+    "spec/support/setup_roles.rb",
+    "spec/support/transaction.rb",
+    "spec/transaction_spec.rb"
   ]
-  s.homepage = %q{http://github.com/stanislaw/simple_roles}
-  s.licenses = [%q{MIT}]
-  s.require_paths = [%q{lib}]
-  s.rubygems_version = %q{1.8.8}
-  s.summary = %q{Rails Engine providing Role System for Rails apps}
+  s.homepage = "http://github.com/stanislaw/simple_roles"
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.19"
+  s.summary = "Rails Engine providing Role System for Rails apps"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
@@ -152,15 +164,13 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<require_all>, [">= 0"])
       s.add_runtime_dependency(%q<sugar-high>, [">= 0"])
       s.add_runtime_dependency(%q<sweetloader>, [">= 0"])
-      s.add_development_dependency(%q<activerecord>, [">= 0"])
+      s.add_runtime_dependency(%q<activerecord>, [">= 0"])
       s.add_development_dependency(%q<rake-kit>, [">= 0"])
       s.add_development_dependency(%q<devise>, [">= 0"])
       s.add_development_dependency(%q<mysql2>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<cutter>, [">= 0"])
-      s.add_development_dependency(%q<rails>, [">= 0"])
-      s.add_development_dependency(%q<rspec-rails>, [">= 0"])
-      s.add_development_dependency(%q<capybara>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<factory_girl>, [">= 0"])
     else
       s.add_dependency(%q<require_all>, [">= 0"])
@@ -172,9 +182,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<mysql2>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<cutter>, [">= 0"])
-      s.add_dependency(%q<rails>, [">= 0"])
-      s.add_dependency(%q<rspec-rails>, [">= 0"])
-      s.add_dependency(%q<capybara>, [">= 0"])
+      s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<factory_girl>, [">= 0"])
     end
   else
@@ -187,9 +195,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<mysql2>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<cutter>, [">= 0"])
-    s.add_dependency(%q<rails>, [">= 0"])
-    s.add_dependency(%q<rspec-rails>, [">= 0"])
-    s.add_dependency(%q<capybara>, [">= 0"])
+    s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<factory_girl>, [">= 0"])
   end
 end

data/spec/dummy/config/database.yml

@@ -3,7 +3,7 @@ development:
   host: localhost
   database: simple_roles_development
   username: root 
-  password: root
+  password:
   encoding: utf8
 
 test:
@@ -11,16 +11,5 @@ test:
   host: localhost
   database: simple_roles_test
   username: root
-  password: root
+  password:
   encoding: utf8
-
-production:
-  adapter: mysql2
-  host: localhost
-  port: 5432
-  database: simple_roles_production
-  username: pgsql 
-  password: pgsql 
-  schema_search_path: public
-  encoding: utf8
-  template: template0

data/spec/dummy/config/environments/development.rb

@@ -13,9 +13,6 @@ Dummy::Application.configure do
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
 
-  # Don't care if the mailer can't send
-  config.action_mailer.raise_delivery_errors = false
-
   # Print deprecation notices to the Rails logger
   config.active_support.deprecation = :log
 

data/spec/dummy/config/initializers/simple_roles.rb

@@ -1,3 +1,4 @@
 SimpleRoles.configure do |config|
-  config.valid_roles = [:user, :admin, :editor]
+  strategy :many
+  valid_roles :user, :admin, :editor
 end

data/spec/integration/main_spec.rb

@@ -1,7 +1,7 @@
-require 'dummy_spec_helper'
+require 'spec_helper'
 
-describe "" do
-  it "truth" do
-    Rails.application.should be_kind_of(Dummy::Application)
-  end
-end
+# describe "" do
+#   pending "truth" do
+#     Rails.application.should be_kind_of(Dummy::Application)
+#   end
+# end

data/spec/integration/requests/main_spec.rb

@@ -1,21 +1,20 @@
-require 'dummy_spec_helper'
+require 'spec_helper'
 
-describe "Requests" do
-  it "truth" do
-    Rails.application.should be_kind_of(Dummy::Application)
-  end
+# describe "Requests" do
+#   pending "truth" do
+#     Rails.application.should be_kind_of(Dummy::Application)
+#   end
 
-  describe "Basic pages" do
-    before do
-      login_as(User.first) 
-    end
+#   pending "Basic pages" do
+#     before do
+#       login_as(User.first) 
+#     end
 
-    it "should get root" do
-      pending
+#     it "should get root" do
+#       pending
       
-      get '/'
-      response.status.should be(200)
-    end
-
-  end
-end
+#       get '/'
+#       response.status.should be(200)
+#     end
+#   end
+# end

data/spec/simple_roles/configuration_spec.rb

@@ -0,0 +1,66 @@
+require 'spec_helper'
+
+describe SimpleRoles::Configuration do
+  subject { SimpleRoles::Configuration }
+
+  its(:default_strategy) { should == :one }
+  its(:strategy) { should == :one }
+  its(:strategy_class) { should == SimpleRoles::One }
+
+  describe ".strategy" do
+    it "should retrieve current strategy if no argument passed" do
+      subject.strategy.should == :one
+    end
+
+    it "should set current strategy if strategy passed as argument" do
+      subject.strategy :many
+      subject.strategy.should == :many
+    end
+    
+    it "should not allow wrong strategies" do
+      expect {
+        subject.strategy :wrong!
+      }.to raise_error
+    end
+  end
+
+  describe ".strategy=" do
+    it "should set current strategy if strategy passed as argument" do
+      subject.strategy = :one
+      subject.strategy.should == :one
+
+      subject.strategy = :many
+      subject.strategy.should == :many
+    end
+
+    it "should not allow wrong strategies" do
+      expect {
+        subject.strategy = :wrong!
+      }.to raise_error
+    end
+  end
+ 
+  describe ".valid_roles=" do
+    it "should set valid roles" do
+      valid_roles_before = SimpleRoles::Configuration.valid_roles
+
+      SimpleRoles::Configuration.valid_roles = [:user]
+      SimpleRoles::Configuration.valid_roles.should == [:user]
+
+      SimpleRoles::Configuration.valid_roles = valid_roles_before
+      SimpleRoles::Configuration.valid_roles.should == valid_roles_before
+    end
+  end
+
+  describe ".valid_roles" do
+    it "should also set valid roles if they passed as arg" do
+      valid_roles_before = SimpleRoles::Configuration.valid_roles
+
+      SimpleRoles::Configuration.valid_roles :user
+      SimpleRoles::Configuration.valid_roles.should == [:user]
+
+      SimpleRoles::Configuration.valid_roles valid_roles_before
+      SimpleRoles::Configuration.valid_roles.should == valid_roles_before
+    end
+  end
+end

data/spec/simple_roles/integration_many_spec.rb

@@ -0,0 +1,47 @@
+require 'spec_helper'
+
+SimpleRoles.configure do |config|
+  config.valid_roles = [:user, :admin, :editor]
+end
+
+describe 'Integration for SimpleRoles::Many' do
+  before do
+    setup_roles
+    SimpleRoles::Packager.package User, :many
+  end
+
+  it "should all work" do
+    admin_role = Role.find_by_name("admin")
+    user = User.new(:name => "stanislaw")
+    user.roles_list.should be_empty
+    user.has_any_role?(:admin).should be_false
+    user.roles = [ :admin ]
+    user.roles_list.should include(:admin)
+    user.roles.should include(:admin)
+    user.has_role?(:admin).should be_true
+    user.admin?.should be_true
+    user.is_admin?.should be_true
+    user.has_roles?(:admin).should be_true
+    user.save!
+    user.roles.should include(:admin)
+    user = User.find_by_name! "stanislaw"
+    user.roles.should include(:admin)
+    user.remove_role(:admin)
+    user.roles.should be_empty
+    user.save!
+    user.roles.should be_empty
+    user.roles = [:admin, :user]
+    user.roles.should == Array.new([:admin, :user])
+    user.has_role?(:admin, :user).should be_true
+    user.has_roles?([:admin, :user]).should be_true
+    user.roles.size.should == 2
+    user.roles = [:admin]
+    user.roles.should include(:admin)
+    user.add_role :user
+    user.roles.should include(:user, :admin)
+    user.has_any_role?(:user).should be_true
+    user.has_any_role?(:user, :admin).should be_true
+    user.has_any_role?([:user, :admin])
+    user.has_any_role?(:blip).should be_false
+  end
+end

data/spec/simple_roles/macros_spec.rb

@@ -1,25 +1,40 @@
 require 'spec_helper'
 
-describe SimpleRoles::Base do
-  
+describe 'SimpleRoles Macros' do
+
   context "Macros availability" do
     subject { Module }
-    before {
-      require 'simple_roles'
-    }
-
-    specify { should be_kind_of(SimpleRoles::Macros) }
+    before { require 'simple_roles' }
+    specify { should be_kind_of SimpleRoles::Macros }
   end
 
-  context "after applying macros" do
+  context "When Macros is applied" do
     subject { User }
+
+    specify { should be_kind_of SimpleRoles::Macros }
+
     before do
       class User < ActiveRecord::Base
-        simple_roles
+        simple_roles do
+          strategy :many
+        end
+      end
+    end
+
+    context "Changes in User" do
+      specify { should include SimpleRoles::Many::RolesMethods }
+      specify { should include SimpleRoles::Many::RolesMethods }
+
+      [:roles, :roles_list, :add_role, :roles=, :remove_role].each do |meth|
+        specify { subject.new.should respond_to meth }
       end
     end
 
-    specify { should be_kind_of(SimpleRoles::Macros) }    
+    context "Changes in SimpleRoles::Configuration" do
+      it "should set strategy" do
+        SimpleRoles::Configuration.strategy.should == :many
+      end
+    end
   end
 
 end

data/spec/simple_roles/many_spec.rb

@@ -0,0 +1,186 @@
+require 'spec_helper'
+
+SimpleRoles.configure do |config|
+  config.valid_roles = [:user, :admin, :editor]
+end
+
+describe SimpleRoles::Many do
+  let(:user) { create :user }
+
+  before(:each) do
+    setup_roles
+    SimpleRoles.package User, :many
+  end
+
+  context "Class Methods" do 
+    subject { User }
+
+    specify { should respond_to(:valid_roles) }
+    its(:valid_roles) { should include(:user, :admin)}
+  end
+
+  context "Instance methods" do
+    subject { User.new }
+   
+    [:roles, :roles_list].each do |meth|
+      specify { should respond_to(meth) }
+      its(:"#{meth}") { should be_empty }
+    end
+  end
+
+  context "Read API" do
+    subject do
+      user
+    end
+
+    it "#has_role?, #has_roles?" do
+      subject.roles = [:admin]
+      
+      subject.has_role?(:admin).should be_true
+      subject.has_role?(:admin, :user).should be_false
+      subject.has_roles?(:editor).should be_false
+      
+      subject.roles = [ :admin, :user ]
+
+      subject.has_role?(:admin, :user).should be_true
+      subject.has_role?([:admin, :user]).should be_true
+    end
+
+    it "#admin?, #user?, #editor? ..." do
+      subject.roles = [ :admin ]
+      subject.admin?.should be_true
+      subject.is_admin?.should be_true
+      subject.user?.should be_false
+      subject.editor?.should be_false
+      subject.roles = [ :editor ]
+      subject.editor?.should be_true
+    end
+  end
+  
+  context "Write API" do
+    subject do
+      user
+    end
+
+    it "#roles= should set roles" do
+      subject.roles = :admin
+      subject.roles.should == Array.new([:admin])
+      subject.roles = :user
+      subject.roles.should == Array.new([:user])
+    end
+
+    it "#roles= should set roles if array of strings passed (sh accept strings too!)" do
+      subject.roles = 'admin'
+      subject.roles.should == Array.new([:admin])
+      subject.roles = ['user', 'editor']
+      subject.roles.should == Array.new([:user, :editor])
+    end
+    
+    it "#remove_roles should remove roles" do
+      subject.roles = [ :admin, :user, :editor ]
+
+      subject.roles.should == Array.new([:admin, :user, :editor])
+ 
+      subject.remove_roles :admin
+      subject.roles.should == Array.new([:user, :editor])
+  
+      subject.remove_roles :admin, :user, :editor
+      subject.roles.should == Array.new([])
+    end
+  end
+
+  context "Integration for roles methods" do
+    it "should work when #flatten is called over #roles" do
+      user.roles = [ :admin ]
+      
+      user.roles_list.should == Array.new([:admin])
+      user.roles_list.flatten.should == Array.new([:admin])
+    end
+    
+    it "should add :roles to accessible_attributes if they are Whitelisted" do
+      user.roles = [ :admin ]
+
+      user.roles_list.should include(:admin)
+      user.save!
+      User.find_by_name!("stanislaw").should be_kind_of(User)
+      User.delete_all
+
+      User.attr_accessible :name
+        
+      user = User.new(:name => "stanislaw")
+      user.roles = [ :admin ]
+      user.roles_list.should include(:admin)
+      user.save!
+      User.find_by_name!("stanislaw").should be_kind_of(User)
+    end
+    
+    it "should not duplicate roles when adding" do
+      user.roles = [ :admin ]
+      user.roles.should == [ :admin ]
+
+      user.add_role :admin
+
+      user.roles.should == [ :admin ]
+    end
+  end
+
+  describe ".package" do
+    describe "Persistence" do
+      it "should set roles" do
+        user.roles = :admin
+        user.roles.should == [:admin]
+      end
+    end
+
+    describe "Roles methods" do
+      describe "#set_role" do
+        it "should set role" do
+          user.set_role(:admin)
+          user.roles.should == [:admin]
+        end
+
+        it "should persist role" do
+          user.set_role(:admin)
+          user.reload
+          user.roles.should == [:admin]
+        end
+      end
+
+      describe "Dynamic scopes" do
+        subject { User }
+        SimpleRoles.config.valid_roles.each do |r|
+          it { should respond_to :"#{r}s" }
+          it { should respond_to(:"#{r}s_ids") }
+
+          its(:"#{r}s") { should be_kind_of(Array) }
+        end
+      end
+
+      describe "Dynamic methods" do
+        SimpleRoles.config.valid_roles.each do |r|
+          specify { user.should respond_to :"#{r}?" }
+        end
+
+        describe "#user?, #admin?, ..." do
+          specify do
+            user.set_role(:admin)
+            user.admin?.should == true
+
+            user.set_role(:user)
+            user.user?.should == true
+          end
+        end
+        
+        describe "#is_user?, #is_admin?, ..." do
+          specify do
+            user.set_role(:admin)
+            user.is_admin?.should == true
+
+            user.set_role(:user)
+            user.is_user?.should == true
+          end
+        end
+      end
+    end
+  end
+end

data/spec/simple_roles/one_spec.rb

@@ -0,0 +1,77 @@
+require 'spec_helper'
+
+describe SimpleRoles::One do
+  subject { SimpleRoles::One }
+  let(:user) { create :one_user, :role => 'user' }
+  
+  describe ".package" do
+    before(:all) do
+      SimpleRoles::Packager.package OneUser, :one
+    end
+
+    describe "Persistence" do
+      it "should read role as symbol" do
+        user.update_attribute :role, 'user'
+        user.role.should == :user
+      end
+
+      it "should set roles" do
+        user.role = :admin
+        user.role.should == :admin
+      end
+
+      it "should persist roles" do
+        user.role = :admin
+        user.save
+        user.role.should == :admin
+      end
+    end
+
+    describe "Roles methods" do
+      describe "#set_role" do
+        it "should set role" do
+          user.set_role(:admin)
+          user.role.should == :admin
+        end
+
+        it "should persist role" do
+          user.set_role(:admin)
+          user.reload
+          user.role.should == :admin
+        end
+      end
+
+      describe "Dynamic scopes" do
+        SimpleRoles.config.valid_roles.each do |r|
+          specify { OneUser.should respond_to :"#{r}s" }
+        end
+      end
+
+      describe "Dynamic methods" do
+        SimpleRoles.config.valid_roles.each do |r|
+          specify { user.should respond_to :"#{r}?" }
+        end
+
+        describe "#user?, #admin?, ..." do
+          specify do
+            user.set_role(:admin)
+            user.admin?.should == true
+
+            user.set_role(:user)
+            user.user?.should == true
+          end
+        end
+        
+        describe "#is_user?, #is_admin?, ..." do
+          specify do
+            user.set_role(:admin)
+            user.is_admin?.should == true
+
+            user.set_role(:user)
+            user.is_user?.should == true
+          end
+        end
+      end
+    end
+  end
+end