restpack_activity 0.0.5 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53efba83edf005114417206ae4bde20850c474bf
-  data.tar.gz: 6ad29dd7144c7c7af1052ff443ff481900466d5a
+  metadata.gz: 78a83e44dd48091b097197d6364e09e283512ca9
+  data.tar.gz: 77b177e9fc4b919e3d32b5075198d08e6551919b
 SHA512:
-  metadata.gz: 103112562ad21324f7f5b5a280df1f596007ff159b80412125fda1ee9432d16b33afdbc947b44a809ab9c12b1b805317e51bdff3da40dd2a00a4790f441885c2
-  data.tar.gz: a74ccd4c3ab6a6e59dc11a565abee3e2582097c724b6730a149c12c5fdf57a3f1d8fca1bf3720f5d64059163451df4f60ac7ec51d4ee2fea6e194f01108c1eff
+  metadata.gz: cb4c30d671916dfc61279c1d3693e9a78982d3f1351bfe6aa1e090f4ade023685668112ac6e056a6c62f97fc6e5d813a15a6d67854fbdc21ae8668a86829d702
+  data.tar.gz: dcb4a6c27cd0564fd3be7f967f5b0d575cc3a0d6dcdfd18e67b75ded6c56c490800412106e2736dca3d66b5fb101669d304705a1c644c63f87e68f45dd537b6f

data/README.md

@@ -1,4 +1,4 @@
-# restpack_activity [![Build Status](https://api.travis-ci.org/RestPack/restpack_activity.png?branch=master)](https://travis-ci.org/RestPack/restpack_activity) [![Code Climate](https://codeclimate.com/github/RestPack/restpack_activity.png)](https://codeclimate.com/github/RestPack/restpack_activity) [![Dependency Status](https://gemnasium.com/RestPack/restpack_activity.png)](https://gemnasium.com/RestPack/restpack_activity)
+# restpack_activity [![Build Status](https://api.travis-ci.org/RestPack/restpack_activity.png?branch=master)](https://travis-ci.org/RestPack/restpack_activity) [![Code Climate](https://codeclimate.com/github/RestPack/restpack_activity.png)](https://codeclimate.com/github/RestPack/restpack_activity) [![Dependency Status](https://gemnasium.com/RestPack/restpack_activity.png)](https://gemnasium.com/RestPack/restpack_activity) [![Gem Version](https://badge.fury.io/rb/restpack_activity.png)](http://badge.fury.io/rb/restpack_activity)
 
 A client gem to the RestPack Activity service
 

data/lib/restpack_activity/models/activity.rb

@@ -13,7 +13,7 @@ class Activity
 
   def self.get(id)
     response = service.get(id)
-    Activity.new(response.result)
+    Activity.new(response.result[:activities].first)
   end
 
   def self.destroy(id)
@@ -75,6 +75,7 @@ class Activity
   end
 
   def update_attributes(params)
+    #TODO: GJ: extract into base class
     #TODO: whitelist updateble params
     @title = params[:title] if params[:title]
     @content = params[:content] if params[:content]
@@ -97,6 +98,7 @@ class Activity
   private
 
   def attributes
+    #TODO: GJ: extract into base class
     #TODO: GJ: only those that have changed
     hash = {
       id: @id,
@@ -104,13 +106,13 @@ class Activity
       user_id: @user_id,
       title: @title,
       content: @content,
-      data: @data,
       tags: @tags.join(','),
       access: @access.join(',')
     }
 
     hash[:latitude] = @latitude unless @latitude.blank?
     hash[:longitude] = @longitude unless @longitude.blank?
+    hash[:data] = @data unless @data.blank?
     hash
   end
 end

data/lib/restpack_activity/proxies/activity/api.rb

@@ -3,23 +3,23 @@ require 'rest_client'
 module RestPack::Activity::Proxies
   class Api < RestPack::BaseProxy
     def self.get(id)
-      http(:get, "/api/v1/activities/#{id}.json")
+      http(:get, "/api/v1/activities/#{id}")
     end
 
     def self.list(params = {})
-      http(:get, "/api/v1/activities.json", params)
+      http(:get, "/api/v1/activities", params)
     end
 
     def self.create(params)
-      http(:post, "/api/v1/activities.json", params)
+      http(:post, "/api/v1/activities", params)
     end
 
     def self.update(params)
-      http(:put, "/api/v1/activities/#{params[:id]}.json", params)
+      http(:put, "/api/v1/activities/#{params[:id]}", params)
     end
 
     def self.destroy(id)
-      http(:delete, "/api/v1/activities/#{id}.json")
+      http(:delete, "/api/v1/activities/#{id}")
     end
 
     private
@@ -27,7 +27,10 @@ module RestPack::Activity::Proxies
     def self.http(method, path, params = {})
       params = { params: params } if method == :get
 
-      RestClient.send(method, "#{RestPack::Activity.config.api_domain}#{path}", params) do |rest_response|
+      credentials = "#{RestPack::Activity.config.application_id}:#{RestPack::Activity.config.api_token}"
+
+      url = "http://#{credentials}@#{RestPack::Activity.config.api_domain}#{path}"
+      RestClient.send(method, url, params) do |rest_response|
         response = RestPack::Service::Response.from_rest(rest_response)
         raise_exceptions_if_required(response)
         response

data/lib/restpack_activity/proxies/activity/local.rb

@@ -1,7 +1,7 @@
 module RestPack::Activity::Proxies
   class Local < RestPack::BaseProxy
     def self.get(id)
-      response = RestPack::Services::Activity::Get.run({
+      response = Commands::Activities::Activity::Get.run({
         id: id,
         application_id: RestPack::Activity.config.application_id
       })
@@ -11,7 +11,7 @@ module RestPack::Activity::Proxies
     end
 
     def self.list(params = {})
-      response = RestPack::Services::Activity::List.run(params, {
+      response = Commands::Activities::Activity::List.run(params, {
         application_id: RestPack::Activity.config.application_id
       })
 
@@ -20,7 +20,7 @@ module RestPack::Activity::Proxies
     end
 
     def self.create(params)
-      response = RestPack::Services::Activity::Create.run(params, {
+      response = Commands::Activities::Activity::Create.run(params, {
         application_id: RestPack::Activity.config.application_id
       })
 
@@ -29,7 +29,7 @@ module RestPack::Activity::Proxies
     end
 
     def self.update(params)
-      response = RestPack::Services::Activity::Update.run(params, {
+      response = Commands::Activities::Activity::Update.run(params, {
         application_id: RestPack::Activity.config.application_id
       })
 
@@ -38,7 +38,7 @@ module RestPack::Activity::Proxies
     end
 
     def self.destroy(id)
-      response = RestPack::Services::Activity::Destry.run({
+      response = Commands::Activities::Activity::Destry.run({
         id: id,
         application_id: RestPack::Activity.config.application_id
       })

data/lib/restpack_activity/proxies/base_proxy.rb

@@ -7,6 +7,8 @@ module RestPack
         case(response.status)
         when :not_found
           raise ActiveRecord::RecordNotFound
+        when :unauthorized
+          raise "Unauthorized RestPack request"
         end
       end
     end

data/lib/restpack_activity/version.rb

@@ -1,5 +1,5 @@
 module RestPack
   module Activity
-    VERSION = "0.0.5"
+    VERSION = "0.0.7"
   end
 end

data/restpack_activity.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "restpack_activity_service",  "~> 0.0.8"
+  spec.add_dependency "restpack_activity_service"
   spec.add_dependency "activemodel",                "~> 4.0.0"
   spec.add_dependency "activesupport",              "~> 4.0"
   spec.add_dependency "rest-client",                "~> 1.6.7"

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: restpack_activity
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.7
 platform: ruby
 authors:
 - Gavin Joyce
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-22 00:00:00.000000000 Z
+date: 2013-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: restpack_activity_service
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.0.8
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.0.8
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
@@ -182,7 +182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.7
 signing_key: 
 specification_version: 4
 summary: A client gem to the activity service