heimdallr-resource 1.0.0 → 1.0.1

data/CHANGELOG.md

@@ -0,0 +1,7 @@
+# Changelog
+
+## 1.0.1
+
+* load_and_authorize_resource accepts just one hash parameter from now [@_inossidabile][]
+
+[@_inossidabile]: http://twitter.com/#!/_inossidabile

data/heimdallr-resource.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "heimdallr-resource"
-  s.version     = "1.0.0"
+  s.version     = "1.0.1"
   s.authors     = ["Peter Zotov", "Boris Staal"]
   s.email       = ["whitequark@whitequark.org", "boris@roundlake.ru"]
   s.homepage    = "http://github.com/roundlake/heimdallr-resource"

data/lib/heimdallr/resource.rb

@@ -4,8 +4,8 @@ module Heimdallr
 
   module ResourceImplementation
     class << self
-      def prepare_options(klass, resource, options)
-        options.merge! :resource => (resource || klass.name.sub(/Controller$/, '').underscore)
+      def prepare_options(klass, options)
+        options.merge! :resource => (options[:resource] || klass.name.sub(/Controller$/, '').underscore).to_s
 
         filter_options = {}
         filter_options[:only]   = options.delete(:only)   if options.has_key?(:only)
@@ -81,21 +81,21 @@ module Heimdallr
     extend ActiveSupport::Concern
 
     module ClassMethods
-      def load_and_authorize_resource(resource=nil, options={})
-        load_resource(resource, options)
-        authorize_resource(resource, options)
+      def load_and_authorize_resource(options={})
+        load_resource(options)
+        authorize_resource(options)
       end
 
-      def load_resource(resource=nil, options={})
-        options, filter_options = Heimdallr::ResourceImplementation.prepare_options(self, resource, options)
+      def load_resource(options={})
+        options, filter_options = Heimdallr::ResourceImplementation.prepare_options(self, options)
 
         before_filter filter_options do |controller|
           Heimdallr::ResourceImplementation.load(controller, options)
         end
       end
 
-      def authorize_resource(resource=nil, options={})
-        options, filter_options = Heimdallr::ResourceImplementation.prepare_options(self, resource, options)
+      def authorize_resource(options={})
+        options, filter_options = Heimdallr::ResourceImplementation.prepare_options(self, options)
 
         before_filter filter_options do |controller|
           Heimdallr::ResourceImplementation.authorize(controller, options)

data/spec/dummy/app/controllers/fluffies_controller.rb

@@ -0,0 +1,29 @@
+class FluffiesController < ApplicationController
+  include Heimdallr::Resource
+
+  load_and_authorize_resource :resource => :entity
+
+  def index
+    render :nothing => true
+  end
+
+  def new
+    render :nothing => true
+  end
+
+  def create
+    render :nothing => true
+  end
+
+  def edit
+    render :nothing => true
+  end
+
+  def update
+    render :nothing => true
+  end
+
+  def destroy
+    render :nothing => true
+  end
+end

data/spec/dummy/config/routes.rb

@@ -1,3 +1,4 @@
 Dummy::Application.routes.draw do
   resources :entity
+  resources :fluffies
 end

data/spec/fluffies_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+describe FluffiesController, :type => :controller do
+  before(:all) do
+    @john    = User.create!   :admin => false
+    @maria   = User.create!   :admin => false
+    @admin   = User.create!   :admin => true
+    @private = Entity.create! :name => 'ent1', :public => false
+    @public  = Entity.create! :name => 'ent1', :public => true, :owner_id => @john.id
+  end
+
+  after(:all) do
+    Entity.delete_all
+  end
+
+  it "accepts load_and_authorize_resource params" do
+    User.mock @admin
+    get :index
+
+    assigns(:entities).count.should == 2
+  end
+end

data/spec/resource_spec.rb

@@ -9,8 +9,8 @@ describe EntityController, :type => :controller do
     @public  = Entity.create! :name => 'ent1', :public => true, :owner_id => @john.id
   end
 
-  describe "shows everything to admin" do
-    it "showws everything to the admin" do
+  describe "CRUD" do
+    it "shows everything to the admin" do
       User.mock @admin
       get :index
 
@@ -38,36 +38,36 @@ describe EntityController, :type => :controller do
 
     it "allows update for admin" do
       User.mock @admin
-      post :update, {:id => 1}
+      post :update, {:id => @private.id}
 
       assigns(:entity).should be_kind_of Heimdallr::Proxy::Record
-      assigns(:entity).id.should == 1
+      assigns(:entity).id.should == @private.id
     end
 
     it "disallows update for non-admin" do
       User.mock @john
-      expect { post :update, {:id => 2} }.should raise_error
+      expect { post :update, {:id => @public.id} }.should raise_error
     end
 
     it "allows destroy for admin" do
       User.mock @admin
-      post :destroy, {:id => 1}
+      post :destroy, {:id => @private.id}
 
       assigns(:entity).should be_kind_of Heimdallr::Proxy::Record
-      assigns(:entity).id.should == 1
+      assigns(:entity).id.should == @private.id
     end
 
     it "allows destroy for owner" do
       User.mock @john
-      post :destroy, {:id => 2}
+      post :destroy, {:id => @public.id}
 
       assigns(:entity).should be_kind_of Heimdallr::Proxy::Record
-      assigns(:entity).id.should == 2
+      assigns(:entity).id.should == @public.id
     end
 
     it "disallows destroy for nobody" do
       User.mock @maria
-      expect { post :destroy, {:id => 2} }.should raise_error
+      expect { post :destroy, {:id => @public.id} }.should raise_error
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heimdallr-resource
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-04 00:00:00.000000000 Z
+date: 2012-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70329699570520 !ruby/object:Gem::Requirement
+  requirement: &70267893225580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70329699570520
+  version_requirements: *70267893225580
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70329699566680 !ruby/object:Gem::Requirement
+  requirement: &70267893201220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70329699566680
+  version_requirements: *70267893201220
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70329699553660 !ruby/object:Gem::Requirement
+  requirement: &70267893200560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70329699553660
+  version_requirements: *70267893200560
 - !ruby/object:Gem::Dependency
   name: tzinfo
-  requirement: &70329695606560 !ruby/object:Gem::Requirement
+  requirement: &70267893199740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70329695606560
+  version_requirements: *70267893199740
 - !ruby/object:Gem::Dependency
   name: heimdallr
-  requirement: &70329695604200 !ruby/object:Gem::Requirement
+  requirement: &70267893198820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,7 +66,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70329695604200
+  version_requirements: *70267893198820
 description: Heimdallr-Resource provides CanCan-like interface for Heimdallr-secured
   objects.
 email:
@@ -78,6 +78,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
@@ -88,6 +89,7 @@ files:
 - spec/dummy/Rakefile
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/controllers/entity_controller.rb
+- spec/dummy/app/controllers/fluffies_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/models/entity.rb
 - spec/dummy/app/models/user.rb
@@ -113,6 +115,7 @@ files:
 - spec/dummy/public/favicon.ico
 - spec/dummy/public/stylesheets/.gitkeep
 - spec/dummy/script/rails
+- spec/fluffies_spec.rb
 - spec/resource_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/roundlake/heimdallr-resource
@@ -143,6 +146,7 @@ test_files:
 - spec/dummy/Rakefile
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/controllers/entity_controller.rb
+- spec/dummy/app/controllers/fluffies_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/models/entity.rb
 - spec/dummy/app/models/user.rb
@@ -168,5 +172,6 @@ test_files:
 - spec/dummy/public/favicon.ico
 - spec/dummy/public/stylesheets/.gitkeep
 - spec/dummy/script/rails
+- spec/fluffies_spec.rb
 - spec/resource_spec.rb
 - spec/spec_helper.rb