ey_resolver 0.1.0 → 0.1.1

data/lib/ey_resolver/app_env_resolver.rb

@@ -6,8 +6,21 @@ class EY::Resolver
   end
 
   class AppEnvResolver < AbstractResolver
+
+    def self.association
+      if Object.const_defined?(:AppDeployment)
+        :app_deployments
+      else
+        :app_environments
+      end
+    end
+
     def self.model
-      ::AppEnvironment
+      if Object.const_defined?(:AppDeployment)
+        ::AppDeployment
+      else
+        ::AppEnvironment
+      end
     end
 
     def matches
@@ -20,7 +33,7 @@ class EY::Resolver
       dm_query[model.environment.name.like] = "%#{query.environment_name}%" if query.environment_name
       dm_query[model.app.account.name.like] = "%#{query.account_name}%"     if query.account_name
 
-      candidates = user.accounts.apps.app_environments.all(dm_query)
+      candidates = user.accounts.apps.send(self.class.association).all(dm_query)
       best_matches filter_by_remotes(candidates)
     end
 

data/lib/ey_resolver/environment_resolver.rb

@@ -16,9 +16,9 @@ class EY::Resolver
       end
 
       dm_query = {}
-      dm_query[:name.like]                           = "%#{query.environment_name}%" if query.environment_name
-      dm_query[model.account.name.like]              = "%#{query.account_name}%"     if query.account_name
-      dm_query[model.app_environments.app.name.like] = "%#{query.app_name}%"         if query.app_name
+      dm_query[:name.like]              = "%#{query.environment_name}%" if query.environment_name
+      dm_query[model.account.name.like] = "%#{query.account_name}%"     if query.account_name
+      dm_query[model.apps.name.like]    = "%#{query.app_name}%"         if query.app_name
 
       candidates = user.accounts.environments.all(dm_query)
 
@@ -43,18 +43,22 @@ class EY::Resolver
 
     private
 
+    # cache app uris since we might use it twice
+    def app_uris(env)
+      @app_uris ||= {}
+      @app_uris[env] ||= env.apps.map { |app| app.gitable_uri }.flatten
+    end
+
     def equivalent_remote?(env, uri)
-      app_uris = env.apps.map { |app| app.gitable_uri }.flatten
-      app_uris.any? { |app_uri| app_uri.equivalent?(uri) }
+      app_uris(env).any? { |app_uri| app_uri.equivalent?(uri) }
     end
 
     def exact_match?(env, key, val)
       case key.to_sym
       when :remotes
-        app_uris = env.apps.map { |app| app.gitable_uri }.flatten
-        val.any? { |uri| app_uris.any? { |app_uri| app_uri.equivalent?(uri) } }
+        val.any? { |uri| equivalent_remote?(env, uri) }
       when :app_name
-        env.app_environments.any? { |app_env| app_env.app.name.downcase == val.downcase }
+        env.apps.any? { |app| app.name.downcase == val.downcase }
       when :environment_name
         env.name.downcase == val.downcase
       when :account_name

data/lib/ey_resolver/query.rb

@@ -4,6 +4,9 @@ class EY::Resolver
   class Query
 
     def initialize(params)
+      unless params && params.respond_to?(:each)
+        raise ArgumentError, "Expected params to be a set of constraints: #{params.inspect}"
+      end
       self.query = params
     end
 

data/lib/ey_resolver/version.rb

@@ -1,5 +1,5 @@
 module EY
   class Resolver
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

metadata

@@ -1,77 +1,57 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ey_resolver
-version: !ruby/object:Gem::Version 
-  hash: 27
+version: !ruby/object:Gem::Version
+  version: 0.1.1
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 0
-  version: 0.1.0
 platform: ruby
-authors: 
+authors:
 - Martin Emde
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-02-13 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2012-02-21 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: gitable
+  requirement: &70106287480080 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 17
-        segments: 
-        - 0
-        - 2
-        - 3
+      - !ruby/object:Gem::Version
         version: 0.2.3
-  name: gitable
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  type: :runtime
   prerelease: false
-  type: :development
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: *70106287480080
+- !ruby/object:Gem::Dependency
   name: rake
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  prerelease: false
+  requirement: &70106287479660 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *70106287479660
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70106287479120 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 0
-        version: "2.0"
-  name: rspec
-  version_requirements: *id003
-description: Resolves apps, environments, app_environments and accounts using a set of constraints
-email: 
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :development
+  prerelease: false
+  version_requirements: *70106287479120
+description: Resolves apps, environments, app_environments and accounts using a set
+  of constraints
+email:
 - martin.emde@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - README.md
@@ -98,40 +78,37 @@ files:
 - spec/app_resolver_spec.rb
 - spec/environment_resolver_spec.rb
 - spec/spec_helper.rb
-homepage: ""
+homepage: ''
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 960271519958005982
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: 960271519958005982
 requirements: []
-
 rubyforge_project: ey_resolver
 rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Resolves awsm models given constraints
-test_files: 
+test_files:
 - spec/account_resolver_spec.rb
 - spec/app_env_resolver_spec.rb
 - spec/app_resolver_spec.rb