protector 0.7.6 → 0.7.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d6e09054172469d5a87d231ad7f173504cb370d
-  data.tar.gz: 6711053459b16743c42b18192406bbda09a1bd45
+  metadata.gz: 887a8a01b4826c0199726be2a4ec3375df624476
+  data.tar.gz: 240ab6a77289a4813f0e141d12f6dd4cb7f95fd3
 SHA512:
-  metadata.gz: 73b84873fae0417524c733ccf96216e311923fc80fe69bf3bf690c26624a237297dd9c4166171830c2ed3e7978ce9dd5d28daf05e3e910f30e4b42ae48c12536
-  data.tar.gz: d7390a28c52aa295aa46fa295a8cd250e5548c5e8916b71c39db6e077fd1cccfbe345710bcf3292249672a5925f8948f5889d56b95b6af82654a99ba62547da7
+  metadata.gz: fcec818537f70793185f37e1cf0ca1add42dc43d7de09cae213b899616f43c4516814a13fa96984e6bd1ca61f250393c06ee4b84ea5f420ea3cbf0182c331132
+  data.tar.gz: 2da8876bd0c678c98ab1e43903db81d47b85d3b86a5dedabe62a2bff83cd575da82828ee06d70239a47618ebd8fd8824f62c4d87a0936c2da05cf76124176421

data/.travis.yml

@@ -2,6 +2,11 @@ rvm:
   - 1.9.3
   - jruby-19mode
   - 2.0.0
+  - 2.1.0
+
+matrix:
+  allow_failures:
+    - gemfile: gemfiles/AR_edge.gemfile
 
 gemfile:
   - gemfiles/AR_3.2.gemfile
@@ -11,4 +16,4 @@ gemfile:
   - gemfiles/Rails_4.gemfile
   - gemfiles/Sequel.gemfile
 
-script: bundle exec rspec
+script: bundle exec rspec

data/lib/protector/adapters/active_record/base.rb

@@ -58,7 +58,7 @@ module Protector
         module ClassMethods
           # Storage of {Protector::DSL::Meta}
           def protector_meta
-            @protector_meta ||= Protector::DSL::Meta.new(Protector::Adapters::ActiveRecord, self) do
+            ensure_protector_meta!(Protector::Adapters::ActiveRecord) do
               column_names
             end
           end

data/lib/protector/adapters/sequel/model.rb

@@ -18,7 +18,7 @@ module Protector
         module ClassMethods
           # Storage of {Protector::DSL::Meta}
           def protector_meta
-            @protector_meta ||= Protector::DSL::Meta.new(Protector::Adapters::Sequel, self) do
+            ensure_protector_meta!(Protector::Adapters::Sequel) do
               columns
             end
           end

data/lib/protector/dsl.rb

@@ -212,7 +212,7 @@ module Protector
 
           fields.each do |k, v|
             case x = @access[part][k]
-            when Range
+            when Enumerable
               return k unless x.include?(v)
             when Proc
               return k unless Protector.insecurely{ x.call(v) }
@@ -257,11 +257,21 @@ module Protector
         @blocks ||= []
       end
 
+      def blocks=(blocks)
+        @blocks = blocks
+      end
+
       # Register another protection block
       def <<(block)
         blocks << block
       end
 
+      def inherit(model, &fields_proc)
+        clone = self.class.new(@adapter, model, &fields_proc)
+        clone.blocks = @blocks.clone unless @blocks.nil?
+        clone
+      end
+
       # Calculate protection at the context of subject
       #
       # @param subject [Object]           Restriction subject
@@ -317,6 +327,14 @@ module Protector
         def protect(&block)
           protector_meta << block
         end
+
+        def ensure_protector_meta!(adapter, &column_names)
+          @protector_meta ||= if superclass && superclass.respond_to?(:protector_meta)
+            superclass.protector_meta.inherit(self, &column_names)
+          else
+            Protector::DSL::Meta.new(adapter, self, &column_names)
+          end
+        end
       end
     end
   end

data/lib/protector/version.rb

@@ -1,4 +1,4 @@
 module Protector
   # Gem version
-  VERSION = '0.7.6'
+  VERSION = '0.7.7'
 end

data/locales/ru.yml

@@ -0,0 +1,3 @@
+ru:
+  protector:
+    invalid: "Нет прав доступа к полю '%{field}'"

data/spec/spec_helpers/examples/model.rb

@@ -21,6 +21,23 @@ shared_examples_for "a model" do
     meta.access[:update].should == fields
   end
 
+  it "respects inheritance" do
+    dummy.instance_eval do
+      protect do
+        can :read, :test
+      end
+    end
+
+    attempt = Class.new(dummy) do
+      protect do
+        can :create, :test
+      end
+    end
+
+    dummy.protector_meta.evaluate(nil, nil).access.should == {read: {"test"=>nil}}
+    attempt.protector_meta.evaluate(nil, nil).access.should == {read: {"test"=>nil}, create: {"test"=>nil}}
+  end
+
   it "drops meta on restrict" do
     d = Dummy.first
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: protector
 version: !ruby/object:Gem::Version
-  version: 0.7.6
+  version: 0.7.7
 platform: ruby
 authors:
 - Boris Staal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-06 00:00:00.000000000 Z
+date: 2014-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -81,6 +81,7 @@ files:
 - lib/protector/engine.rb
 - lib/protector/version.rb
 - locales/en.yml
+- locales/ru.yml
 - migrations/active_record.rb
 - migrations/sequel.rb
 - perf/active_record_perf.rb
@@ -118,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: 'Protector is a successor to the Heimdallr gem: it hits the same goals keeping