timestamp_api 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a9b651bd6a1f81bb14b9edc23be1403ee37a4d3
-  data.tar.gz: 50238b9ee2ab12eb51b8fd4e5f82657c3cfb0385
+  metadata.gz: 8eda86ccc06685b3025de57778e18b1943e0f134
+  data.tar.gz: 939a0532a3315cef11d210ef6e538c9c1ec2f17f
 SHA512:
-  metadata.gz: 5a72476235ef88e59f68f3e8d56a0d34c657581cf2f0cd4e2bbe626db7ec8d4193f89b5e90d45a14b7a299f326d431c93d204cd0d9ac4bfc9cd2ed974a46caa3
-  data.tar.gz: f6b28f91da78b36c7d8240fc1c37c5d16b21c2fac7242d4397fdcdb09cb87e0bf5773bcc60b4f46aa865333c337b7305ef3114277f72dce03f37942013e1d4c2
+  metadata.gz: df9a1a1057a2669dcaa5c236541ac01e56b50dbb741c287151e5c60e6ae2d04726bd322d2e97f80983fd3a4d1e8afd2527d9075f155d0161da09137944de42d7
+  data.tar.gz: d762cc2172b2ed7884302fc5de2137a33ab34e0f5b47f7473123b77488766a00e6c4640a30f6dcb7ba75049fb62c7d460f6c161bca0857a3dbf300ba7bc28cc7

data/README.md

@@ -125,14 +125,16 @@ There's also a `bin/console` executable provided with this gem, if you want a RE
 
 ### What's implemented already ?
 
-* [x] `Project#all`
-* [x] `Project#find`
+* [x] `Project` model
+* [x] `Client` model
+* [x] `Task` model
 * [x] `belongs_to` relationships
 
 ### What's not implemented yet ?
 
 * [ ] _all other models_ :scream:
 * [ ] `has_many` relationships
+* [ ] document and integrate [Inch-CI](https://inch-ci.org)
 
 ## Development
 

data/lib/timestamp_api.rb

@@ -13,8 +13,11 @@ require "timestamp_api/model"
 require "timestamp_api/collection"
 require "timestamp_api/models/project"
 require "timestamp_api/models/client"
+require "timestamp_api/models/task"
 
 module TimestampAPI
+  extend Utils
+
   @api_endpoint = "https://api.ontimestamp.com/api"
 
   class << self
@@ -22,8 +25,8 @@ module TimestampAPI
   end
 
   def self.request(method, path, query_params = {})
-    output(method, path, query_params) if verbose
-    response = RestClient::Request.execute(request_options(method, path, query_params))
+    output(method, path, camelize_keys(query_params)) if verbose
+    response = RestClient::Request.execute(request_options(method, path, camelize_keys(query_params)))
     modelify(JSON.parse(response))
   rescue RestClient::Forbidden
     raise InvalidAPIKey

data/lib/timestamp_api/model_default_api_methods.rb

@@ -14,15 +14,15 @@ module TimestampAPI
         path.nil? ? self.class_variable_get(:@@api_path) : self.class_variable_set(:@@api_path, path)
       end
 
-      def all
+      def all(query_params = {})
         raise APIPathNotSet.new(self) if api_path.nil?
-        TimestampAPI.request(:get, api_path)
+        TimestampAPI.request(:get, api_path, query_params)
       end
 
-      def find(id)
+      def find(id, query_params = {})
         return nil if id.nil?
         raise APIPathNotSet.new(self) if api_path.nil?
-        TimestampAPI.request(:get, "#{api_path}/#{id}")
+        TimestampAPI.request(:get, "#{api_path}/#{id}", query_params)
       rescue RestClient::ResourceNotFound
         raise ResourceNotFound.new(self, id)
       end

data/lib/timestamp_api/model_relations.rb

@@ -5,7 +5,11 @@ module TimestampAPI
       base.class_eval do
         after_initialize do
           self.class.class_variable_get(:@@belongs_to).each do |association_name|
-            instance_variable_set(:"@_#{association_name}_id", json_data[camelize(association_name)]["id"]) if json_data.has_key? camelize(association_name)
+            if json_data.has_key? camelize("#{association_name}_id") # e.g. "projectId" in tasks
+              instance_variable_set(:"@_#{association_name}_id", json_data[camelize("#{association_name}_id")])
+            elsif json_data.has_key? camelize(association_name) # e.g. "client" hash with "id" item in projects
+              instance_variable_set(:"@_#{association_name}_id", json_data[camelize(association_name)]["id"])
+            end
           end
         end
 

data/lib/timestamp_api/models/client.rb

@@ -2,6 +2,6 @@ module TimestampAPI
   class Client < Model
     api_path "/clients"
 
-    has_attributes :id, :created_at, :updated_at, :account_id, :name, :code, :is_archived, :is_account_default
+    has_attributes :id, :created_at, :updated_at, :name, :code, :is_archived, :is_account_default
   end
 end

data/lib/timestamp_api/models/project.rb

@@ -2,7 +2,7 @@ module TimestampAPI
   class Project < Model
     api_path "/projects"
 
-    has_attributes :id, :created_at, :updated_at, :account_id, :name, :code, :color, :initiation_date,
+    has_attributes :id, :created_at, :updated_at, :name, :code, :color, :initiation_date,
                    :target_completion_date, :is_archived, :is_billable, :is_public, :is_approvable
 
     belongs_to :client

data/lib/timestamp_api/models/task.rb

@@ -0,0 +1,13 @@
+module TimestampAPI
+  class Task < Model
+    api_path "/tasks"
+
+    has_attributes :id, :created_at, :updated_at, :name, :is_archived, :is_billable
+
+    belongs_to :project
+
+    def self.for_project_id(project_id)
+      all(project_id: project_id)
+    end
+  end
+end

data/lib/timestamp_api/utils.rb

@@ -1,7 +1,11 @@
 module TimestampAPI
   module Utils
     def camelize(symbol)
-      symbol.to_s.split('_').each_with_index.map{ |chunk, idx| idx == 0 ? chunk : chunk.capitalize }.join
+      symbol.to_s.split('_').each_with_index.map{ |chunk, idx| idx == 0 ? chunk : chunk.capitalize }.join.gsub(/^\w/, &:downcase)
+    end
+
+    def camelize_keys(hash)
+      hash.each_with_object({}) { |pair, acc| acc[camelize(pair[0])] = pair[1] }
     end
   end
 end

data/lib/timestamp_api/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: timestamp_api
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Michael Baudino
@@ -166,6 +166,7 @@ files:
 - lib/timestamp_api/model_relations.rb
 - lib/timestamp_api/models/client.rb
 - lib/timestamp_api/models/project.rb
+- lib/timestamp_api/models/task.rb
 - lib/timestamp_api/utils.rb
 - lib/timestamp_api/version.rb
 - timestamp_api.gemspec