cistern 2.2.3 → 2.2.4

data/lib/cistern/collection.rb

@@ -1,5 +1,4 @@
 module Cistern::Collection
-
   BLACKLISTED_ARRAY_METHODS = [
     :compact!, :flatten!, :reject!, :reverse!, :rotate!, :map!,
     :shuffle!, :slice!, :sort!, :sort_by!, :delete_if,
@@ -17,31 +16,31 @@ module Cistern::Collection
   attr_accessor :records, :loaded, :service
 
   module ClassMethods
-    def model(new_model=nil)
+    def model(new_model = nil)
       @_model ||= new_model
     end
 
-    def service_method(name=nil)
+    def service_method(name = nil)
       @_service_method ||= name
     end
   end
 
-  alias build initialize
+  alias_method :build, :initialize
 
   def initialize(attributes = {})
     merge_attributes(attributes)
   end
 
-  def all(_={})
-    raise NotImplementedError
+  def all(_ = {})
+    fail NotImplementedError
   end
 
-  def create(attributes={})
-    self.new(attributes).save
+  def create(attributes = {})
+    new(attributes).save
   end
 
-  def get(identity)
-    raise NotImplementedError
+  def get(_identity)
+    fail NotImplementedError
   end
 
   def clear
@@ -58,7 +57,7 @@ module Cistern::Collection
 
   # @api private
   def load_records
-    self.all unless self.loaded
+    all unless loaded
   end
 
   # Should be called within #all to load records into the collection
@@ -76,12 +75,12 @@ module Cistern::Collection
 
   def new(attributes = {})
     unless attributes.is_a?(::Hash)
-      raise(ArgumentError.new("Initialization parameters must be an attributes hash, got #{attributes.class} #{attributes.inspect}"))
+      fail(ArgumentError.new("Initialization parameters must be an attributes hash, got #{attributes.class} #{attributes.inspect}"))
     end
     model.new(
       {
-        :collection => self,
-        :service    => service,
+        collection: self,
+        service: service
       }.merge(attributes)
     )
   end
@@ -94,7 +93,7 @@ module Cistern::Collection
 
   def to_a
     load_records
-    self.records || []
+    records || []
   end
 
   def respond_to?(method, include_private = false)
@@ -104,7 +103,7 @@ module Cistern::Collection
   def ==(comparison_object)
     comparison_object.equal?(self) ||
       (comparison_object.is_a?(self.class) &&
-       comparison_object.to_a == self.to_a)
+       comparison_object.to_a == to_a)
   end
 
   protected

data/lib/cistern/coverage.rb

@@ -1,10 +1,13 @@
 module Cistern::Coverage
-
   unless Kernel.respond_to? :caller_locations
     abort <<-ABORT
 Cannot enable Cistern coverage reporting
 
-Your ruby version ruby is: #{RUBY_VERSION rescue 'unknown'}
+Your ruby version ruby is: #{begin
+                               RUBY_VERSION
+                             rescue
+                               'unknown'
+                             end}
 `Kernel` does not have the required method `caller_locations`
 
 Try a newer ruby (should be > 2.0)
@@ -18,17 +21,16 @@ Try a newer ruby (should be > 2.0)
     call = nil
 
     # seek to the first entry from within `file`
-    while(call = enum.next) do
+    while (call = enum.next)
       break if call.path.end_with? file
     end
 
     # seek to the first entry thats not within `file`
-    while(call = enum.next) do
+    while (call = enum.next)
       break unless call.path.end_with? file
     end
 
     # the call location that called in to `file`
     call
   end
-
 end

data/lib/cistern/data/hash.rb

@@ -1,8 +1,8 @@
 class Cistern::Data::Hash
   Cistern::Data.backends[:hash] = self
 
-  def initialize(options={}, &default)
-    @hash    = Hash.new
+  def initialize(_options = {}, &default)
+    @hash    = {}
     @default = default
   end
 
@@ -16,7 +16,7 @@ class Cistern::Data::Hash
     hash.store(key, *args)
   end
 
-  alias []= store
+  alias_method :[]=, :store
 
   def fetch(key, *args)
     assign_default(key)
@@ -24,15 +24,13 @@ class Cistern::Data::Hash
     hash.fetch(key, *args)
   end
 
-  alias [] fetch
+  alias_method :[], :fetch
 
   protected
 
   attr_reader :hash, :default
 
   def assign_default(key)
-    if !hash.key?(key) && default
-      default.call(hash, key)
-    end
+    default.call(hash, key) if !hash.key?(key) && default
   end
 end

data/lib/cistern/data/redis.rb

@@ -11,17 +11,17 @@ class Cistern::Data::Redis
                  end
   end
 
-  def self.marshal=(marshal)
-    @marshal = marshal
+  class << self
+    attr_writer :marshal
   end
 
-  def initialize(options={}, &block)
+  def initialize(options = {}, &block)
     @client  = options[:client] || ::Redis.new
     @default = block
   end
 
   def clear
-    unless (keys = client.keys("*")).empty?
+    unless (keys = client.keys('*')).empty?
       client.del(*keys)
     end
   end
@@ -32,7 +32,7 @@ class Cistern::Data::Redis
     client.set(key, Cistern::Data::Redis.marshal.dump(value), *args)
   end
 
-  alias []= store
+  alias_method :[]=, :store
 
   def fetch(key, *args)
     assign_default(key)
@@ -40,15 +40,13 @@ class Cistern::Data::Redis
     Cistern::Data::Redis.marshal.load(client.get(key, *args))
   end
 
-  alias [] fetch
+  alias_method :[], :fetch
 
   protected
 
   attr_reader :client, :default
 
   def assign_default(key)
-    if client.keys(key).empty? && default
-      default.call(client, key)
-    end
+    default.call(client, key) if client.keys(key).empty? && default
   end
 end

data/lib/cistern/data.rb

@@ -16,7 +16,7 @@ module Cistern::Data
 
   module ClassMethods
     def data
-      @data ||= Cistern::Data.backend(*storage) { |d,k| d[k] = [] }
+      @data ||= Cistern::Data.backend(*storage) { |d, k| d[k] = [] }
     end
 
     def reset!
@@ -25,7 +25,7 @@ module Cistern::Data
     end
 
     def clear!
-      self.data.clear
+      data.clear
     end
 
     def store_in(*args)

data/lib/cistern/formatter/awesome_print.rb

@@ -27,7 +27,7 @@ module AwesomePrint::Cistern
   # Format Cistern::Model
   #------------------------------------------------------------------------------
   def awesome_cistern_model(object)
-    data = object.attributes.keys.inject({}){|r,k| r.merge(k => object.send(k))}
+    data = object.attributes.keys.inject({}) { |r, k| r.merge(k => object.send(k)) }
     "#{object} " << awesome_hash(data)
   end
 

data/lib/cistern/formatter/default.rb

@@ -12,11 +12,11 @@ module Cistern::Formatter::Default
     end
 
     def format_model(model)
-      "#{model.to_s} #{model.attributes.inspect}"
+      "#{model} #{model.attributes.inspect}"
     end
 
     def format_collection(collection)
-      "#{collection.to_s} #{collection.attributes.inspect} records=[#{collection.records.map { |m| format_model(m) }.join(", ")}]"
+      "#{collection} #{collection.attributes.inspect} records=[#{collection.records.map { |m| format_model(m) }.join(', ')}]"
     end
   end
 end

data/lib/cistern/formatter/formatador.rb

@@ -29,14 +29,14 @@ module Cistern::Formatter::Formatador
     Thread.current[:formatador].indent do
       unless collection.class.attributes.empty?
         data << "#{Thread.current[:formatador].indentation}"
-        data << collection.class.attributes.map {|attribute| "#{attribute}=#{send(attribute).inspect}"}.join(",\n#{Thread.current[:formatador].indentation}")
+        data << collection.class.attributes.map { |attribute| "#{attribute}=#{send(attribute).inspect}" }.join(",\n#{Thread.current[:formatador].indentation}")
         data << "\n"
       end
       data << "#{Thread.current[:formatador].indentation}["
       unless collection.empty?
         data << "\n"
         Thread.current[:formatador].indent do
-          data << collection.map {|member| member.inspect}.join(",\n")
+          data << collection.map(&:inspect).join(",\n")
           data << "\n"
         end
         data << Thread.current[:formatador].indentation
@@ -48,6 +48,6 @@ module Cistern::Formatter::Formatador
   end
 
   def table(attributes = nil)
-    Formatador.display_table(self.map {|instance| instance.attributes}, attributes)
+    Formatador.display_table(map(&:attributes), attributes)
   end
 end

data/lib/cistern/hash.rb

@@ -1,7 +1,7 @@
 class Cistern::Hash
   def self.slice(hash, *keys)
     {}.tap do |sliced|
-      keys.each{ |k| sliced[k] = hash[k] if hash.key?(k) }
+      keys.each { |k| sliced[k] = hash[k] if hash.key?(k) }
     end
   end
 
@@ -18,9 +18,9 @@ class Cistern::Hash
   def self.stringify_keys(object)
     case object
     when Hash
-      object.inject({}){|r,(k,v)| r.merge(k.to_s => stringify_keys(v))}
+      object.inject({}) { |r, (k, v)| r.merge(k.to_s => stringify_keys(v)) }
     when Array
-      object.map{|v| stringify_keys(v) }
+      object.map { |v| stringify_keys(v) }
     else
       object
     end

data/lib/cistern/mock.rb

@@ -1,7 +1,7 @@
 module Cistern
   class Mock
-    def self.not_implemented(method="")
-      raise NotImplementedError, method ? "The call '#{method}' is not implemented" : ""
+    def self.not_implemented(method = '')
+      fail NotImplementedError, method ? "The call '#{method}' is not implemented" : ''
     end
 
     def self.random_hex(length)

data/lib/cistern/model.rb

@@ -16,7 +16,7 @@ module Cistern::Model
   end
 
   module ClassMethods
-    def service_method(name=nil)
+    def service_method(name = nil)
       @_service_method ||= name
     end
   end
@@ -27,7 +27,7 @@ module Cistern::Model
     Cistern.formatter.call(self)
   end
 
-  def initialize(attributes={})
+  def initialize(attributes = {})
     merge_attributes(attributes)
   end
 
@@ -37,7 +37,7 @@ module Cistern::Model
   end
 
   def save
-    raise NotImplementedError
+    fail NotImplementedError
   end
 
   def reload
@@ -53,29 +53,29 @@ module Cistern::Model
   def ==(comparison_object)
     super ||
       (comparison_object.is_a?(self.class) &&
-       comparison_object.identity == self.identity &&
+       comparison_object.identity == identity &&
        !comparison_object.new_record?)
   end
 
-  alias :eql? :==
+  alias_method :eql?, :==
 
   def hash
-    if self.identity
-      [self.class, self.identity].join(":").hash
+    if identity
+      [self.class, identity].join(':').hash
     else
       super
     end
   end
 
-  def wait_for(timeout = self.service_class.timeout, interval = self.service_class.poll_interval, &block)
+  def wait_for(timeout = service_class.timeout, interval = service_class.poll_interval, &block)
     service_class.wait_for(timeout, interval) { reload && block.call(self) }
   end
 
-  def wait_for!(timeout = self.service_class.timeout, interval = self.service_class.poll_interval, &block)
+  def wait_for!(timeout = service_class.timeout, interval = service_class.poll_interval, &block)
     service_class.wait_for!(timeout, interval) { reload && block.call(self) }
   end
 
   def service_class
-    self.service ? self.service.class : Cistern
+    service ? service.class : Cistern
   end
 end

data/lib/cistern/request.rb

@@ -1,7 +1,7 @@
 module Cistern::Request
   def self.service_request(service, klass, name)
     unless klass.name
-      raise ArgumentError, "can't turn anonymous class into a Cistern request"
+      fail ArgumentError, "can't turn anonymous class into a Cistern request"
     end
 
     service::Mock.module_eval <<-EOS, __FILE__, __LINE__
@@ -24,7 +24,7 @@ module Cistern::Request
   end
 
   module ClassMethods
-    def service_method(name=nil)
+    def service_method(name = nil)
       @_service_method ||= name
     end
   end

data/lib/cistern/service.rb

@@ -1,8 +1,8 @@
 class Cistern::Service
   def self.inherited(klass)
     Cistern.deprecation(
-      %q{subclassing Cistern::Service is deprecated.  Please use `include Cistern::Client`},
-      caller[0],
+      'subclassing Cistern::Service is deprecated.  Please use `include Cistern::Client`',
+      caller[0]
     )
     klass.send(:include, Cistern::Client)
   end

data/lib/cistern/singular.rb

@@ -1,5 +1,4 @@
 module Cistern::Singular
-
   def self.service_singular(service, klass, name)
     service.const_get(:Collections).module_eval <<-EOS, __FILE__, __LINE__
       def #{name}(attributes={})
@@ -28,12 +27,10 @@ module Cistern::Singular
   def reload
     new_attributes = fetch_attributes
 
-    if new_attributes
-      merge_attributes(new_attributes)
-    end
+    merge_attributes(new_attributes) if new_attributes
   end
 
   def fetch_attributes
-    raise NotImplementedError
+    fail NotImplementedError
   end
 end

data/lib/cistern/string.rb

@@ -1,15 +1,15 @@
 class Cistern::String
   def self.camelize(string)
-    string.gsub(/[A-Z]+/) { |w| "_#{w.downcase}" }.gsub(/^_/, "")
+    string.gsub(/[A-Z]+/) { |w| "_#{w.downcase}" }.gsub(/^_/, '')
   end
 
   # File activesupport/lib/active_support/inflector/methods.rb, line 90
   def self.underscore(camel_cased_word)
     word = camel_cased_word.to_s.gsub('::', '/')
-    #word.gsub!(/(?:([A-Za-z\d])|^)(#{inflections.acronym_regex})(?=\b|[^a-z])/) { "#{$1}#{$1 && '_'}#{$2.downcase}" }
-    word.gsub!(/([A-Z\d]+)([A-Z][a-z])/,'\1_\2')
-    word.gsub!(/([a-z\d])([A-Z])/,'\1_\2')
-    word.tr!("-", "_")
+    # word.gsub!(/(?:([A-Za-z\d])|^)(#{inflections.acronym_regex})(?=\b|[^a-z])/) { "#{$1}#{$1 && '_'}#{$2.downcase}" }
+    word.gsub!(/([A-Z\d]+)([A-Z][a-z])/, '\1_\2')
+    word.gsub!(/([a-z\d])([A-Z])/, '\1_\2')
+    word.tr!('-', '_')
     word.downcase!
     word
   end
@@ -18,7 +18,7 @@ class Cistern::String
   def self.demodulize(path)
     path = path.to_s
     if i = path.rindex('::')
-      path[(i+2)..-1]
+      path[(i + 2)..-1]
     else
       path
     end