simple_roles 0.0.11 → 0.0.12

data/Gemfile

@@ -5,6 +5,7 @@ source "http://rubygems.org"
 # development dependencies will be added by default to the :development group.
 
 gem 'activerecord', '>=3.1.0'
+# gem 'activerecord', '4.0.0.beta1'
 
 group :development, :test do
   gem 'rake-kit'
@@ -16,4 +17,5 @@ group :development, :test do
   gem 'cutter'
   gem 'rspec'
   gem 'factory_girl', '2.6.4'
+  gem 'database_cleaner'
 end

data/lib/simple_roles/configuration.rb

@@ -1,7 +1,7 @@
 module SimpleRoles
   module Configuration
     extend self
-    
+
     attr_writer :strategy, :user_models
 
     def user_models
@@ -78,7 +78,7 @@ module SimpleRoles
         end
       end if strategy == :many
     end
-    
+
     def default_strategy
       :one
     end

data/lib/simple_roles/one/roles_methods.rb

@@ -26,7 +26,7 @@ module SimpleRoles
           has_role? r
         end
       end
-      
+
       module DynamicMethods
         class << self
           def extended base
@@ -36,8 +36,12 @@ module SimpleRoles
 
         def register_dynamic_methods
           SimpleRoles.config.valid_roles.each do |r|
-            scope :"#{r}s", where(:role => r.to_s)
-            
+            self.class_eval %{
+              def self.#{r}s
+                where(:role => :#{r})
+              end
+            }
+
             define_method :"#{r}?" do
               role == r
             end

data/lib/simple_roles/version.rb

@@ -1,3 +1,3 @@
 module SimpleRoles
-  VERSION = "0.0.11"
+  VERSION = "0.0.12"
 end

data/simple_roles.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "simple_roles"
-  s.version = "0.0.11"
+  s.version = "0.0.12"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["stanislaw"]
-  s.date = "2013-04-10"
+  s.date = "2013-04-16"
   s.description = "Simple Role System for Rails Apps"
   s.email = "s.pankevich@gmail.com"
   s.extra_rdoc_files = [
@@ -123,13 +123,10 @@ Gem::Specification.new do |s|
     "spec/dummy/test/unit/post_test.rb",
     "spec/dummy/test/unit/user_test.rb",
     "spec/dummy_spec_helper.rb",
-    "spec/integration/main_spec.rb",
-    "spec/integration/requests/main_spec.rb",
     "spec/simple_roles/configuration_spec.rb",
     "spec/simple_roles/integration_many_spec.rb",
     "spec/simple_roles/integration_one_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",
@@ -141,9 +138,7 @@ Gem::Specification.new do |s|
     "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"
+    "spec/support/setup_roles.rb"
   ]
   s.homepage = "http://github.com/stanislaw/simple_roles"
   s.licenses = ["MIT"]
@@ -165,6 +160,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<cutter>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<factory_girl>, ["= 2.6.4"])
+      s.add_development_dependency(%q<database_cleaner>, [">= 0"])
     else
       s.add_dependency(%q<activerecord>, [">= 3.1.0"])
       s.add_dependency(%q<rake-kit>, [">= 0"])
@@ -176,6 +172,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<cutter>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<factory_girl>, ["= 2.6.4"])
+      s.add_dependency(%q<database_cleaner>, [">= 0"])
     end
   else
     s.add_dependency(%q<activerecord>, [">= 3.1.0"])
@@ -188,6 +185,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<cutter>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<factory_girl>, ["= 2.6.4"])
+    s.add_dependency(%q<database_cleaner>, [">= 0"])
   end
 end
 

data/spec/simple_roles/many_spec.rb

@@ -21,7 +21,7 @@ describe SimpleRoles::Many do
 
   context "Instance methods" do
     subject { User.new }
-   
+
     [:roles, :roles_list].each do |meth|
       specify { should respond_to(meth) }
       its(:"#{meth}") { should be_empty }
@@ -106,28 +106,29 @@ describe SimpleRoles::Many do
   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
+
+    # Need to investigate how stuff like that is done in Rails 4
+    pending "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.find_by_name!("stanislaw").should_not be_nil
       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 ]
@@ -162,11 +163,17 @@ describe SimpleRoles::Many do
 
       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) }
+        SimpleRoles.config.valid_roles.each do |role|
+          it { should respond_to :"#{role}s" }
+          it { should respond_to(:"#{role}s_ids") }
+
+          it "should return the users of role :#{role}" do
+            user = create(:user, :roles => [ role ])
+
+            User.send(:"#{role}s").count.should == 1
+            User.send(:"#{role}s").should include user
+          end
         end
       end
 
@@ -184,7 +191,7 @@ describe SimpleRoles::Many do
             user.user?.should == true
           end
         end
-        
+
         describe "#is_user?, #is_admin?, ..." do
           specify do
             user.set_role(:admin)

data/spec/simple_roles/one_spec.rb

@@ -1,9 +1,13 @@
 require 'spec_helper'
 
+SimpleRoles.configure do |config|
+  config.valid_roles = [:user, :admin, :editor]
+end
+
 describe SimpleRoles::One do
   subject { SimpleRoles::One }
   let(:user) { create :one_user, :role => 'user' }
-  
+
   before(:all) do
     SimpleRoles::Packager.package OneUser, :one
   end
@@ -59,7 +63,7 @@ describe SimpleRoles::One do
         user.role.should == :admin
       end
     end
-    
+
     describe "#update_role" do
       it "should set role" do
         user.update_role(:admin)
@@ -91,7 +95,7 @@ describe SimpleRoles::One do
       user.has_any_role?(:admin, :editor).should be_true
       user.has_any_role?(:editor, :user).should be_false
     end
-    
+
     describe "Dynamic methods" do
       SimpleRoles.config.valid_roles.each do |r|
         specify { user.should respond_to :"#{r}?" }
@@ -106,7 +110,7 @@ describe SimpleRoles::One do
           user.user?.should == true
         end
       end
-      
+
       describe "#is_user?, #is_admin?, ..." do
         specify do
           user.set_role(:admin)
@@ -118,4 +122,19 @@ describe SimpleRoles::One do
       end
     end
   end
+
+  describe "Scope methods" do
+    subject { OneUser }
+
+    SimpleRoles.config.valid_roles.each do |role|
+      it { should respond_to :"#{role}s" }
+
+      it "should return the users of role :#{role}" do
+        user = create(:one_user, :role => role)
+
+        OneUser.send(:"#{role}s").count.should == 1
+        OneUser.send(:"#{role}s").should include user
+      end
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -4,12 +4,14 @@ require 'rubygems'
 ENV["RAILS_ENV"] ||= 'test'
 
 #require File.expand_path("../dummy/config/environment", __FILE__)
+
 require 'logger'
 require 'require_all'
 require 'cutter'
 require 'sugar-high/dsl'
 
 require 'active_record'
+require 'database_cleaner'
 
 require 'rspec/core'
 
@@ -25,19 +27,22 @@ dbfile = File.open(path)
 dbconfig = YAML::load(dbfile)
 ActiveRecord::Base.establish_connection(dbconfig)
 
-class ActiveRecord::Base
-  mattr_accessor :shared_connection
-  @@shared_connection = nil
+# class ActiveRecord::Base
+  # mattr_accessor :shared_connection
+  # @@shared_connection = nil
 
-  def self.connection
-    @@shared_connection || retrieve_connection
-  end
-end
+  # def self.connection
+    # @@shared_connection || retrieve_connection
+  # end
+# end
 
-ActiveRecord::Base.shared_connection = ActiveRecord::Base.connection
+#ActiveRecord::Base.shared_connection = ActiveRecord::Base.connection
 
 # ActiveRecord::Base.logger = Logger.new(STDERR)
 
+# TODO: do not preserve roles table
+DatabaseCleaner.strategy = :truncation, { :except => %w[roles], :pre_count => true, :reset_ids => true }
+
 RSpec.configure do |config|
   config.mock_with :rspec
 
@@ -53,19 +58,10 @@ RSpec.configure do |config|
         # Helper migration - users table
         migrate File.expand_path('../support/migrations', __FILE__)
       end if tables.empty?
-
-      # (tables - ['schema_migrations']).map do |table|
-      #   table_count = execute("SELECT COUNT(*) FROM #{table}").first.first
-      #   execute "TRUNCATE #{table}" unless table_count == 0
-      # end
     end
   end
 
-  config.before(:each) do
-    Transaction.start
-  end
-
   config.after(:each) do
-    Transaction.clean
+    DatabaseCleaner.clean
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_roles
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-10 00:00:00.000000000 Z
+date: 2013-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -171,6 +171,22 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.6.4
+- !ruby/object:Gem::Dependency
+  name: database_cleaner
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Simple Role System for Rails Apps
 email: s.pankevich@gmail.com
 executables: []
@@ -285,13 +301,10 @@ files:
 - spec/dummy/test/unit/post_test.rb
 - spec/dummy/test/unit/user_test.rb
 - spec/dummy_spec_helper.rb
-- spec/integration/main_spec.rb
-- spec/integration/requests/main_spec.rb
 - spec/simple_roles/configuration_spec.rb
 - spec/simple_roles/integration_many_spec.rb
 - spec/simple_roles/integration_one_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
@@ -304,8 +317,6 @@ files:
 - spec/support/models/one_user.rb
 - spec/support/models/user.rb
 - spec/support/setup_roles.rb
-- spec/support/transaction.rb
-- spec/transaction_spec.rb
 homepage: http://github.com/stanislaw/simple_roles
 licenses:
 - MIT
@@ -321,7 +332,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2073500389955326145
+      hash: -429828586756405293
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/spec/integration/main_spec.rb

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

data/spec/integration/requests/main_spec.rb

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

data/spec/support/transaction.rb

@@ -1,30 +0,0 @@
-# Stolen from Bmabey's database_cleaner gem for educational purposes ;)
-
-module Transaction
-  class << self
-    def connection_klass
-      ActiveRecord::Base
-    end
-
-    def start
-      if connection_klass.connection.respond_to?(:increment_open_transactions)
-        connection_klass.connection.increment_open_transactions
-      else
-        connection_klass.__send__(:increment_open_transactions)
-      end
-      connection_klass.connection.begin_db_transaction
-    end
-
-    def clean
-      return unless connection_klass.connection.open_transactions > 0
-
-      connection_klass.connection.rollback_db_transaction
-
-      if connection_klass.connection.respond_to?(:decrement_open_transactions)
-        connection_klass.connection.decrement_open_transactions
-      else
-        connection_klass.__send__(:decrement_open_transactions)
-      end
-    end
-  end
-end

data/spec/transaction_spec.rb

@@ -1,15 +0,0 @@
-require 'spec_helper'
-
-describe "Transactions test" do
-  specify "We create some records" do
-    3.times do
-      create :one_user
-      create :user
-    end
-  end
-
-  specify "All tables must empty" do
-    OneUser.count.should == 0
-    User.count.should == 0
-  end
-end