driftrock-service 0.2.8 → 0.3.1

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

@@ -0,0 +1,35 @@
+module Driftrock
+  module Service
+    module Api
+      module Admin
+        include Driftrock::Service::Api
+
+        module URLs
+          BASE     = '/admin'
+          APPS    = BASE+'/apps'
+        end
+
+        def all_apps
+          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")
+        end
+
+      end
+    end
+  end
+end

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

@@ -9,8 +9,8 @@ module Driftrock
           get(ENDPOINT+'/'+channel.to_s, opts)
         end
 
-        def driftrock_query(query)
-          get(ENDPOINT+'/query', {query: query})
+        def driftrock_query(query, opts = {})
+          get(ENDPOINT+'/query', {query: query}.merge(opts))
         end
 
         def driftrock_app_status

data/lib/driftrock-service/api/{administrative.rb → website.rb}

@@ -1,8 +1,8 @@
 module Driftrock
   module Service
     module Api
-      module Administrative 
-        include Driftrock::Service::Api
+      module Website
+      include Driftrock::Service::Api
 
         module URLs
           BASE     = '/dashboard_api'

data/lib/driftrock-service/api.rb

@@ -2,7 +2,7 @@ module Driftrock
   module Service
     module Api
       def get(url, opts={})
-        api_request do |user_id, company_id|
+        api_request(opts) do |user_id, company_id|
           Driftrock::Service::Connector.get_from_api(
             url, user_id, company_id, opts
           )
@@ -10,7 +10,7 @@ module Driftrock
       end
       
       def put(url, opts={})
-        api_request do |user_id, company_id|
+        api_request(opts) do |user_id, company_id|
           Driftrock::Service::Connector.put_to_api(
             url, user_id, company_id, opts
           )
@@ -18,7 +18,7 @@ module Driftrock
       end
 
       def post(url, opts={})
-        api_request do |user_id, company_id|
+        api_request(opts) do |user_id, company_id|
           Driftrock::Service::Connector.post_to_api(
             url, user_id, company_id, opts
           )
@@ -26,16 +26,18 @@ module Driftrock
       end
 
       private
-      def api_request
+      def api_request(opts)
         user_id, company_id = nil
-        begin
-          sess = session.reduce({}){|h, (k, v)| h[k.to_sym] = v; h}
-          user_id = sess[:user_id]
-          company_id = sess[:company_id]
-        rescue => e
+        if respond_to?(:session)
+          user_id = session[:user_id] if session && session[:user_id]
+          company_id = session[:company_id] if session && session[:company_id]
         end
+        user_id = opts[:user_id] if opts[:user_id]
+        company_id = opts[:company_id] if opts[:company_id]
+
         response = yield(user_id, company_id)
         if response['errors']
+          DriftrockLogger.error(response['errors'])
           raise Errors::DriftrockError.new(response['errors'])
         else
           response['data']

data/lib/driftrock-service/config.rb

@@ -1,6 +1,6 @@
 module Driftrock
   module Service
-    class Config <  Struct.new(:salt,:base_url,:app_id,:api_token,
+    class Config <  Struct.new(:salt,:log_location,:log_level,:base_url,:app_id,:api_token,
                                :unauthorised_path)
       private_class_method :new
 
@@ -24,10 +24,21 @@ module Driftrock
         @config.app_id
       end
 
+      def self.log_level
+        @config.log_level
+      end
+
+      def self.log_location
+        @config.log_location
+      end
+
       def self.init
         config = new
+        config.log_level = DriftrockLogger::Levels::ALL
+        config.log_location = STDOUT
         yield(config)
         config.base_url.gsub(/\/$/, "") if config.base_url
+        
         if Rails && config.app_id 
           Rails.application.routes.prepend do
             get 'driftrock_app_status' => 'application#driftrock_app_status'

data/lib/driftrock-service/connector.rb

@@ -9,24 +9,31 @@ module Driftrock
       end
 
       def post_to_api(url, user_id, company_id, data)
-        response = HTTParty.post(build_url_for_driftrock(url), :body => body_for(user_id, company_id, data))
-        puts "[MD => CALLING #{build_url_for_driftrock(url)} WITH:"
-        puts body_for(user_id, company_id, data)
-        puts "[MD] => RESPONSE IS:"
-        puts response
-        puts "========="
+        response = HTTParty.post(build_url_for_driftrock(url), 
+                                 :body => body_for(user_id, company_id, data))
+        debug_request(url, user_id, company_id, data, response)
         response
       end
       def get_from_api(url, user_id, company_id, data={})
-        response = HTTParty.get(build_url_for_driftrock(url), :body => body_for(user_id, company_id, data))
-        puts "[MD => CALLING #{build_url_for_driftrock(url)} WITH:"
-        puts body_for(user_id, company_id, data)
-        puts "[MD] => RESPONSE IS:"
-        puts response
-        puts "========="
+        response = HTTParty.get(build_url_for_driftrock(url), 
+                                :body => body_for(user_id, company_id, data))
+        debug_request(url, user_id, company_id, data, response)
         response
       end
+     
+      def debug_request(url, user_id, company_id, data, response)
+        out = <<-OUT
+========= 
+CALLING #{build_url_for_driftrock(url)} WITH:
+#{body_for(user_id, company_id, data)}
+RESPONSE IS:
+#{response}
+==========
+OUT
+        DriftrockLogger.debug(out)
+      end
       
+
       def put_to_api(url, user_id, company_id, data={})
         HTTParty.put(build_url_for_driftrock(url), :body => body_for(user_id, company_id, data))
       end
@@ -43,7 +50,7 @@ module Driftrock
           } 
         }
       end
-      module_function :get_from_api, :post_to_api, :body_for, :build_url_for_driftrock
+      module_function :debug_request, :get_from_api, :post_to_api, :put_to_api, :body_for, :build_url_for_driftrock
     end
   end
 end

data/lib/driftrock-service/driftrock_app.rb

@@ -0,0 +1,30 @@
+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]
+      timestamp = params[:timestamp]
+      company_id= params[:company_id]
+      token     = params[:token]
+      expected_token = token_for(timestamp, company_id)
+      if token != expected_token
+        redirect_to Driftrock::Service::Config.unauthorised_path
+      else
+        session[:user_id] = params[:user_id]
+        session[:company_id] = params[:company_id]
+      end
+    end
+
+    def token_for(timestamp, company_id)
+      OpenSSL::Digest::SHA1.hexdigest( 
+        [timestamp,Driftrock::Service::Config.salt,company_id].join(":")
+      )
+    end
+  
+  end
+end

data/lib/driftrock-service/driftrock_logger.rb

@@ -0,0 +1,68 @@
+require 'logger'
+module Driftrock::Service
+  class DriftrockLogger
+    class Levels
+      DEBUG = 1
+      INFO = 2
+      WARNING = 3
+      ERROR = 4
+      ALL = 5
+    end
+    private_class_method :new
+   
+    attr_accessor :logger
+
+    def self.info(msg)
+      me.out(msg, Levels::MESSAGE)
+    end
+
+    def self.error(msg)
+      me.out(msg, Levels::ERROR)
+    end
+
+    def self.warning(msg)
+      me.out(msg, Levels::WARNING)
+    end
+
+    def self.debug(msg)
+      me.out(msg, Levels::DEBUG)
+    end
+    
+    def self.me
+      @instance ||= new
+      if !@instance.logger
+        @instance.logger = Logger.new(Config.log_location)
+        level = Config.log_level
+        case level
+        when Levels::DEBUG
+          @instance.logger.level = Logger::DEBUG
+        when Levels::INFO
+          @instance.logger.level = Logger::INFO
+        when Levels::WARNING
+          @instance.logger.level = Logger::WARN
+        when Levels::ERROR
+          @instance.logger.level = Logger::ERROR
+        end
+      end
+      @instance
+    end
+
+
+    def out(content, level)
+      log_level = Config.log_level
+      if log_level >= level
+        case level
+        when Levels::DEBUG
+          logger.debug(content)
+        when Levels::INFO
+          logger.info(content)
+        when Levels::WARNING
+          logger.warn(content)
+        when Levels::ERROR
+          logger.error(content)
+        end
+      end
+    end
+
+  end
+end

data/lib/driftrock-service/version.rb

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

data/lib/driftrock-service.rb

@@ -2,29 +2,42 @@ require "driftrock-service/version"
 require "driftrock-service/config"
 require "driftrock-service/connector"
 require "driftrock-service/api"
-require "driftrock-service/api/administrative"
+require "driftrock-service/api/website"
+require "driftrock-service/api/admin"
 require "driftrock-service/api/data"
 require "driftrock-service/api/puller"
 require "driftrock-service/errors/driftrock_error"
+require "driftrock-service/driftrock_logger"
+require "driftrock-service/driftrock_app"
 
 
 module Driftrock
   module Service      
     
     module ClassMethods
-      def act_as_driftrock_app
+      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
       end
+      
+      def acts_as_driftrock_app_model
+        include Driftrock::Service::Api::Data
+        extend Driftrock::Service::Api::Data
+      end
 
-      def act_as_driftrock_administrator
-        include Driftrock::Service::Api::Administrative
-      end 
+      def acts_as_driftrock_website
+        include Driftrock::Service::Api::Website
+      end
 
-      def act_as_driftrock_puller
+      def acts_as_driftrock_admin
+        include Driftrock::Service::Api::Admin
+      end
+
+      def acts_as_driftrock_puller
         include Driftrock::Service::Api::Puller
       end 
     end
@@ -33,34 +46,6 @@ module Driftrock
       base.extend ClassMethods
     end
 
-    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
-      puts "SESSION #{session}"
-      return if session && session[:user_id] && session[:company_id]
-      timestamp = params[:timestamp]
-      company_id= params[:company_id]
-      token     = params[:token]
-
-      expected_token = token_for(timestamp, company_id)
-      puts "expected_token: #{expected_token}"
-
-      if token != expected_token
-        redirect_to Driftrock::Service::Config.unauthorised_path
-      else
-        session[:user_id] = params[:user_id]
-        session[:company_id] = params[:company_id]
-        puts "SESSION AFTER #{session}"
-      end
-    end
-
-    def token_for(timestamp, company_id)
-      OpenSSL::Digest::SHA1.hexdigest( 
-        [timestamp,Driftrock::Service::Config.salt,company_id].join(":")
-      )
-    end
 
   end
 end

data/spec/models/administrative_api_test.rb

@@ -1,5 +1,5 @@
 class AdministrativeApiTest
-  include Driftrock::Service::Api::Administrative
+  include Driftrock::Service::Api::Website
 
   def test
     apps 

metadata

@@ -1,49 +1,55 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: driftrock-service
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.3.1
   prerelease: 
-  version: 0.2.8
 platform: ruby
-authors: 
+authors:
 - Max
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-05-24 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-05-29 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: httparty
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Gem for talking to the driftrock api
-email: 
+email:
 - max.dupenois@forward.co.uk
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - LICENSE.txt
@@ -52,11 +58,14 @@ files:
 - driftrock-service.gemspec
 - lib/driftrock-service.rb
 - lib/driftrock-service/api.rb
-- lib/driftrock-service/api/administrative.rb
+- lib/driftrock-service/api/admin.rb
 - lib/driftrock-service/api/data.rb
 - lib/driftrock-service/api/puller.rb
+- lib/driftrock-service/api/website.rb
 - lib/driftrock-service/config.rb
 - lib/driftrock-service/connector.rb
+- lib/driftrock-service/driftrock_app.rb
+- lib/driftrock-service/driftrock_logger.rb
 - lib/driftrock-service/errors/driftrock_error.rb
 - lib/driftrock-service/version.rb
 - spec/administrative_api_spec.rb
@@ -64,32 +73,29 @@ files:
 - spec/spec_helper.rb
 homepage: https://github.com/forward/driftrock-service
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Maintains the api endpoints and the calls to them with authorisation, etc.
-test_files: 
+test_files:
 - spec/administrative_api_spec.rb
 - spec/models/administrative_api_test.rb
 - spec/spec_helper.rb