bitbucket_rest_api 0.1.0 → 0.1.1

data/lib/bitbucket_rest_api/api.rb

@@ -40,7 +40,6 @@ module BitBucket
       super()
       setup options
       set_api_client
-      client if client_id? && client_secret?
 
       self.instance_eval(&block) if block_given?
     end

data/lib/bitbucket_rest_api/authorization.rb

@@ -3,21 +3,6 @@
 module BitBucket
   module Authorization
 
-    # Setup OAuth instance
-    def client
-      @client ||= ::OAuth::Consumer.new(client_id, client_secret,
-                                      {:signature_method=>"HMAC-SHA1",
-                                       :request_token_path=>"/1.0/oauth/request_token",
-                                       :authorize_path=>"/1.0/oauth/authenticate",
-                                       :access_token_path=>"/1.0/oauth/access_token",
-                                       :proxy=>nil,
-                                       :scheme=>:header,
-                                       :http_method=>:post,
-                                       :oauth_version=>"1.0",
-                                       :site=>"https://api.bitbucket.org"}
-      )
-    end
-
     # Check whether authentication credentials are present
     def authenticated?
       basic_authed? || oauth_token?

data/lib/bitbucket_rest_api/connection.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 
 require 'faraday'
+require 'faraday_middleware'
 require 'bitbucket_rest_api/response'
 require 'bitbucket_rest_api/response/mashify'
 require 'bitbucket_rest_api/response/jsonize'
@@ -26,10 +27,7 @@ module BitBucket
     def default_options(options={})
       {
           :headers => {
-              ACCEPT           => "application/json;q=0.1",
-              ACCEPT_CHARSET   => "utf-8",
-              USER_AGENT       => user_agent,
-              CONTENT_TYPE     => 'application/json'
+              USER_AGENT       => user_agent
           },
           :ssl => { :verify => false },
           :url => options.fetch(:endpoint) { BitBucket.endpoint }
@@ -41,11 +39,12 @@ module BitBucket
     #
     def default_middleware(options={})
       Proc.new do |builder|
-        builder.use BitBucket::Request::Jsonize
+        #builder.use BitBucket::Request::Jsonize
         builder.use Faraday::Request::Multipart
         builder.use Faraday::Request::UrlEncoded
-        builder.use BitBucket::Request::OAuth, client, oauth_token, oauth_secret if oauth_token? and oauth_secret?
+        builder.use FaradayMiddleware::OAuth, {:consumer_key => client_id, :consumer_secret => client_secret, :token => oauth_token, :token_secret => oauth_secret} if oauth_token? and oauth_secret?
         builder.use BitBucket::Request::BasicAuth, authentication if basic_authed?
+        builder.use FaradayMiddleware::EncodeJson
 
         builder.use Faraday::Response::Logger if ENV['DEBUG']
         builder.use BitBucket::Response::Helpers

data/lib/bitbucket_rest_api/issues.rb

@@ -10,27 +10,21 @@ module BitBucket
                  :Milestones => 'milestones'
 
     VALID_ISSUE_PARAM_NAMES = %w[
-      filter
-      state
-      labels
-      sort
-      direction
-      since
-      milestone
-      assignee
-      mentioned
       title
-      body
-      resource
-      mime_type
+      content
+      component
+      milestone
+      version
+      responsible
+      priority
+      status
+      kind
     ].freeze
 
     VALID_ISSUE_PARAM_VALUES = {
-        'filter'    => %w[ assigned created mentioned subscribed ],
-        'state'     => %w[ open closed ],
-        'sort'      => %w[ created updated comments ],
-        'direction' => %w[ desc asc ],
-        'since'     => %r{\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}Z}
+        'priority'    => %w[ trivial minor major critical blocker ],
+        'status'     => ['new', 'open', 'resolved', 'on hold', 'invalid', 'duplicate', 'wontfix'],
+        'kind'      => %w[ bug enhancement proposal task ]
     }
 
     # Creates new Issues API
@@ -72,8 +66,8 @@ module BitBucket
       assert_valid_values(VALID_ISSUE_PARAM_VALUES, params)
 
       response = get_request("/repositories/#{user}/#{repo}/issues", params)
-      return response unless block_given?
-      response.each { |el| yield el }
+      return response.issues unless block_given?
+      response.issues.each { |el| yield el }
     end
 
     alias :list_repository :list_repo
@@ -140,11 +134,12 @@ module BitBucket
       _validate_user_repo_params(user, repo) unless user? && repo?
 
       normalize! params
+      _merge_user_into_params!(params) unless params.has_key?('user')
       # _merge_mime_type(:issue, params)
       filter! VALID_ISSUE_PARAM_NAMES, params
       assert_required_keys(%w[ title ], params)
 
-      post_request("/repositories/#{user}/#{repo}/issues", params)
+      post_request("/repositories/#{user}/#{repo}/issues/", params)
     end
 
     # Edit an issue

data/lib/bitbucket_rest_api/repos.rb

@@ -176,12 +176,12 @@ module BitBucket
       _merge_user_into_params!(params) unless params.has_key?('user')
       filter! %w[ user type ], params
 
-      response = if (user_name = params.delete("user"))
-                   get_request("/users/#{user_name}", params)
-                 else
+      response = #if (user_name = params.delete("user"))
+                 #  get_request("/users/#{user_name}", params)
+                 #else
                    # For authenticated user
                    get_request("/user/repositories", params)
-                 end
+                 #end
       return response unless block_given?
       response.each { |el| yield el }
     end

data/lib/bitbucket_rest_api/request/oauth.rb

@@ -7,24 +7,26 @@ module BitBucket
     class OAuth < Faraday::Middleware
       include BitBucket::Utils::Url
 
-      ACCESS_TOKEN = 'access_token'.freeze
       AUTH_HEADER  = 'Authorization'.freeze
 
-      dependency 'oauth'
+      dependency 'simple_oauth'
 
       def call(env)
         # Extract parameters from the query
         params = {  }.update query_params(env[:url])
 
         if (@token and @secret) and (!@token.empty? and !@secret.empty?)
-          env[:url].query = build_query params
-
           access_token = ::OAuth::AccessToken.new(@consumer, @token, @secret)
-          oauth_params = {:consumer => @consumer, :token => access_token}
-          req = Net::HTTP::Get.new env[:url].to_s
-          oauth_helper = ::OAuth::Client::Helper.new(req, oauth_params.merge(:request_uri => env[:url].to_s))
+          env[:url].query = build_query params
+          
+          puts oauth_helper.header
+          puts oauth_helper.header.class
           env[:request_headers].merge!(AUTH_HEADER => oauth_helper.header)
         end
+          
+          env[:url].query = build_query params
+
+
 
         @app.call env
       end

data/lib/bitbucket_rest_api/version.rb

@@ -4,7 +4,7 @@ module BitBucket
   module VERSION
     MAJOR = 0
     MINOR = 1
-    PATCH = 0
+    PATCH = 1
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bitbucket_rest_api
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-31 00:00:00.000000000Z
+date: 2012-08-06 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &70165761556820 !ruby/object:Gem::Requirement
+  requirement: &70111273293220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70165761556820
+  version_requirements: *70111273293220
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &70165761555840 !ruby/object:Gem::Requirement
+  requirement: &70111273292600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.8.1
   type: :runtime
   prerelease: false
-  version_requirements: *70165761555840
+  version_requirements: *70111273292600
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70165761554920 !ruby/object:Gem::Requirement
+  requirement: &70111273292020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,21 +43,21 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70165761554920
+  version_requirements: *70111273292020
 - !ruby/object:Gem::Dependency
-  name: oauth
-  requirement: &70165761554180 !ruby/object:Gem::Requirement
+  name: faraday_middleware
+  requirement: &70111273291360 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.1
   type: :runtime
   prerelease: false
-  version_requirements: *70165761554180
+  version_requirements: *70111273291360
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70165761552500 !ruby/object:Gem::Requirement
+  requirement: &70111273290740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,21 @@ dependencies:
         version: 1.5.2
   type: :runtime
   prerelease: false
-  version_requirements: *70165761552500
+  version_requirements: *70111273290740
+- !ruby/object:Gem::Dependency
+  name: simple_oauth
+  requirement: &70111273290120 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70111273290120
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70165761551240 !ruby/object:Gem::Requirement
+  requirement: &70111273288880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70165761551240
+  version_requirements: *70111273288880
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70165761550100 !ruby/object:Gem::Requirement
+  requirement: &70111273288020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70165761550100
+  version_requirements: *70111273288020
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70165761548520 !ruby/object:Gem::Requirement
+  requirement: &70111273269300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +109,10 @@ dependencies:
         version: 1.8.0
   type: :development
   prerelease: false
-  version_requirements: *70165761548520
+  version_requirements: *70111273269300
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: &70165761546980 !ruby/object:Gem::Requirement
+  requirement: &70111273268560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +120,10 @@ dependencies:
         version: 2.2.0
   type: :development
   prerelease: false
-  version_requirements: *70165761546980
+  version_requirements: *70111273268560
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70165761545860 !ruby/object:Gem::Requirement
+  requirement: &70111273267400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +131,10 @@ dependencies:
         version: 0.6.1
   type: :development
   prerelease: false
-  version_requirements: *70165761545860
+  version_requirements: *70111273267400
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70165761545080 !ruby/object:Gem::Requirement
+  requirement: &70111273266280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70165761545080
+  version_requirements: *70111273266280
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70165761544020 !ruby/object:Gem::Requirement
+  requirement: &70111273265240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +153,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70165761544020
+  version_requirements: *70111273265240
 - !ruby/object:Gem::Dependency
   name: guard-cucumber
-  requirement: &70165761543080 !ruby/object:Gem::Requirement
+  requirement: &70111273264600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +164,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70165761543080
+  version_requirements: *70111273264600
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70165761542340 !ruby/object:Gem::Requirement
+  requirement: &70111273263720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +175,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70165761542340
+  version_requirements: *70111273263720
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70165761541400 !ruby/object:Gem::Requirement
+  requirement: &70111273262820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,8 +186,8 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70165761541400
-description: ! ' Ruby wrapper for the BitBucket API '
+  version_requirements: *70111273262820
+description: ! ' Ruby wrapper for the BitBucket API supporting OAuth and Basic Authentication '
 email: mcochran@linux.com
 executables: []
 extensions: []
@@ -262,5 +273,5 @@ rubyforge_project:
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: Ruby wrapper for the BitBucket API
+summary: Ruby wrapper for the BitBucket API supporting OAuth and Basic Authentication
 test_files: []