foreman_api 0.0.1 → 0.0.2

data/foreman_api.gemspec

@@ -9,7 +9,6 @@ Gem::Specification.new do |gem|
   gem.homepage      = "http://github.com/mbacovsky/foreman_api"
 
   gem.files         = `git ls-files`.split($\)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "foreman_api"
   gem.require_paths = ["lib"]

data/lib/foreman_api/base.rb

@@ -7,32 +7,28 @@ module ForemanApi
   class Base
     attr_reader :client
 
-    def initialize(config = ForemanApi.client_config)
-      @client = RestClient::Resource.new(config[:base_url],
+    def initialize(config = ForemanApi.client_config, options = { })
+      @client = RestClient::Resource.new config[:base_url],
                                          :user     => config[:username],
                                          :password => config[:password],
                                          :oauth    => config[:oauth],
                                          :headers  => { :content_type => 'application/json',
-                                                        :accept       => 'application/json' })
+                                                        :accept       => 'application/json' }
     end
 
-    def call(method, path, payload = nil)
-      if payload && (method == :post || method == :put)
-        # TODO: is this neccessary? RestClient converts it automaticaly for me.
-        payload = payload.to_json
-      end
-      ret  = client[path].send(*([method, payload].compact))
-      data = begin
-        JSON.parse(ret.body)
-      rescue JSON::ParserError
-        ret.body
-      end
-      return data, ret
+    def call(method, path, options = { })
+      payload, headers, params = options.values_at :payload, :headers, :params
+      headers[:params] = params if params
+
+      args = [method]
+      args << payload.to_json if [:post, :put].include?(method)
+      args << headers if headers
+      process_data client[path].send(*args)
     end
 
     def validate_params!(options, valid_keys)
       return unless options.is_a?(Hash)
-      invalid_keys = options.keys - (valid_keys.is_a?(Hash) ? valid_keys.keys : valid_keys)
+      invalid_keys = options.keys.map(&:to_s) - (valid_keys.is_a?(Hash) ? valid_keys.keys : valid_keys)
       raise ArgumentError, "Invalid keys: #{invalid_keys.join(", ")}" unless invalid_keys.empty?
 
       if valid_keys.is_a? Hash
@@ -44,5 +40,16 @@ module ForemanApi
       end
     end
 
+    protected
+
+    def process_data(response)
+      data = begin
+        JSON.parse(response.body)
+      rescue JSON::ParserError
+        response.body
+      end
+      return data, response
+    end
+
   end
 end

data/lib/foreman_api/resources/architecture.rb

@@ -2,26 +2,26 @@ module ForemanApi
   module Resources
     class Architecture < ForemanApi::Base
 
-      def index
-        call(:get, "/api/architectures")
+      def index(headers = {})
+        call(:get, "/api/architectures", :headers => headers)
       end
 
-      def show(id)
-        call(:get, "/api/architectures/#{id}")
+      def show(id, headers = {})
+        call(:get, "/api/architectures/#{id}", :headers => headers)
       end
 
-      def create(params = {})
+      def create(params = {}, headers = {})
         validate_params!(params, {"architecture"=>["name"]})
-        call(:post, "/api/architectures", params)
+        call(:post, "/api/architectures", :payload => params, :headers => headers)
       end
 
-      def update(id, params = {})
+      def update(id, params = {}, headers = {})
         validate_params!(params, {"architecture"=>["name"]})
-        call(:put, "/api/architectures/#{id}", params)
+        call(:put, "/api/architectures/#{id}", :payload => params, :headers => headers)
       end
 
-      def destroy(id)
-        call(:delete, "/api/architectures/#{id}")
+      def destroy(id, headers = {})
+        call(:delete, "/api/architectures/#{id}", :headers => headers)
       end
 
     end

data/lib/foreman_api/resources/bookmark.rb

@@ -2,26 +2,26 @@ module ForemanApi
   module Resources
     class Bookmark < ForemanApi::Base
 
-      def index
-        call(:get, "/api/bookmarks")
+      def index(headers = {})
+        call(:get, "/api/bookmarks", :headers => headers)
       end
 
-      def show(id)
-        call(:get, "/api/bookmarks/#{id}")
+      def show(id, headers = {})
+        call(:get, "/api/bookmarks/#{id}", :headers => headers)
       end
 
-      def create(params = {})
+      def create(params = {}, headers = {})
         validate_params!(params, {"bookmark"=>["name", "controller", "query"]})
-        call(:post, "/api/bookmarks", params)
+        call(:post, "/api/bookmarks", :payload => params, :headers => headers)
       end
 
-      def update(id, params = {})
+      def update(id, params = {}, headers = {})
         validate_params!(params, {"bookmark"=>["name", "controller", "query"]})
-        call(:put, "/api/bookmarks/#{id}", params)
+        call(:put, "/api/bookmarks/#{id}", :payload => params, :headers => headers)
       end
 
-      def destroy(id)
-        call(:delete, "/api/bookmarks/#{id}")
+      def destroy(id, headers = {})
+        call(:delete, "/api/bookmarks/#{id}", :headers => headers)
       end
 
     end

data/lib/foreman_api/resources/home.rb

@@ -2,12 +2,12 @@ module ForemanApi
   module Resources
     class Home < ForemanApi::Base
 
-      def index
-        call(:get, "/api")
+      def index(headers = {})
+        call(:get, "/api", :headers => headers)
       end
 
-      def status
-        call(:get, "/api/status")
+      def status(headers = {})
+        call(:get, "/api/status", :headers => headers)
       end
 
     end

data/lib/foreman_api/resources/operating_system.rb

@@ -2,31 +2,31 @@ module ForemanApi
   module Resources
     class OperatingSystem < ForemanApi::Base
 
-      def index
-        call(:get, "/api/operatingsystems")
+      def index(headers = {})
+        call(:get, "/api/operatingsystems", :headers => headers)
       end
 
-      def show(id)
-        call(:get, "/api/operatingsystems/#{id}")
+      def show(id, headers = {})
+        call(:get, "/api/operatingsystems/#{id}", :headers => headers)
       end
 
-      def create(params = {})
+      def create(params = {}, headers = {})
         validate_params!(params, {"operatingsystem"=>["name", "major", "minor"]})
-        call(:post, "/api/operatingsystems", params)
+        call(:post, "/api/operatingsystems", :payload => params, :headers => headers)
       end
 
-      def update(id, params = {})
+      def update(id, params = {}, headers = {})
         validate_params!(params, {"operatingsystem"=>["name", "major", "minor"]})
-        call(:put, "/api/operatingsystems/#{id}", params)
+        call(:put, "/api/operatingsystems/#{id}", :payload => params, :headers => headers)
       end
 
-      def destroy(id)
-        call(:delete, "/api/operatingsystems/#{id}")
+      def destroy(id, headers = {})
+        call(:delete, "/api/operatingsystems/#{id}", :headers => headers)
       end
 
-      def bootfiles(id, params = {})
+      def bootfiles(id, params = {}, headers = {})
         validate_params!(params, ["medium", "architecture"])
-        call(:get, "/api/operatingsystems/#{id}/bootfiles", :params => params)
+        call(:get, "/api/operatingsystems/#{id}/bootfiles", :params => params, :headers => headers)
       end
 
     end

data/lib/foreman_api/resources/user.rb

@@ -2,26 +2,26 @@ module ForemanApi
   module Resources
     class User < ForemanApi::Base
 
-      def index
-        call(:get, "/api/users")
+      def index(headers = {})
+        call(:get, "/api/users", :headers => headers)
       end
 
-      def show(id)
-        call(:get, "/api/users/#{id}")
+      def show(id, headers = {})
+        call(:get, "/api/users/#{id}", :headers => headers)
       end
 
-      def create(params = {})
-        validate_params!(params, {"user"=>["login", "firstname", "lastname", "mail", "admin"]})
-        call(:post, "/api/users", params)
+      def create(params = {}, headers = {})
+        validate_params!(params, {"user"=>["login", "firstname", "lastname", "mail", "admin", "password", "auth_source_id"]})
+        call(:post, "/api/users", :payload => params, :headers => headers)
       end
 
-      def update(id, params = {})
-        validate_params!(params, {"user"=>["login", "firstname", "lastname", "mail", "admin"]})
-        call(:put, "/api/users/#{id}", params)
+      def update(id, params = {}, headers = {})
+        validate_params!(params, {"user"=>["login", "firstname", "lastname", "mail", "admin", "password"]})
+        call(:put, "/api/users/#{id}", :payload => params, :headers => headers)
       end
 
-      def destroy(id)
-        call(:delete, "/api/users/#{id}")
+      def destroy(id, headers = {})
+        call(:delete, "/api/users/#{id}", :headers => headers)
       end
 
     end

data/lib/foreman_api/version.rb

@@ -1,3 +1,3 @@
 module ForemanApi
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: foreman_api
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - "Martin Ba\xC4\x8Dovsk\xC3\xBD"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-09 00:00:00 Z
+date: 2012-08-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json