bitroles 0.0.4 → 0.1.0

data/README.md

@@ -20,11 +20,7 @@ Or install it yourself as:
 
 ```ruby
 class MyModel < ActiveRecord::Base
-
-  include Bitroles
-
-  roles :admin, :moderator
-
+  has_roles :admin, :moderator
 end
 ```
 By default bitroles uses roles_mask integer column in your table to store the roles. You can change column name pretty
@@ -32,12 +28,24 @@ easy:
 
 ```ruby
 class MyModel < ActiveRecord::Base
+  has_roles :admin, :moderator, mask_column: :someothercolumn
+end
+```
+## Available class methods
+```ruby
+MyModel.with_role(:admin) # Scope that finds all MyModel objects with admin role
+```
 
-  include Bitroles
+## Available instance methods
 
-  roles :admin, :moderator, mask_column: :someothercolumn
+```ruby
+has_role? :admin # Checks if the object has admin role
+is_admin? # Checks the above. It can be is_moderator? or is_whatever? depends on roles given to has_role
+roles # Shows all roles of object (strings array)
+obj.roles = [:admin, :moderator] # Sets admin and moderator role to obj
+obj.admin = true # obj became admin (same for other roles)
+obj.admin = false # obj is no longer an admin (same for other roles)
 
-end
 ```
 
 ## Contributing

data/bitroles.gemspec

@@ -14,6 +14,5 @@ Gem::Specification.new do |gem|
   gem.name          = "bitroles"
   gem.require_paths = ["lib"]
   gem.version       = Bitroles::VERSION
-  gem.add_dependency("activesupport", ">= 3.0.0")
   gem.add_dependency("activerecord", ">= 3.0.0")
 end

data/lib/bitroles/version.rb

@@ -1,3 +1,3 @@
 module Bitroles
-  VERSION = "0.0.4"
+  VERSION = "0.1.0"
 end

data/lib/bitroles.rb

@@ -1,49 +1,57 @@
 require "bitroles/version"
 
 module Bitroles
-  extend ActiveSupport::Concern
-
-  included do
-    scope :with_role, -> role { where("#{mask_column_name} & #{2**roles.index(role.to_s)} > 0") }
+  def self.included(base)
+    base.extend(ClassMethods)
   end
 
   module ClassMethods
-    def roles(*args)
+    def has_roles(*args)
       if args.any?
+        roles_mask = 'roles_mask'
         if args.last.is_a?(Hash)
           options = args.pop if args.last.is_a?(Hash)
-          @@mask_column_name = options[:mask_column].to_s
+          roles_mask = options[:mask_column].to_s
+        end
+        roles = args.map(&:to_s)
+
+        roles.each do |role|
+          class_eval <<-EVAL, __FILE__, __LINE__
+            scope :with_role, -> role { where(["#{roles_mask} & ? > 0", 2**#{roles}.index(role.to_s)]) }
+
+            def is_#{role}?
+              role? role
+            end
+
+            def #{role}=(val)
+              if val
+                self.roles += [#{role}] unless has_role? #{role}
+              else
+                self.roles -= [#{role}] if has_role? #{role}
+              end
+            end
+          EVAL
         end
-        @@roles = args.map(&:to_s)
-      else
-        @@roles
-      end
-    end
-
-    def mask_column_name
-      defined?(@@mask_column_name) ? @@mask_column_name : 'roles_mask'
-    end
-  end
 
-  def method_missing(method_sym, *arguments, &block)
-    roles = self.class.roles.join('|')
-    if method_sym.to_s =~ /^is_(#{roles})\?$/
-      role? $1
-    else
-      super
-    end
-  end
+        class_eval <<-EVAL, __FILE__, __LINE__
+          def roles=(roles)
+            roles = (roles.map(&:to_s) & #{roles}).map { |r| 2**#{roles}.index(r) }.sum
+            self.#{roles_mask} = roles
+          end
 
-  def roles=(roles)
-    roles = (roles.map(&:to_s) & self.class.roles).map { |r| 2**self.class.roles.index(r) }.sum
-    self.send("#{self.class.mask_column_name}=", roles)
-  end
+          def roles
+            #{roles}.reject { |r| ((#{roles_mask} || 0) & 2**#{roles}.index(r)).zero? }
+          end
 
-  def roles
-    self.class.roles.reject { |r| ((send(self.class.mask_column_name) || 0) & 2**self.class.roles.index(r)).zero? }
+          def has_role?(role)
+            roles.include? role.to_s
+          end
+        EVAL
+      end
+    end
   end
+end
 
-  def role?(role)
-    roles.include? role.to_s
-  end
+class ActiveRecord::Base
+  include Bitroles
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bitroles
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,22 +11,6 @@ bindir: bin
 cert_chain: []
 date: 2012-05-07 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -81,5 +65,5 @@ rubyforge_project:
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Bitroles gem v0.0.4
+summary: Bitroles gem v0.1.0
 test_files: []