lib/resourcelogic/actions.rb in resourcelogic-0.12.2 vs lib/resourcelogic/actions.rb in resourcelogic-0.12.3

@@ -6,11 +6,10 @@
     def self.included(klass)
       klass.class_eval do
         ACTIONS.each do |action|
           class_scoping_reader action, FAILABLE_ACTIONS.include?(action) ? FailableActionOptions.new : ActionOptions.new
         end
-        class_scoping_reader :context, ContextOptions.new
         add_acts_as_resource_module(Methods)
       end
     end
     
     module Methods
@@ -151,10 +150,10 @@
             instance_eval &block unless block.nil?
           end
         end
         
         def load_parent
-          instance_variable_set "@#{parent_model_name}", parent_object if parent?
+          instance_variable_set "@#{parent_model_name}", parent if parent?
         end
         
         # Used internally to load the member object in to an instance variable @#{model_name} (i.e. @post)
         #
         def load_object