simple_roles 0.0.5 → 0.0.6

data/spec/spec_helper.rb

@@ -4,49 +4,68 @@ require 'rubygems'
 ENV["RAILS_ENV"] ||= 'test'
 
 #require File.expand_path("../dummy/config/environment", __FILE__)
+require 'logger'
 require 'require_all'
-
-#require 'rails'
-require 'active_record'
-require 'active_model'
-
-require 'simple_roles'
-
 require 'cutter'
 require 'sugar-high/dsl'
 
+require 'active_record'
+
 require 'rspec/core'
-#require 'shoulda'
+
 require 'factory_girl'
 
+require 'simple_roles'
+
 require_all File.expand_path('../support', __FILE__)
 
 path = File.dirname(__FILE__) + '/support/database.yml'
+
 dbfile = File.open(path)
 dbconfig = YAML::load(dbfile)
 ActiveRecord::Base.establish_connection(dbconfig)
 
-#ActiveRecord::Base.logger = Logger.new(STDERR)
+class ActiveRecord::Base
+  mattr_accessor :shared_connection
+  @@shared_connection = nil
+
+  def self.connection
+    @@shared_connection || retrieve_connection
+  end
+end
+
+ActiveRecord::Base.shared_connection = ActiveRecord::Base.connection
+
+# ActiveRecord::Base.logger = Logger.new(STDERR)
 
 RSpec.configure do |config|
   config.mock_with :rspec
-  
-  config.include Factory::Syntax::Methods
+
+  config.include FactoryGirl::Syntax::Methods
 
   config.before(:suite) do
     with ActiveRecord::Base.connection do
-      
-      tables.map do |table|
-        drop_table table
-      end
-    end
+      # tables.each {|t| drop_table t }
+
+      # with ActiveRecord::Migrator do
+      #   # SimpleRoles's own migrations
+      #   migrate File.expand_path('../../db/migrate', __FILE__)
+      #   # Helper migration - users table
+      #   migrate File.expand_path('../support/migrations', __FILE__)
+      # end if tables.empty?
 
-    with ActiveRecord::Migrator do
-      # SimpleRoles's own migrations
-      ActiveRecord::Migrator.migrate File.expand_path('../../db/migrate', __FILE__)
-      # Helper migration - users table
-      ActiveRecord::Migrator.migrate File.expand_path('../support/migrations', __FILE__)
+      # (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
   end
 end

data/spec/support/controller_macros.rb

@@ -2,25 +2,8 @@ module ControllerMacros
   def login_user
     before(:each) do
       @request.env["devise.mapping"] = :user
-      sign_in Factory(:user) #@admin
+      sign_in create(:user)
     end
   end
-
-  def login_student
-    before(:each) do
-       @student = User.create!(:username => "AStudent", :email => "agb@yandex.ru", :middlename => "Sergeevna", :surname => "Bakhtiyarova", :name => "Galina", :password => "666666", :role => :student)
-      @request.env["devise.mapping"] = @student
-      sign_in @student
-    end
-  end
-
-  def login_curator
-    before(:each) do
-       @curator = User.create!(:username => "AStudent", :email => "agb@yandex.ru", :middlename => "Sergeevna", :surname => "Bakhtiyarova", :name => "Galina", :password => "666666", :role => :curator)
-      @request.env["devise.mapping"] = @curator
-      sign_in @curator
-    end
-  end
-
 end
 

data/spec/support/database.yml

@@ -2,5 +2,5 @@ adapter: mysql2
 host: localhost
 database: simple_roles_test
 username: root
-password: root
+password:
 encoding: utf8

data/spec/support/factories.rb

@@ -1,22 +1,11 @@
-=begin
-FactoryGirl.define do
-  factory :first_message, :class => Carrier::Message do
-    sender 1
-    recipients [2, 3]
-    content "Hello!"
-    subject "FirstMessage"
-    association :chain, :factory => :chain
-  end
 
-  factory :second_message, :class => Carrier::Message do
-    sender 2
-    recipients [3, 1]
-    content "Hello you too!"
-    subject "SecondMessage"
-    association :chain, :factory => :chain
+FactoryGirl.define do
+  factory :user, :class => User do
+    name 'stanislaw'
   end
 
-  factory :chain, :class => Carrier::Chain do
+  factory :one_user, :class => OneUser do
+    name 'stanislaw'
+    role = 'user'
   end
 end
-=end

data/spec/support/migrations/010_create_one_users.rb

@@ -0,0 +1,16 @@
+class CreateOneUsers < ActiveRecord::Migration
+  def up
+    create_table(:one_users) do |t|
+      t.string  :name
+      t.string  :username
+
+      t.string :role
+
+      t.timestamps
+    end
+  end
+
+  def down
+    drop_table :users
+  end
+end

data/spec/support/migrations/{010_create_users.rb → 011_create_users.rb}

@@ -1,9 +1,9 @@
 class CreateUsers < ActiveRecord::Migration
   def up
     create_table(:users) do |t|
-      t.string  :name
-      t.string  :username
-       
+      t.string :name
+      t.string :username
+
       t.timestamps
     end
   end

data/spec/support/models/one_user.rb

@@ -0,0 +1,2 @@
+class OneUser < ActiveRecord::Base
+end

data/spec/support/{fixtures/models → models}/user.rb

@@ -1,3 +1,2 @@
 class User < ActiveRecord::Base
-  simple_roles
 end

data/spec/support/setup_roles.rb

@@ -0,0 +1,5 @@
+def setup_roles
+  SimpleRoles::Configuration.valid_roles.each do |role|
+    Role.create(:name => role.to_s)
+  end
+end

data/spec/support/transaction.rb

@@ -0,0 +1,30 @@
+# 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

@@ -0,0 +1,15 @@
+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

metadata

@@ -1,170 +1,201 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: simple_roles
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.0.6
   prerelease: 
-  version: 0.0.5
 platform: ruby
-authors: 
+authors:
 - stanislaw
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-14 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-06-27 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: require_all
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: sugar-high
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: sweetloader
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  type: :development
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rake-kit
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: devise
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: cutter
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: rails
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  type: :development
-  prerelease: false
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: rspec-rails
-  requirement: &id011 !ruby/object:Gem::Requirement 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  name: capybara
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  type: :development
-  prerelease: false
-  version_requirements: *id012
-- !ruby/object:Gem::Dependency 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id013
+  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: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
-files: 
+files:
 - .rspec
+- CHANGELOG.md
 - Gemfile
 - MIT-LICENSE
 - README.md
@@ -184,11 +215,16 @@ files:
 - 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
@@ -273,48 +309,51 @@ files:
 - 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
 homepage: http://github.com/stanislaw/simple_roles
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: -675418947
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -387698285
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.8
+rubygems_version: 1.8.19
 signing_key: 
 specification_version: 3
 summary: Rails Engine providing Role System for Rails apps
 test_files: []
-