delphix_rb 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7350c64cf8d446bda6529be6aa7385bd399fce50
-  data.tar.gz: 2a8d077c2ee44e55bfca06da8714b795afd36ec7
+  metadata.gz: 916878dc92aeeb06d919257efd28d2d3a9de5161
+  data.tar.gz: e0513a8bff89d459b872a0d5d76f8c35e4cd10f0
 SHA512:
-  metadata.gz: ce887be1591ee007c0be1b187e34648a2519f9ad0cd1d94526d7b46807dda4c49c524f4b8ff883e0a2cfc948271a3fda36414173fd8ef01f259ba4822b1ff378
-  data.tar.gz: d5527ab922eb63d2c5b62b62d98a29ad7a49ca925a3fdf67af0020540681753c0ccd290966a0c903f802f026110ec5d4b15ba6572db2aee56b772048c29575c6
+  metadata.gz: b812e7c6099b206a8e23101037b53d61fb0ca97ffd1689299ea7952d01a1edcf71efcb78908bc08967b0fdeea99ea62c591062db5457204257fd1f6390258987
+  data.tar.gz: a329c59718488e81a3146082631d13018c65349b4e3a00d9c6f64403e5296e1fabeb95de005c0a42c6df4e99208b5a21e9b454a7d4f57526090b904f8cd9d214

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/delphix_rb.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: delphix_rb 0.1.0 ruby lib
+# stub: delphix_rb 0.2.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "delphix_rb"
-  s.version = "0.1.0"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]

data/lib/delphix/base.rb

@@ -2,33 +2,31 @@
 module Delphix::Base
   include Delphix::Error
 
-  attr_accessor :connection, :info, :details
+  attr_accessor :details
   
   # The private new method accepts a connection and a hash
-  def initialize(connection, info={})
-    unless connection.is_a?(Delphix::Connection)
-      raise ArgumentError, "Expected a Delphix::Connection, got: #{connection}."
+  def initialize(reference=nil, details=nil)
+    if details == nil
+      @details = { 'reference' => reference }
+    else
+      @details = details
     end
-    
-    @connection, @info = connection, info
-    @details = nil
   end
 
   def type
-    @info['type'] || 'unknown'
+    @details['type'] || 'unknown'
   end
   
   def name
-    @info['name'] || ''
+    @details['name'] || ''
   end
   
   def reference
-    @info['reference'] || ''
+    @details['reference'] || ''
   end
     
   def details
     @details ||= refresh_details
-    @info = @details
     @details
   end
 
@@ -42,12 +40,12 @@ module Delphix::Base
   
   # a generic get method, used when there is not specialized method to invoke an API call
   def get(endpoint, payload)
-    @connection.get( endpoint, {}, :body => payload)
+    Delphix.get( endpoint, payload)
   end
   
   # a generic get method, used when there is not specialized method to invoke an API call
   def post(endpoint, payload)
-    @connection.post( endpoint, {}, :body => payload)
+    Delphix.post( endpoint, payload)
   end
   
 end

data/lib/delphix/connection.rb

@@ -1,5 +1,7 @@
+
 # This class represents a Connection to a Delphix Engine. The Connection is
 # immutable in that once the url and options is set they cannot be changed.
+
 class Delphix::Connection
   include Delphix::Error
   
@@ -20,13 +22,6 @@ class Delphix::Connection
     end
   end
   
-  # The actual client that sends HTTP methods to the Delphix Engine.
-  def session
-    @session
-  end
-  
-  private :session
-  
   # Send a request to the server
   def request(*args, &block)
     
@@ -35,7 +30,7 @@ class Delphix::Connection
     log_request(request) if Delphix.debug
     
     # execute the request and grao the session cookie if not already set
-    response = session.request(request)
+    response = @session.request(request)
     @session_cookie ||= cookie?(response)
     
     log_response(response) if Delphix.debug

data/lib/delphix/environment.rb

@@ -5,10 +5,8 @@ require 'delphix/repository'
 class Delphix::Environment
   include Delphix::Base
   
-  def initialize(reference)
-    @connection = Delphix.connection
-    @info = { 'reference' => reference }
-    @details = nil
+  def initialize(reference, details=nil)
+    super(reference, details)
   end
   
   def repositories
@@ -58,7 +56,7 @@ class Delphix::Environment
     env = Delphix::Environment.new ref
     
     # refresh the object from the DE
-    env.details
+    env.refresh_details
     
     env
   end

data/lib/delphix/group.rb

@@ -2,10 +2,8 @@
 class Delphix::Group
   include Delphix::Base
   
-  def initialize(reference)
-    @connection = Delphix.connection
-    @info = { 'reference' => reference }
-    @details = nil
+  def initialize(reference, details=nil)
+    super(reference, details)
   end
   
   def refresh_details
@@ -23,7 +21,7 @@ class Delphix::Group
     group = Delphix::Group.new ref
     
     # refresh the object from the DE
-    group.details
+    group.refresh_details
     
     group
   end

data/lib/delphix/repository.rb

@@ -2,6 +2,10 @@
 class Delphix::Repository
   include Delphix::Base
   
+  def initialize(reference, details=nil)
+    super(reference, details)
+  end
+  
   def refresh_details
     @details = get("/resources/json/delphix/repository/#{reference}", nil)['result']
   end

data/lib/delphix.rb

@@ -14,13 +14,12 @@ module Delphix
   require 'delphix/repository'
   
   def authenticate!(username,password)
+    
     case
-    when !username.is_a?(String)
-      raise ArgumentError, "Expected a String, got: '#{username}'"
-    when !password.is_a?(String)
-      raise ArgumentError, "Expected a String, got: '#{password}'"
-    else
-      @username, @password = username, password
+      when !username.is_a?(String)
+        raise ArgumentError, "Expected a String, got: '#{username}'"
+      when !password.is_a?(String)
+        raise ArgumentError, "Expected a String, got: '#{password}'"
     end
     
     reset_connection!
@@ -50,8 +49,8 @@ module Delphix
   def environments
     envs = BaseArray.new
     result = get('/resources/json/delphix/environment', nil)['result']
-    result.each do |o|
-      envs << Environment.new(connection, o)
+    result.each do |env|
+      envs << Environment.new(env['reference'],env)
     end
     envs
   end
@@ -59,8 +58,8 @@ module Delphix
   def groups
     groups = BaseArray.new
     result = get('/resources/json/delphix/group', nil)['result']
-    result.each do |o|
-      groups << Group.new(connection, o)
+    result.each do |group|
+      groups << Group.new(group['reference'],group)
     end
     groups
   end
@@ -68,8 +67,8 @@ module Delphix
   def repositories
     repos = BaseArray.new
     result = get('/resources/json/delphix/repository', nil)['result']
-    result.each do |o|
-      repos << Repository.new(connection, o)
+    result.each do |repo|
+      repos << Repository.new(repo['reference'],repo)
     end
     repos
   end
@@ -109,14 +108,6 @@ module Delphix
     reset_connection!
   end
 
-  def connection
-    @connection ||= Connection.new(url, options)
-  end
-
-  def reset_connection!
-    @connection = nil
-  end
-  
   def debug
     @debug || false
   end
@@ -127,6 +118,14 @@ module Delphix
   
 private
   
+  def connection
+    @connection ||= Connection.new(url, options)
+  end
+
+  def reset_connection!
+    @connection = nil
+  end
+  
   def env_url
     ENV['DELPHIX_URL'] || default_url
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: delphix_rb
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Michael Kuehl