lib/brief/document_mapper.rb in brief-1.2.0 vs lib/brief/document_mapper.rb in brief-1.3.0
- old
+ new
@@ -18,11 +18,11 @@
class Selector
attr_reader :attribute, :operator
def initialize(opts = {})
unless Brief::DocumentMapper::VALID_OPERATORS.include?(opts[:operator])
- raise 'Operator not supported'
+ fail 'Operator not supported'
end
@attribute, @operator = opts[:attribute], opts[:operator]
end
end
@@ -34,22 +34,22 @@
@model = model
@where = {}
end
def where(constraints_hash)
- selector_hash = constraints_hash.reject { |key, value| !key.is_a? Selector }
- symbol_hash = constraints_hash.reject { |key, value| key.is_a? Selector }
+ selector_hash = constraints_hash.reject { |key, _value| !key.is_a? Selector }
+ symbol_hash = constraints_hash.reject { |key, _value| key.is_a? Selector }
symbol_hash.each do |attribute, value|
- selector = Selector.new(:attribute => attribute, :operator => 'equal')
- selector_hash.update({ selector => value })
+ selector = Selector.new(attribute: attribute, operator: 'equal')
+ selector_hash.update(selector => value)
end
@where.merge! selector_hash
self
end
def order_by(field)
- @order_by = field.is_a?(Symbol) ? {field => :asc} : field
+ @order_by = field.is_a?(Symbol) ? { field => :asc } : field
self
end
def offset(number)
@offset = number
@@ -60,15 +60,15 @@
@limit = number
self
end
def first
- self.all.first
+ all.first
end
def last
- self.all.last
+ all.last
end
def run_query
if query_is_empty?
select
@@ -127,11 +127,11 @@
def query_is_empty?
@where.empty? && @limit.nil? && @order_by.nil?
end
def inspect
- "Query: #{ @where.map {|k,v| "#{k.attribute} #{k.operator} #{v}" }}"
+ "Query: #{ @where.map { |k, v| "#{k.attribute} #{k.operator} #{v}" }}"
end
def method_missing(meth, *args, &block)
if all.respond_to?(meth)
all.send(meth, *args, &block)
@@ -151,9 +151,9 @@
OPERATORS
end
unless method_defined?(:"<=>")
def <=>(other)
- self.to_s <=> other.to_s
+ to_s <=> other.to_s
end
end
end