code42 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5016c27492e6c35df7c2e929aad4c1decd716043
-  data.tar.gz: 3b45794691537a0af54e0d497349be891cd9d5e0
+  metadata.gz: 9e4779f663016dbb2239a99c9cee391ce4c03627
+  data.tar.gz: 599b65430440a9aea5cc384675af10739f6e7b8c
 SHA512:
-  metadata.gz: b6831500eefe3bc2050162469ebe54aef89089b5bc77d25177458ce755e75f78913aba2444d800bc4d2c47a87462a27c978a30bd241af15b3a9a08ad8c2502dd
-  data.tar.gz: 1b0bf029724e99e6ea571092c7d9e24799a1c05149bb4760f7be62923bd59f5b885afcf141c9668d90e069eb7507f7a695430f73a46b94c02ff04d91761387d2
+  metadata.gz: d7ef9ef0c96aff020be4c584cae265ed8ed365834d9effdfa582e4e98b4cc6c240d4bcc399fc17ef5d23325c440df223b488524081e4c1caacb1fa54196f10ba
+  data.tar.gz: 630b13729bb81af29b7fb072cce7da8981127f170a9666403637e70554cb0be4d2efa7f4ec971d79e6c04d7e9bac511b7b46a4fb69176bedfb76b26d92e86034

data/.gitignore

@@ -2,6 +2,7 @@
 *.rbc
 .bundle
 .config
+.idea
 .yardoc
 Gemfile.lock
 InstalledFiles

data/.travis.yml

@@ -3,3 +3,4 @@ rvm:
   - 2.0.0
   - 2.1.0
   - 2.1.1
+cache: bundler

data/code42.gemspec

@@ -16,9 +16,9 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'webmock', '~> 1.11.0'
   gem.add_development_dependency 'vcr',     '~> 2.5.0'
   gem.add_development_dependency 'rake'
-  gem.add_dependency 'faraday',             '~> 0.8.7'
+  gem.add_dependency 'faraday',             '~> 0.9.0'
   gem.add_dependency 'activesupport',       '>= 3.2.0'
-  gem.add_dependency 'faraday_middleware',  '~> 0.8.7'
+  gem.add_dependency 'faraday_middleware',  '~> 0.9.1'
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

data/lib/code42.rb

@@ -4,6 +4,7 @@ require "active_support/core_ext/hash/keys"
 require "active_support/core_ext/string/inflections"
 require "active_support/core_ext/object/blank"
 require "active_support/core_ext/object/try"
+require "active_support/notifications"
 require "code42/version"
 require "code42/client"
 require "code42/settings"

data/lib/code42/api/computer.rb

@@ -17,6 +17,18 @@ module Code42
         params.merge!(key: 'computers')
         objects_from_response(Code42::Computer, :get, 'computer', params)
       end
+
+
+      # Block a computer from backing up
+      # @return [Code42::Computer] The blocked computer
+      # @params id [Integer, String] The computer ID you want to block
+      def block_computer(id)
+        put("computerblock/#{id}")
+      end
+
+      def unblock_computer(id)
+        delete("computerblock/#{id}")
+      end
     end
   end
 end

data/lib/code42/api/org.rb

@@ -28,19 +28,31 @@ module Code42
         object_from_response(Code42::Org, :get, "org/#{id}", params)
       end
 
-      # Returns an org for a given name
+      # Returns an org for a given name.  If multiple orgs are found, the first found will
+      # be returned.
       # @return [Code42::Org] The requested org
       # @param name [String] A Code42 org name
+      # @param params [Hash] Additional params used by the server for filtering, output, etc.
       # FIXME: This needs to change when the API implements a better way.
-      def find_org_by_name(name)
-        search_orgs(name).select { |o| o.name == name }.first
+      def find_org_by_name(name, params = {})
+        search_orgs(name, params).select { |o| o.name == name }.first
+      end
+
+      # Returns the first org that starts with a given name.
+      # Since orgs are renamed when they are deactivated, it is impossible
+      # to guarantee a match by name alone.
+      # @param name [String] A Code42 org name
+      # @param params [Hash] Additional params used by the server for filtering, output, etc.
+      def find_inactive_org_by_name(name, params = {})
+        search_orgs(name, params.merge!(:active => false)).first
       end
 
       # Searches orgs for a query string
       # @return [Array] An array of matching orgs
       # @param query [String] A string to search for
-      def search_orgs(query)
-        orgs(q: query)
+      def search_orgs(query, params = {})
+        params.merge!(q: query)
+        orgs(params)
       end
 
       # Returns a list of up to 100 orgs
@@ -55,6 +67,23 @@ module Code42
         object_from_response(Code42::Org, :put, "org/#{id}", attrs)
       end
 
+      def activate_org(id = 'my', attrs = {})
+        object_from_response(Code42::Org, :delete, "orgDeactivation/#{id}", attrs)
+      end
+
+      def deactivate_org(id = 'my', attrs = {})
+        object_from_response(Code42::Org, :put, "orgDeactivation/#{id}", attrs)
+      end
+
+      def block_org(id = 'my', attrs = {})
+        object_from_response(Code42::Org, :put, "orgBlock/#{id}", attrs)
+      end
+
+      def unblock_org(id = 'my', attrs = {})
+        object_from_response(Code42::Org, :delete, "orgBlock/#{id}", attrs)
+      end
+
+
     end
   end
 end

data/lib/code42/api/user.rb

@@ -77,6 +77,14 @@ module Code42
       def unblock_user(id)
         delete("UserBlock/#{id}")
       end
+
+      def deactivate_user(id)
+        put("UserDeactivation/#{id}")
+      end
+
+      def activate_user(id)
+        delete("UserDeactivation/#{id}")
+      end
     end
   end
 end

data/lib/code42/client.rb

@@ -16,6 +16,8 @@ module Code42
       self.settings = options
     end
 
+    def last_response; connection.last_response; end
+
     def settings=(options)
       @settings = Settings.new(options)
     end
@@ -61,16 +63,16 @@ module Code42
     end
 
     def connection
-      @connection = Connection.new(
-        host: settings.host,
-        port: settings.port,
-        scheme: settings.scheme,
-        path_prefix: settings.api_root,
-        verify_https: settings.verify_https,
-      )
-      if settings.debug
-        @connection.use Faraday::Response::Logger
-      end
+      @connection ||= begin
+                        connection = Connection.new
+                        settings.debug && connection.use(Faraday::Response::Logger)
+                        connection
+                      end
+      @connection.host         = settings.host
+      @connection.port         = settings.port
+      @connection.scheme       = settings.scheme
+      @connection.path_prefix  = settings.api_root
+      @connection.verify_https = settings.verify_https
       if settings.username && settings.password
         @connection.username = settings.username
         @connection.password = settings.password
@@ -87,7 +89,7 @@ module Code42
       klass = fetch_class(klass)
       options = klass.serialize(options)
       response = send(request_method.to_sym, path, options)
-      return nil unless response_has_data?(response['data'])
+      return nil unless response_has_data?(response)
       klass.from_response(response['data'], self)
     end
 
@@ -98,7 +100,7 @@ module Code42
       response = send(request_method.to_sym, path, options)
       return nil unless response_has_data?(response)
       response = response['data']
-      response = response[key] if key
+      response = response[key] if !response.empty? && key
       objects_from_array(klass, response)
     end
 
@@ -107,7 +109,7 @@ module Code42
     end
 
     def response_has_data?(response)
-      !response.nil?
+      response && response['data']
     end
 
     def collection_from_response(collection_klass, object_klass, request_method, path, options = {})

data/lib/code42/connection.rb

@@ -1,3 +1,4 @@
+require 'bundler/setup'
 require 'faraday'
 require 'faraday_middleware'
 require 'logger'
@@ -5,7 +6,8 @@ require 'code42/error'
 
 module Code42
   class Connection
-    attr_accessor :host, :port, :scheme, :path_prefix, :username, :password, :adapter, :token, :verify_https, :logger
+    attr_accessor :host, :port, :scheme, :path_prefix, :username, :password, :adapter, :token, :verify_https, :logger, :last_response
+
     def initialize(options = {})
       self.host         = options[:host]
       self.port         = options[:port]
@@ -15,24 +17,34 @@ module Code42
       self.password     = options[:password]
       self.token        = options[:token] if options[:token]
       self.verify_https = !options[:verify_https].nil? ? options[:verify_https] : true
+    end
+
+    extend Forwardable
 
-      adapter.host        = host
-      adapter.port        = port
-      adapter.scheme      = scheme
-      adapter.path_prefix = path_prefix
+    delegate %i(host port path_prefix scheme) => :adapter
+    delegate %i(host= port= path_prefix= scheme=) => :adapter
+
+    def verify_https=(verify_https)
       adapter.ssl[:verify] = verify_https
     end
 
+    def verify_https
+      adapter.ssl[:verify]
+    end
+
     def logger
       @logger ||= Logger.new(STDOUT)
     end
 
     def adapter
-      if !@adapter
-        @adapter = Faraday.new
-        @adapter.response :json
+      @adapter ||= Faraday.new do |f|
+        f.request  :multipart
+        f.request  :json
+
+        f.adapter  :net_http
+
+        f.response :json
       end
-      @adapter
     end
 
     def has_valid_credentials?
@@ -58,7 +70,12 @@ module Code42
 
     def make_request(method, *args)
       begin
-        response = self.send(method, *args)
+        @last_response = response = self.send(method, *args)
+        ActiveSupport::Notifications.instrument('code42.request', {
+          method:   method,
+          args:     args,
+          response: response
+        })
       rescue Faraday::Error::ConnectionFailed
         raise Code42::Error::ConnectionFailed
       end
@@ -71,13 +88,11 @@ module Code42
     end
 
     def put(path, data)
-      adapter.headers['Content-Type'] = 'application/json'
-      adapter.put path, data.to_json
+      adapter.put path, data
     end
 
     def post(path, data)
-      adapter.headers['Content-Type'] = 'application/json'
-      adapter.post path, data.to_json
+      adapter.post path, data
     end
 
     def delete(path, data)
@@ -96,22 +111,29 @@ module Code42
 
     def check_for_errors(response)
       if response.status == 401
-        raise Code42::Error::AuthenticationError.new(nil, response.status)
+        raise Code42::Error::AuthenticationError.new(description_from_response(response), response.status)
+      elsif response.status == 403
+        raise Code42::Error::AuthorizationError.new(description_from_response(response), response.status)
       elsif response.status == 404
-        raise Code42::Error::ResourceNotFound.new(nil, response.status)
+        raise Code42::Error::ResourceNotFound.new(description_from_response(response), response.status)
       elsif response.status >= 400 && response.status < 600
         body = response.body.is_a?(Array) ? response.body.first : response.body
         raise exception_from_body(body, response.status)
       end
     end
 
+    def description_from_response(response)
+      response.try { |resp| resp.body.try { |body| body.first['description'] } }
+    end
+
     def exception_from_body(body, status = nil)
       return Code42::Error.new("Status: #{status}") if body.nil? || !body.has_key?('name')
       exception_name = body['name'].downcase.camelize
       if Code42::Error.const_defined?(exception_name)
         klass = Code42::Error.const_get(exception_name)
       else
-        klass = Code42::Error
+        # Generic server error if no specific error is caught.
+        klass = Code42::Error::ServerError
       end
       klass.new(body['description'], status)
     end

data/lib/code42/error.rb

@@ -8,6 +8,7 @@ module Code42
   end
 
   class Error::AuthenticationError < Error; end
+  class Error::AuthorizationError < Error; end
   class Error::UsernameNotEmail < Error; end
   class Error::EmailInvalid < Error; end
   class Error::InvalidUsername < Error; end
@@ -18,4 +19,5 @@ module Code42
   class Error::OrgNameTooShort < Error; end
   class Error::ConnectionFailed < Error; end
   class Error::ResourceNotFound < Error; end
+  class Error::ServerError < Error; end
 end

data/lib/code42/org.rb

@@ -9,13 +9,47 @@ module Code42
     attribute :created_at, :from => 'creationDate', :as => DateTime
     attribute :updated_at, :from => 'modificationDate', :as => DateTime
     attribute :customer_id
+    attribute :active
+    attribute :blocked
 
     def self.create(attrs = {})
       client.create_org(attrs)
     end
 
-    def self.find_by_name(name)
-      client.find_org_by_name(name)
+    def self.find_by_id(id, attrs = {})
+      find_active_by_id(id, attrs) || find_inactive_by_id(id, attrs)
+    end
+
+    def self.find_active_by_id(id, attrs = {})
+      client.org(id, attrs)
+    end
+
+    def self.find_inactive_by_id(id, attrs = {})
+      client.org(id, attrs.merge(active: false))
+    end
+
+    def self.find_by_name(name, attrs = {})
+      find_active_by_name(name, attrs) || find_inactive_by_name(name, attrs)
+    end
+
+    def self.find_active_by_name(name, attrs = {})
+      client.find_org_by_name(name, attrs.merge(active: true))
+    end
+
+    def self.find_inactive_by_name(name, attrs = {})
+      client.find_inactive_org_by_name name, attrs
+    end
+
+    def self.find_all_orgs
+      find_all_active_orgs + find_all_inactive_orgs
+    end
+
+    def self.find_all_active_orgs
+      client.orgs
+    end
+
+    def self.find_all_inactive_orgs
+      client.orgs(active: false)
     end
 
     def users
@@ -26,8 +60,24 @@ module Code42
       client.update_org(id, attrs)
     end
 
+    def activate
+      client.activate_org(id)
+      client.org id
+    end
+
     def deactivate
       client.deactivate_org(id)
+      client.org(id, active: false)
+    end
+
+    def block
+      client.block_org(id)
+      client.org id
+    end
+
+    def unblock
+      client.unblock_org(id)
+      client.org id
     end
 
     def create_user(attrs = {})

data/lib/code42/user.rb

@@ -8,18 +8,27 @@ module Code42
     attribute :org_id
     attribute :updated_at, :from => 'modificationDate', :as => DateTime
     attribute :created_at, :from => 'creationDate', :as => DateTime
+    attribute :role, :from => 'roleName' # from plan_user_Dto
     attribute :status, :username, :email, :first_name, :last_name, :quota_in_bytes, :org_id, :org_uid, :org_name, :active, :blocked, :email_promo, :invited, :org_type, :username_is_an_email, :customer_id
 
     def self.create(attributes)
       client.create_user(attributes)
     end
 
-    def update(attributes)
-      client.update_user(id, attributes)
+    def self.find_by_id(id)
+      client.find_user_by_id id
+    end
+
+    def self.find_by_name(user_name)
+      client.user user_name
+    end
+
+    def self.find_all_users
+      client.users + client.users(active: false)
     end
 
-    def delete
-      client.delete_user(id)
+    def update(attributes)
+      client.update_user(id, attributes)
     end
 
     # Returns the org associated with this user
@@ -42,11 +51,23 @@ module Code42
     end
 
     def block
-      client.block_user(user_id: id)
+      client.block_user(id)
+      client.user id
     end
 
     def unblock
-      client.unblock_user(user_id: id)
+      client.unblock_user(id)
+      client.user id
+    end
+
+    def activate
+      client.activate_user(id)
+      client.user id
+    end
+
+    def deactivate
+      client.deactivate_user(id)
+      client.user(id, active: false)
     end
   end
 end

data/lib/code42/version.rb

@@ -1,3 +1,3 @@
 module Code42
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 require 'code42'
+require 'active_support'
 require 'rspec/autorun'
 require 'vcr'
 require 'net/http'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: code42
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Code 42
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-02 00:00:00.000000000 Z
+date: 2014-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: 0.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: 0.9.1
 description: Provides a Ruby interface to the Code42 API
 email:
 - dev-ruby@code42.com