redminer 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/redminer.rb

@@ -2,6 +2,6 @@ require 'net/http'
 require 'uri'
 require 'json'
 require 'yaml'
-require 'redminer/base'
-require 'redminer/issue'
-
+require File.dirname(__FILE__) + '/redminer/base'
+require File.dirname(__FILE__) + '/redminer/issue'
+require File.dirname(__FILE__) + '/redminer/server'

data/lib/redminer/base.rb

@@ -1,46 +1,22 @@
 module Redminer
   class Base
-    attr_accessor :server, :access_key
+    attr_accessor :server
 
     def initialize(host, access_key, options = {})
-      options = {:port => 80}.merge(options)
-      @server = Net::HTTP.new(host, options[:port])
-      @access_key = access_key
+      @server = Server.new(host, access_key, options)
     end
 
-    def request(path, params = nil, obj = Net::HTTP::Get)
-      req = obj.new(path)
-      req.add_field('X-Redmine-API-Key', access_key)
-      req.body = hash_to_querystring(params) if not params.nil? and not params.empty?
-      begin
-        if block_given?
-          yield server.request(req)
-        else
-          server.request(req).body
+    def all=(hash)
+      hash.each_pair { |k, v|
+        if respond_to?("#{k}=")
+          send("#{k}=", v)
         end
-      rescue Timeout::Error
-        raise "#{host}:#{port} does not respond"
-      end
+      }
+      self
     end
 
-    def hash_to_querystring(hash)
-      hash.keys.inject('') do |query_string, key|
-        value = case hash[key]
-          when Hash then hash[key].to_json
-          else hash[key].to_s
-        end
-        query_string << '&' unless key == hash.keys.first
-        query_string << "#{URI.encode(key.to_s)}=#{URI.encode(value)}"
-      end
-    end
-
-    def get(path, params = nil, &block); request(path, params, &block) end
-    def put(path, params = nil, &block); request(path, params, Net::HTTP::Put, &block) end
-    def post(path, params = nil, &block); request(path, params, Net::HTTP::Post, &block) end
-    def delete(path, params = nil, &block); request(path, params, Net::HTTP::Delete, &block) end
-
-    def issue(issue_key = nil)
-      Redminer::Issue.new(self, issue_key)
+    def method_missing(m, *args, &blk)
+      @server.send(m, *args, &blk)
     end
   end
 end

data/lib/redminer/issue.rb

@@ -1,56 +1,48 @@
 module Redminer
   class Issue < Redminer::Base
-    attr_reader :base, :id
-    attr_accessor :author, :project
-    attr_accessor :tracker, :status, :priority, :category
-    attr_accessor :subject, :description
-    attr_accessor :start_date, :due_date
-    attr_accessor :created_on, :updated_on
+    attr_reader :id
+    attr_accessor :author, :project,
+                  :tracker, :status, :priority, :category,
+                  :subject, :description,
+                  :start_date, :due_date,
+                  :created_on, :updated_on
 
-    def initialize(base, id = nil)
-      @base = base
+    def initialize(server, id = nil)
+      @server = server
       unless id.nil?
         @id = id
-        retrieve
+        self.retrieve
       end
     end
 
     def retrieve
-      response = base.get("/issues/#{id}.json")
+      response = server.get("/issues/#{id}.json")
       raise "#{id} issue does not exists" if response.nil?
-      origin = JSON.parse(response)["issue"]
-      origin.each_pair { |k, v|
-        if respond_to?("#{k}=")
-          send("#{k}=", v)
-        end
-      }
+      origin = response["issue"]
+      self.all = origin
       self
     end
 
-    def self.exists?(id)
-      (self.new(id) and true) rescue false
-    end
-
     def sync
       (@id.nil? ? create : update)
     end
 
     def craete
-      params = {
-        :subject => @subject,
-        :description => @description,
-        :project => @project
-      }
-      base.post("/issues.json", params)
+      server.post("/issues.json", to_hash)
     end
+
     def update(note = nil)
-      params = {
-        :subject => @subject,
-        :description => @description,
-        :project => @project
-      }
-      params.merge!(:notes => note) unless note.nil?
-      base.put("/issues/#{id}.json", params)
+      params = to_hash.merge(:notes => note) unless note.nil?
+      server.put("/issues/#{id}.json", params)
     end
+
+    private
+      def to_hash
+        {
+          :subject => @subject,
+          :description => @description,
+          :project => @project
+        }
+      end
   end
 end

data/lib/redminer/server.rb

@@ -0,0 +1,70 @@
+module Redminer
+  class Server
+    attr_accessor :http, :access_key
+    attr_accessor :verbose, :reqtrace
+
+    def initialize(host, access_key, options = {})
+      options = {:port => 80}.merge(options)
+      @http = Net::HTTP.new(host, options[:port])
+      @access_key = access_key
+      @verbose = options[:verbose]
+      @reqtrace = options[:reqtrace]
+    end
+
+    def request(path, params = nil, obj = Net::HTTP::Get)
+      puts "requesting... #{http.address}:#{http.port}#{path} by #{obj}" if verbose
+      puts caller.join("\n  ") if reqtrace
+      req = obj.new(path)
+      req.add_field('X-Redmine-API-Key', access_key)
+      req.body = hash_to_querystring(params) if not params.nil? and not params.empty?
+      begin
+        if block_given?
+          yield http.request(req)
+        else
+          response = http.request(req)
+          if response.code != "200"
+            raise "fail to request #{response.code}:#{response.message}"
+          end
+          return {} if response.body.nil? or response.body.strip.empty?
+          JSON.parse(response.body)
+        end
+      rescue Timeout::Error => e
+        raise e, "#{host}:#{port} timeout error", e.backtrace
+      rescue JSON::ParserError => e
+        raise e, "response json parsing error", e.backtrace
+      end
+    end
+
+    def hash_to_querystring(hash)
+      hash.keys.inject('') do |query_string, key|
+        value = case hash[key]
+          when Hash then hash[key].to_json
+          else hash[key].to_s
+        end
+        query_string << '&' unless key == hash.keys.first
+        query_string << "#{URI.encode(key.to_s)}=#{URI.encode(value)}"
+      end
+    end
+
+    def get(path, params = nil, &block); request(path, params, &block) end
+    def put(path, params = nil, &block); request(path, params, Net::HTTP::Put, &block) end
+    def post(path, params = nil, &block); request(path, params, Net::HTTP::Post, &block) end
+    def delete(path, params = nil, &block); request(path, params, Net::HTTP::Delete, &block) end
+
+    def current_user
+      Redminer::User.current(self)
+    end
+
+    def working?
+      begin
+        current_user and true
+      rescue
+        false
+      end
+    end
+
+    def issue(issue_key = nil)
+      Redminer::Issue.new(self, issue_key)
+    end
+  end
+end

data/lib/redminer/user.rb

@@ -0,0 +1,19 @@
+module Redminer
+  class User
+    attr_reader :id
+    attr_accessor :login, :firstname, :lastname, :mail
+
+    def initialize(server, id = nil)
+      @id = id
+    end
+
+    def self.current(server)
+      response = server.get('/users/current.json')
+      origin = response["user"]
+      c_user = self.new(server)
+      c_user.all = origin
+      c_user.instance_variable_get(:@id, origin["id"])
+      c_user
+    end
+  end
+end

data/redminer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "redminer"
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["insoul"]
-  s.date = "2012-04-05"
+  s.date = "2012-04-10"
   s.description = "Redmine rest api client"
   s.email = "insoul@thinkreals.com"
   s.extra_rdoc_files = [
@@ -26,6 +26,8 @@ Gem::Specification.new do |s|
     "lib/redminer.rb",
     "lib/redminer/base.rb",
     "lib/redminer/issue.rb",
+    "lib/redminer/server.rb",
+    "lib/redminer/user.rb",
     "redminer.gemspec",
     "test/helper.rb",
     "test/test_redminer.rb"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: redminer
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - insoul
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-05 00:00:00 Z
+date: 2012-04-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -125,6 +125,8 @@ files:
 - lib/redminer.rb
 - lib/redminer/base.rb
 - lib/redminer/issue.rb
+- lib/redminer/server.rb
+- lib/redminer/user.rb
 - redminer.gemspec
 - test/helper.rb
 - test/test_redminer.rb