tinybucket 1.0.1 → 1.1.0

data/lib/tinybucket/enumerator.rb

@@ -10,12 +10,13 @@ module Tinybucket
     # @param block [Proc] a proc object to handle each item.
     def initialize(iterator, block)
       @iterator = iterator
+      @block = block
 
       super() do |y|
         loop do
-          m = y.yield(@iterator.next)
-          m = block.call(m) if block
-          m
+          v = @iterator.next
+          m = @block ? @block.call(v) : v
+          y.yield(m)
         end
       end
 

data/lib/tinybucket/model.rb

@@ -5,8 +5,9 @@ module Tinybucket
     [
       :Base,
       :BranchRestriction,
-      :Commit,
+      :BuildStatus,
       :Comment,
+      :Commit,
       :ErrorResponse,
       :Page,
       :Profile,

data/lib/tinybucket/model/base.rb

@@ -5,6 +5,7 @@ module Tinybucket
       include Concerns::AcceptableAttributes
       include Concerns::Enumerable
       include Concerns::Reloadable
+      include Concerns::ApiCallable
 
       def self.concern_included?(concern_name)
         mod_name = "Tinybucket::Model::Concerns::#{concern_name}".constantize
@@ -36,23 +37,6 @@ module Tinybucket
 
       protected
 
-      def create_api(api_key, keys)
-        key = ('@' + api_key.underscore).intern
-        api = instance_variable_get(key)
-        return api if api.present?
-
-        api = create_instance(api_key)
-        api.repo_owner = keys[:repo_owner]
-        api.repo_slug  = keys[:repo_slug]
-        instance_variable_set(key, api)
-
-        api
-      end
-
-      def create_instance(klass_name)
-        ApiFactory.create_instance(klass_name)
-      end
-
       def logger
         Tinybucket.logger
       end

data/lib/tinybucket/model/build_status.rb

@@ -0,0 +1,55 @@
+module Tinybucket
+  module Model
+    # Build Status
+    #
+    # @see https://confluence.atlassian.com/bitbucket/statuses-build-resource-779295267.html
+    #   statuses/build Resource
+    #
+    # @!attribute [rw] state
+    #   @return [String]
+    # @!attribute [rw] type
+    #   @return [String]
+    # @!attribute [rw] key
+    #   @return [String]
+    # @!attribute [rw] name
+    #   @return [String]
+    # @!attribute [rw] url
+    #   @return [String]
+    # @!attribute [rw] description
+    #   @return [String]
+    # @!attribute [rw] links
+    #   @return [Hash]
+    class BuildStatus < Base
+      include Tinybucket::Model::Concerns::RepositoryKeys
+      include Tinybucket::Model::Concerns::Reloadable
+
+      acceptable_attributes \
+        :state, :type, :key, :name, :url, :description, :links, \
+        :created_on, :updated_on
+
+      attr_accessor :revision
+
+      # Update build status
+      #
+      # @param options [Hash]
+      # @option options [String] :state
+      # @return [Tinybucket::Model::BuildStatus]
+      def update(options)
+        build_status_api.put(revision, key, options).tap do |m|
+          m.repo_keys = repo_keys
+          m.revision = revision
+        end
+      end
+
+      private
+
+      def build_status_api
+        create_api('BuildStatus', repo_keys)
+      end
+
+      def load_model
+        build_status_api.find(revision, key)
+      end
+    end
+  end
+end

data/lib/tinybucket/model/commit.rb

@@ -36,14 +36,9 @@ module Tinybucket
       # Get comments which associate with this commit.
       #
       # @param options [Hash]
-      # @return [Tinybucket::Enumerator] enumerator to enumerate comments
-      #   as {Tinybucket::Model::Comment} instance.
+      # @return [Tinybucket::Resource::Commit::Comments]
       def comments(options = {})
-        enumerator(
-          comments_api,
-          :list,
-          options
-        ) { |m| block_given? ? yield(m) : m }
+        comments_resource(options)
       end
 
       # Get the specific commit comment which associate with this commit.
@@ -52,13 +47,14 @@ module Tinybucket
       # @param options [Hash]
       # @return [Tinybucket::Model::Comment]
       def comment(comment_id, options = {})
-        comments_api.find(comment_id, options)
+        comments_resource.find(comment_id, options)
       end
 
       # Give approval on this commit.
       #
       # @param options [Hash]
-      # @return [true, false]
+      # @return [true]
+      # @return [false]
       def approve(options = {})
         commit_api.approve(hash, options)
       end
@@ -66,19 +62,40 @@ module Tinybucket
       # Revoke approval on this commit.
       #
       # @param options [Hash]
-      # @return [true, false]
+      # @return [true]
+      # @return [false]
       def unapprove(options = {})
         commit_api.unapprove(hash, options)
       end
 
+      # Get build status resource
+      #
+      # @param options [Hash]
+      # @return [Tinybucket::Resource::Commit::BuildStatuses]
+      def build_statuses(options = {})
+        build_statuses_resource(options)
+      end
+
+      # Get the specific build status which associate with key.
+      #
+      # @param key [String]
+      # @param options [Hash]
+      # @return [Tinybucket::Model::BuildStatus]
+      # @return [nil] when build_status does not found.
+      def build_status(key, options = {})
+        build_statuses_resource.find(key, options)
+      rescue Tinybucket::Error::NotFound
+        nil
+      end
+
       private
 
-      def comments_api
-        raise ArgumentError, MISSING_REPOSITORY_KEY unless repo_keys?
+      def comments_resource(options = {})
+        Tinybucket::Resource::Commit::Comments.new(self, options)
+      end
 
-        api = create_api('Comments', repo_keys)
-        api.commented_to = self
-        api
+      def build_statuses_resource(options = {})
+        Tinybucket::Resource::Commit::BuildStatuses.new(self, options)
       end
 
       def commit_api

data/lib/tinybucket/model/concerns.rb

@@ -5,6 +5,7 @@ module Tinybucket
 
       [
         :AcceptableAttributes,
+        :ApiCallable,
         :Enumerable,
         :RepositoryKeys,
         :Reloadable

data/lib/tinybucket/model/concerns/api_callable.rb

@@ -0,0 +1,19 @@
+module Tinybucket
+  module Model
+    module Concerns
+      module ApiCallable
+        protected
+
+        def create_api(name, keys = {})
+          api = ApiFactory.create_instance(name)
+          return api if keys.empty?
+
+          api.tap do |m|
+            m.repo_owner = keys[:repo_owner]
+            m.repo_slug  = keys[:repo_slug]
+          end
+        end
+      end
+    end
+  end
+end

data/lib/tinybucket/model/profile.rb

@@ -31,50 +31,33 @@ module Tinybucket
       # Get this user's followers
       #
       # @param options [Hash]
-      # @return [Tinybucket::Enumerator] enumerator to enumerate followers
-      #   as {Tinybucket::Model::Profile} instance.
+      # @return [Tinybucket::Resource::User::Followers]
       def followers(options = {})
-        enumerator(
-          user_api,
-          :followers,
-          options
-        ) { |m| block_given? ? yield(m) : m }
+        Tinybucket::Resource::User::Followers.new(username, options)
       end
 
       # Get users which this user is following
       #
       # @param options [Hash]
-      # @return [Tinybucket::Enumerator] an enumerator to enumerate followings
-      #   as {Tinybucket::Model::Profile} instance.
+      # @return [Tinybucket::Resource::User::Following]
       def following(options = {})
-        enumerator(
-          user_api,
-          :following,
-          options
-        ) { |m| block_given? ? yield(m) : m }
+        Tinybucket::Resource::User::Following.new(username, options)
       end
 
       # Get this user's repositories
       #
       # @param options [Hash]
-      # @return [Tinybucket::Enumerator] an enumerator to enumerate repositories
-      #   as {Tinybucket::Model::Repository} instance.
+      # @return [Tinybucket::Resource::User::Repos]
       def repos(options = {})
-        enumerator(
-          user_api,
-          :repos,
-          options
-        ) { |m| block_given? ? yield(m) : m }
+        Tinybucket::Resource::User::Repos.new(username, options)
       end
 
       private
 
       def user_api
-        return @user if @user
-
-        @user = create_instance('User')
-        @user.username = username
-        @user
+        create_api('User').tap do |api|
+          api.username = username
+        end
       end
 
       def load_model

data/lib/tinybucket/model/pull_request.rb

@@ -55,14 +55,6 @@ module Tinybucket
         :created_on, :author, :updated_on, :merge_commit, :closed_by,
         :reviewers, :participants, :uuid, :type
 
-      # Create a new pull request.
-      #
-      # @todo to be implemented.
-      # @raise [NotImplementedError] to be implemented.
-      def create(_params)
-        raise NotImplementedError
-      end
-
       # Update this pull request.
       #
       # @todo to be implemented.
@@ -98,36 +90,26 @@ module Tinybucket
       # Get commits associated with this pull request.
       #
       # @param options [Hash]
-      # @return [Tinybucket::Enumerator] enumerator to enumerate commits
-      #   as {Tinybucket::Model::Commit} instance.
+      # @return [Tinybucket::Resource::PullRequest::Commits]
       def commits(options = {})
-        enumerator(
-          pull_request_api,
-          :commits,
-          id,
-          options
-        ) { |m| block_given? ? yield(m) : m }
+        commits_resource(options)
       end
 
       # Get comments on this pull request.
       #
       # @param options [Hash]
-      # @return [Tinybucket::Enumerator] enumerator to enumerate comments
-      #   as {Tinybucket::Model::Comment} instance.
+      # @return [Tinybucket::Resource::PullRequest::Comments]
       def comments(options = {})
-        enumerator(
-          comment_api,
-          :list,
-          options
-        ) { |m| block_given? ? yield(m) : m }
+        comments_resource(options)
       end
 
       # Get the specific comment on this pull request.
       #
+      # @param comment_id [String]
       # @param options [Hash]
       # @return [Tinybucket::Model::Comment]
       def comment(comment_id, options = {})
-        comment_api.find(comment_id, options)
+        comments_resource.find(comment_id, options)
       end
 
       # Get the diff for this pull request.
@@ -146,12 +128,20 @@ module Tinybucket
         pull_request_api.merge(id, options)
       end
 
+      # Get activities on this pull requests.
+      #
+      def activities(_options = {})
+        raise NotImplementedError
+      end
+
       private
 
-      def comment_api
-        api = create_api('Comments', repo_keys)
-        api.commented_to = self
-        api
+      def commits_resource(options = {})
+        Tinybucket::Resource::PullRequest::Commits.new(self, options)
+      end
+
+      def comments_resource(options = {})
+        Tinybucket::Resource::PullRequest::Comments.new(self, options)
       end
 
       def pull_request_api

data/lib/tinybucket/model/repository.rb

@@ -58,14 +58,6 @@ module Tinybucket
         end
       end
 
-      # Create a new repository.
-      #
-      # @todo to be implemented.
-      # @raise [NotImplementedError] to be implemented.
-      def create(_params)
-        raise NotImplementedError
-      end
-
       # Remove this repository
       #
       # @todo to be implemented.
@@ -80,14 +72,7 @@ module Tinybucket
       # @return [Tinybucket::Enumerator] an enumerator to enumerate
       #   pull requests as {Tinybucket::Model::PullRequest} instance.
       def pull_requests(options = {})
-        enumerator(
-          pull_requests_api,
-          :list,
-          options
-        ) do |m|
-          inject_repo_keys(m)
-          block_given? ? yield(m) : m
-        end
+        pull_requests_resource(options)
       end
 
       # Get the specific pull request on this repository.
@@ -95,61 +80,32 @@ module Tinybucket
       # @param pullrequest_id [String]
       # @param options [Hash]
       # @return [Tinybucket::Model::PullRequest]
-      def pull_request(pullrequest_id = nil, options = {})
-        m = if pullrequest_id.present?
-              pull_requests_api.find(pullrequest_id, options)
-            else
-              Tinybucket::Model::PullRequest.new({})
-            end
-        inject_repo_keys(m)
+      def pull_request(pullrequest_id, options = {})
+        pull_requests_resource.find(pullrequest_id, options)
       end
 
       # Get watchers on this repository.
       #
       # @param options [Hash]
-      # @return [Tinybucket::Enumerator] an enumerator to enumerate watchers
-      #   as {Tinybucket::Model::Profile} instance.
+      # @return [Tinybucket::Resource::Watchers]
       def watchers(options = {})
-        enumerator(
-          repo_api,
-          :watchers,
-          options
-        ) do |m|
-          inject_repo_keys(m)
-          block_given? ? yield(m) : m
-        end
+        watchers_resource(options)
       end
 
       # Get repository forks.
       #
       # @param options [Hash]
-      # @return [Tinybucket::Enumerator] an enumerator to enumerate forks
-      #   as {Tinybucket::Model::Repository} instance.
+      # @return [Tinybucket::Resource::Forks]
       def forks(options = {})
-        enumerator(
-          repo_api,
-          :forks,
-          options
-        ) do |m|
-          inject_repo_keys(m)
-          block_given? ? yield(m) : m
-        end
+        forks_resource(options)
       end
 
       # Get commits on this repository.
       #
       # @param options [Hash]
-      # @return [Tinybucket::Enumerator] an enumerator to enumerate commits
-      #   as {Tinybucket::Model::Commit} instance.
+      # @return [Tinybucket::Resource::Commits]
       def commits(options = {})
-        enumerator(
-          commits_api,
-          :list,
-          options
-        ) do |m|
-          inject_repo_keys(m)
-          block_given? ? yield(m) : m
-        end
+        commits_resource(options)
       end
 
       # Get the specific commit on this repository.
@@ -158,25 +114,15 @@ module Tinybucket
       # @param options [Hash]
       # @return [Tinybucket::Model::Commit]
       def commit(revision, options = {})
-        m = commits_api.find(revision, options)
-        inject_repo_keys(m)
+        commits_resource.find(revision, options)
       end
 
       # Get the branch restriction information associated with this repository.
       #
       # @param options [Hash]
-      # @return [Tinybucket::Enumerator] an enumerator to enumerate
-      #   branch restriction information as
-      #   {Tinybucket::Model::BranchRestriction} instance.
+      # @return [Tinybucket::Resource::BranchRestrictions]
       def branch_restrictions(options = {})
-        enumerator(
-          restrictions_api,
-          :list,
-          options
-        ) do |m|
-          inject_repo_keys(m)
-          block_given? ? yield(m) : m
-        end
+        branch_restrictions_resource(options)
       end
 
       # Get the specific branch restriction information on this repository.
@@ -185,8 +131,7 @@ module Tinybucket
       # @param options [Hash]
       # @return [Tinybucket::Model::BranchRestriction]
       def branch_restriction(restriction_id, options = {})
-        m = restrictions_api.find(restriction_id, options)
-        inject_repo_keys(m)
+        branch_restrictions_resource.find(restriction_id, options)
       end
 
       # Get the diff for this repository.
@@ -210,20 +155,28 @@ module Tinybucket
 
       private
 
-      def pull_requests_api
-        create_api('PullRequests', repo_keys)
+      def branch_restrictions_resource(options = {})
+        Tinybucket::Resource::BranchRestrictions.new(self, options)
       end
 
-      def repo_api
-        create_api('Repo', repo_keys)
+      def commits_resource(options = {})
+        Tinybucket::Resource::Commits.new(self, options)
+      end
+
+      def pull_requests_resource(options = {})
+        Tinybucket::Resource::PullRequests.new(self, options)
+      end
+
+      def watchers_resource(options = {})
+        Tinybucket::Resource::Watchers.new(self, options)
       end
 
-      def commits_api
-        create_api('Commits', repo_keys)
+      def forks_resource(options = {})
+        Tinybucket::Resource::Forks.new(self, options)
       end
 
-      def restrictions_api
-        create_api('BranchRestrictions', repo_keys)
+      def repo_api
+        create_api('Repo', repo_keys)
       end
 
       def diff_api