dar_da_da 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f3508fbde233fce90f037ff62c15721426891bef
-  data.tar.gz: a6b5e04b1a88b2ad6d1752c0f21da50b327e6a42
+  metadata.gz: 2cbcc4b69917c7ca27338f031a305db6cf41c8e1
+  data.tar.gz: e679ab5829006b42be6100769d2d8603b1bb2ef3
 SHA512:
-  metadata.gz: 4aec035d497a9378ec819d01305ec3cbf0f03dea9db724500d5659c18993325ae6c11ef65158235660f13ff263e9ee89f3964d7e5ecbf14f955c93a26deeceff
-  data.tar.gz: 595661f990878b8847aa363c16955e1f50cdc25b01737555151e4fef142975528ad3481eb34fb39dfe0132f994c5851c7b51e65099b6ae075ed91634bd5d553c
+  metadata.gz: d9661616f99dcef354a0c4893558e173cccc962459c4823cbbf6578e14ca18f681062547cb3982b1ae7b0056d70e9f02321d3242c83e3675755d4966ad3d7068
+  data.tar.gz: 071d5455d3190a7ae7c736bf625620a7aca49e59141e92e26f25f7d9a2a5a7a40799bebe10a38aadd74747ef2292a236ffd5f5121dd446d0a6b8c1da5ce63b95

data/CHANGES.md

@@ -1,15 +1,22 @@
 ### dev
 
-[full changelog](http://github.com/yolk/valvat/compare/v0.0.5...master)
+[full changelog](http://github.com/yolk/dar_dar_da/compare/v0.0.6...master)
+
+### 0.0.5 / 2017-01-31
+
+[full changelog](http://github.com/yolk/dar_dar_da/compare/v0.0.6...v0.0.5)
+
+* Use before_action instead of before_filter
+* Require Rails >= 4.0
 
 ### 0.0.5 / 2014-04-09
 
-[full changelog](http://github.com/yolk/valvat/compare/v0.0.5...v0.0.3)
+[full changelog](http://github.com/yolk/dar_dar_da/compare/v0.0.5...v0.0.3)
 
 * Compatiblity with Rails 4.0
 
 ### 0.0.3 / 2012-02-06
 
-[full changelog](http://github.com/yolk/valvat/compare/v0.0.2...v0.0.3)
+[full changelog](http://github.com/yolk/dar_dar_da/compare/v0.0.2...v0.0.3)
 
-* Compatiblity with Rails 3.2
+* Compatiblity with Rails 3.2

data/Guardfile

@@ -1,5 +1,5 @@
-guard 'rspec', :version => 2 do
+guard 'rspec', cmd: "bundle exec rspec --color" do
   watch(/^spec\/(.*)_spec\.rb/)   { "spec" }
   watch(/^lib\/(.*)\.rb/)         { "spec" } # { |m| "spec/#{m[1]}_spec.rb" }
   watch(/^spec\/spec_helper\.rb/) { "spec" }
-end
+end

data/README.rdoc

@@ -4,4 +4,4 @@ Roles easy like sunday morning.
 
 == Copyright
 
-Copyright (c) 2009 Yolk GbR. See LICENSE for details.
+Copyright (c) 2009-2017 Yolk GbR. See LICENSE for details.

data/dar_da_da.gemspec

@@ -19,11 +19,11 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency 'activerecord',            '>= 3.0'
+  s.add_dependency 'activerecord',            '>= 4.0'
 
   # Actionpack is optional!
-  s.add_development_dependency 'actionpack',  '>= 3.0'
+  s.add_development_dependency 'actionpack',  '>= 4.0'
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'guard-rspec'
-  s.add_development_dependency 'sqlite3-ruby'
+  s.add_development_dependency 'sqlite3'
 end

data/lib/dar_da_da/action_controller_extension.rb

@@ -6,25 +6,25 @@ module DarDaDa
         base.class_eval "class ::ActionController::ForbiddenError < ::ActionController::ActionControllerError;end"
       end
     end
-    
-    module ClassMethods      
+
+    module ClassMethods
       def define_access_control(user_class, user_method_name = :current_user)
         user_class.dar_dar_da.all_rights.each do |right|
           self.class_eval("
             private
-            
+
             def check_if_#{user_class.name.downcase}_is_allowed_to_#{right}
               raise ActionController::ForbiddenError.new unless #{user_method_name}.allowed_to_#{right}?
             end
           ")
-          
+
           self.class_eval("
             def self.require_right(right, options={})
-              before_filter :\"check_if_#{user_class.name.downcase}_is_allowed_to_#\{right}\", options
+              before_action :\"check_if_#{user_class.name.downcase}_is_allowed_to_#\{right}\", options
             end
           ")
         end
       end
     end
   end
-end
+end

data/lib/dar_da_da/version.rb

@@ -1,3 +1,3 @@
 module DarDaDa
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/spec/dar_da_da/action_controller_extension_spec.rb

@@ -2,16 +2,16 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe DarDaDa::ActionControllerExtension, "extended Base" do
   it "should define only_if_{user}_is_allowed_to_{right} methods" do
-    ApplicationController.private_instance_methods.map(&:to_s).should include("check_if_user_is_allowed_to_cancel_account")
+    expect(ApplicationController.private_instance_methods.map(&:to_s)).to include("check_if_user_is_allowed_to_cancel_account")
     User.create!(:role => :user)
-    lambda{ 
-      ApplicationController.new.send(:check_if_user_is_allowed_to_cancel_account) 
-    }.should raise_error(ActionController::ForbiddenError)
+    expect {
+      ApplicationController.new.send(:check_if_user_is_allowed_to_cancel_account)
+    }.to raise_error(ActionController::ForbiddenError)
   end
-  
+
   it "should define only_if_user_is_allowed_to class method" do
-    ApplicationController.methods.map(&:to_s).should include("require_right")
-    ApplicationController.should_receive(:before_filter).with(:check_if_user_is_allowed_to_read_acticles, :only => [:index])
+    expect(ApplicationController.methods.map(&:to_s)).to include("require_right")
+    expect(ApplicationController).to receive(:before_action).with(:check_if_user_is_allowed_to_read_acticles, :only => [:index])
     ApplicationController.require_right(:read_acticles, :only => [:index])
   end
-end
+end

data/spec/dar_da_da/active_record_extension_spec.rb

@@ -4,75 +4,75 @@ describe DarDaDa::ActiveRecordExtension, "extended Model" do
   before { @user = User.create! }
 
   it "should set role to default_role" do
-    @user.role.should eql("user")
-    User.new.role.should eql("user")
+    expect(@user.role).to eql("user")
+    expect(User.new.role).to eql("user")
   end
 
   it "should add role accessor to map role_attribute" do
     @user.role = :author
-    @user.role.should eql("author")
+    expect(@user.role).to eql("author")
     @user.role = :unknown_role
-    @user.role.should eql("author")
+    expect(@user.role).to eql("author")
     @user.save!
-    @user.role.should eql("author")
+    expect(@user.role).to eql("author")
     @user.update_attributes!(:role => 'user')
-    @user.role.should eql("user")
+    expect(@user.role).to eql("user")
   end
 
   it "should set default_role to user" do
-    User.dar_dar_da.options[:default_role].should == (:"user")
+    expect(User.dar_dar_da.options[:default_role]).to eql :user
   end
 
   it "should prevent saving role_attribute with nil or empty" do
     @user.role_name = ""
-    @user.send(:read_role_attribute).should be_blank
+    expect(@user.send(:read_role_attribute)).to be_blank
     @user.save!
     @user.reload
-    @user.send(:read_role_attribute).should eql("user")
-    @user.role_name.should eql("user")
-    @user.role.should eql("user")
+    expect(@user.send(:read_role_attribute)).to eql("user")
+    expect(@user.role_name).to eql("user")
+    expect(@user.role).to eql("user")
   end
 
   it "should prevent saving role_attribute with not exisiting role" do
     @user.role_name = "unknown"
-    @user.send(:read_role_attribute).should eql("unknown")
+    expect(@user.send(:read_role_attribute)).to eql("unknown")
     @user.save!
     @user.reload
-    @user.send(:read_role_attribute).should eql("user")
-    @user.role_name.should eql("user")
-    @user.role.should eql("user")
+    expect(@user.send(:read_role_attribute)).to eql("user")
+    expect(@user.role_name).to eql("user")
+    expect(@user.role).to eql("user")
   end
 
   it "should add {role}? methods" do
-    @user.should be_user
+    expect(@user).to be_user
     @user.role = :author
-    @user.should be_author
+    expect(@user).to be_author
     @user.role = :admin
-    @user.should be_admin
+    expect(@user).to be_admin
   end
 
   it "should add allowed_to? method" do
-    @user.allowed_to?(:read_acticles).should be_true
-    @user.allowed_to?("read_acticles").should be_true
-    @user.allowed_to?(:write_acticles).should be_false
-    @user.allowed_to?(:cancel_account).should be_false
-    @user.allowed_to?(:do_unknown_stuff).should be_false
-    @user.allowed_to?("").should be_false
-    @user.allowed_to?(nil).should be_false
+    expect(@user.allowed_to?(:read_acticles)).to be true
+    expect(@user.allowed_to?("read_acticles")).to be true
+    expect(@user.allowed_to?(:write_acticles)).to be false
+    expect(@user.allowed_to?(:cancel_account)).to be false
+    expect(@user.allowed_to?(:do_unknown_stuff)).to be false
+    expect(@user.allowed_to?("")).to be false
+    expect(@user.allowed_to?(nil)).to be false
   end
 
   it "should add allowed_to_{right}? methods" do
-    @user.should be_allowed_to_read_acticles
-    @user.should_not be_allowed_to_write_acticles
-    @user.should_not be_allowed_to_cancel_account
+    expect(@user).to be_allowed_to_read_acticles
+    expect(@user).to_not be_allowed_to_write_acticles
+    expect(@user).to_not be_allowed_to_cancel_account
     @user.role = :author
-    @user.should be_allowed_to_read_acticles
-    @user.should be_allowed_to_write_acticles
-    @user.should_not be_allowed_to_cancel_account
+    expect(@user).to be_allowed_to_read_acticles
+    expect(@user).to be_allowed_to_write_acticles
+    expect(@user).to_not be_allowed_to_cancel_account
     @user.role = :admin
-    @user.should be_allowed_to_read_acticles
-    @user.should be_allowed_to_write_acticles
-    @user.should be_allowed_to_cancel_account
+    expect(@user).to be_allowed_to_read_acticles
+    expect(@user).to be_allowed_to_write_acticles
+    expect(@user).to be_allowed_to_cancel_account
   end
 
   it "should add named_scope for every role" do
@@ -80,8 +80,8 @@ describe DarDaDa::ActiveRecordExtension, "extended Model" do
     User.create!(:role => "admin")
     2.times { User.create!(:role => :author) }
     3.times { User.create!(:role => :user) }
-    User.admins.map(&:role).should eql(["admin"])
-    User.authors.map(&:role).should eql(["author", "author"])
-    User.users.map(&:role).should eql(["user", "user", "user"])
+    expect(User.admins.map(&:role)).to eql(["admin"])
+    expect(User.authors.map(&:role)).to eql(["author", "author"])
+    expect(User.users.map(&:role)).to eql(["user", "user", "user"])
   end
-end
+end

data/spec/dar_da_da/config_spec.rb

@@ -1,139 +1,139 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe DarDaDa::Config do
-  
+
   it "should require nothing as attribute" do
-    lambda { DarDaDa::Config.new }.should_not raise_error
+    expect { DarDaDa::Config.new }.not_to raise_error
   end
-  
+
   it "should be empty " do
-    DarDaDa::Config.new.should be_empty
+    expect(DarDaDa::Config.new).to be_empty
   end
-  
+
   it "should allow accessing role by string" do
     config = DarDaDa::Config.new do
       role :admin
     end
-    config["admin"].should eql(config[:admin])
+    expect(config["admin"]).to eql(config[:admin])
     config[nil]
     config[""]
   end
-  
+
   describe "options" do
     it "should have role_attribute set to role_name default" do
-      DarDaDa::Config.new.options[:role_attribute].should eql(:role_name)
+      expect(DarDaDa::Config.new.options[:role_attribute]).to eql(:role_name)
     end
-    
+
     it "should allow setting role_attribute via options" do
-      DarDaDa::Config.new(:role_attribute => :role).options[:role_attribute].should eql(:role)
+      expect(DarDaDa::Config.new(:role_attribute => :role).options[:role_attribute]).to eql(:role)
     end
   end
-  
+
   it "should eval block inside instance" do
-    lambda { DarDaDa::Config.new do
+    expect { DarDaDa::Config.new do
       raise "config_error"
-    end }.should raise_error("config_error")
+    end }.to raise_error("config_error")
   end
-  
+
   describe "role" do
-  
+
     it "should add new instance to roles" do
       config = DarDaDa::Config.new do
         role :admin
       end
-      config.keys.should eql([:admin])
+      expect(config.keys).to eql([:admin])
     end
-  
+
     it "should eval role-block inside role-instance" do
-      lambda { DarDaDa::Config.new do
+      expect { DarDaDa::Config.new do
         role :admin do
           raise name.to_s + "_deep_error"
         end
-      end }.should raise_error("admin_deep_error")
-    
+      end }.to raise_error("admin_deep_error")
+
       config = DarDaDa::Config.new do
         role :admin do
           is_allowed_to :manage_users
         end
       end
-    
-      config.should == ({:admin => [:manage_users]})
+
+      expect(config).to eql ({:admin => [:manage_users]})
     end
-  
+
     it "should eval role-block inside of exisiting role-instance" do
       config = DarDaDa::Config.new do
         role :admin do
           is_allowed_to :manage_users
         end
-      
+
         role :admin do
           is_allowed_to :manage_projects
         end
       end
-    
-      config.should == ({:admin => [:manage_users, :manage_projects]})
+
+      expect(config).to eql ({:admin => [:manage_users, :manage_projects]})
     end
-  
+
     it "should reopen existing config and eval block" do
       config = DarDaDa::Config.new
       config.reopen do
         role :admin
       end
-      config.keys.should eql([:admin])
+      expect(config.keys).to eql([:admin])
     end
-    
+
   end
-  
+
   describe "default_role" do
     it "should have empty default_role" do
-      DarDaDa::Config.new.options[:default_role].should be_nil
+      expect(DarDaDa::Config.new.options[:default_role]).to be_nil
     end
-    
+
     it "should set first added role to default_role by default" do
       config = DarDaDa::Config.new do
         role :admin
         role :author
       end
-      config.options[:default_role].should eql(:admin)
+      expect(config.options[:default_role]).to eql(:admin)
     end
-    
+
     it "should allow setting default_role while initalizing" do
       config = DarDaDa::Config.new :default_role => :admin do
         role :author
         role :admin
       end
-      config.options[:default_role].should eql(:admin)
+      expect(config.options[:default_role]).to eql(:admin)
     end
-    
+
     it "should remove nonexisiting roles after initalizing" do
       config = DarDaDa::Config.new :default_role => :admin do
       end
-      config.options[:default_role].should be_nil
+      expect(config.options[:default_role]).to be_nil
       config = DarDaDa::Config.new :default_role => :admin
-      config.options[:default_role].should be_nil
+      expect(config.options[:default_role]).to be_nil
     end
-    
+
     it "should take first added role even when invalid other specified" do
       config = DarDaDa::Config.new :default_role => :admin do
         role :author
       end
-      config.options[:default_role].should eql(:author)
+      expect(config.options[:default_role]).to eql(:author)
     end
-    
+
     it "should allow setting role to default_role when given" do
       config = DarDaDa::Config.new do
         role :admin
         role :author, :default => true
       end
-      config.options[:default_role].should eql(:author)
+      expect(config.options[:default_role]).to eql(:author)
     end
   end
-  
+
   describe "all_rights" do
     it "should be empty by default" do
-      DarDaDa::Config.new.all_rights.should eql([])
+      expect(DarDaDa::Config.new.all_rights).to eql([])
     end
-    
+
     it "should collect all rights" do
       config = DarDaDa::Config.new do
         role :admin do
@@ -144,10 +144,10 @@ describe DarDaDa::Config do
           is_allowed_to :d
         end
       end
-      config.all_rights.should include(:a, :b, :c, :d, :e)
-      config.all_rights.size.should eql([:a, :b, :c, :d, :e].size)
+      expect(config.all_rights).to include(:a, :b, :c, :d, :e)
+      expect(config.all_rights.size).to eql([:a, :b, :c, :d, :e].size)
     end
-    
+
     it "should remove duplicates" do
       config = DarDaDa::Config.new do
         role :admin do
@@ -159,54 +159,54 @@ describe DarDaDa::Config do
           is_allowed_to :c
         end
       end
-      
-      config.all_rights.should include(:a, :b, :c)
-      config.all_rights.size.should eql([:a, :b, :c].size)
+
+      expect(config.all_rights).to include(:a, :b, :c)
+      expect(config.all_rights.size).to eql([:a, :b, :c].size)
     end
   end
-    
+
   describe "based_on" do
     it "should copy rights between roles" do
       config = DarDaDa::Config.new do
-      
+
         role :author do
           based_on :user
           is_allowed_to :write_articles
         end
-      
+
         role :user do
           is_allowed_to :read_articles
         end
-      
+
         role :admin do
           based_on :author
           is_allowed_to :cancel_accounts
         end
       end
-    
-      config[:admin].should == ([:cancel_accounts, :write_articles, :read_articles])
-      config[:author].should == ([:write_articles, :read_articles])
-      config[:user].should == ([:read_articles])
+
+      expect(config[:admin]).to eql ([:cancel_accounts, :write_articles, :read_articles])
+      expect(config[:author]).to eql ([:write_articles, :read_articles])
+      expect(config[:user]).to eql ([:read_articles])
     end
-    
+
     it "should throw error on circular references" do
-      lambda { config = DarDaDa::Config.new do
-      
+      expect { config = DarDaDa::Config.new do
+
         role :author do
           based_on :user
           is_allowed_to :write_articles
         end
-      
+
         role :user do
           based_on :admin
           is_allowed_to :read_articles
         end
-      
+
         role :admin do
           based_on :author
           is_allowed_to :cancel_accounts
         end
-      end }.should raise_error("You defined a circular reference when configuring DarDaDa with 'based_on'.")
+      end }.to raise_error("You defined a circular reference when configuring DarDaDa with 'based_on'.")
     end
   end
-end
+end

data/spec/dar_da_da/role_spec.rb

@@ -1,69 +1,69 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe DarDaDa::Role do
-  
+
   before do
     @role = DarDaDa::Role.new(:role1)
   end
-  
+
   it "should require name as attribute" do
-    lambda { DarDaDa::Role.new }.should raise_error(ArgumentError)
-    DarDaDa::Role.new(:role1).name.should eql(:role1)
+    expect { DarDaDa::Role.new }.to raise_error(ArgumentError)
+    expect(DarDaDa::Role.new(:role1).name).to eql(:role1)
   end
-  
+
   it "should store name as symbol" do
-    DarDaDa::Role.new("role1").name.should eql(:role1)
+    expect(DarDaDa::Role.new("role1").name).to eql(:role1)
   end
-  
+
   it "should be empty array" do
-    @role.should eql([])
+    expect(@role).to eql([])
   end
-  
+
   it "should convert strings to symbols when adding" do
     @role << :r1
-    @role.should eql([:r1])
+    expect(@role).to eql([:r1])
     @role << "r2"
-    @role.should eql([:r1, :r2])
+    expect(@role).to eql([:r1, :r2])
   end
-  
+
   it "should have include?/memeber? methods that convert strings to symbols" do
     @role << :manage_projects
-    @role.include?(:manage_projects).should be_true
-    @role.include?("manage_projects").should be_true
-    @role.include?("manage_users").should be_false
-    @role.member?(:manage_projects).should be_true
-    @role.member?("manage_projects").should be_true
-    @role.member?("manage_users").should be_false
+    expect(@role.include?(:manage_projects)).to be true
+    expect(@role.include?("manage_projects")).to be true
+    expect(@role.include?("manage_users")).to be false
+    expect(@role.member?(:manage_projects)).to be true
+    expect(@role.member?("manage_projects")).to be true
+    expect(@role.member?("manage_users")).to be false
   end
-  
+
   describe "is_allowed_to" do
     it "should add new instance to rights" do
       @role.is_allowed_to :manage_projects
-      @role.should eql([:manage_projects])
+      expect(@role).to eql([:manage_projects])
     end
-    
+
     it "should convert strings to symbols" do
       @role.is_allowed_to "manage_projects"
-      @role.should eql([:manage_projects])
+      expect(@role).to eql([:manage_projects])
     end
-  
+
     it "should allow adding multiple rights at once" do
       @role.is_allowed_to :manage_projects, :cancel_account
-      @role.should eql([:manage_projects, :cancel_account])
+      expect(@role).to eql([:manage_projects, :cancel_account])
     end
   end
-  
+
   describe "based_on" do
     it "should add new instance to merge_rights_from" do
       role = DarDaDa::Role.new(:admin)
       role.based_on "author"
-      role.merge_rights_from.should eql([:author])
+      expect(role.merge_rights_from).to eql([:author])
     end
-    
+
     it "should allow adding multiple roles at once" do
       role = DarDaDa::Role.new(:role1)
       role.based_on :author, "user"
-      role.merge_rights_from.should == ([:author, :user])
+      expect(role.merge_rights_from).to eql([:author, :user])
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dar_da_da
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Sebastian Munz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-08 00:00:00.000000000 Z
+date: 2017-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3-ruby
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -126,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: dar_da_da
-rubygems_version: 2.2.0
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Roles easy like sunday morning.