driftrock-service 0.3.1 → 0.3.2

data/lib/driftrock-service.rb

@@ -18,7 +18,6 @@ module Driftrock
       def acts_as_driftrock_app
         if respond_to?(:before_filter)
           include Driftrock::Service::DriftrockApp
-          before_filter :add_p3p_header
           before_filter :authorise, except: :driftrock_app_status
         end
         include Driftrock::Service::Api::Data
@@ -33,6 +32,11 @@ module Driftrock
         include Driftrock::Service::Api::Website
       end
 
+      def acts_as_driftrock_website_model
+        include Driftrock::Service::Api::Website
+        extend Driftrock::Service::Api::Website
+      end
+
       def acts_as_driftrock_admin
         include Driftrock::Service::Api::Admin
       end

data/lib/driftrock-service/api/admin.rb

@@ -13,20 +13,8 @@ module Driftrock
           get(URLs::APPS)
         end
 
-        def make_visible(app_id)
-          put(URLs::APPS+"/#{app_id}/make_visible")
-        end
-
-        def make_invisible(app_id)
-          put(URLs::APPS+"/#{app_id}/make_invisible")
-        end
-
-        def activate(app_id)
-          put(URLs::APPS+"/#{app_id}/activate")
-        end
-
-        def deactivate(app_id)
-          put(URLs::APPS+"/#{app_id}/deactivate")
+        def update_app(id, app_data)
+          put(URLs::APPS + "/#{id}", app_data)
         end
 
       end

data/lib/driftrock-service/api/data.rb

@@ -16,7 +16,11 @@ module Driftrock
         def driftrock_app_status
           render text: "OK"
         end
-
+        
+        def driftrock_logout
+          reset_session
+          redirect_to Config.website_location+"/logout"
+        end
       end
     end
   end

data/lib/driftrock-service/api/website.rb

@@ -11,26 +11,30 @@ module Driftrock
           APPS     = BASE+'/driftrock_app'
         end
         
-        def list_apps
-          get(URLs::APPS+"/")
+        def list_apps(opts = {})
+          get(URLs::APPS+"/", opts)
         end 
         
-        def get_app(app_id)
-          get(URLs::APPS+"/#{app_id}")
+        def get_app(app_id, opts ={})
+          get(URLs::APPS+"/#{app_id}", opts)
+        end
+
+        def get_app_by_string_app_id(app_id, opts ={})
+          get(URLs::APPS+"/#{app_id}/by_app_id", opts)
         end
 
         def add_twitter_details(username, password)
           post(URLs::CHANNELS+"/temp/connect_twitter", {username: username, password: password})
         end
 
-        def auth_token(app_id, timestamp, company_id)
+        def auth_token(app_id, timestamp, opts={})
           response = post(URLs::APPS+"/#{app_id}/auth_token", 
-               {company_id: company_id, timestamp: timestamp})
+               {timestamp: timestamp}.merge(opts))
           response['token']
         end
 
-        def activate_app(app_id)
-          post(URLs::APPS+"/#{app_id}/activate")
+        def activate_app(app_id, opts={})
+          post(URLs::APPS+"/#{app_id}/activate", opts)
         end
 
         def channel_types

data/lib/driftrock-service/config.rb

@@ -1,7 +1,9 @@
 module Driftrock
   module Service
-    class Config <  Struct.new(:salt,:log_location,:log_level,:base_url,:app_id,:api_token,
-                               :unauthorised_path)
+    class Config <  Struct.new(:salt, :website_location, :status_location,
+                               :status_action, 
+                               :logout_action, :log_location,:log_level,:base_url,
+                               :app_id,:api_token)
       private_class_method :new
 
       def self.base_url
@@ -16,10 +18,6 @@ module Driftrock
         @config.api_token
       end
       
-      def self.unauthorised_path
-        @config.unauthorised_path
-      end
-
       def self.app_id
         @config.app_id
       end
@@ -31,17 +29,24 @@ module Driftrock
       def self.log_location
         @config.log_location
       end
+      
+      def self.website_location
+        @config.website_location
+      end
 
       def self.init
         config = new
         config.log_level = DriftrockLogger::Levels::ALL
         config.log_location = STDOUT
+        config.website_location = "http://www.driftrock.com" 
+        config.status_action = "application#driftrock_app_status"
+        config.logout_action = "application#driftrock_logout"
         yield(config)
         config.base_url.gsub(/\/$/, "") if config.base_url
-        
-        if Rails && config.app_id 
+        if defined?(Rails) && config.app_id 
           Rails.application.routes.prepend do
-            get 'driftrock_app_status' => 'application#driftrock_app_status'
+            get 'driftrock_app_status' => config.status_action 
+            get 'driftrock_logout' => config.logout_action
           end
         end
         @config = config

data/lib/driftrock-service/driftrock_app.rb

@@ -1,10 +1,5 @@
 module Driftrock::Service
   module DriftrockApp
- 
-
-    def add_p3p_header
-      response.headers["p3p"] = "CP=\"IDC DSP COR ADM DEVi TAIi PSA PSD IVAi IVDi CONi HIS OUR IND CNT\""
-    end
 
     def authorise
       return if session && session[:user_id] && session[:company_id]
@@ -13,7 +8,8 @@ module Driftrock::Service
       token     = params[:token]
       expected_token = token_for(timestamp, company_id)
       if token != expected_token
-        redirect_to Driftrock::Service::Config.unauthorised_path
+        redirect_to Driftrock::Service::Config.website_location+
+                    "?unauthorised=true"
       else
         session[:user_id] = params[:user_id]
         session[:company_id] = params[:company_id]

data/lib/driftrock-service/version.rb

@@ -1,5 +1,5 @@
 module Driftrock
   module Service
-    VERSION = "0.3.1"
+    VERSION = "0.3.2"
   end
 end

data/spec/administrative_api_spec.rb

@@ -1,9 +1,11 @@
 require 'spec_helper'
 
 describe AdministrativeApiTest do
-  it "should be able to make a call to the api" do
+  it "should error without a user and session id" do
     #Assume for the sake of testing there's at least one app
-    AdministrativeApiTest.new.apps.count.should be > 0
+    lambda{
+      AdministrativeApiTest.new.list_apps
+    }.should raise_error(Driftrock::Errors::DriftrockError)
   end
   
 end

data/spec/models/administrative_api_test.rb

@@ -2,7 +2,7 @@ class AdministrativeApiTest
   include Driftrock::Service::Api::Website
 
   def test
-    apps 
+    list_apps 
   end
 
 end

data/spec/spec_helper.rb

@@ -6,5 +6,4 @@ Driftrock::Service::Config.init do |config|
   config.salt = "3kllki3weid9n3rljcw932oknc2ico23nlckno2i3f2on2o4ilknc2il3jp23mn"
   config.api_token = "45asf42cwewfwf234/sfw34"
   config.app_id = "23df434v34gdfnrnrt/regergw4"
-  config.unauthorised_path = "/unauthorised"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: driftrock-service
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-29 00:00:00.000000000 Z
+date: 2013-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty