List of model fields should be lazy-loadable to avoid interferention …

…with model until we actually try to protect it (fixes #21)

lib/protector/adapters/active_record/base.rb

@@ -63,11 +63,9 @@ def [](name)
         module ClassMethods
           # Storage of {Protector::DSL::Meta}
           def protector_meta
-            @protector_meta ||= Protector::DSL::Meta.new(
-              Protector::Adapters::ActiveRecord,
-              self,
+            @protector_meta ||= Protector::DSL::Meta.new(Protector::Adapters::ActiveRecord, self) do
               self.column_names
-            )
+            end
           end
 
           # Wraps every `.field` method with a check against {Protector::DSL::Meta::Box#readable?}

lib/protector/adapters/sequel/model.rb

@@ -18,11 +18,9 @@ def restrict!(*args)
         module ClassMethods
           # Storage of {Protector::DSL::Meta}
           def protector_meta
-            @protector_meta ||= Protector::DSL::Meta.new(
-              Protector::Adapters::Sequel,
-              self,
+            @protector_meta ||= Protector::DSL::Meta.new(Protector::Adapters::Sequel, self) do
               self.columns
-            )
+            end
           end
 
           # Gets default restricted `Dataset`

lib/protector/dsl.rb

@@ -214,10 +214,14 @@ def modifiable?(part, fields)
         end
       end
 
-      def initialize(adapter, model, fields)
-        @adapter = adapter
-        @model   = model
-        @fields  = fields
+      def initialize(adapter, model, &fields_proc)
+        @adapter     = adapter
+        @model       = model
+        @fields_proc = fields_proc
+      end
+
+      def fields
+        @fields ||= @fields_proc.call
       end
 
       # Storage for `protect` blocks
@@ -235,7 +239,7 @@ def <<(block)
       # @param subject [Object]           Restriction subject
       # @param entry [Object]             An instance of the model
       def evaluate(subject, entry=nil)
-        Box.new(@adapter, @model, @fields, subject, entry, blocks)
+        Box.new(@adapter, @model, fields, subject, entry, blocks)
       end
     end
 

lib/protector/version.rb

@@ -1,4 +1,4 @@
 module Protector
   # Gem version
-  VERSION = "0.5.4"
+  VERSION = "0.5.5"
 end

migrations/active_record.rb

@@ -44,4 +44,7 @@ class Bobby < ActiveRecord::Base
 end
 
 class Loony < ActiveRecord::Base
+end
+
+class Rumba < ActiveRecord::Base
 end

migrations/sequel.rb

@@ -46,4 +46,7 @@ class Bobby < Sequel::Model
 end
 
 class Loony < Sequel::Model
+end
+
+class Rumba < Sequel::Model
 end

spec/lib/dsl_spec.rb

@@ -42,7 +42,7 @@
         include Protector::DSL::Entry
 
         def self.protector_meta
-          @protector_meta ||= Protector::DSL::Meta.new nil, nil, []
+          @protector_meta ||= Protector::DSL::Meta.new(nil, nil){[]}
         end
       end
     end
@@ -61,7 +61,7 @@ def self.protector_meta
       l = lambda {|x| x > 4 }
 
       before :each do
-        @meta = Protector::DSL::Meta.new nil, nil, %w(field1 field2 field3 field4 field5)
+        @meta = Protector::DSL::Meta.new(nil, nil){%w(field1 field2 field3 field4 field5)}
         @meta << lambda {
           can :view
         }
@@ -159,7 +159,7 @@ def self.protector_meta
 
     context "custom methods" do
       before :each do
-        @meta = Protector::DSL::Meta.new nil, nil, %w(field1 field2)
+        @meta = Protector::DSL::Meta.new(nil, nil){%w(field1 field2)}
 
         @meta << lambda {
           can :drink, :field1

spec/spec_helpers/examples/model.rb

@@ -30,6 +30,14 @@
     d.instance_variable_get('@protector_meta').should == nil
   end
 
+  it "doesn't get stuck with non-existing tables" do
+    Rumba.class_eval do
+      protect do
+        can
+      end
+    end
+  end
+
   describe "visibility" do
     it "marks blocked" do
       Dummy.first.restrict!('-').visible?.should == false