ey-core 3.6.4 → 3.6.5

data/lib/ey-core/mock/params.rb

@@ -1,31 +1,31 @@
-module Ey::Core::Mock
-  module Params
-    def url_params(url)
-      uri   = URI.parse(url)
-      query = uri.query || ""
-
-      query.split("&").inject({}){|r,e| k,v = e.split("="); r.merge(k => v)}
-    end
-
-    def path_params(url)
-      parts = URI.parse(url).path.split("/").rotate
-      if parts.size % 2 == 1
-        parts.pop
-      end
-      Hash[*parts].reject {|key,val| val.nil? || val.empty? }
-    end
-
-    def extract_url_params!(params)
-      if url = params.delete("url")
-        @logger.debug('request.params') { "Extracted params from url: #{path_params(url).inspect}" }
-
-        path_params(url).each do |resource,id|
-          next unless id && ! id.empty?
-          params[resource.to_s.gsub(/s$/, '').gsub("-", "_")] = url_for("/#{resource}/#{id}")
-        end
-
-        params.merge!(url_params(url))
-      end
-    end
-  end
-end
+module Ey::Core::Mock
+  module Params
+    def url_params(url)
+      uri   = URI.parse(url)
+      query = uri.query || ""
+
+      query.split("&").inject({}){|r,e| k,v = e.split("="); r.merge(k => v)}
+    end
+
+    def path_params(url)
+      parts = URI.parse(url).path.split("/").rotate
+      if parts.size % 2 == 1
+        parts.pop
+      end
+      Hash[*parts].reject {|key,val| val.nil? || val.empty? }
+    end
+
+    def extract_url_params!(params)
+      if url = params.delete("url")
+        @logger.debug('request.params') { "Extracted params from url: #{path_params(url).inspect}" }
+
+        path_params(url).each do |resource,id|
+          next unless id && ! id.empty?
+          params[resource.to_s.gsub(/s$/, '').gsub("-", "_")] = url_for("/#{resource}/#{id}")
+        end
+
+        params.merge!(url_params(url))
+      end
+    end
+  end
+end

data/lib/ey-core/mock/resources.rb

@@ -1,92 +1,92 @@
-module Ey::Core::Mock
-  module Resources
-    # Attempt to determine the identity of the resource. Used to make the mock requests DRYer
-    #
-    # @param params [nil] returns nil
-    # @param params [Integer] id of the resource
-    # @param params [String] id or url of the resource
-    # @param params [Hash] description of resource
-    # @option params [String] url url of the resource
-    # @option params [String] id id of the resource
-    # @return identity of the resource
-    def resource_identity(params)
-      id = nil
-      url = nil
-
-      case params
-      when Hash
-        id  = params["id"]
-        url = params["url"]
-      when String
-        if params.start_with?(@url)
-          url = params
-        else
-          id = params
-        end
-      when Integer
-        id = params
-      when nil
-        return
-      else
-        raise ArgumentError, "Cannot determine resource identity of #{params.inspect}"
-      end
-
-      id ||= url && URI.parse(url).path.split("/")[2]
-
-      Integer(id) rescue id
-    end
-
-    def find(collection, id_or_url)
-      id = resource_identity(id_or_url)
-
-      # polymorphic associations suck
-      if collection.is_a?(Array)
-        resource = collection.map do |key|
-          data = self.data[key][id] || self.data[key][id.to_i]
-          [key.to_s.tr('_', '-'), data] if data
-        end.compact.first
-        resource || response(status: 404, body: "Couldn't find #{collection.last} with #{id}")
-      else
-        self.data[collection][id] || self.data[collection][id.to_i] || response(status: 404, body: "Couldn't find #{collection} with [#{id}]")
-      end
-    end
-
-    def mock_account_setup(resource_id, resource)
-      resource["support_plan"] ||= "standard"
-      account_url = url_for("/accounts/#{resource_id}")
-      resource.merge!({
-        "id"               => resource_id,
-        "account_trial"    => "#{account_url}/trial",
-        "addons"           => "#{account_url}/addons",
-        "addresses"        => "#{account_url}/addressses",
-        "applications"     => "#{account_url}/applications",
-        "cancelled_at"     => nil,
-        "costs"            => "#{account_url}/costs",
-        "created_at"       => Time.now.to_s,
-        "deis_clusters"    => "#{account_url}/deis-clusters",
-        "environments"     => "#{account_url}/environments",
-        "features"         => "#{account_url}/features",
-        "memberships"      => "#{account_url}/memberships",
-        "notes"            => "#{account_url}/notes",
-        "owners"           => "#{account_url}/owners",
-        "providers"        => "#{account_url}/providers",
-        "referrals"        => "#{account_url}/referrals",
-        "requests"         => "#{account_url}/requests",
-        "resource_url"     => account_url,
-        "ssl_certificates" => "#{account_url}/ssl-certificates",
-        "support_trial"    => nil,
-        "updated_at"       => Time.now.to_s,
-        "users"            => "#{account_url}/users",
-      })
-      resource
-    end
-
-    def mock_ssh_key
-      {
-        public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC05RVR8BF6gm1oevz+y34AY84OJ3JRSK8sGQycW1Ita7PV8H1b/i5zGWUFjhmR4tuQFjtIku9duZzxKES0bHGVng6PbJeUoJVflYf8rXQzcD4gcF+rYHZGv34N59RH2WYcA+4W4JM8m+hmp/dbXvYjqvf5ykOcETkwUcCfCsAD9tk2GqQQpu8z991Lwu36UHN2I8gcuPy+hR1PokbBxSBT+46MbZFomvA7onjqDcvkXIgZ+GyW12yeKMaF8+zvOT1dDxTnzjvWB7zffCDaNfMW7HkdhvlGAKUxk3CdEVO6peQy4a0E5AdElZDEoCvxpKxKZHXfA6penIysk6p/bEBx".freeze,
-        private_key: "-----BEGIN RSA PRIVATE KEY-----\nMIIEpAIBAAKCAQEAtOUVUfAReoJtaHr8/st+AGPODidyUUivLBkMnFtSLWuz1fB9\nW/4ucxllBY4ZkeLbkBY7SJLvXbmc8ShEtGxxlZ4Oj2yXlKCVX5WH/K10M3A+IHBf\nq2B2Rr9+DefUR9lmHAPuFuCTPJvoZqf3W172I6r3+cpDnBE5MFHAnwrAA/bZNhqk\nEKbvM/fdS8Lt+lBzdiPIHLj8voUdT6JGwcUgU/uOjG2RaJrwO6J46g3L5FyIGfhs\nltdsnijGhfPs7zk9XQ8U58471ge833wg2jXzFux5HYb5RgClMZNwnRFTuqXkMuGt\nBOQHRJWQxKAr8aSsSmR13wOqXpyMrJOqf2xAcQIDAQABAoIBAACyxbNMRvT/HecC\nWomtRW5A9GGvm0xfCHYWHqtX2uhb+xS/WeyJ/anqFi7ATq72fjx/KXltP8lP1yBD\nNIixxnp6YroBBFDJkeoNjLnX/ZPZQhQj+uqRc8NwJ89r7rDcUP2YskmaUlcwjuQe\nj+Dla/PVTCHFux8WHe9m0WSLyRP61U+aCEMX5mFhaiXCZGZjtN8CpNl/drfbQTyF\nZMGI4AuPiwR4uS0DN1o1VKIYxsDB5ZMvYqwthqF2WZE4H84IJvvfFyhX39hF9VDr\nqiTI2BRQoBs5O5zqCY0C2xxpICJmlqrM9DYd/411GwIGFBHXBgp8qJxF0PIxHjPt\naYHvqrECgYEA5YV7iQdKi07Cip99Y6MeyFjvp7oYHsSlrPko5y7VmDdAZlvZQ6KI\nNlJ7Vbl3GHtRYyPgh6WZMGDH+1EnSON0c/7IJk30BScMl5pAPHSy3cr2QWLlC9tE\ngyTzJC2GwSyN8ObSl9Mv71L1+y1SAS9ZuG984Y8r/EJLaiMwDNv8TVUCgYEAycN/\n4DjBGLvt9WfuXAQdKuUHvxp4LJOz1cAU60hucGYAY9/kmOsdfMUL+kh1diijmT35\nrr5zC665zq2FyVOnbUPkwKDnLW1o13rhxZYX9se1CFMUbskxCbc39CJmmyEX4bOm\n2Wwt2cJpfCnv+D+rMxXldQOFf46XkMiDjhusBq0CgYEAnDpkoRweaH5+ux7embCR\npmurDS8FdgQChZ+/cMUXTJnnMwU3+Oqr7tXr76jjYP2no2TrU0mr4RsvZGiT5fA0\n9zOohzIudEdlMdgj+0Kv8XpSbqVjJNPmaaIAAlMe02SBZUWoeQGeMjf1CTiLBhV1\n662vglUS6o0xihhTf51JulUCgYEAtgxVDH6JFIU0/3Hoa1Q28SY4KCF8/1PCNwKa\nnXT8WSRgA73X6HZ0Y8jztr+8ZIHko3d9G0OyUH82HhsJlQ+LCRbyhzBnhuCqcYrp\nvbthIgUt/jXgQNn+CjMsJHcJt71TbA4KZTGr6Uj2ntbENG1WTsDaCgvEX8TMUxHp\nSccEH/0CgYBULXDEqtCv85sAiJlgQ0uUI/LhAG48B/G8xUgZkSI+hId/dfrZuSqs\nJvms2/3P58fb15rE5fWtn9iPwA6wU2jlJg6KEnCawiEfhTZgy8XRhgQm0XK0HAHz\n4EWoM5VwYbdIs+LyuVQK/yNRJlP3gtODs6ADAZyzVyj8H2VBduzn9w==\n-----END RSA PRIVATE KEY-----\n".freeze,
-        fingerprint: 16.times.map {rand(16**2).to_s(16).rjust(2,'0')}.join(":"), # => "8a:56:9a:b3:90:b1:3e:21:33:8d:a8:ee:61:69:c5:bc"
-      }
-    end
-  end
-end
+module Ey::Core::Mock
+  module Resources
+    # Attempt to determine the identity of the resource. Used to make the mock requests DRYer
+    #
+    # @param params [nil] returns nil
+    # @param params [Integer] id of the resource
+    # @param params [String] id or url of the resource
+    # @param params [Hash] description of resource
+    # @option params [String] url url of the resource
+    # @option params [String] id id of the resource
+    # @return identity of the resource
+    def resource_identity(params)
+      id = nil
+      url = nil
+
+      case params
+      when Hash
+        id  = params["id"]
+        url = params["url"]
+      when String
+        if params.start_with?(@url)
+          url = params
+        else
+          id = params
+        end
+      when Integer
+        id = params
+      when nil
+        return
+      else
+        raise ArgumentError, "Cannot determine resource identity of #{params.inspect}"
+      end
+
+      id ||= url && URI.parse(url).path.split("/")[2]
+
+      Integer(id) rescue id
+    end
+
+    def find(collection, id_or_url)
+      id = resource_identity(id_or_url)
+
+      # polymorphic associations suck
+      if collection.is_a?(Array)
+        resource = collection.map do |key|
+          data = self.data[key][id] || self.data[key][id.to_i]
+          [key.to_s.tr('_', '-'), data] if data
+        end.compact.first
+        resource || response(status: 404, body: "Couldn't find #{collection.last} with #{id}")
+      else
+        self.data[collection][id] || self.data[collection][id.to_i] || response(status: 404, body: "Couldn't find #{collection} with [#{id}]")
+      end
+    end
+
+    def mock_account_setup(resource_id, resource)
+      resource["support_plan"] ||= "standard"
+      account_url = url_for("/accounts/#{resource_id}")
+      resource.merge!({
+        "id"               => resource_id,
+        "account_trial"    => "#{account_url}/trial",
+        "addons"           => "#{account_url}/addons",
+        "addresses"        => "#{account_url}/addressses",
+        "applications"     => "#{account_url}/applications",
+        "cancelled_at"     => nil,
+        "costs"            => "#{account_url}/costs",
+        "created_at"       => Time.now.to_s,
+        "deis_clusters"    => "#{account_url}/deis-clusters",
+        "environments"     => "#{account_url}/environments",
+        "features"         => "#{account_url}/features",
+        "memberships"      => "#{account_url}/memberships",
+        "notes"            => "#{account_url}/notes",
+        "owners"           => "#{account_url}/owners",
+        "providers"        => "#{account_url}/providers",
+        "referrals"        => "#{account_url}/referrals",
+        "requests"         => "#{account_url}/requests",
+        "resource_url"     => account_url,
+        "ssl_certificates" => "#{account_url}/ssl-certificates",
+        "support_trial"    => nil,
+        "updated_at"       => Time.now.to_s,
+        "users"            => "#{account_url}/users",
+      })
+      resource
+    end
+
+    def mock_ssh_key
+      {
+        public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC05RVR8BF6gm1oevz+y34AY84OJ3JRSK8sGQycW1Ita7PV8H1b/i5zGWUFjhmR4tuQFjtIku9duZzxKES0bHGVng6PbJeUoJVflYf8rXQzcD4gcF+rYHZGv34N59RH2WYcA+4W4JM8m+hmp/dbXvYjqvf5ykOcETkwUcCfCsAD9tk2GqQQpu8z991Lwu36UHN2I8gcuPy+hR1PokbBxSBT+46MbZFomvA7onjqDcvkXIgZ+GyW12yeKMaF8+zvOT1dDxTnzjvWB7zffCDaNfMW7HkdhvlGAKUxk3CdEVO6peQy4a0E5AdElZDEoCvxpKxKZHXfA6penIysk6p/bEBx".freeze,
+        private_key: "-----BEGIN RSA PRIVATE KEY-----\nMIIEpAIBAAKCAQEAtOUVUfAReoJtaHr8/st+AGPODidyUUivLBkMnFtSLWuz1fB9\nW/4ucxllBY4ZkeLbkBY7SJLvXbmc8ShEtGxxlZ4Oj2yXlKCVX5WH/K10M3A+IHBf\nq2B2Rr9+DefUR9lmHAPuFuCTPJvoZqf3W172I6r3+cpDnBE5MFHAnwrAA/bZNhqk\nEKbvM/fdS8Lt+lBzdiPIHLj8voUdT6JGwcUgU/uOjG2RaJrwO6J46g3L5FyIGfhs\nltdsnijGhfPs7zk9XQ8U58471ge833wg2jXzFux5HYb5RgClMZNwnRFTuqXkMuGt\nBOQHRJWQxKAr8aSsSmR13wOqXpyMrJOqf2xAcQIDAQABAoIBAACyxbNMRvT/HecC\nWomtRW5A9GGvm0xfCHYWHqtX2uhb+xS/WeyJ/anqFi7ATq72fjx/KXltP8lP1yBD\nNIixxnp6YroBBFDJkeoNjLnX/ZPZQhQj+uqRc8NwJ89r7rDcUP2YskmaUlcwjuQe\nj+Dla/PVTCHFux8WHe9m0WSLyRP61U+aCEMX5mFhaiXCZGZjtN8CpNl/drfbQTyF\nZMGI4AuPiwR4uS0DN1o1VKIYxsDB5ZMvYqwthqF2WZE4H84IJvvfFyhX39hF9VDr\nqiTI2BRQoBs5O5zqCY0C2xxpICJmlqrM9DYd/411GwIGFBHXBgp8qJxF0PIxHjPt\naYHvqrECgYEA5YV7iQdKi07Cip99Y6MeyFjvp7oYHsSlrPko5y7VmDdAZlvZQ6KI\nNlJ7Vbl3GHtRYyPgh6WZMGDH+1EnSON0c/7IJk30BScMl5pAPHSy3cr2QWLlC9tE\ngyTzJC2GwSyN8ObSl9Mv71L1+y1SAS9ZuG984Y8r/EJLaiMwDNv8TVUCgYEAycN/\n4DjBGLvt9WfuXAQdKuUHvxp4LJOz1cAU60hucGYAY9/kmOsdfMUL+kh1diijmT35\nrr5zC665zq2FyVOnbUPkwKDnLW1o13rhxZYX9se1CFMUbskxCbc39CJmmyEX4bOm\n2Wwt2cJpfCnv+D+rMxXldQOFf46XkMiDjhusBq0CgYEAnDpkoRweaH5+ux7embCR\npmurDS8FdgQChZ+/cMUXTJnnMwU3+Oqr7tXr76jjYP2no2TrU0mr4RsvZGiT5fA0\n9zOohzIudEdlMdgj+0Kv8XpSbqVjJNPmaaIAAlMe02SBZUWoeQGeMjf1CTiLBhV1\n662vglUS6o0xihhTf51JulUCgYEAtgxVDH6JFIU0/3Hoa1Q28SY4KCF8/1PCNwKa\nnXT8WSRgA73X6HZ0Y8jztr+8ZIHko3d9G0OyUH82HhsJlQ+LCRbyhzBnhuCqcYrp\nvbthIgUt/jXgQNn+CjMsJHcJt71TbA4KZTGr6Uj2ntbENG1WTsDaCgvEX8TMUxHp\nSccEH/0CgYBULXDEqtCv85sAiJlgQ0uUI/LhAG48B/G8xUgZkSI+hId/dfrZuSqs\nJvms2/3P58fb15rE5fWtn9iPwA6wU2jlJg6KEnCawiEfhTZgy8XRhgQm0XK0HAHz\n4EWoM5VwYbdIs+LyuVQK/yNRJlP3gtODs6ADAZyzVyj8H2VBduzn9w==\n-----END RSA PRIVATE KEY-----\n".freeze,
+        fingerprint: 16.times.map {rand(16**2).to_s(16).rjust(2,'0')}.join(":"), # => "8a:56:9a:b3:90:b1:3e:21:33:8d:a8:ee:61:69:c5:bc"
+      }
+    end
+  end
+end

data/lib/ey-core/mock/searching.rb

@@ -1,115 +1,115 @@
-module Ey::Core::Mock
-  module Searching
-    def url_for_page(collection, page_index, page_size, rel)
-      "<#{url_for(collection)}?page=#{page_index}&per_page=#{page_size}>; rel=\"#{rel}\""
-    end
-
-    def page(params, collection, options={})
-      if params["url"]
-        raise "url param should be extracted before paging"
-      end
-
-      unless resources = options.delete(:resources)
-        raise "tried to `page` #{collection} without given `resources` option."
-      end
-
-      if options.any?
-        raise ArgumentError, "Unknown options: #{options.keys}"
-      end
-
-      page_size   = (params["per_page"] || 20).to_i
-      page_index  = (params["page"] || 1).to_i
-      total_pages = (resources.size.to_f / page_size.to_f).ceil
-      offset      = (page_index - 1) * page_size
-      links       = []
-
-      resource_page = resources.values.reverse.slice(offset, page_size)
-
-      if page_index < total_pages
-        links << url_for_page(collection, page_index + 1, page_size, 'next')
-      end
-
-      if page_index - 1 > 0
-        links << url_for_page(collection, page_index - 1, page_size, 'prev')
-      end
-
-      links << url_for_page(collection, total_pages, page_size, 'last')
-      headers = {
-        "Link" => links.join(", "),
-        "X-Total-Count" => resources.size
-      }
-
-      [headers, resource_page]
-    end
-
-    def pluralize(word)
-      # @fixme make it better
-      "#{word}s"
-    end
-
-    # Filter a mocked data collection by given search parameters
-    # @param resource [...] mocked data collection to search through
-    # @param params [Hash] parameters to AND search by, array value ORs within that key
-    def search(resources, params)
-      search_params = Cistern::Hash.stringify_keys(params)
-
-      search_params.select { |k,v| v.respond_to?(:id) }.each do |k,v|
-        search_params[k] = v.id
-      end
-
-      resources.select do |id, attrs|
-        search_params.all? do |term, condition|
-          if condition.kind_of? Array
-            condition.include?(attrs[term]) || condition.include?(attrs["_#{term}"])
-          else
-            # @fixme the search functions should define more accurate / explicit definition of search terms
-            # this is a cheap mapping
-
-            # [provider, 3] => "http://api-test.engineyard.com/providers/3"
-            resource_url = url_for("/#{pluralize(term.to_s).gsub("_", "-")}/#{condition}")
-            hidden_term = "_#{term}"
-
-            (
-              attrs.key?(term) && (
-                attrs[term] == resource_url ||  # find by relation to a specific resource
-                attrs[term] == condition        # find by direct attribute
-              )
-            ) || (
-              attrs.key?(hidden_term) &&
-              (attrs[hidden_term] == condition) # find by a hidden attribute
-            )
-          end
-        end
-      end
-    end
-
-    # @param params [Hash] all query params
-    # @param collection [Symbol] collection to use, matches self.data[...]
-    # @option opts [Array<#to_s>] :search_keys param keys to search by, using ==
-    # @option opts [...] :resources (self.data[collection]) to search and page from
-    # @see #page for more options
-    def search_and_page(params, collection, options={})
-      deleted_key   = options.delete(:deleted_key) || "deleted_at"
-      resources     = (options.delete(:resources) || self.data[collection]) or raise ArgumentError, "Could not find collection: #{collection}"
-      search_keys   = options.delete(:search_keys) or raise ArgumentError, "Missing required option 'search_keys'"
-      search_params = Cistern::Hash.slice(params, *search_keys)
-
-      unless (bad_params = params.keys - search_keys - %w[deleted with_deleted page per_page]).empty?
-        raise "Cannot search #{collection} by params: #{bad_params.join(', ')}"
-      end
-
-      @logger.debug('request.search') { "Searching #{collection} with: #{params.inspect}" }
-
-      resources = search(resources, search_params)
-
-      # filter out deleted resources by default
-      filter = lambda { |_, attrs| attrs[deleted_key] }
-
-      unless params["with_deleted"]
-        params["deleted"] ? resources.select!(&filter) : resources.reject!(&filter)
-      end
-
-      page(params, collection, options.merge(resources: resources))
-    end
-  end
-end
+module Ey::Core::Mock
+  module Searching
+    def url_for_page(collection, page_index, page_size, rel)
+      "<#{url_for(collection)}?page=#{page_index}&per_page=#{page_size}>; rel=\"#{rel}\""
+    end
+
+    def page(params, collection, options={})
+      if params["url"]
+        raise "url param should be extracted before paging"
+      end
+
+      unless resources = options.delete(:resources)
+        raise "tried to `page` #{collection} without given `resources` option."
+      end
+
+      if options.any?
+        raise ArgumentError, "Unknown options: #{options.keys}"
+      end
+
+      page_size   = (params["per_page"] || 20).to_i
+      page_index  = (params["page"] || 1).to_i
+      total_pages = (resources.size.to_f / page_size.to_f).ceil
+      offset      = (page_index - 1) * page_size
+      links       = []
+
+      resource_page = resources.values.reverse.slice(offset, page_size)
+
+      if page_index < total_pages
+        links << url_for_page(collection, page_index + 1, page_size, 'next')
+      end
+
+      if page_index - 1 > 0
+        links << url_for_page(collection, page_index - 1, page_size, 'prev')
+      end
+
+      links << url_for_page(collection, total_pages, page_size, 'last')
+      headers = {
+        "Link" => links.join(", "),
+        "X-Total-Count" => resources.size
+      }
+
+      [headers, resource_page]
+    end
+
+    def pluralize(word)
+      # @fixme make it better
+      "#{word}s"
+    end
+
+    # Filter a mocked data collection by given search parameters
+    # @param resource [...] mocked data collection to search through
+    # @param params [Hash] parameters to AND search by, array value ORs within that key
+    def search(resources, params)
+      search_params = Cistern::Hash.stringify_keys(params)
+
+      search_params.select { |k,v| v.respond_to?(:id) }.each do |k,v|
+        search_params[k] = v.id
+      end
+
+      resources.select do |id, attrs|
+        search_params.all? do |term, condition|
+          if condition.kind_of? Array
+            condition.include?(attrs[term]) || condition.include?(attrs["_#{term}"])
+          else
+            # @fixme the search functions should define more accurate / explicit definition of search terms
+            # this is a cheap mapping
+
+            # [provider, 3] => "http://api-test.engineyard.com/providers/3"
+            resource_url = url_for("/#{pluralize(term.to_s).gsub("_", "-")}/#{condition}")
+            hidden_term = "_#{term}"
+
+            (
+              attrs.key?(term) && (
+                attrs[term] == resource_url ||  # find by relation to a specific resource
+                attrs[term] == condition        # find by direct attribute
+              )
+            ) || (
+              attrs.key?(hidden_term) &&
+              (attrs[hidden_term] == condition) # find by a hidden attribute
+            )
+          end
+        end
+      end
+    end
+
+    # @param params [Hash] all query params
+    # @param collection [Symbol] collection to use, matches self.data[...]
+    # @option opts [Array<#to_s>] :search_keys param keys to search by, using ==
+    # @option opts [...] :resources (self.data[collection]) to search and page from
+    # @see #page for more options
+    def search_and_page(params, collection, options={})
+      deleted_key   = options.delete(:deleted_key) || "deleted_at"
+      resources     = (options.delete(:resources) || self.data[collection]) or raise ArgumentError, "Could not find collection: #{collection}"
+      search_keys   = options.delete(:search_keys) or raise ArgumentError, "Missing required option 'search_keys'"
+      search_params = Cistern::Hash.slice(params, *search_keys)
+
+      unless (bad_params = params.keys - search_keys - %w[deleted with_deleted page per_page]).empty?
+        raise "Cannot search #{collection} by params: #{bad_params.join(', ')}"
+      end
+
+      @logger.debug('request.search') { "Searching #{collection} with: #{params.inspect}" }
+
+      resources = search(resources, search_params)
+
+      # filter out deleted resources by default
+      filter = lambda { |_, attrs| attrs[deleted_key] }
+
+      unless params["with_deleted"]
+        params["deleted"] ? resources.select!(&filter) : resources.reject!(&filter)
+      end
+
+      page(params, collection, options.merge(resources: resources))
+    end
+  end
+end

data/lib/ey-core/mock/util.rb

@@ -1,23 +1,23 @@
-module Ey::Core::Mock
-  module Util
-    def normalize_hash(hash)
-      JSON.load(JSON.dump(hash))
-    end
-
-    def deep_dup(object)
-      Marshal.load(Marshal.dump(object))
-    end
-
-    def uuid
-      SecureRandom.uuid
-    end
-
-    def ip_address
-      Array.new(4) { rand(256) }.join('.')
-    end
-
-    def api_token
-      SecureRandom.hex(20)
-    end
-  end
-end
+module Ey::Core::Mock
+  module Util
+    def normalize_hash(hash)
+      JSON.load(JSON.dump(hash))
+    end
+
+    def deep_dup(object)
+      Marshal.load(Marshal.dump(object))
+    end
+
+    def uuid
+      SecureRandom.uuid
+    end
+
+    def ip_address
+      Array.new(4) { rand(256) }.join('.')
+    end
+
+    def api_token
+      SecureRandom.hex(20)
+    end
+  end
+end

data/lib/ey-core/model.rb

@@ -1,44 +1,44 @@
-class Ey::Core::Model < Cistern::Model
-  def url
-    if self.class.attributes[:url]
-      read_attribute(:url)
-    else
-      "#{self.collection.url}/#{self.id}"
-    end
-  end
-
-  def to_s
-    shortname = self.class.name.split("::").last
-    "#{shortname}:#{id}"
-  end
-
-  def self.range_parser(v)
-    case v
-    when Range then
-      v
-    when String then
-      first, last = v.split("-").map(&:to_i)
-      last ||= first
-      Range.new(first, last)
-    else
-      v
-    end
-  end
-
-  def update!(attributes)
-    merge_attributes(attributes)
-    save!
-  end
-
-  def save
-    save!
-  rescue Ey::Core::Response::Error
-    false
-  end
-
-  def destroy
-    destroy!
-  rescue Ey::Core::Response::Error
-    false
-  end
-end
+class Ey::Core::Model < Cistern::Model
+  def url
+    if self.class.attributes[:url]
+      read_attribute(:url)
+    else
+      "#{self.collection.url}/#{self.id}"
+    end
+  end
+
+  def to_s
+    shortname = self.class.name.split("::").last
+    "#{shortname}:#{id}"
+  end
+
+  def self.range_parser(v)
+    case v
+    when Range then
+      v
+    when String then
+      first, last = v.split("-").map(&:to_i)
+      last ||= first
+      Range.new(first, last)
+    else
+      v
+    end
+  end
+
+  def update!(attributes)
+    merge_attributes(attributes)
+    save!
+  end
+
+  def save
+    save!
+  rescue Ey::Core::Response::Error
+    false
+  end
+
+  def destroy
+    destroy!
+  rescue Ey::Core::Response::Error
+    false
+  end
+end