grafana 0.9.0 → 0.10.1

data/lib/grafana/tools.rb

@@ -17,16 +17,16 @@ module Grafana
       raise ArgumentError.new(format('wrong type. \'text\' must be an String, given \'%s\'', text.class.to_s)) unless( text.is_a?(String) )
 
       begin
-      if( text =~ /\s/ && text =~ /-/ )
+        if( text =~ /\s/ && text =~ /-/ )
 #        if( text =~ /-/ )
           text = text.gsub( /\s+/, '' )
         else
           text = text.gsub( /\s+/, '-' )
 #        end
-      end
+        end
 
-      rescue => e
-        puts e
+      rescue => error
+        puts error
       end
 
       text.downcase
@@ -87,12 +87,12 @@ module Grafana
       begin
         JSON.parse( json )
         return true
-      rescue JSON::ParserError => e
-        @logger.error("json parse error: #{e}") if @debug
+      rescue JSON::ParserError => error
+        @logger.error("json parse error: #{error}") if @debug
         return false
       end
     end
 
-  end
 
+  end
 end

data/lib/grafana/user.rb

@@ -98,7 +98,9 @@ module Grafana
     #
     def add_dashboard_star( dashboard_id )
 
-      raise ArgumentError.new(format('wrong type. user \'dashboard_id\' must be an String (for an Dashboard name) or an Integer (for an Dashboard Id), given \'%s\'', dashboard_id.class.to_s)) if( dashboard_id.is_a?(String) && dashboard_id.is_a?(Integer) )
+      if( dashboard_id.is_a?(String) && dashboard_id.is_a?(Integer) )
+        raise ArgumentError.new(format('wrong type. \'dashboard_id\' must be an String (for an Dashboard name) or an Integer (for an Dashboard Id), given \'%s\'', dashboard_id.class.to_s))
+      end
       raise ArgumentError.new('missing \'dashboard_id\'') if( dashboard_id.size.zero? )
 
       dashboard_id = dashboard if(dashboard_id.is_a?(Integer))
@@ -128,7 +130,9 @@ module Grafana
     #
     def remove_dashboard_star( dashboard_id )
 
-      raise ArgumentError.new(format('wrong type. user \'dashboard_id\' must be an String (for an Dashboard name) or an Integer (for an Dashboard Id), given \'%s\'', dashboard_id.class.to_s)) if( dashboard_id.is_a?(String) && dashboard_id.is_a?(Integer) )
+      if( dashboard_id.is_a?(String) && dashboard_id.is_a?(Integer) )
+        raise ArgumentError.new(format('wrong type. \'dashboard_id\' must be an String (for an Dashboard name) or an Integer (for an Dashboard Id), given \'%s\'', dashboard_id.class.to_s))
+      end
       raise ArgumentError.new('missing \'dashboard_id\'') if( dashboard_id.size.zero? )
 
       dashboard_id = dashboard( dashboard_id ) if(dashboard_id.is_a?(Integer))

data/lib/grafana/users.rb

@@ -30,17 +30,23 @@ module Grafana
     #
     def user( user_id )
 
-      raise ArgumentError.new(format('wrong type. user \'user_id\' must be an String (for an Datasource name) or an Integer (for an Datasource Id), given \'%s\'', user_id.class.to_s)) if( user_id.is_a?(String) && user_id.is_a?(Integer) )
+      if( user_id.is_a?(String) && user_id.is_a?(Integer) )
+        raise ArgumentError.new(format('wrong type. user \'user_id\' must be an String (for an User name) or an Integer (for an User Id), given \'%s\'', user_id.class.to_s))
+      end
       raise ArgumentError.new('missing \'user_id\'') if( user_id.size.zero? )
 
       if(user_id.is_a?(String))
-        user_map = {}
-        users.dig('message').each do |d|
-          usr_id = d.dig('id').to_i
-          user_map[usr_id] = d
-        end
+        usrs  = users
+        usrs  = JSON.parse(usrs) if(usrs.is_a?(String))
+
+        status = usrs.dig('status')
+        return usrs if( status != 200 )
+
+        u = usrs.dig('message').detect { |v| v['login'] == user_id || v['email'] == user_id || v['name'] == user_id }
 
-        user_id = user_map.select { |_k,v| v['login'] == user_id || v['email'] == user_id || v['name'] == user_id }.keys.first
+        return { 'status' => 404, 'message' => format( 'No User \'%s\' found', user_id) } if( u.nil? )
+
+        user_id = u.dig('id') unless(u.nil?)
       end
 
       return { 'status' => 404, 'message' => format( 'No User \'%s\' found', user_id) } if( user_id.nil? )
@@ -102,10 +108,10 @@ module Grafana
 
       raise ArgumentError.new(format('wrong type. \'params\' must be an Hash, given \'%s\'', params.class.to_s)) unless( params.is_a?(Hash) )
 
-      user_name  = validate( params, required: true, var: 'user_name', type: String )
-      email      = validate( params, required: true, var: 'email', type: String )
+      user_name  = validate( params, required: true , var: 'user_name' , type: String )
+      email      = validate( params, required: true , var: 'email'     , type: String )
       login_name = validate( params, required: false, var: 'login_name', type: String ) || user_name
-      theme      = validate( params, required: false, var: 'theme', type: String )
+      theme      = validate( params, required: false, var: 'theme'     , type: String )
 
       usr = user(user_name)
 
@@ -144,7 +150,9 @@ module Grafana
     #
     def user_organizations( user_id )
 
-      raise ArgumentError.new(format('wrong type. user \'user_id\' must be an String (for an Username) or an Integer (for an Userid), given \'%s\'', user_id.class.to_s)) if( user_id.is_a?(String) && user_id.is_a?(Integer) )
+      if( user_id.is_a?(String) && user_id.is_a?(Integer) )
+        raise ArgumentError.new(format('wrong type. user \'user_id\' must be an String (for an Username) or an Integer (for an Userid), given \'%s\'', user_id.class.to_s))
+      end
       raise ArgumentError.new('missing \'user_id\'') if( user_id.size.zero? )
 
       usr = user(user_id)

data/lib/grafana/validator.rb

@@ -26,7 +26,7 @@ module Grafana
       params   = params.deep_symbolize_keys
       variable = params.dig(var.to_sym)
 
-      raise ArgumentError.new(format('\'%s\' is requiered and missing!', var)) if(variable.nil?) if(required == true )
+      raise ArgumentError.new(format('\'%s\' is requiered and missing!', var)) if(variable.nil? && required == true )
 
       unless( type.nil? )
         clazz = Object.const_get(type.to_s)
@@ -36,6 +36,38 @@ module Grafana
       variable
     end
 
+    # validate an value with an array of values
+    #
+    #
+    # @return [Mixed]
+    #
+    def validate_hash( value, valid_params )
+
+#       puts "validate_hash( #{value}, #{valid_params} )"
+
+      unless( valid_params.collect { |r| r.downcase }.include?(value.downcase) )
+#         puts "NOOO : #{value}"
+        return {
+          'status' => 404,
+          'message' => format( 'wrong value. \'%s\' must be one of \'%s\'', value, valid_params.join('\', \''))
+        }
+      end
+#      puts "result: #{result} #{result.class}"
+#
+#
+#      downcased = Set.new valid_params.map(&:downcase)
+#
+#      puts "downcased: #{downcased}"
+#
+#      unless( downcased.include?( value.downcase ) )
+#        return {
+#          'status' => 404,
+#          'message' => format( 'wrong value. \'%s\' must be one of \'%s\'', value, valid_params.join('\', \''))
+#        }
+#      end
+      true
+    end
+
   end
 end
 

data/lib/grafana/version.rb

@@ -6,9 +6,9 @@ module Grafana
     # major part of version
     MAJOR = 0
     # minor part of version
-    MINOR = 9
+    MINOR = 10
     # tiny part of version
-    TINY  = 0
+    TINY  = 1
   end
 
   # Current version of gem.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grafana
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.1
 platform: ruby
 authors:
 - Bodo Schulz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-11 00:00:00.000000000 Z
+date: 2018-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -38,20 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
-- !ruby/object:Gem::Dependency
-  name: ruby_dig
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -252,14 +238,20 @@ files:
 - lib/grafana/annotations.rb
 - lib/grafana/client.rb
 - lib/grafana/dashboard.rb
+- lib/grafana/dashboard_permissions.rb
 - lib/grafana/dashboard_versions.rb
 - lib/grafana/datasource.rb
+- lib/grafana/folder.rb
+- lib/grafana/folder_and_dashboard_search.rb
+- lib/grafana/folder_permissions.rb
 - lib/grafana/login.rb
 - lib/grafana/network.rb
 - lib/grafana/organization.rb
 - lib/grafana/organizations.rb
+- lib/grafana/preferences.rb
 - lib/grafana/snapshot.rb
 - lib/grafana/tags.rb
+- lib/grafana/teams.rb
 - lib/grafana/tools.rb
 - lib/grafana/user.rb
 - lib/grafana/users.rb
@@ -287,7 +279,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Grafana HTTP API Wrapper