petergate 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7187ecf8f85815e545390c1d6990f5f86dd4b681
-  data.tar.gz: 9d7af8202338b5dccf7c44ff3e4aab8a6f48a090
+  metadata.gz: df522f0d5ba79467f079e0592fb6f19471c763b4
+  data.tar.gz: e6eb64935d92dfa959765b354099a0b697888b88
 SHA512:
-  metadata.gz: ed8b2dcf4ad4e053c383f606c5f69c0feb2e6354c2d090448bf6f28a65971047b2d3e0074d4c08fd4f3be3bf1bc9f2437b4916de5bf09a9aae4b1e844dc8bf09
-  data.tar.gz: 89c02b9422e50a40032ceacb276f2a0dd258545d431b9cf7d19804c3ae153b4646a90a18a15e4599b19792dd04c5820acff52d12515fc72d001b2631e9f1c67f
+  metadata.gz: 82976196c290845cd522a04c1a126e289620bc58ea901e1b1dfd71195d65b159a78aca870c308b3f81e0614157766078c31bb568f16ccbf247266d38e53c876b
+  data.tar.gz: ea208dffeecf56dafdaac758d7c1c91288021e94554bcc1c7a14337e92baadf5edb92788b678d8bb8abf359a1db4dce12db9b14dfc5287dc00f3eb33e6b3b169

data/lib/generators/petergate/install_generator.rb

@@ -19,33 +19,10 @@ module Petergate
 
   ################################################################################ 
   ## PeterGate Roles
+  ## The :user role is added by default and shouldn't be included in this list.
+  petergate(roles: [admin, company_admin])
   ################################################################################
-
-  serialize :roles
-
-  # The :user role is added by default and shouldn't be included in this list.
-  Roles = [:admin] 
-
-  after_initialize do
-    self[:roles] = []
-  end
-
-  def roles=(v)
-    self[:roles] = v.map(&:to_sym).to_a.select{|r| r.size > 0 && Roles.include?(r)}
-  end
-
-  def roles
-    self[:roles] + [:user]
-  end
-
-  def role
-    roles.first
-  end
-
-  ################################################################################ 
-  ## End PeterGate Roles
-  ################################################################################
-
+ 
           RUBY
         end
       end

data/lib/petergate.rb

@@ -1,17 +1,26 @@
 require "petergate/version"
-require 'petergate/railtie' if defined?(Rails)
 
-module Petergate
+module PeterGate
   module ControllerMethods
+    module ClassMethods
+      def access(rules = {}, &block)
+        if block
+          b_rules = block.call
+          rules = rules.merge(b_rules) if b_rules.is_a?(Hash)
+        end
+        def check_access
+          perms(rules)
+        end
+      end
+    end
+
     AllRest = [:show, :index, :new, :edit, :update, :create, :destroy]
 
-    ################################################################################
-    # Start Permissions
-    ################################################################################
     def self.included(base)
+      base.extend(ClassMethods)
       base.before_filter do 
         unless logged_in?(:admin)
-          message= access
+          message= check_access
           if message.is_a?(String) || message == false
             if user_signed_in?
               redirect_to (request.referrer || after_sign_in_path_for(current_user)), :notice => message || "Permission Denied"
@@ -23,7 +32,7 @@ module Petergate
       end
     end
 
-    def access
+    def check_access
       permissions
     end
 
@@ -47,9 +56,67 @@ module Petergate
     def logged_in?(*roles)
       current_user && (roles & current_user.roles).any?
     end
+  end
+
+  module UserMethods
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
+
+    module ClassMethods
+      def petergate(options = {roles: [:admin]})
+        serialize :roles
+        after_initialize do
+          self[:roles] ||= []
+        end
+
+        instance_eval do
+          @available_roles = options[:roles]
+
+          def available_roles
+            @available_roles
+          end
+        end
+
 
-    ################################################################################
-    # End Permissions
-    ################################################################################
+        class_eval do
+          # TODO: Find a better way of making this available as both class and instance method.
+          def available_roles
+            self.class.available_roles
+          end
+
+          def roles=(v)
+            self[:roles] = v.map(&:to_sym).to_a.select{|r| r.size > 0 && available_roles.include?(r)}
+          end
+
+          def roles
+            self[:roles] + [:user]
+          end
+
+          def role
+            roles.first
+          end
+        end
+      end
+    end
   end
 end
+
+class ActionController::Base
+  include PeterGate::ControllerMethods
+end
+
+class ActiveRecord::Base
+  include PeterGate::UserMethods
+end
+
+# class User < ActiveRecord::Base
+#   ################################################################################ 
+#   ## PeterGate Roles
+#   ################################################################################
+# 
+# 
+#   ################################################################################ 
+#   ## End PeterGate Roles
+#   ################################################################################
+# end

data/lib/petergate/railtie.rb

@@ -1,10 +1,14 @@
-# require 'petergate/view_helpers'
+require 'petergate/view_helpers'
 module Petergate
   class Railtie < Rails::Railtie
     initializer "petergate.libs" do
       ActiveSupport.on_load(:action_controller) do
         ActionController::Base.send(:include, Petergate::ControllerMethods)
       end
+
+      ActiveSupport.on_load(:active_record) do
+        User.send(:include, Petergate::ModelMethods)
+      end
     end
   end
 end

data/lib/petergate/version.rb

@@ -1,3 +1,3 @@
 module Petergate
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: petergate
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Isaac Sloan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-11 00:00:00.000000000 Z
+date: 2014-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler