petergate 1.1.7 → 1.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5141c4d903727b7fc9845493e4683fd57b1a9504
-  data.tar.gz: 63556c22177794cfc7f50675d90f7856b26e4cec
+  metadata.gz: e874f558d2dba4491ce0df91cd9dd14d97169abd
+  data.tar.gz: 5068a8370ec69a9797af8ccb27b3001a2ecd21a7
 SHA512:
-  metadata.gz: e722c47a15e9feb53af47f3dbefec7f5dc874b8ec2b2f128be81eb58f648cea862c464d015a245907a3abd271f30c98d224630ef557b093a6ed65392022a824b
-  data.tar.gz: 0fef487eb9ccb21acf9d210a792b51c94823a3cf55af5d62262e9996e4a9bbd6838794aa84a4bd1c14ad040165dfbe798731ca5143b914de5a98ad30de477540
+  metadata.gz: b26024de4dd6f9a8f5dd223c576be77001bb717a3193dcd17c558d7e4cba65efa5b0160883b192c1ec9f863beb8c943ac91a30dd95332e96c3827328111b1d3d
+  data.tar.gz: 10b62d0f11bdc6696152e5092f0be7ff562eca0f21a8000bc44a56e38895d75353d298209561d07d99854d31fade1ed314a62df21eac8307ba95388ca7ac6747

data/lib/petergate.rb

@@ -1,162 +1,8 @@
 require "petergate/version"
 require "petergate/railtie"
+require 'petergate/action_controller/base'
+require 'petergate/active_record/base'
 
 module Petergate
-  module ControllerMethods
-    module ClassMethods
-      def const_missing(const_name)
-        if [:AllRest, :ALLREST].include?(const_name)
-          warn "`AllRest` and `ALLREST` has been deprecated. Use :all instead."
-          return ALLRESTDEP
-        else
-          return super 
-        end
-      end
 
-      def all_actions
-        ->{self.action_methods.to_a.map(&:to_sym) - [:check_access, :title]}.call
-      end
-
-      def except_actions(arr = [])
-        all_actions - arr
-      end
-
-      def access(rules = {}, &block)
-        if block
-          b_rules = block.call
-          rules = rules.merge(b_rules) if b_rules.is_a?(Hash)
-        end
-
-        instance_eval do
-          @_controller_rules = rules
-
-          def controller_rules
-            @_controller_rules
-          end
-
-          def inherited(subclass)
-            subclass.instance_variable_set("@_controller_rules", instance_variable_get("@_controller_rules"))
-          end
-        end
-
-        class_eval do
-          def check_access
-            permissions(self.class.controller_rules)
-          end
-        end
-      end
-    end
-
-    ALLRESTDEP = [:show, :index, :new, :edit, :update, :create, :destroy]
-
-    def self.included(base)
-      base.extend(ClassMethods)
-      base.helper_method :logged_in?, :forbidden!
-      base.before_filter do 
-        unless logged_in?(:admin)
-          message= defined?(check_access) ? check_access : true
-          if message.is_a?(String) || message == false
-            if user_signed_in?
-              forbidden! message
-            else
-              authenticate_user!
-            end
-          end
-        end
-      end
-    end
-
-    def parse_permission_rules(rules)
-      rules = rules.inject({}) do |h, (k, v)| 
-        special_values = case v.class.to_s
-                         when "Symbol"
-                           v == :all ? self.class.all_actions : raise("No action for: #{v}")
-                         when "Hash"
-                           v[:except].present? ? self.class.except_actions(v[:except]) : raise("Invalid values for except: #{v.values}")
-                         when "Array"
-                           v
-                         else
-                           raise("No action for: #{v}")
-                         end
-
-        h.merge({k => special_values})
-      end
-      # Allows Array's of keys for he same hash.
-      rules.inject({}){|h, (k, v)| k.class == Array ? h.merge(Hash[k.map{|kk| [kk, v]}]) : h.merge(k => v) }
-    end
-
-    def permissions(rules = {all: [:index, :show], customer: [], wiring: []})
-      rules = parse_permission_rules(rules)
-      case params[:action].to_sym
-      when *(rules[:all]) # checks where the action can be seen by :all
-        true
-      when *(rules[:user]) # checks if the action can be seen for all users
-        user_signed_in?
-      when *(rules[(user_signed_in? ? current_user.role.to_sym : :all)]) # checks if action can be seen by the  current_users role. If the user isn't logged in check if it can be seen by :all
-        true
-      else
-        false
-      end
-    end
-
-    def logged_in?(*roles)
-      current_user && (roles & current_user.roles).any?
-    end
-
-    def forbidden!(msg = nil)
-      respond_to do |format|
-        format.any(:js, :json, :xml) { render nothing: true, status: :forbidden }
-        format.html do
-          destination = current_user.present? ? request.referrer || after_sign_in_path_for(current_user) : root_path
-          redirect_to destination, notice: msg || 'Permission Denied'
-        end
-      end
-    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
-          const_set('ROLES', options[:roles])
-        end
-
-
-        class_eval do
-          def available_roles
-            self.class::ROLES
-          end
-
-          def roles=(v)
-            self[:roles] = Array(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

data/lib/petergate/action_controller/base.rb

@@ -0,0 +1,119 @@
+module Petergate
+  module ActionController
+    module Base
+      module ClassMethods
+        def const_missing(const_name)
+          if [:AllRest, :ALLREST].include?(const_name)
+            warn "`AllRest` and `ALLREST` has been deprecated. Use :all instead."
+            return ALLRESTDEP
+          else
+            return super 
+          end
+        end
+
+        def all_actions
+          ->{self.action_methods.to_a.map(&:to_sym) - [:check_access, :title]}.call
+        end
+
+        def except_actions(arr = [])
+          all_actions - arr
+        end
+
+        def access(rules = {}, &block)
+          if block
+            b_rules = block.call
+            rules = rules.merge(b_rules) if b_rules.is_a?(Hash)
+          end
+
+          instance_eval do
+            @_controller_rules = rules
+
+            def controller_rules
+              @_controller_rules
+            end
+
+            def inherited(subclass)
+              subclass.instance_variable_set("@_controller_rules", instance_variable_get("@_controller_rules"))
+            end
+          end
+
+          class_eval do
+            def check_access
+              permissions(self.class.controller_rules)
+            end
+          end
+        end
+      end
+
+      ALLRESTDEP = [:show, :index, :new, :edit, :update, :create, :destroy]
+
+      def self.included(base)
+        base.extend(ClassMethods)
+        base.helper_method :logged_in?, :forbidden!
+        base.before_filter do 
+          unless logged_in?(:admin)
+            message= defined?(check_access) ? check_access : true
+            if message.is_a?(String) || message == false
+              if user_signed_in?
+                forbidden! message
+              else
+                authenticate_user!
+              end
+            end
+          end
+        end
+      end
+
+      def parse_permission_rules(rules)
+        rules = rules.inject({}) do |h, (k, v)| 
+          special_values = case v.class.to_s
+                           when "Symbol"
+                             v == :all ? self.class.all_actions : raise("No action for: #{v}")
+                           when "Hash"
+                             v[:except].present? ? self.class.except_actions(v[:except]) : raise("Invalid values for except: #{v.values}")
+                             when "Array"
+                               v
+                             else
+                               raise("No action for: #{v}")
+                             end
+
+          h.merge({k => special_values})
+        end
+        # Allows Array's of keys for he same hash.
+        rules.inject({}){|h, (k, v)| k.class == Array ? h.merge(Hash[k.map{|kk| [kk, v]}]) : h.merge(k => v) }
+      end
+
+      def permissions(rules = {all: [:index, :show], customer: [], wiring: []})
+        rules = parse_permission_rules(rules)
+        case params[:action].to_sym
+        when *(rules[:all]) # checks where the action can be seen by :all
+          true
+        when *(rules[:user]) # checks if the action can be seen for all users
+          user_signed_in?
+        when *(rules[(user_signed_in? ? current_user.role.to_sym : :all)]) # checks if action can be seen by the  current_users role. If the user isn't logged in check if it can be seen by :all
+          true
+        else
+          false
+        end
+      end
+
+      def logged_in?(*roles)
+        current_user && (roles & current_user.roles).any?
+      end
+
+      def forbidden!(msg = nil)
+        respond_to do |format|
+          format.any(:js, :json, :xml) { render nothing: true, status: :forbidden }
+          format.html do
+            destination = current_user.present? ? request.referrer || after_sign_in_path_for(current_user) : root_path
+            redirect_to destination, notice: msg || 'Permission Denied'
+          end
+        end
+      end
+    end
+  end
+end
+
+class ActionController::Base
+  include Petergate::ActionController::Base
+end

data/lib/petergate/active_record/base.rb

@@ -0,0 +1,45 @@
+module Petergate
+  module ActiveRecord
+    module Base
+      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
+            const_set('ROLES', options[:roles])
+          end
+
+
+          class_eval do
+            def available_roles
+              self.class::ROLES
+            end
+
+            def roles=(v)
+              self[:roles] = Array(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
+end
+
+class ActiveRecord::Base
+  include Petergate::ActiveRecord::Base
+end

data/lib/petergate/version.rb

@@ -1,3 +1,3 @@
 module Petergate
-  VERSION = "1.1.7"
+  VERSION = "1.1.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: petergate
 version: !ruby/object:Gem::Version
-  version: 1.1.7
+  version: 1.1.8
 platform: ruby
 authors:
 - Isaac Sloan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-01 00:00:00.000000000 Z
+date: 2015-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -70,6 +70,8 @@ files:
 - lib/generators/petergate/install_generator.rb
 - lib/generators/petergate/templates/migrations/add_roles_to_users.rb
 - lib/petergate.rb
+- lib/petergate/action_controller/base.rb
+- lib/petergate/active_record/base.rb
 - lib/petergate/railtie.rb
 - lib/petergate/version.rb
 - lib/templates/rails/scaffold_controller/controller.rb