liquidplanner 0.0.6 → 0.0.7

data/lib/liquidplanner.rb

@@ -33,6 +33,7 @@ require "liquidplanner/resources/package"
 require "liquidplanner/resources/folder"
 require "liquidplanner/resources/project"
 require "liquidplanner/resources/client"
+require "liquidplanner/resources/timesheet_entry"
 
 require "liquidplanner/resources/luggage"
 require "liquidplanner/resources/note"

data/lib/liquidplanner/base.rb

@@ -18,11 +18,11 @@ module LiquidPlanner
     end
 
     def account
-      LiquidPlanner::Resources::Account.find(:one, :from => "/api/account")
+      LiquidPlanner::Resources::Account.find( :one, :from => "/api/account" )
     end
 
     def workspaces( scope=:all )
-      LiquidPlanner::Resources::Workspace.find(scope)
+      LiquidPlanner::Resources::Workspace.find( scope )
     end
 
     private

data/lib/liquidplanner/liquidplanner_resource.rb

@@ -7,7 +7,7 @@ module LiquidPlanner
     
     # LiquidPlanner does not send back data that is already in the path (prefix_options), so merge
     # any values that the object already had back into the prefix_options.
-    def load(attributes)
+    def load(attributes, remove_root = false)
       initial_prefix_options = @prefix_options.clone
       super
       @prefix_options.merge!(initial_prefix_options){|k, old_attr,new_attr| old_attr || new_attr }

data/lib/liquidplanner/resources/activity.rb

@@ -1,6 +1,16 @@
 module LiquidPlanner
   module Resources
     class Activity < Luggage
+
+      self.prefix = "/api/workspaces/:workspace_id/"
+
+      def collection_path(options = nil)
+        ret = super
+        puts ret.inspect
+        return ret unless options && options.item_id
+        "#{super}/#{options.item_id}"
+      end
+      
     end
   end
 end

data/lib/liquidplanner/resources/timesheet_entry.rb

@@ -0,0 +1,6 @@
+module LiquidPlanner
+  module Resources
+    class TimesheetEntry < WorkspaceResource
+    end
+  end
+end

data/lib/liquidplanner/resources/workspace.rb

@@ -42,6 +42,18 @@ module LiquidPlanner
         CustomField.find( scope, :params => { :workspace_id => self.id }.merge(options) )
       end
             
+      def activities( scope=:all, options={} )
+        Activity.find( scope, :params => { 
+          :workspace_id => self.id
+        }.merge(options) )
+      end
+
+      def timesheet_entries scope = :all, options = {}
+        TimesheetEntry.find( scope, :params => {
+          :workspace_id  => self.id
+        }.merge( options ) );
+      end
+
       protected
 
       # create a new instance of klass (Task, Folder, etc.),

data/test/liquidplanner_resource_test.rb

@@ -1,5 +1,5 @@
 require 'test/unit'
-require 'mocha'
+require 'mocha/setup'
 require File.dirname(__FILE__) + '/../lib/liquidplanner'
 
 # Test that the special behaviors that LiquidPlanner expects behave sanely.
@@ -7,15 +7,15 @@ class LiquidPlannerResourceTest < Test::Unit::TestCase
   def setup
     @email    = 'testing@example.com'
     @password = 'password'
-    @lp       = LiquidPlanner::Base.new(:email=>@email, :password=>@password)
+    @lp       = LiquidPlanner::Base.new( :email => @email, :password => @password )
   end
   
   # LiquidPlanner does not include redundant data in the responses, ensure that workspace_id is preserved
   def test_loading_does_not_clobber_prefix_options
     id = 7
     task = LiquidPlanner::Resources::Task.new()
-    task.prefix_options = {:workspace_id=>id}
-    task.load(:name=>'cake')
+    task.prefix_options = { :workspace_id => id }
+    task.load( :name => 'cake' )
     
     assert_equal id, task.workspace_id
   end
@@ -26,12 +26,12 @@ class LiquidPlannerResourceTest < Test::Unit::TestCase
     workspace_id = 9
     comment_text = "hello"
     
-    task = LiquidPlanner::Resources::Task.new(:workspace_id=>workspace_id, :id=>task_id, :name=>'new task')
-    comment = task.build_comment(:comment=>comment_text)
+    task = LiquidPlanner::Resources::Task.new( :workspace_id => workspace_id, :id => task_id, :name => 'new task' )
+    comment = task.build_comment( :comment => { :comment => comment_text } )
     assert_equal LiquidPlanner::Resources::Comment, comment.class
     
     assert_equal task_id, comment.prefix_options[:item_id]
     assert_equal workspace_id, comment.prefix_options[:workspace_id]
     assert_equal comment_text, comment.comment
   end
-end
+end

data/test/workspace_test.rb

@@ -1,5 +1,4 @@
 require 'test/unit'
-require 'mocha'
 require File.dirname(__FILE__) + '/../lib/liquidplanner'
 
 # Very Basic tests around the workspace resource to ensure that it generates proper calls to ActiveResource.
@@ -8,24 +7,33 @@ class WorkspaceTest < Test::Unit::TestCase
     @email    = 'testing@example.com'
     @password = 'password'
     @lp       = LiquidPlanner::Base.new(:email=>@email, :password=>@password)
+
+    ActiveResource::HttpMock.respond_to do |mock|
+      headers = { 
+        "Authorization"   => "Basic dGVzdGluZ0BleGFtcGxlLmNvbTpwYXNzd29yZA==",
+        "accept-encoding" => "gzip",
+        "Accept"          => "application/json"
+      }
+
+      space = { :workspace => { :name => "Space" } }
+
+      mock.get "/api/workspaces.json",    headers, [ space ].to_json
+      mock.get "/api/workspaces/17.json", headers, space.to_json
+    end
   end
   
   def test_showing_workspace
     id = 17
-    LiquidPlanner::LiquidPlannerResource.connection
-      .expects(:get)
-      .with(regexp_matches(/workspaces\/#{id}\.json$/), anything)
-      .returns({})
-      
-    @lp.workspaces(id)
+
+    space = @lp.workspaces(id)
+
+    assert_equal "Space", space.name
   end
   
   def test_listing_workspaces
-    LiquidPlanner::LiquidPlannerResource.connection
-      .expects(:get)
-      .with(regexp_matches(/workspaces\.json$/), anything)
-      .returns([])
-      
-    @lp.workspaces
+    spaces = @lp.workspaces
+
+    assert_equal 1, spaces.length
+    assert_equal "Space", spaces.first.name
   end
-end
+end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: liquidplanner
 version: !ruby/object:Gem::Version
-  version: 0.0.6
   prerelease: 
+  version: 0.0.7
 platform: ruby
 authors:
 - Brett Bender
@@ -12,12 +12,21 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-27 00:00:00.000000000 Z
+date: 2014-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activeresource
-  requirement: &54247400 !ruby/object:Gem::Requirement
+  type: :runtime
+  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
     none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -25,13 +34,21 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
+    none: false
+  name: activeresource
+- !ruby/object:Gem::Dependency
   type: :runtime
   prerelease: false
-  version_requirements: *54247400
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: &54246620 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
     none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -39,13 +56,12 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
+    none: false
+  name: activesupport
+- !ruby/object:Gem::Dependency
   type: :runtime
   prerelease: false
-  version_requirements: *54246620
-- !ruby/object:Gem::Dependency
-  name: multipart-post
-  requirement: &54245620 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -53,31 +69,33 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.1
-  type: :runtime
-  prerelease: false
-  version_requirements: *54245620
-- !ruby/object:Gem::Dependency
-  name: highline
-  requirement: &54244900 !ruby/object:Gem::Requirement
     none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.1
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: 1.0.1
+    none: false
+  name: multipart-post
+- !ruby/object:Gem::Dependency
   type: :development
   prerelease: false
-  version_requirements: *54244900
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: &54244380 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.5'
     none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - =
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.9.8
-  type: :development
-  prerelease: false
-  version_requirements: *54244380
+        version: '1.5'
+    none: false
+  name: highline
 description: LiquidPlanner API client
 email:
 - api@liquidplanner.com
@@ -96,6 +114,7 @@ files:
 - lib/liquidplanner/resources/root.rb
 - lib/liquidplanner/resources/member.rb
 - lib/liquidplanner/resources/inbox.rb
+- lib/liquidplanner/resources/timesheet_entry.rb
 - lib/liquidplanner/resources/container.rb
 - lib/liquidplanner/resources/folder.rb
 - lib/liquidplanner/resources/custom_field_values.rb
@@ -141,20 +160,20 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+  none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: LiquidPlanner API client