you_track 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 955e0cbeff48652b234859b7f9dcd451ace204bb
-  data.tar.gz: 3f06505e3d48a2f81810fc57e3dd2f598d7fe374
+  metadata.gz: d654b31db68a4ca3c3cfa398cccf07eced13ec79
+  data.tar.gz: 26c79fb2b4900eed1001c615799231edaaf09616
 SHA512:
-  metadata.gz: d0f07989847a8b6fce2b885e2434d23df4835f247ddae23bbf37d3551e978d15e77b809732de59be01f00b7ec9c8da43ea86f8d69bb4e13c2248f7e9f9042f7f
-  data.tar.gz: 05cba23274ba3d4f655ae550b2d039ed2fc20d014458655fef93420bad47aca7407d129f141e954c320e77c8f1d1a8f9209549bce6ac04899e61b10910257208
+  metadata.gz: 0950583b556fc92462e59f7609ec3e98da2645552b9e51377398362036d68694f67445260a78038c2e80cfa93a29d9f4940c02f624bb563d5fc061eec66c9a7b
+  data.tar.gz: 13d02d870e5e9f5c5dbef8d4c1eb78c0780b393c5515af8afb0cee1fae465f1ea69438dab008ec1f5f412e4bc8273272589b61a46d86bbfd61b4af22f6c292d7

data/lib/you_track/client/mock.rb

@@ -7,20 +7,8 @@ class YouTrack::Client::Mock
         :issues   => {},
         :comments => {},
         :users    => {},
-        :projects => {
-          "YTD" => {
-            "name"        => "You Track Dev",
-            "shortName"   => "YTD",
-            "versions"    => [],
-            "assignees"   => {},
-            "isImporting" => "false",
-            "description" => "Fake project for YouTrack development",
-          }
-        },
+        :projects => {},
         :custom_fields => {
-          "YTD" => [
-            {"name" => "Fix versions", "url" => "https://foo.bar/rest/admin/project/YTD/customfield/Fix%20versions"}
-          ]
         }
       }
     }
@@ -38,7 +26,7 @@ class YouTrack::Client::Mock
 
   def url_for(path, options={})
     URI.parse(
-      File.join(self.url.to_s, "/rest", path.to_s)
+      File.join(self.url.to_s, "/rest", URI.escape(path.to_s))
     ).tap do |uri|
       if query = options[:query]
         uri.query = Faraday::NestedParamsEncoder.encode(query)
@@ -67,7 +55,7 @@ class YouTrack::Client::Mock
     url  = options[:url] || url_for(path, query: params)
 
     request_headers  = {"Accept"       => "application/xml"}
-    response_headers = {"Content-Type" => "application/xml"}
+    response_headers = {"Content-Type" => "application/xml"}.merge(options[:response_headers] || {})
 
     # request phase
     # * :method - :get, :post, ...

data/lib/you_track/client/model.rb

@@ -8,4 +8,8 @@ class YouTrack::Client::Model
       end
     }
   end
+
+  def require_admin!
+    raise YouTrack::NotAnAdminError unless service.current_user.admin?
+  end
 end

data/lib/you_track/client/models/issue.rb

@@ -5,9 +5,9 @@ class YouTrack::Client::Issue < YouTrack::Client::Model
   attribute :comment_count, alias: "commentsCount", type: :integer
   attribute :comments, type: :array
   attribute :created_at, alias: "created", parser: ms_time
-  attribute :custom_fields, type: :array
+  attribute :custom_fields, default: [], parser: lambda { |v, _| Hash[v] }
   attribute :description
-  attribute :project, alias: "projectShortName"
+  attribute :project_id, alias: "projectShortName"
   attribute :project_index, alias: "numberInProject", type: :integer
   attribute :reporter, alias: "reporterFullName"
   attribute :reporter_username, alias: "reporterName"
@@ -33,7 +33,7 @@ class YouTrack::Client::Issue < YouTrack::Client::Model
   end
 
   def state
-    custom_fields.detect { |f| f[0] == 'State' }.last
+    custom_fields["State"]
   end
 
   def state=(new_state)
@@ -41,29 +41,40 @@ class YouTrack::Client::Issue < YouTrack::Client::Model
     self.reload
   end
 
+  def project=(project)
+    self.project_id = (project.is_a?(YouTrack::Client::Project) ? project.identity : project)
+  end
+
   def project
-    service.projects.get(self.attributes[:project])
+    requires :project_id
+
+    service.projects.get(self.project_id)
   end
 
   def save
     if new_record?
-      requires :project, :summary
+      requires :summary, :project_id
 
-      service.create_issue(
-        "project"         => self.attributes[:project],
+      response = service.create_issue(
+        "project"         => self.project_id,
         "summary"         => self.summary,
         "description"     => self.description,
         "attachments"     => self.attachments,
         "permittedGroups" => self.permitted_group,
       )
 
-      merge_attributes(project.issues.detect { |s| s.summary == summary }.attributes) # hacky, but the create request returns nothing
+      merge_attributes(
+        :id => File.basename(response.headers["Location"]),
+      )
+
+      reload
     else
       requires :identity
+
       service.update_issue(
         "id"          => self.identity,
         "summary"     => self.summary,
-        "description" => self.description
+        "description" => self.description,
       )
       self.reload
     end

data/lib/you_track/client/models/issues.rb

@@ -3,7 +3,9 @@ class YouTrack::Client::Issues < YouTrack::Client::Collection
   model YouTrack::Client::Issue
 
   def all(project, filters={})
-    service.issues.load(service.get_issues(project, filters).body)
+    project_id = (project.respond_to?(:identity) ? project.identity : project)
+
+    load(service.get_issues(project_id, filters).body)
   end
 
   def get(identity)

data/lib/you_track/client/models/project.rb

@@ -1,33 +1,70 @@
 class YouTrack::Client::Project < YouTrack::Client::Model
   identity :id, aliases: ["shortName"]
 
-  attribute :versions,     type: :array
+  attribute :versions,     type: :array, default: []
   attribute :name
   attribute :description
   attribute :is_importing, type: :boolean, aliases: ["isImporting"]
   attribute :assignees
 
+  attr_accessor :starting_number, :lead, :prefix
+
   def issues
-    service.issues.all(self.id)
+    service.issues.all(self.identity)
   end
 
   def custom_fields
     service.get_project_custom_fields(self.id).body
   end
 
+  def save
+    if new_record?
+      requires :name, :prefix
+
+      starting_number = self.starting_number || 1
+      lead            = self.lead            || service.current_user
+
+      lead_id = (lead.is_a?(YouTrack::Client::User) ? lead.identity : lead)
+
+      service.create_project(
+        "projectId"        => self.prefix,
+        "projectName"      => self.name,
+        "startingNumber"   => starting_number,
+        "projectLeadLogin" => lead_id,
+        "description"      => self.description,
+      )
+
+      merge_attributes(
+        :identity => self.prefix,
+      )
+    else
+      raise NotImplementedError
+    end
+  end
+
   def add_version(version)
-    raise YouTrack::NotAnAdminError unless service.current_user.admin?
+    require_admin!
 
     unless versions.include?(version)
       service.add_project_fix_version('project' => self.id, 'version' => version)
+      self.versions << version
     end
+
+    self.versions
+  end
+
+  def reload
+    merge_attributes(collection.reload.get(self.identity).attributes)
   end
 
   def remove_version(version)
-    raise YouTrack::NotAnAdminError unless service.current_user.admin?
+    require_admin!
 
     if versions.include?(version)
       service.remove_project_fix_version('project' => self.id, 'version' => version)
+      self.versions.delete(version)
     end
+
+    self.versions
   end
 end

data/lib/you_track/client/models/projects.rb

@@ -2,10 +2,10 @@ class YouTrack::Client::Projects < YouTrack::Client::Collection
   model YouTrack::Client::Project
 
   def all
-    service.projects.load(service.get_projects.body)
+    load(service.get_projects.body)
   end
 
   def get(identity)
-    all.detect { |p| p.id == identity }
+    find { |p| p.identity == identity }
   end
 end

data/lib/you_track/client/real.rb

@@ -48,7 +48,7 @@ class YouTrack::Client::Real
     raise RuntimeError, "Missing required options: #{missing.inspect}" unless missing.empty?
   end
 
-  def request(options={})
+  def authenticate!
     # @note first request gets the cookie
     if !@authenticated && !@authenticating
 
@@ -65,6 +65,10 @@ class YouTrack::Client::Real
         @authenticated = true
       }
     end
+  end
+
+  def request(options={})
+    authenticate!
 
     method    = options[:method] || :get
     query     = options[:query]

data/lib/you_track/client/request.rb

@@ -3,4 +3,19 @@ class YouTrack::Client::Request
     service.data.fetch(collection)[id] ||
       service.response(status: 404, body: {"error" => "#{collection.to_s.gsub(/s\Z/, "").capitalize} not found."})
   end
+
+  def require_parameters(_params, *_requirements)
+    params       = Cistern::Hash.stringify_keys(_params)
+    requirements = _requirements.map(&:to_s)
+
+    requirements.each do |requirement|
+      unless !params[requirement].nil?
+        response(
+          :status => 400,
+          :body   => {"error" => "Bad Request"})
+      end
+    end
+    values = params.values_at(*requirements)
+    values.size == 1 ? values.first : values
+  end
 end

data/lib/you_track/client/requests/add_project_fix_version.rb

@@ -11,9 +11,8 @@ class YouTrack::Client::AddProjectFixVersion < YouTrack::Client::Request
 
   def mock(params={})
     project = find(:projects, params.delete("project"))
-    version = params.delete("version")
 
-    project["versions"] << version
+    project["versions"] << params.delete("version")
 
     service.response
   end

data/lib/you_track/client/requests/create_issue.rb

@@ -40,6 +40,9 @@ class YouTrack::Client::CreateIssue < YouTrack::Client::Request
     service.data[:issues][identity] = issue
 
     service.response(
+      :response_headers => {
+        "Location" => service.url_for("/issue/#{identity}"),
+      },
       :status => 201,
     )
   end

data/lib/you_track/client/requests/create_project.rb

@@ -0,0 +1,41 @@
+# https://confluence.jetbrains.com/display/YTD6/PUT+Project
+class YouTrack::Client::CreateProject < YouTrack::Client::Request
+  def self.accepted_attributes
+    # "projectId",        # string  required   Unique identifier of a project to be created. This short name will be used as prefix in issue IDs for this project.
+    @_accepted_attributes ||= [
+      "projectName",      # string  required   Full name of a new project. Must be unique.
+      "startingNumber",   # integer required   Number to assign to the next manually created issue.
+      "projectLeadLogin", # string  required   Login name of a user to be assigned as a project leader.
+      "description",      # string  Optional   description of the new project.
+    ]
+  end
+
+  def real(params)
+    service.request(
+      :path   => "/admin/project/#{params.fetch("projectId")}",
+      :method => :put,
+      :params => Cistern::Hash.slice(params, *self.class.accepted_attributes),
+    )
+  end
+
+  def mock(params)
+    identity = params.fetch("projectId")
+
+    service.data[:projects][identity] = {
+      "isImporting"    => "false",
+      "lead"           => params.fetch("projectLeadLogin"), # @todo check user login
+      "shortName"      => identity,
+      "name"           => params.fetch("projectName"),
+      "startingNumber" => params.fetch("startingNumber"),
+      "sub"            => { "value" => "No subsystem" },
+      "versions"       => [],
+    }.merge(Cistern::Hash.slice(params, "description"))
+
+    # @hack
+    service.data[:custom_fields][identity] = [
+      {"name" => "Fix versions", "url" => service.url_for("/admin/project/#{identity}/customfield/Fix versions")}
+    ]
+
+    service.response(status: 201)
+  end
+end

data/lib/you_track/client/requests/get_issues.rb

@@ -15,6 +15,10 @@ class YouTrack::Client::GetIssues < YouTrack::Client::Request
       issues.delete_if.with_index { |x,i| i < (filters["after"].to_i - 1) }
     end
 
+    max = filters["max"] || 10
+
+    issues.slice!(max)
+
     service.response(
       :body => issues
     )

data/lib/you_track/client/requests/get_projects.rb

@@ -1,4 +1,9 @@
 class YouTrack::Client::GetProjects < YouTrack::Client::Request
+
+  def self.attributes
+    @_attributes ||= %w[name shortName isImporting subsystems assignees versions]
+  end
+
   def real
     service.request(
       :path   => "/project/all",
@@ -9,7 +14,7 @@ class YouTrack::Client::GetProjects < YouTrack::Client::Request
 
   def mock
     service.response(
-      :body => service.data[:projects].values
+      :body => service.data[:projects].values.map { |p| Cistern::Hash.slice(p, *self.class.attributes) }
     )
   end
 end

data/lib/you_track/client.rb

@@ -19,6 +19,7 @@ requests = %w(
   add_project_fix_version
   apply_issue_command
   create_issue
+  create_project
   get_admin_user
   get_current_user
   get_issue

data/lib/you_track/version.rb

@@ -1,3 +1,3 @@
 module YouTrack
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: you_track
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Josh Lane
@@ -146,6 +146,7 @@ files:
 - lib/you_track/client/requests/add_project_fix_version.rb
 - lib/you_track/client/requests/apply_issue_command.rb
 - lib/you_track/client/requests/create_issue.rb
+- lib/you_track/client/requests/create_project.rb
 - lib/you_track/client/requests/get_admin_user.rb
 - lib/you_track/client/requests/get_current_user.rb
 - lib/you_track/client/requests/get_issue.rb