producteev 0.0.3 → 1.0.0

data/lib/producteev/activities.rb

@@ -1,24 +1,23 @@
 module Producteev
     class Activities
-      @api = nil
-      def initialize(api)
-        @api = api
+      def initialize(token)
+        @token = token
       end
 
       def show_activities(options = {})
-        return @api.send_request("/activities/show_activities.json",options)
+        return Producteev::Api.instance.send_request("/activities/show_activities.json",options,@token)
       end
 
       def show_notifications(options = {})
-        return @api.send_request("/activities/show_notifications.json",options)
+        return Producteev::Api.instance.send_request("/activities/show_notifications.json",options,@token)
       end
 
       def notifications_set_read(options = {})
-        return @api.send_request("/activities/notifications_set_read.json",options)
+        return Producteev::Api.instance.send_request("/activities/notifications_set_read.json",options,@token)
       end
 
       def set_read(options = {})
-        return @api.send_request("/activities/set_read.json",options)
+        return Producteev::Api.instance.send_request("/activities/set_read.json",options,@token)
       end
   end
 end

data/lib/producteev/api.rb

@@ -3,17 +3,19 @@ module Producteev
       include HTTParty
       base_uri 'https://api.producteev.com/'
 
-      def initialize(apikey,secret, debug)
-        @apikey = apikey
-        @secret = secret
-        @token = nil
-        @debug = debug
+      @@instance = Api.new
+     
+      def self.instance
+        return @@instance
       end
 
-      def login(email,password)
-        param = {:email => email, :password => password}
-        @token = self.send_request("/users/login.json",param)['login']['token']
+      def api_set(apikey, secret, debug)
+        @@apikey = apikey
+        @@secret = secret
+        @debug = debug
       end
+     
+      private_class_method :new
 
       def generate_signature(parameters)
         signature = ""
@@ -26,17 +28,17 @@ module Producteev
             signature = "#{signature}#{key}#{value}"
           end
         }
-        signature = signature+@secret
+        signature = "#{signature}#{@@secret}"
         signature = Digest::MD5.hexdigest(signature)
         return signature
       end
 
 
-      def send_request(path, options={})
-        options.merge!({:api_key => @apikey})
+      def send_request(path, options={},token = nil)
+        options.merge!({:api_key => @@apikey})
 
-        if @token != nil
-          options.merge!({:token => @token})
+        if token != nil
+          options.merge!({:token => token})
         end
         options.merge!({:api_sig => generate_signature(options)})
 

data/lib/producteev/client.rb

@@ -1,37 +1,33 @@
 module Producteev
   class Client
-    @api = nil
-
-    def initialize(apikey,secret, debug = false)
-      @api = Producteev::Api.new(apikey,secret, debug)
-    end
-
-    def login(email,password)
-      @api.login(email,password)
+   
+    def initialize(email,password)
+      param = {:email => email, :password => password}
+      @token = Producteev::Api.instance.send_request("/users/login.json",param)['login']['token']
     end
 
     def tasks()
-      return Producteev::Tasks.new(@api)
+      return Producteev::Tasks.new(@token)
     end
 
     def labels()
-       return Producteev::Labels.new(@api)
+       return Producteev::Labels.new(@token)
     end
 
     def time()
-     return @api.send_request("/time.json")
+      return Producteev::Api.instance.send_request("/time.json",{},@token)
     end
 
     def activities()
-       return Producteev::Activities.new(@api)
+       return Producteev::Activities.new(@token)
     end
 
     def dashboards()
-       return Producteev::Dashboards.new(@api)
+       return Producteev::Dashboards.new(@token)
     end
 
     def users()
-       return Producteev::Users.new(@api)
+       return Producteev::Users.new(@token)
     end
 
   end

data/lib/producteev/dashboards.rb

@@ -1,72 +1,71 @@
 module Producteev
     class Dashboards
-      @api = nil
-      def initialize(api)
-        @api = api
+      def initialize(token)
+        @token = token
       end
 
       def create(options = {})
-        return @api.send_request("/dashboards/create.json",options)
+        return Producteev::Api.instance.send_request("/dashboards/create.json",options,@token)
       end
 
       def view(options = {})
-        return @api.send_request("/dashboards/view.json",options)
+        return Producteev::Api.instance.send_request("/dashboards/view.json",options,@token)
       end
 
       def show_list(options = {})
-        return @api.send_request("/dashboards/show_list.json",options)
+        return Producteev::Api.instance.send_request("/dashboards/show_list.json",options,@token)
       end
 
       def access(options = {})
-        return @api.send_request("/dashboards/access.json",options)
+        return Producteev::Api.instance.send_request("/dashboards/access.json",options,@token)
       end
 
       def leave(options = {})
-        return @api.send_request("/dashboards/leave.json",options)
+        return Producteev::Api.instance.send_request("/dashboards/leave.json",options,@token)
       end
 
       def set_title(options = {})
-        return @api.send_request("/dashboards/set_title.json",options)
+        return Producteev::Api.instance.send_request("/dashboards/set_title.json",options,@token)
       end
 
       def set_smart_labels(options = {})
-        return @api.send_request("/dashboards/set_smart_labels.json",options)
+        return Producteev::Api.instance.send_request("/dashboards/set_smart_labels.json",options,@token)
       end
 
       def delete(options = {})
-        return @api.send_request("/dashboards/delete.json",options)
+        return Producteev::Api.instance.send_request("/dashboards/delete.json",options,@token)
       end
 
       def tasks(options = {})
-        return @api.send_request("/dashboards/tasks.json",options)
+        return Producteev::Api.instance.send_request("/dashboards/tasks.json",options,@token)
       end
 
       def confirm(options = {})
-        return @api.send_request("/dashboards/confirm.json",options)
+        return Producteev::Api.instance.send_request("/dashboards/confirm.json",options,@token)
       end
 
       def refuse(options = {})
-        return @api.send_request("/dashboards/refuse.json",options)
+        return Producteev::Api.instance.send_request("/dashboards/refuse.json",options,@token)
       end
 
       def invite_user_by_id(options = {})
-        return @api.send_request("/dashboards/invite_user_by_id.json",options)
+        return Producteev::Api.instance.send_request("/dashboards/invite_user_by_id.json",options,@token)
       end
 
       def invite_user_by_email(options = {})
-        return @api.send_request("/dashboards/invite_user_by_email.json",options)
+        return Producteev::Api.instance.send_request("/dashboards/invite_user_by_email.json",options,@token)
       end
 
       def need_upgrade_list(options = {})
-        return @api.send_request("/dashboards/need_upgrade_list.json",options)
+        return Producteev::Api.instance.send_request("/dashboards/need_upgrade_list.json",options,@token)
       end
 
       def needs_upgrade(options = {})
-        return @api.send_request("/dashboards/needs_upgrade.json",options)
+        return Producteev::Api.instance.send_request("/dashboards/needs_upgrade.json",options,@token)
       end
 
       def reorder(options = {})
-        return @api.send_request("/dashboards/reorder.json",options)
+        return Producteev::Api.instance.send_request("/dashboards/reorder.json",options,@token)
       end
 
   end

data/lib/producteev/labels.rb

@@ -1,32 +1,31 @@
 module Producteev
     class Labels
-      @api = nil
-      def initialize(api)
-        @api = api
+      def initialize(token)
+        @token = token
       end
 
       def create(options = {})
-        return @api.send_request("/labels/create.json",options)
+        return Producteev::Api.instance.send_request("/labels/create.json",options,@token)
       end
 
       def delete(options = {})
-        return @api.send_request("/labels/delete.json",options)
+        return Producteev::Api.instance.send_request("/labels/delete.json",options,@token)
       end
 
       def view(options = {})
-        return @api.send_request("/labels/view.json",options)
+        return Producteev::Api.instance.send_request("/labels/view.json",options,@token)
       end
 
       def show_list(options = {})
-        return @api.send_request("/labels/show_list.json",options)
+        return Producteev::Api.instance.send_request("/labels/show_list.json",options,@token)
       end
 
       def tasks(options = {})
-        return @api.send_request("/labels/tasks.json",options)
+        return Producteev::Api.instance.send_request("/labels/tasks.json",options,@token)
       end
 
       def set_title(options = {})
-        return @api.send_request("/labels/set_title.json",options)
+        return Producteev::Api.instance.send_request("/labels/set_title.json",options,@token)
       end
   end
 end

data/lib/producteev/tasks.rb

@@ -1,112 +1,111 @@
 module Producteev
     class Tasks
-      @api = nil
-      def initialize(api)
-        @api = api
+      def initialize(token)
+        @token = token
       end
 
       def create(options = {})
-        return @api.send_request("/tasks/create.json",options)
+        return  Producteev::Api.instance.send_request("/tasks/create.json", options,@token)
       end
 
       def delete(options = {})
-        return @api.send_request("/tasks/delete.json",options)
+        return  Producteev::Api.instance.send_request("/tasks/delete.json",options,@token)
       end
 
       def view(options = {})
-        return @api.send_request("/tasks/view.json",options)
+        return  Producteev::Api.instance.send_request("/tasks/view.json",options,@token)
       end
 
       def show_list(options = {})
-        return @api.send_request("/tasks/show_list.json",options)
+        return  Producteev::Api.instance.send_request("/tasks/show_list.json",options,@token)
       end
       
       def my_tasks(options = {})
-        return @api.send_request("/tasks/show_list.json",options)
+        return  Producteev::Api.instance.send_request("/tasks/show_list.json",options,@token)
       end
 
       def my_tasks(options = {})
-        return @api.send_request("/tasks/archived.json",options)
+        return  Producteev::Api.instance.send_request("/tasks/archived.json",options,@token)
       end
 
       def my_team_tasks(options = {})
-        return @api.send_request("/tasks/my_team_tasks.json",options)
+        return  Producteev::Api.instance.send_request("/tasks/my_team_tasks.json",options,@token)
       end
 
       def set_title(options = {})
-        return @api.send_request("/tasks/set_title.json",options)
+        return  Producteev::Api.instance.send_request("/tasks/set_title.json",options,@token)
       end
 
       def set_status(options = {})
-        return @api.send_request("/tasks/set_status.json",options)
+        return  Producteev::Api.instance.send_request("/tasks/set_status.json",options,@token)
       end
 
       def set_star(options = {})
-        return @api.send_request("/tasks/set_star.json",options)
+        return  Producteev::Api.instance.send_request("/tasks/set_star.json",options,@token)
       end
 
       def set_responsible(options = {})
-        return @api.send_request("/tasks/set_responsible.json",options)
+        return  Producteev::Api.instance.send_request("/tasks/set_responsible.json",options,@token)
       end
 
       def unset_responsible(options = {})
-        return @api.send_request("/tasks/unset_responsible.json",options)
+        return  Producteev::Api.instance.send_request("/tasks/unset_responsible.json",options,@token)
       end
 
       def set_deadline(options = {})
-        return @api.send_request("/tasks/set_deadline.json",options)
+        return  Producteev::Api.instance.send_request("/tasks/set_deadline.json",options,@token)
       end
 
       def unset_deadline(options = {})
-        return @api.send_request("/tasks/unset_deadline.json",options)
+        return  Producteev::Api.instance.send_request("/tasks/unset_deadline.json",options,@token)
       end
 
       def set_reminder(options = {})
-        return @api.send_request("/tasks/set_reminder.json",options)
+        return  Producteev::Api.instance.send_request("/tasks/set_reminder.json",options,@token)
       end
 
       def set_repeating(options = {})
-        return @api.send_request("/tasks/set_repeating.json",options)
+        return  Producteev::Api.instance.send_request("/tasks/set_repeating.json",options,@token)
       end
 
       def unset_repeating(options = {})
-        return @api.send_request("/tasks/unset_repeating.json",options)
+        return  Producteev::Api.instance.send_request("/tasks/unset_repeating.json",options,@token)
       end
 
       def labels(options = {})
-        return @api.send_request("/tasks/labels.json",options)
+        return  Producteev::Api.instance.send_request("/tasks/labels.json",options,@token)
       end
 
       def change_labels(options = {})
-        return @api.send_request("/tasks/change_labels.json",options)
+        return  Producteev::Api.instance.send_request("/tasks/change_labels.json",options,@token)
       end
 
       def set_workspace(options = {})
-        return @api.send_request("/tasks/set_workspace.json",options)
+        return  Producteev::Api.instance.send_request("/tasks/set_workspace.json",options,@token)
       end
 
       def note_view(options = {})
-        return @api.send_request("/tasks/note_view.json",options)
+        return  Producteev::Api.instance.send_request("/tasks/note_view.json",options,@token)
       end
 
       def notes_get(options = {})
-        return @api.send_request("/tasks/notes_get.json",options)
+        return  Producteev::Api.instance.send_request("/tasks/notes_get.json",options,@token)
       end
 
       def note_create(options = {})
-        return @api.send_request("/tasks/note_create.json",options)
+        return  Producteev::Api.instance.send_request("/tasks/note_create.json",options,@token)
       end
 
       def note_delete(options = {})
-        return @api.send_request("/tasks/note_delete.json",options)
+        return  Producteev::Api.instance.send_request("/tasks/note_delete.json",options,@token)
       end
 
       def activity_view(options = {})
-        return @api.send_request("/tasks/activity_view.json",options)
+        return  Producteev::Api.instance.send_request("/tasks/activity_view.json",options,@token)
       end
 
       def activities_get(options = {})
-        return @api.send_request("/tasks/activities_get.json",options)
+        return  Producteev::Api.instance.send_request("/tasks/activities_get.json",options,@token)
       end
   end
 end

data/lib/producteev/version.rb

@@ -1,8 +1,8 @@
 module Producteev
   module VERSION
-    MAJOR = 0
+    MAJOR = 1
     MINOR = 0
-    PATCH = 3
+    PATCH = 0
     BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.');

data/lib/producteev.rb

@@ -16,7 +16,12 @@ module Producteev
   class << self
 
     def new(apikey,secret, debug = false)
-      Producteev::Client.new(apikey,secret,debug)
+      Producteev::Api.instance.api_set(apikey,secret, debug)
+      return self
+    end
+
+    def login (username, password)
+    	return Producteev::Client.new(username, password)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: producteev
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &22266440 !ruby/object:Gem::Requirement
+  requirement: &17732380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *22266440
+  version_requirements: *17732380
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &22265820 !ruby/object:Gem::Requirement
+  requirement: &17731800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *22265820
+  version_requirements: *17731800
 description: Api client for producteev
 email: steve@thatbytes.co.uk
 executables: []