lolita 3.3.9 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8100b8ed2afcaecc1e852b9165d5e5f29a2f4a04
-  data.tar.gz: ff559fb108e2a5ec335fd16e6ad03eb0c30ac0ee
+  metadata.gz: 4b73d7232b6d16a4d0b0b0c0c35a1928fe316390
+  data.tar.gz: 8f0f31e08f83abff1884b007b8559fa96c25108c
 SHA512:
-  metadata.gz: 707395307c6fbe049f7a1fbe8ff2c5bae14658c5bd1548887594926dbaf2fe9a74cc5d5403082d1f06a719bc0e6ba9389a18e367fadcfbcf296d0a0c87bd9ef6
-  data.tar.gz: cebbb5d41e485b07bbe9a39f94e8ac4baf450eeaf4b1e430a87492ed38a8da9308af2560eceddacb560b34d2ab41052ca1d4a6e8125d8d0d6a49affc82efe63e
+  metadata.gz: 25028f189a32ad2a665b3f4cbfff3002e5517845d6c1e84a2d2d329cd0f18fd1e0a8ebec07d8118cb2471260fb263b632667b9065fd506cebe493d669d8baaf9
+  data.tar.gz: 502fd36b78421dcb183bf3c9a03ac535653f257773a3742065bf1b3197948648e0fc37fa9c3057f3fd974ef71fcca2431896ae0d38b5cde59e8d6fa07a3b6c6c

data/.gitignore

@@ -33,3 +33,4 @@ pkg
 tags
 .gemtags
 .ruby-version
+.local.vimrc

data/Gemfile

@@ -4,7 +4,7 @@ gemspec
 
 group :test, :development do
   unless ENV['CI']
-    gem 'byebug'
+    gem 'pry-byebug'
   end
   gem 'fabrication', '~> 1.3.2'
   gem 'rspec', '~> 2.13'

data/README.md

@@ -14,7 +14,7 @@ password: lolita
 
 First add Lolita gem to your Gemfile
 
-    gem 'lolita', '~> 3.3.0'
+    gem 'lolita', '~> 3.4.0'
 
 Then go to your rails project and
 

data/app/assets/stylesheets/lolita/style.css.erb

@@ -431,7 +431,13 @@ tr.nested-list td{
   display: inline-block;
   margin-right: 10px;
 }
-
+#main .box form.filter .field {
+	overflow: inherit;
+}
+.filter button[type='submit'] {
+	float: right;
+	margin-top: 8px;
+}
 /* --------------------------------------------- */
 
 /* Pagination */

data/app/controllers/lolita/info_controller.rb

@@ -4,7 +4,7 @@ class Lolita::InfoController < ApplicationController
 
   def index
     if Lolita.mappings.any?
-      if available_mapping = Lolita.mappings.detect{ |name,mapping| authorization_proxy.authorize!(:read, mapping.to) }
+      if available_mapping = Lolita.mappings.detect{ |name,mapping| authorization_proxy.can?(:read, mapping.to) }
         mapping = available_mapping.last
         return redirect_to(lolita_resources_path(mapping))
       end

data/lib/lolita/adapter/common_helper.rb

@@ -50,6 +50,8 @@ module Lolita
         def ability_criteria
           @ability_criteria ||= if @adapter.klass.respond_to?(:accessible_by)
             @adapter.klass.accessible_by(current_ability)
+          elsif current_ability.respond_to?(:scope)
+            current_ability.scope
           else
             nil
           end
@@ -216,4 +218,4 @@ module Lolita
 
     end
   end
-end
+end

data/lib/lolita/controller_additions.rb

@@ -7,10 +7,11 @@ module Lolita
         include Lolita::Controllers::InternalHelpers
         include Lolita::Controllers::AuthenticationHelpers
         if Lolita.rails?
-          include Lolita::Controllers::RailsHelpers 
+          include Lolita::Controllers::RailsHelpers
         end
+        attr_accessor :current_ability
       end
     end
 
   end
-end
+end

data/lib/lolita/extensions/authentication/default_adapter.rb

@@ -1,7 +1,7 @@
 module Lolita
   module Extensions
     module Authentication
-      
+
       class DefaultAdapter
         def initialize context, options={}
         end
@@ -9,7 +9,7 @@ module Lolita
         def current_user
           nil
         end
-        
+
         def user_signed_in?
           false
         end
@@ -21,4 +21,4 @@ module Lolita
 
     end
   end
-end
+end

data/lib/lolita/extensions/authorization/cancan_adapter.rb

@@ -1,9 +1,9 @@
 module Lolita
   module Extensions
     module Authorization
-      
+
       class CanCanAdapter
-        
+
         def initialize context, options={}
           raise NameError, "CanCan is not defined" unless defined?(CanCan)
           raise Lolita::NoAuthorizationDefinedError, "Lolita.authorization is not defined" unless Lolita.authorization
@@ -32,7 +32,7 @@ module Lolita
         def authorize! *args
           current_ability && @context && @context.authorize!(*args) || current_ability.authorize!(*args)
         end
-        
+
         private
 
         def set_default_options
@@ -42,4 +42,4 @@ module Lolita
 
     end
   end
-end
+end

data/lib/lolita/extensions/authorization/proxy.rb

@@ -1,9 +1,10 @@
 require "#{File.dirname(__FILE__)}/default_adapter"
 require "#{File.dirname(__FILE__)}/cancan_adapter"
+require "#{File.dirname(__FILE__)}/pundit_adapter"
 
 module Lolita
   class NoAuthorizationDefinedError < ArgumentError ; end
-  
+
   module Extensions
     module Authorization
 
@@ -31,7 +32,7 @@ module Lolita
         def current_ability *args
           @adapter.current_ability *args
         end
-        
+
         private
 
         def get_adapter
@@ -45,4 +46,4 @@ module Lolita
 
     end
   end
-end
+end

data/lib/lolita/extensions/authorization/pundit_adapter.rb

@@ -0,0 +1,77 @@
+module Lolita
+  module Extensions
+    module Authorization
+      class PunditAdapter
+
+        def initialize context, options={}
+          raise NameError, "Pundit is not defined" unless defined?(Pundit)
+          raise Lolita::NoAuthorizationDefinedError, "Lolita.authorization is not defined" unless Lolita.authorization
+          @context = context
+          @options = options
+          current_ability
+        end
+
+        def can? *args
+          !!(ability = current_ability(*args) and ability.send(policy_method(args)))
+        end
+
+        def cannot? *args
+          !can?(*args)
+        end
+
+        def current_ability *args
+          if current_user && record = get_record(*args)
+            @current_ability = Pundit.policy(current_user, record) || Lolita.policy_class.new(current_user, record)
+            @context && @context.instance_variable_set(:"@current_ability", @current_ability)
+          end
+          @current_ability
+        end
+
+        def authorize! *args
+          unless ability = current_ability(*args) and ability.public_send(policy_method(args))
+            raise Pundit::NotAuthorizedError.new("not allowed to #{args.first} this #{args.last}")
+          end
+          true
+        end
+
+        private
+
+        def current_user
+          @context && @context.authentication_proxy.current_user
+        end
+
+        def get_record *args
+          if args.any?
+            record_as_instance(args.last)
+          else
+            mapping = @options[:request].env["lolita.mapping"] and mapping.class_name.constantize
+          end
+        end
+
+        def policy_method args
+          "#{args.first}?"
+        end
+
+        # pundit can receive only instance as record, but Lolita can give
+        # sometime instance sometimes class or module, so we try to make it 
+        # as instance
+        def record_as_instance record
+          if is_instance?(record)
+            record
+          elsif is_module?(record)
+            Object.new
+          else
+            record.new
+          end
+        end
+
+        def is_module? obj
+          obj.class == Module
+        end
+        def is_instance? obj
+          !obj.respond_to? :ancestors
+        end
+      end
+    end
+  end
+end

data/lib/lolita/extensions/extensions.rb

@@ -25,7 +25,7 @@ module Lolita
         load_extension_proxy(type,context,options)
       end
     end
-    
+
     def load_extension_proxy type,context=self,options={}
       proxy_class = "Lolita::Extensions::#{type.to_s.camelize}::Proxy".constantize
       initialize_arity = proxy_class.instance_method(:initialize).arity
@@ -63,4 +63,4 @@ Lolita::Extensions.add :authentication
 Lolita::Extensions.add :authorization
 
 require 'lolita/extensions/authorization/proxy'
-require 'lolita/extensions/authentication/proxy'
+require 'lolita/extensions/authentication/proxy'

data/lib/lolita/system_configuration/base.rb

@@ -3,7 +3,7 @@ module Lolita
     class Base
       attr_reader :scope, :modules, :routes, :controllers,:resources
       attr_accessor :mappings,:default_route,:user_classes,:authentication,:authorization
-      attr_writer :default_locale, :ability_class
+      attr_writer :default_locale, :ability_class, :policy_class
 
       def initialize(scope)
         @scope=scope
@@ -31,11 +31,17 @@ module Lolita
         end
         Lolita::Navigation::Tree[:"left_side_navigation"]
       end
-      
+
+      # ability class for CanCan
       def ability_class
         @ability_class || (::Ability rescue nil) || raise("No ability class found.")
       end
 
+      # policy class for Pundit
+      def policy_class
+        @policy_class || (::LolitaPolicy rescue nil) || raise("No policy class found.")
+      end
+
       def locales=(value)
         unless value.is_a?(Array)
           @locales=[value]
@@ -95,7 +101,7 @@ module Lolita
           end
         }.flatten.compact.uniq
       end
-        
+
       # Include module in Lolita, don't know why i need this
       def use(module_name)
         Lolita.send(:include,module_name)
@@ -165,4 +171,4 @@ module Lolita
       
     end
   end
-end
+end

data/lib/lolita/version.rb

@@ -1,8 +1,8 @@
 module Lolita
   module Version
     MAJOR = 3
-    MINOR = 3
-    PATCH = 9
+    MINOR = 4
+    PATCH = 0
     BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')

data/spec/configuration/filter_spec.rb

@@ -91,6 +91,9 @@ describe Lolita::Configuration::Filter do
 
   describe "Filtering list" do
     let(:list){ Lolita::Configuration::List}
+    let(:request){
+      double('request', headers: {}, params: {})
+    }
 
     it "should filter with default filters" do
       tags = %w(Android Linux Windows).map{|name| Fabricate(:tag, :name => name )}
@@ -101,16 +104,11 @@ describe Lolita::Configuration::Filter do
           field :tags
         end
       end
-      list_conf.paginate(1).should have(3).items
-      request = Object.new
-      request.class_eval do
-        def params
-          {:filter => {:tag_ids => Tag.where(:name => 'Android').first.id}}
-        end
-      end
-      list_conf.paginate(1,request).should have(1).items
+      list_conf.paginate(1, request).should have(3).items
+      request.stub(params: {:filter => {:tag_ids => Tag.where(:name => 'Android').first.id}})
+      list_conf.paginate(1, request).should have(1).items
     end
-    
+
     it "should filter with custom search" do
       tags = %w(Android Linux Windows).map{|name| Fabricate(:tag, :name => name )}
       3.times {|i| Fabricate(:post,:tags => [tags[i]])}
@@ -125,13 +123,8 @@ describe Lolita::Configuration::Filter do
           search :custom_filter
         end
       end
-      list_conf.paginate(1).should have(3).items
-      request = Object.new
-      request.class_eval do
-        def params
-          {:filter => {:tag_ids => Tag.where(:name => 'Android').first.id}}
-        end
-      end
+      list_conf.paginate(1, request).should have(3).items
+      request.stub(params: {:filter => {:tag_ids => Tag.where(:name => 'Android').first.id}})
       list_conf.paginate(1,request).should have(2).items
     end
   end

data/spec/extensions/authorization/cancan_adapter_spec.rb

@@ -71,8 +71,8 @@ describe Lolita::Extensions::Authorization::CanCanAdapter do
     it "should authorize resource" do
       adapter2 = klass.new(nil)
       expect do
-        adapter2.authorize!(:read,Object).should == "ability_response"
-        adapter.authorize!(:read,Object).should == "context_response"
+        adapter2.authorize!(:read, Object).should == "ability_response"
+        adapter.authorize!(:read, Object).should == "context_response"
       end.not_to raise_error
     end
   end
@@ -91,4 +91,4 @@ describe Lolita::Extensions::Authorization::CanCanAdapter do
       proxy.adapter.current_ability == adapter.current_ability
     end
   end
-end
+end

data/spec/extensions/authorization/pundit_adapter_spec.rb

@@ -0,0 +1,104 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../simple_spec_helper')
+
+class TestApplicationController
+  include Lolita::Extensions
+end
+
+class TestPolicy
+  def initialize user, record
+  end
+
+  def read?
+    true
+  end
+
+  def create?
+    false
+  end
+end
+
+module Pundit
+  class NotAuthorizedError < StandardError ; end
+
+  def self.policy user, record
+  end
+end
+
+describe Lolita::Extensions::Authorization::PunditAdapter do
+  let(:klass){ Lolita::Extensions::Authorization::PunditAdapter }
+  around(:each){|example|
+    Lolita.authorization = 'Pundit'
+    Lolita.policy_class = TestPolicy
+    example.run
+    Lolita.authorization = nil
+    Lolita.policy_class = nil
+  }
+  let(:adapter){ klass.new(TestApplicationController.new,{request: double(env: {})}) }
+
+  it "should create new" do
+    expect do
+      klass.new(TestApplicationController.new,{request: double(env: {})})
+    end.not_to raise_error
+  end
+
+  it "should raise error without authorization" do
+    expect do
+      Lolita.authorization = nil
+      klass.new(TestApplicationController.new,{request: double(env: {})})
+    end.to raise_error(Lolita::NoAuthorizationDefinedError)
+  end
+
+  context "current user" do
+
+    before do
+      TestApplicationController.any_instance.stub(authentication_proxy: double(current_user: double('Admin')))
+    end
+
+    it "can do some action with current policy" do
+      adapter.can?(:read,"HiddenText".class).should be_true
+      adapter.can?(:create,"HiddenText".class).should be_false
+    end
+
+    it "can ONLY do actions from policy" do
+      adapter.cannot?(:read,"HiddenText".class).should be_false
+      adapter.cannot?(:create,"HiddenText".class).should be_true
+    end
+
+    it "should have current policy" do
+      adapter.current_ability(Object.new).should be_a(Lolita.policy_class)
+    end
+
+    it "should not authorize resource without current_user" do
+      adapter2 = klass.new(nil)
+      expect do
+        adapter2.authorize!(:read, Object)
+      end.to raise_error
+    end
+
+    it "should authorize resource" do
+      expect do
+        adapter.authorize!(:read, Object).should be_true
+      end.to_not raise_error
+    end
+  end
+
+  describe 'Integration with proxy' do
+    let(:proxy){
+      mock_class = Object.new
+      mock_class.class_eval{include Lolita::Extensions}
+      Lolita::Extensions::Authorization::Proxy.new(mock_class,{request: double(env: {})})
+    }
+
+    before do
+      TestApplicationController.any_instance.stub(authentication_proxy: double(current_user: double('Admin')))
+    end
+
+    it "should have the same method results for adapter and proxy" do
+      proxy.adapter = adapter
+      %w(can? cannot? authorize!).each do |name|
+        proxy.send(name,:read, String).should eql(adapter.send(name,:read,String))
+      end
+      proxy.adapter.current_ability(Object) == adapter.current_ability(Object)
+    end
+  end
+end

data/spec/simple_spec_helper.rb

@@ -1 +1,6 @@
 require_relative '../lib/lolita'
+require 'rubygems'
+require 'bundler/setup'
+unless ENV['CI']
+  require 'pry-byebug'
+end

data/spec/spec_helper.rb

@@ -1,7 +1,7 @@
 require 'rubygems'
 require 'bundler/setup'
 unless ENV['CI']
-  require 'byebug'
+  require 'pry-byebug'
 end
 # require 'simplecov'
 # SimpleCov.start do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lolita
 version: !ruby/object:Gem::Version
-  version: 3.3.9
+  version: 3.4.0
 platform: ruby
 authors:
 - ITHouse (Latvia) and Arturs Meisters
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-18 00:00:00.000000000 Z
+date: 2014-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kaminari
@@ -329,6 +329,7 @@ files:
 - lib/lolita/extensions/authorization/cancan_adapter.rb
 - lib/lolita/extensions/authorization/default_adapter.rb
 - lib/lolita/extensions/authorization/proxy.rb
+- lib/lolita/extensions/authorization/pundit_adapter.rb
 - lib/lolita/extensions/extensions.rb
 - lib/lolita/helpers.rb
 - lib/lolita/hooks.rb
@@ -383,6 +384,7 @@ files:
 - spec/extensions/authorization/cancan_adapter_spec.rb
 - spec/extensions/authorization/default_adapter_spec.rb
 - spec/extensions/authorization/proxy_spec.rb
+- spec/extensions/authorization/pundit_adapter_spec.rb
 - spec/extensions/extensions_spec.rb
 - spec/fabricators/category_fabricator.rb
 - spec/fabricators/post_fabricator.rb
@@ -552,6 +554,7 @@ test_files:
 - spec/extensions/authorization/cancan_adapter_spec.rb
 - spec/extensions/authorization/default_adapter_spec.rb
 - spec/extensions/authorization/proxy_spec.rb
+- spec/extensions/authorization/pundit_adapter_spec.rb
 - spec/extensions/extensions_spec.rb
 - spec/fabricators/category_fabricator.rb
 - spec/fabricators/post_fabricator.rb