matterhorn_whymper 1.6.0 → 1.7.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Yzg4Y2YxYzliNDRkMzg2Yzk4OGViZThkYWVkNWNlY2E4Y2Y3NDliZA==
+    Njk1NzdhNmE5NjdiNjBmNWY4ZGY4ODk0NjUyM2UxYWNjZjdjNzMyMw==
   data.tar.gz: !binary |-
-    MThlMWRkNjQ0ZWZmMWI3ZWI5NDA0MjdmZmZjOWNkMDQ3MmJlZTZlMA==
+    NDU1ZDcxZTc5ZjYxMTk2MWU5ZGYxMjc3NzU0YjBkNDJkOGQ4ODQyMA==
 SHA512:
   metadata.gz: !binary |-
-    NmU2OGQxOGU1ZmE0ODlmYWNlMjdmODc0ZmZhMDk3YjUzMWQ2MDIzMTg3YTUx
-    OWNkMDc2YjYxMzEyZDlhNjNlN2IzZjA4ZTAxNmUzYTk0NDRjMzE3MjZiMTBm
-    NjQyYTg0MGZkMjA1NjA3MDAwZmRhNjgwMzFmYTc4MjFlNGQyOWE=
+    OGQ1M2ZjMWZjMDY1MWFhMTc2Y2RhMTJhMmQ5OGJkNjhiMjhmNzllZmZhNzZj
+    MDRkNGNiZDU4ZjlkNDM5YWNhNzBkZTUzY2Q2ZTYyNWRhNzQyOTJmODAzYjYy
+    NjliYzQwNjZlODgwOWU4ZDVmMWY0MTRkOTk1MTQzMWQ4MWMxYzc=
   data.tar.gz: !binary |-
-    YzQ1ODRjZWJmODBjOWQ5YjMwOTk2OWJhZTljYTQxZTM0Yzk5Yzk0OTk1YWI2
-    Y2I1ZDA0M2QxOGVhZjZiNDRjNDE0NjYyMDZhNWMzOWNmM2YxMDY3OTJkNDg2
-    NzEzYWU3ZDRlYWI4YjJiYjdmYzgyZWI1ZDM1ZmI0N2QzYTMzOTA=
+    MmNiMThhOTg3MmUzNzcyMmY2ZjU5MTBhMzUyODlkNWExNWMwNjUxOGYxZTcz
+    ODZjZDViNWIzY2Q2M2YwYzdjMjI0M2UyY2QwNzVkM2JmNmRkZjU1NTI2YTBm
+    MmMxZjkxZjZhOGVmNTIyY2M5MzY0NjYzNTQyZmI3MTMwZmFmMTU=

data/lib/matterhorn/endpoint/group.rb

@@ -35,11 +35,28 @@ class Matterhorn::Endpoint::Group < Matterhorn::Endpoint
 
   # --------------------------------------------------------------------------------------- read ---
 
+  # Return a list of groups as a hash
+  # {
+  #   'groups' => {
+  #     'group' => [
+  #       {
+  #         'id' => <group_id>,
+  #         'name' => <name>,
+  #         'description' => <description>,
+  #         'role' => <role>,
+  #         'memebers' => [ <username>, ... ],
+  #         'roles' => [ <role>, ...],
+  #       },
+  #       ...
+  #     ]
+  #   }
+  # }
+  #
   def index(offset = 0, limit = 100)
     groups = {}
     begin
       split_response http_endpoint_client.get(
-        "groups/groups.json"
+        "groups/groups.json?limit=#{limit}&offset=#{offset}"
       )
       groups = filter_groups(JSON.parse(response_body))
     rescue => ex
@@ -114,40 +131,55 @@ class Matterhorn::Endpoint::Group < Matterhorn::Endpoint
   
 
   def filter_groups(respons_hash)
-    MatterhornWhymper.logger.debug { respons_hash.inspect }
-    groups = { }
+    unless respons_hash['groups']['group'].kind_of?(Array)
+      respons_hash['groups']['group'] = [ respons_hash['groups']['group'] ]
+    end
+    groups = { 'groups' => { 'group' => [] } }
     respons_hash['groups']['group'].each do |group_hash|
-
-      groups[group_hash['id']] = {
-        :group_id => group_hash['id'],
-        :name => group_hash['name'],
-        :description => group_hash['description'],
-        :role => group_hash['role'],
+      next unless group_hash.kind_of?(Hash)
+      groups['groups']['group'] << {
+        'id' => group_hash['id'],
+        'name' => group_hash['name'],
+        'description' => group_hash['description'],
+        'role' => group_hash['role'],
+        'members' => filter_members(group_hash['members']),
+        'roles' => filter_roles(group_hash['roles'])
       }
+    end
+    groups
+  end
 
-      groups[group_hash['id']][:members] = 
-        if    group_hash['members'].nil?                       then []
-        elsif group_hash['members'].kind_of?(String)           then []
-        elsif group_hash['members']['member'].nil?             then []
-        elsif group_hash['members']['member'].kind_of?(Array)  then group_hash['members']['member']
-        elsif group_hash['members']['member'].kind_of?(String) then [ group_hash['members']['member'] ]
-        else                                                        []
-        end
-
-      groups[group_hash['id']][:roles] = 
-        if    group_hash['roles'].nil?                    then []
-        elsif group_hash['roles'].kind_of?(String) &&
-              group_hash['roles'].empty?                  then []
-        elsif group_hash['roles'].kind_of?(String) &&
-              !group_hash['roles'].empty?                 then [ group_hash['roles'] ]
-        elsif group_hash['roles']['role'].nil?            then []
-        elsif group_hash['roles']['role'].kind_of?(Array) then group_hash['roles']['role'].map { |r| r['name'] }
-        elsif group_hash['roles']['role'].kind_of?(Hash)  then [ group_hash['roles']['role']['name'] ]
-        else                                                   []
-        end
 
+  def filter_members(members_hash)
+    member_list = { 'member' => [] } 
+    return member_list    if members_hash.nil? ||
+                             !members_hash.kind_of?(Hash) ||
+                             members_hash['member'].nil?
+    unless members_hash['member'].kind_of?(Array)
+      members_hash['member'] = [ members_hash['member'] ]
     end
-    groups
+    members_hash['member'].each do |member|
+      next unless member.kind_of?(String)
+      member_list['member'] << member
+    end
+    member_list
+  end
+
+
+  def filter_roles(roles_hash)
+    role_list = { 'role' => [] }
+    return role_list    if roles_hash.nil? ||
+                           !roles_hash.kind_of?(Hash) ||
+                           roles_hash['role'].nil?
+    unless roles_hash['role'].kind_of?(Array)
+      roles_hash['role'] = [ roles_hash['role'] ]
+    end
+    roles_hash['role'].each do |role|
+      next unless role.kind_of?(Hash) &&
+                  !role['name'].nil?
+      role_list['role'] << role['name']
+    end
+    role_list
   end
 
 

data/lib/matterhorn/endpoint/user.rb

@@ -0,0 +1,184 @@
+require 'json'
+
+# =================================================================== Matterhorn::Endpoint::User ===
+
+class Matterhorn::Endpoint::User < Matterhorn::Endpoint
+
+
+  # -------------------------------------------------------------------------- endpoint methodes ---
+
+  # ------------------------------------------------------------------------------------- create ---
+
+  # Create a new user with username, password, name, email and a list of roles.
+  #
+  def create(username, password, name, email, roles)
+    done = false
+    begin
+      split_response http_endpoint_client.post(
+        "user-utils",
+        convert_to_form_param(username, password, name, email, roles)
+      )
+      done = true
+    rescue => ex
+      exception_handler('create', ex, {
+          409 => "An user with this username: #{username} already exist!"
+        }
+      )
+    end
+    done
+  end
+
+
+  # --------------------------------------------------------------------------------------- read ---
+
+  # Return a list of users as a hash
+  # {
+  #   'users' => {
+  #     'user' => [
+  #       {
+  #         'username' => <username>,
+  #         'name' => <name>,
+  #         'email' => <email>,
+  #         'roles' => [ <role>, ...]
+  #       },
+  #       ...
+  #     ]
+  #   }
+  # }
+  #
+  def index(offset = 0, limit = 100)
+    users = {}
+    begin
+      split_response http_endpoint_client.get(
+        "/user-utils/users.json?limit=#{limit}&offset=#{offset}"
+      )
+      users = filter_users(JSON.parse(response_body))
+    rescue => ex
+      exception_handler('index', ex, {})
+    end
+    users
+  end
+
+
+  # Return a given user as a hash
+  # {
+  #   'user' => {
+  #     'username' => <username>,
+  #     'name' => <name>,
+  #     'email' => <email>,
+  #     'roles' => [ <role>, ...]
+  #   }
+  # }
+  #
+  def get(username)
+    user = nil
+    begin
+      split_response http_endpoint_client.get(
+        "user-utils/#{username}.json"
+      )
+      user = { 'user' => filter_user(JSON.parse(response_body)['user']) }
+    rescue => ex
+      exception_handler('create', ex, {
+          404 => "User[#{username}] not found!"
+        }
+      )
+    end
+    user
+  end
+
+
+  # ------------------------------------------------------------------------------------- update ---
+
+  def update(username, password, name, email, roles)
+    done = false
+    begin
+      split_response http_endpoint_client.put(
+        "user-utils/#{username}.json",
+        convert_to_form_param(nil, password, name, email, roles)
+      )
+      done = true
+    rescue => ex
+      exception_handler('create', ex, {
+          404 => "User[#{username}] not found!"
+        }
+      )
+    end
+    done
+  end
+
+
+  # ------------------------------------------------------------------------------------- delete ---
+
+  def delete(username)
+    done = false
+    begin
+      split_response http_endpoint_client.delete(
+        "user-utils/#{username}.json"
+      )
+      done = true
+    rescue => ex
+      exception_handler('create', ex, {
+          404 => "User[#{username}] not found!"
+        }
+      )
+    end
+    done
+  end
+
+
+  # ---------------------------------------------------------------------------- private section ---
+  private
+
+  def convert_to_form_param(username, password, name, email, roles)
+    form_param = {}
+    form_param['username'] = username.to_s    unless username.nil?
+    form_param['password'] = password.to_s
+    form_param['name']     = name.to_s
+    form_param['email']    = email.to_s
+    form_param['roles']    = roles.to_s
+    form_param
+  end
+  
+
+  def filter_users(respons_hash)
+    unless respons_hash['users']['user'].kind_of?(Array)
+      respons_hash['users']['user'] = [ respons_hash['users']['user'] ]
+    end
+    users = { 'users' => { 'user' => [] } }
+    respons_hash['users']['user'].each do |user_hash|
+      next unless user_hash.kind_of?(Hash)
+      users['users']['user'] << filter_user(user_hash)
+    end
+    users
+  end
+
+
+  def filter_user(user_hash)
+    return {} unless user_hash.kind_of?(Hash)
+    return {
+      'username' => user_hash['username'],
+      'name'     => user_hash['name'],
+      'email'    => user_hash['email'],
+      'roles'    => filter_roles(user_hash['roles'])
+    }
+  end
+
+
+  def filter_roles(roles_hash)
+    role_list = { 'role' => [] }
+    return role_list    if roles_hash.nil? ||
+                           !roles_hash.kind_of?(Hash) ||
+                           roles_hash['role'].nil?
+    unless roles_hash['role'].kind_of?(Array)
+      roles_hash['role'] = [ roles_hash['role'] ]
+    end
+    roles_hash['role'].each do |role|
+      next unless role.kind_of?(Hash) &&
+                  !role['name'].nil?
+      role_list['role'] << role['name']
+    end
+    role_list
+  end
+
+
+end # ----------------------------------------------------------- end Matterhorn::Endpoint::User ---

data/lib/matterhorn_whymper/version.rb

@@ -5,7 +5,7 @@ module MatterhornWhymper
 
   # -------------------------------------------------------------------------- const definitions ---
 
-  VERSION = "1.6.0"
+  VERSION = "1.7.0"
 
 
 end # -------------------------------------------------------------------- end MatterhornWhymper ---

data/lib/matterhorn_whymper.rb

@@ -14,6 +14,7 @@ require 'matterhorn/endpoint/group'
 require 'matterhorn/endpoint/ingest'
 require 'matterhorn/endpoint/series'
 require 'matterhorn/endpoint/staticfiles'
+require 'matterhorn/endpoint/user'
 require 'matterhorn/endpoint/workflow'
 require 'matterhorn/error'
 require 'matterhorn/http_client'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: matterhorn_whymper
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Daniel Fritschi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-02 00:00:00.000000000 Z
+date: 2015-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multipart-post
@@ -149,6 +149,7 @@ files:
 - lib/matterhorn/endpoint/ingest.rb
 - lib/matterhorn/endpoint/series.rb
 - lib/matterhorn/endpoint/staticfiles.rb
+- lib/matterhorn/endpoint/user.rb
 - lib/matterhorn/endpoint/workflow.rb
 - lib/matterhorn/error.rb
 - lib/matterhorn/http_client.rb