katello_api 0.0.3 → 0.0.4

data/doc/top-level-namespace.html

@@ -6,13 +6,13 @@
 <title>
   Top Level Namespace
   
-    &mdash; Documentation by YARD 0.8.5.2
+    &mdash; Documentation by YARD 0.8.7.3
   
 </title>
 
-  <link rel="stylesheet" href="css/style.css" type="text/css" media="screen" charset="utf-8" />
+  <link rel="stylesheet" href="css/style.css" type="text/css" charset="utf-8" />
 
-  <link rel="stylesheet" href="css/common.css" type="text/css" media="screen" charset="utf-8" />
+  <link rel="stylesheet" href="css/common.css" type="text/css" charset="utf-8" />
 
 <script type="text/javascript" charset="utf-8">
   hasFrames = window.top.frames.main ? true : false;
@@ -103,9 +103,9 @@
 </div>
 
     <div id="footer">
-  Generated on Mon Mar 18 14:17:40 2013 by
+  Generated on Wed Jan 15 20:45:13 2014 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.8.5.2 (ruby-1.8.7).
+  0.8.7.3 (ruby-1.9.3).
 </div>
 
   </body>

data/katello_api.gemspec

@@ -5,21 +5,23 @@ Gem::Specification.new do |gem|
   gem.authors       = ["Katello"]
   gem.email         = ["katello-devel@redhat.com"]
   gem.description   = %q{Helps you to use Katello's API calls from your app}
-  gem.summary       = %q{Ruby bindings for Katello's rest API}
+  gem.summary       = %q{Ruby bindings for Katello's API}
   gem.homepage      = "http://github.com/katello/katello_api"
 
   gem.files         = `git ls-files`.split($\)
-  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
+  #gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
+
   gem.files.reject! do |fn|
     fn.start_with?("lib/katello_api/generator") ||
       fn == 'bin/generate.rb' ||
       fn == 'rubygem-katello_api.spec'
   end
+
   gem.name          = "katello_api"
   gem.require_paths = ["lib"]
   gem.version       = KatelloApi::VERSION
 
-  gem.add_dependency 'json'
-  gem.add_dependency 'rest-client', '>= 1.6.1'
-  gem.add_dependency 'oauth'
+  gem.add_dependency('json')
+  gem.add_dependency('rest-client', '>= 1.6.1')
+  gem.add_dependency('oauth')
 end

data/lib/katello_api/base.rb

@@ -24,19 +24,20 @@ module KatelloApi
   end
 
   class Base
-    API_VERSION = "1"
+    API_VERSION = "2"
 
     attr_reader :client, :config
 
-    def initialize(config, options = { })
+    def initialize(config, options = {})
+      headers = { :content_type => 'application/json',
+                  :accept => "application/json,version=#{API_VERSION}" }
+
       @client = RestClient::Resource.new(
-          config[:base_url],
+          "#{config[:base_url]}/katello",
           { :user => config[:username],
             :password => config[:password],
             :oauth => config[:oauth],
-            :headers => { :content_type => 'application/json',
-                          :accept => "application/json;version=#{API_VERSION}",
-                          'HTTP_KATELLO_USER' => 'admin' }
+            :headers => headers
           }.merge(options))
       @config = config
     end
@@ -146,10 +147,10 @@ module KatelloApi
       params          ||= { }
       # insert param values
       url_param_names = self.class.params_in_path(url)
-      url             = url_param_names.inject(url) do |url, param_name|
+      url             = url_param_names.inject(url) do |urrl, param_name|
         param_value = params[param_name] or
           raise ArgumentError, "missing param '#{param_name}' in parameters"
-        url.sub(":#{param_name}", param_value.to_s)
+        urrl.sub(":#{param_name}", param_value.to_s)
       end
 
       return url, params.reject { |param_name, _| url_param_names.include? param_name }