guachiman 0.0.8 → 0.1.0

data/guachiman.gemspec

@@ -18,6 +18,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'railties', '>= 3.2'
+  spec.add_dependency 'activerecord', '>= 3.2'
+  spec.add_dependency 'strong_parameters', '>= 0.2.1'
   spec.add_development_dependency 'minitest'
   spec.add_development_dependency 'minitest-focus'
   spec.add_development_dependency 'bundler', '~> 1.3'

data/lib/guachiman.rb

@@ -1,9 +1,12 @@
 require 'guachiman/version'
 require 'guachiman/permissions'
-require 'guachiman/strong_parameters'
 require 'guachiman/params'
+require 'active_record'
+require 'strong_parameters'
 
 if defined? Rails
   require 'guachiman/rails/railtie'
   require 'guachiman/rails/permissible'
+
+  ActiveRecord::Base.send :include, ActiveModel::ForbiddenAttributesProtection
 end

data/lib/guachiman/params.rb

@@ -22,17 +22,25 @@ module Guachiman
       end
     end
 
+    def allowed_params
+      read_allowed_params & write_allowed_params
+    end
+
     def allow_param resources, attributes
       allow_read_param  resources, attributes
       allow_write_param resources, attributes
     end
 
+    def allow_param? resource, attribute
+      allow_write_param?(resource, attribute) && allow_read_param?(resource, attribute)
+    end
+
     def permit_params! params
       if @allow_all
         params.permit!
       elsif write_allowed_params
         write_allowed_params.each do |resource, attributes|
-          params[resource] = params[resource].permit(*attributes) if params[resource].respond_to? :permit
+          params[resource] = params[resource].permit(*attributes) if params[resource]
         end
       end
     end

data/lib/guachiman/permissions.rb

@@ -7,9 +7,7 @@ module Guachiman
       Array(controllers).each do |controller|
         Array(actions).each do |action|
           allowed_actions[controller] ||= {}
-          allowed_actions[controller].merge!({
-            action => (block || true)
-          })
+          allowed_actions[controller].merge! action => (block || true)
         end
       end
     end

data/lib/guachiman/rails/permissible.rb

@@ -20,7 +20,7 @@ module Guachiman
 
     def authorize
       if current_permission.allow? params[:controller], params[:action], current_resource
-        current_permission.permit_params!(params) if current_permission.respond_to? :permit_params!
+        current_permission.permit_params! params
       else
         not_authorized
       end
@@ -28,9 +28,9 @@ module Guachiman
 
     def not_authorized
       if current_user
-        redirect_to :root, alert: t(:not_authorized)
+        redirect_to root_path, alert: t(:not_authorized)
       else
-        redirect_to :login, alert: t(:please_login)
+        redirect_to login_path, alert: t(:please_login)
       end
     end
   end

data/lib/guachiman/version.rb

@@ -1,3 +1,3 @@
 module Guachiman
-  VERSION = '0.0.8'
+  VERSION = '0.1.0'
 end

data/test/generators/install_generator_test.rb

@@ -4,13 +4,15 @@ require 'generators/guachiman/install/install_generator'
 
 class InstallGeneratorTest < Rails::Generators::TestCase
   DESTINATION = File.expand_path File.join(File.dirname(__FILE__), '..', '..', 'tmp')
+  FileUtils.mkdir_p DESTINATION unless Dir.exists? DESTINATION
+
   destination DESTINATION
 
   tests Guachiman::Generators::InstallGenerator
   setup :prepare_destination
 
   def prepare_destination
-    FileUtils.rm_r "#{DESTINATION}/app"
+    FileUtils.rm_r    "#{DESTINATION}/app" if Dir.exists? "#{DESTINATION}/app"
     FileUtils.mkdir_p "#{DESTINATION}/app"
     FileUtils.mkdir_p "#{DESTINATION}/app/models"
   end

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: guachiman
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.1.0
+  prerelease: 
 platform: ruby
 authors:
 - Francesco Rodriguez
@@ -9,53 +10,92 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-09 00:00:00.000000000 Z
+date: 2013-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: strong_parameters
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.2.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest-focus
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -63,6 +103,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,15 +111,17 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Basic authorization library inspired in Ryan Bates code
@@ -102,33 +145,33 @@ files:
 - lib/guachiman/permissions.rb
 - lib/guachiman/rails/permissible.rb
 - lib/guachiman/rails/railtie.rb
-- lib/guachiman/strong_parameters.rb
 - lib/guachiman/version.rb
 - test/generators/install_generator_test.rb
 - test/test_helper.rb
 homepage: https://github.com/epiclabs/guachiman
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Basic authorization library inspired in Ryan Bates code
 test_files:
 - test/generators/install_generator_test.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: c8008cb477a135e7d4e7e9f1b242bd670a0a6383
-  data.tar.gz: 8fa602dc839dcd31b5a3b5ad72f9f046fe40a3a4
-SHA512:
-  metadata.gz: e0cc34bed4b5dc76ed0e1a130ef593e08bd9939caa41118f00796ffbaf0b727e37474b238f89a7005f816d7dfc966f3e6a2349c0b37b3d4a81dea2e840e7d9fb
-  data.tar.gz: 0410d8d1e00ee44d308df078dd5059dffab944f9473d1490f97053ba10df26d88d4acdd4c4a98b6aad76fb1b7baa447613e55b2a0e0a53c0f3b46999efc60261

data/lib/guachiman/strong_parameters.rb

@@ -1,33 +0,0 @@
-module Guachiman
-  module StrongParameters
-    attr_reader :allowed_params
-
-    def allow_param resources, attributes
-      @allowed_params ||= {}
-      Array(resources).each do |resource|
-        allowed_params[resource] ||= []
-        allowed_params[resource] += Array(attributes)
-      end
-    end
-
-    def allow_param?(resource, attribute)
-      if @allow_all
-        true
-      elsif @allowed_params && @allowed_params[resource]
-        @allowed_params[resource].include? attribute
-      end
-    end
-
-    def permit_params! params
-      if @allow_all
-        params.permit!
-      elsif allowed_params
-        allowed_params.each do |resource, attributes|
-          if params[resource].respond_to? :permit
-            params[resource] = params[resource].permit(*attributes)
-          end
-        end
-      end
-    end
-  end
-end