lib/api_resource/scopes.rb in api_resource-0.3.13 vs lib/api_resource/scopes.rb in api_resource-0.3.14

- old
+ new

@@ -3,30 +3,30 @@ extend ActiveSupport::Concern module ClassMethods def scopes - return self.related_objects[:scope] + return self.related_objects[:scopes] end def scope(name, hsh) raise ArgumentError, "Expecting an attributes hash given #{hsh.inspect}" unless hsh.is_a?(Hash) - self.related_objects[:scope][name.to_sym] = hsh + self.related_objects[:scopes][name.to_sym] = hsh # we also need to define a class method for each scope self.instance_eval <<-EOE, __FILE__, __LINE__ + 1 def #{name}(*args) return #{ApiResource::Associations::ResourceScope.class_factory(hsh)}.new(self, :#{name}, *args) end EOE end def scope?(name) - self.related_objects[:scope][name.to_sym].present? + self.related_objects[:scopes][name.to_sym].present? end def scope_attributes(name) raise "No such scope #{name}" unless self.scope?(name) - self.related_objects[:scope][name.to_sym] + self.related_objects[:scopes][name.to_sym] end end def scopes return self.class.scopes