lib/mls.rb in mls-1.4.0 vs lib/mls.rb in mls-1.4.3

@@ -29,10 +29,17 @@
     yield
   ensure
     Thread.current[:sunstone_cookie_store] = nil
   end
 
+  def self.with_api_key(key, &block)
+    Thread.current[:sunstone_api_key] = key
+    yield
+  ensure
+    Thread.current[:sunstone_api_key] = nil
+  end
+
 end
 
 class MLS::Model < ActiveRecord::Base
   self.abstract_class = true
 end
@@ -41,18 +48,15 @@
 
   extend ActiveSupport::Concern
 
   module ClassMethods
 
-    def find(*args)
-      friendly = -> (arg) { arg.respond_to?(:to_i) && arg.to_i.to_s != arg.to_s }
+    def find(*ids)
+      friendly = -> (id) { id.respond_to?(:to_i) && id.to_i.to_s != id.to_s }
+      return super if ids.size > 1 || !ids.all? { |x| friendly.call(x) }
 
-      if args.count == 1 && friendly.call(args.first)
-        find_by_slug!(args)
-      else
-        super
-      end
+      find_by_slug!(ids)
     end
 
   end
 
   def to_param
@@ -64,15 +68,15 @@
 module MLS::Avatar
 
   extend ActiveSupport::Concern
 
   included do
-    belongs_to :avatar, :class_name => 'Photo'
+    belongs_to :avatar, :class_name => 'Image'
   end
 
   def avatar_url(options={})
-    
+
     options.reverse_merge!({
       :style => nil,
       :bg => nil,
       :protocol => 'https',
       :format => "jpg",
@@ -84,43 +88,15 @@
     if options[:protocol] == :relative # Protocol Relative
       result = '//'
     else options[:protocol]
       result = "#{options[:protocol]}://"
     end
-    
-    result += "#{options[:host]}/#{avatar_digest}.#{options[:format]}"
+
+    result += "#{options[:host]}/#{avatar_hash_key}.#{options[:format]}"
     result += "?#{url_params.to_param}" if url_params.size > 0
 
     result
   end
 
 end
 
-require 'mls/photo'
-require 'mls/account'
-require 'mls/email'
-require 'mls/organization'
-require 'mls/property'
-require 'mls/region'
-require 'mls/listing'
-require 'mls/space'
-require 'mls/lead'
-require 'mls/lead_listing'
-require 'mls/lead_property'
-require 'mls/address'
-require 'mls/locality'
-require 'mls/flyer'
-require 'mls/inquiry'
-require 'mls/agency'
-require 'mls/session'
-require 'mls/floorplan'
-require 'mls/use'
-require 'mls/comment'
-
-# Models
-# # Helpers
-# class MLS
-#
-#   def current_account
-#   end
-#
-# end
+Dir.glob(File.join(File.dirname(__FILE__), 'mls', '*.rb'), &method(:require))