apipie-rails 0.0.9 → 0.0.10

data/.gitignore

@@ -4,3 +4,4 @@ pkg/
 spec/dummy/db/*.sqlite3
 spec/dummy/log/*.log
 spec/dummy/tmp/
+.idea

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    apipie-rails (0.0.8)
+    apipie-rails (0.0.10)
 
 GEM
   remote: http://rubygems.org/
@@ -49,6 +49,7 @@ GEM
     mime-types (1.19)
     minitest (3.2.0)
     multi_json (1.3.6)
+    oauth (0.4.6)
     polyglot (0.3.3)
     rack (1.4.1)
     rack-cache (1.2)
@@ -76,6 +77,8 @@ GEM
     rdoc (3.12)
       json (~> 1.4)
     redcarpet (2.1.1)
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
     rspec (2.11.0)
       rspec-core (~> 2.11.0)
       rspec-expectations (~> 2.11.0)
@@ -108,8 +111,10 @@ DEPENDENCIES
   RedCloth
   apipie-rails!
   minitest
+  oauth
   rails (>= 3.0.10)
   rake
   redcarpet
+  rest-client
   rspec-rails
   sqlite3

data/apipie-rails.gemspec

@@ -23,4 +23,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency "redcarpet"
   s.add_development_dependency "RedCloth"
   s.add_development_dependency "rake"
+  s.add_development_dependency "rest-client"
+  s.add_development_dependency "oauth"
 end

data/lib/apipie/client/generator.rb

@@ -102,6 +102,7 @@ module Apipie
       def client_args(method)
         client_args = params_in_path(method).dup
         client_args << "params = {}" if method[:params].any?
+        client_args << 'headers = {}'
         client_args
       end
 

data/lib/apipie/client/template/base.rb.tt

@@ -7,32 +7,28 @@ module <%= class_base %><%= class_suffix %>
   class Base
     attr_reader :client
 
-    def initialize(config = <%= class_base %><%= class_suffix %>.client_config)
-      @client = RestClient::Resource.new(config[:base_url],
+    def initialize(config = <%= class_base %><%= class_suffix %>.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 <%= class_base %><%= class_suffix %>
       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/apipie/client/template/resource.rb.tt

@@ -7,8 +7,10 @@ module <%= class_base %><%= class_suffix %>
 <% if method[:params].any? -%>
         validate_params!(params, <%= validation_hash(method).inspect.html_safe %>)
 <% end -%>
-        call(:<%= api(method)[:http_method].downcase %>, "<%= substituted_url(method) %>"<%=
-        (api(method)[:http_method].downcase == 'get' ? ", :params => params" : ", params") if method[:params].any? %>)
+<% http_method = api(method)[:http_method].downcase -%>
+        call(:<%= http_method %>, "<%= substituted_url(method) %>"<%=
+        (http_method == 'get' ? ", :params => params" : ", :payload => params") if method[:params].any?
+%>, :headers => headers)
       end
 <% end -%>
 

data/lib/apipie/version.rb

@@ -1,3 +1,3 @@
 module Apipie
-  VERSION = '0.0.9'
+  VERSION = '0.0.10'
 end

metadata

@@ -1,137 +1,162 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: apipie-rails
-version: !ruby/object:Gem::Version
-  version: 0.0.9
+version: !ruby/object:Gem::Version 
+  hash: 11
   prerelease: 
+  segments: 
+  - 0
+  - 0
+  - 10
+  version: 0.0.10
 platform: ruby
-authors:
+authors: 
 - Pavel Pokorny
 - Ivan Necas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-31 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-08-14 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  prerelease: false
   name: rspec-rails
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id001
   type: :development
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
   name: rails
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 3
+        - 0
+        - 10
         version: 3.0.10
+  requirement: *id002
   type: :development
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.0.10
-- !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id003
   type: :development
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
   name: minitest
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id004
   type: :development
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id005
   type: :development
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
   name: RedCloth
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id006
   type: :development
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id007
+  type: :development
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: rest-client
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id008
   type: :development
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  name: oauth
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id009
+  type: :development
 description: Maintain your API documentation up to date!
-email:
+email: 
 - pajkycz@gmail.com
 - inecas@redhat.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .rspec
 - .rvmrc
@@ -239,29 +264,38 @@ files:
 - spec/spec_helper.rb
 homepage: http://github.com/Pajk/apipie-rails
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Rails REST API documentation tool
-test_files:
+test_files: 
 - spec/controllers/apipies_controller_spec.rb
 - spec/controllers/users_controller_spec.rb
 - spec/dummy/Rakefile
@@ -300,4 +334,3 @@ test_files:
 - spec/dummy/public/stylesheets/.gitkeep
 - spec/dummy/script/rails
 - spec/spec_helper.rb
-has_rdoc: