driftrock-service 0.3.3 → 0.4.0

data/.rspec

@@ -0,0 +1 @@
+--color

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

@@ -13,14 +13,6 @@ module Driftrock
           get(ENDPOINT+'/query', {query: query}.merge(opts))
         end
 
-        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

@@ -7,88 +7,15 @@ module Driftrock
         module URLs
           BASE     = '/dashboard_api'
           USERS    = BASE+'/user'
+          COMPANIES= BASE+'/companies'
           CHANNELS = BASE+'/channel'
           APPS     = BASE+'/driftrock_app'
         end
         
-        def list_apps(opts = {})
-          get(URLs::APPS+"/", opts)
-        end 
-        
-        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, opts={})
-          response = post(URLs::APPS+"/#{app_id}/auth_token", 
-               {timestamp: timestamp}.merge(opts))
-          response['token']
-        end
-
-        def activate_app(app_id, opts={})
-          post(URLs::APPS+"/#{app_id}/activate", opts)
-        end
-
-        def channel_types
-          get(URLs::CHANNELS+"/types")
-        end
-
-        def add_channel(channel_name, channel_data)
-          post(URLs::CHANNELS+"/#{channel_name}", channel_data) 
-        end
-
-        def get_channel(channel_name)
-          get(URLs::CHANNELS+"/#{channel_name}") 
-        end
-
-        def add_profile_for_channel(channel_name, profile_id)
-          post(URLs::CHANNELS+"/#{channel_name}/profile", {profile_id: profile_id}) 
-        end
-  
-        def new_token_for_channel(channel_name, token)
-          put(URLs::CHANNELS+"/#{channel_name}/profile", token) 
-        end
-
-        def driftrock_login(validation_data)
-          post(URLs::USERS+"/login", validation_data) 
-        end
-
-        def new_account(user_data)
-          post(URLs::USERS+"/new", user_data) 
-        end
-
-        def add_company(company_data)
-          post(URLs::USERS+"/company", company_data)
-        end
-     
-        def get_user(user_session_id)
-          get(URLs::USERS+"/#{user_session_id}") 
-        end
- 
-        def get_company(company_id)
-          get(URLs::USERS+"/company/#{company_id}") 
-        end
-        
-        def get_companies
-          get(URLs::USERS+"/companies") 
-        end
-
-        def user_admin?(user_session_id)
-          response = get(URLs::USERS+"/#{user_session_id}/is_admin") 
-          response['is_admin'] =~ /true/
-        end
-
-        def new_company(company_data)
-          post(URLs::COMPANIES+"/new", company_data) 
-        end
       end
     end
   end

data/lib/driftrock-service/api.rb

@@ -1,6 +1,8 @@
 module Driftrock
   module Service
     module Api
+      
+
       def get(url, opts={})
         api_request(opts) do |user_id, company_id|
           Driftrock::Service::Connector.get_from_api(
@@ -25,12 +27,19 @@ module Driftrock
         end
       end
 
+      def symbolise_keys(hash)
+        hash.reduce({}) do |new_hash, (key, value)|
+          new_hash[key.to_sym] = value
+          new_hash
+        end
+      end
+
       private
       def api_request(opts)
         user_id, company_id = nil
-        if respond_to?(:session)
-          user_id = session[:user_id] if session && session[:user_id]
-          company_id = session[:company_id] if session && session[:company_id]
+        if DriftrockApi.instance
+          user_id = DriftrockApi.instance.current_user_id
+          company_id = DriftrockApi.instance.current_company_id
         end
         user_id = opts[:user_id] if opts[:user_id]
         company_id = opts[:company_id] if opts[:company_id]

data/lib/driftrock-service/config.rb

@@ -1,57 +1,85 @@
 module Driftrock
   module Service
-    class Config <  Struct.new(:salt, :website_location, :status_location,
+    class Config <  Struct.new(:salt, :environment, :status_location,
                                :status_action, 
-                               :logout_action, :log_location,:log_level,:base_url,
+                               :logout_action, :log_location,:log_level,
                                :app_id,:api_token)
       private_class_method :new
 
-      def self.base_url
-        @config.base_url
+      def self.api_location
+        if config_properties.environment == :production
+          "https://driftrock-user-details-api.herokuapp.com"
+        else
+          "http://localhost:9393"
+        end
       end
       
       def self.salt
-        @config.salt
+        config_properties.salt
       end
 
       def self.api_token
-        @config.api_token
+        config_properties.api_token
       end
       
       def self.app_id
-        @config.app_id
+        config_properties.app_id
       end
 
       def self.log_level
-        @config.log_level
+        config_properties.log_level
       end
 
       def self.log_location
-        @config.log_location
+        config_properties.log_location
       end
       
       def self.website_location
-        @config.website_location
+        if config_properties.environment == :production
+          "http://www.driftrock.com"
+        else
+          "http://localhost:3000"
+        end
+      end
+
+      def self.environment
+        config_properties.enviroment
       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 defined?(Rails) && config.app_id 
+        yield(config_properties)
+        if defined?(Rails) && config_properties.app_id 
+          status_action = config_properties.status_action
+          logout_action = config_properties.logout_action
           Rails.application.routes.prepend do
-            get 'driftrock_app_status' => config.status_action 
-            get 'driftrock_logout' => config.logout_action
+            get 'driftrock_app_status' => status_action 
+            get 'driftrock_logout' => logout_action
           end
         end
-        @config = config
       end
-    
+   
+      private
+      def self.default
+        default = new
+        default.log_level = DriftrockLogger::Levels::ALL
+        default.log_location = STDOUT
+        default.status_action = "application#driftrock_app_status"
+        default.logout_action = "application#driftrock_logout"
+        default.environment = if ENV['RACK_ENV']
+          ENV['RACK_ENV'].to_sym
+        elsif ENV['RAILS_ENV']
+          ENV['RAILS_ENV'].to_sym
+        elsif defined?(Rails)
+          Rails.env
+        else
+          :test
+        end
+        default
+      end
+      def self.config_properties
+        @config ||= default
+        @config
+      end
     end
   end
 end

data/lib/driftrock-service/connector.rb

@@ -5,7 +5,7 @@ module Driftrock
       
       def build_url_for_driftrock(url)
         url = "/"+url if url !~ /^\/.*/
-        Driftrock::Service::Config.base_url+url
+        Driftrock::Service::Config.api_location+url
       end
 
       def post_to_api(url, user_id, company_id, data)

data/lib/driftrock-service/driftrock_api.rb

@@ -0,0 +1,55 @@
+module Driftrock::Service
+  class DriftrockApi
+    private_class_method :new
+    attr_reader :current_user_id, :current_company_id
+    
+    def initialize(user=nil, company=nil)
+      @current_user_id = user if user
+      @current_company_id = company if company
+      DriftrockApi.set_instance(self)
+    end
+
+    def self.set_instance(instance)
+      @instance = instance
+    end
+    def self.instance
+      @instance
+    end
+
+    def self.website_api(user, company)
+      api = new(user, company)
+      require_module_with_dir :driftrock_model
+      api.extend(Driftrock::Service::Api::Website)
+      api
+    end
+
+    def self.data_api(user, company)
+      api = new(user, company)
+      api.extend(Driftrock::Service::Api::Data)
+      api
+    end
+
+    def self.admin_api
+      api = new
+      api.extend(Driftrock::Service::Api::Admin)
+      api
+    end
+
+    def self.puller_api
+      api = new
+      api.extend(Driftrock::Service::Api::Puller)
+      api
+    end
+
+    private 
+    def self.require_module_with_dir(module_name)
+      require "driftrock-service/#{module_name}"
+      folder_glob = File.join(
+        File.dirname(__FILE__), module_name.to_s, *%w[** *.rb])
+      Dir[folder_glob].each do |file|
+        require file
+      end
+    end
+
+  end
+end

data/lib/driftrock-service/driftrock_app.rb

@@ -16,6 +16,15 @@ module Driftrock::Service
       end
     end
 
+    def driftrock_app_status
+      render text: "OK"
+    end
+    
+    def driftrock_logout
+      reset_session
+      redirect_to Config.website_location+"/logout"
+    end
+    
     def token_for(timestamp, company_id)
       OpenSSL::Digest::SHA1.hexdigest( 
         [timestamp,Driftrock::Service::Config.salt,company_id].join(":")

data/lib/driftrock-service/driftrock_model/channel.rb

@@ -0,0 +1,54 @@
+module Driftrock::Service::DriftrockModel
+  class Channel
+    include Driftrock::Service::DriftrockModel
+    set_api_path '/dashboard_api/channel'
+    attr_reader :id, :profile_id, :company,  
+                :token, :refresh_token, :token_expiry,
+                :expires_in, :channel_type, :next_step_action
+    attr_accessor :channel_type 
+    
+    def set_profile_id(profile_id)
+      response = post_to_api_method.call(
+        "/#{channel_type.name}/profile", {profile_id: profile_id}
+      )
+      success = response['status'] == 'success'
+      @profile_id = profile_id if success
+      success
+    end
+
+    def update_token(token_data)
+      response = put_to_api_method.call(
+        "/#{channel_type.name}/profile", token_data
+      )
+      success = response['status'] == 'success'
+      if success
+        @token = token_data[:token]
+        @token_expiry = token_data[:token_expiry]
+        @expires_in = token_data[:expires_in]
+      end
+      success
+    end
+
+    def self.create_by_channel_type(type_name, channel_data)
+      ChannelType.find_by_name(type_name).create_channel(channel_data)
+    end
+
+    def self.find_by_channel_type_name(name)
+      object_hsh = get_from_api_method.call(
+        "/#{name}"
+      )
+      channel = new(object_hsh)
+      channel.channel_type = ChannelType.find_by_name(name)
+      channel
+    end
+
+    def self.channel_types
+      object_arr = get_from_api_method.call(
+        "/types"
+      )
+      object_arr.map do |object_hash|
+        ChannelType.new(object_hash)
+      end
+    end
+  end
+end

data/lib/driftrock-service/driftrock_model/channel_type.rb

@@ -0,0 +1,24 @@
+module Driftrock::Service::DriftrockModel
+  class ChannelType
+    include Driftrock::Service::DriftrockModel
+    set_api_path '/dashboard_api/channel'
+    attr_reader :id, :name, :channel_status, :next_step_action
+
+    def create_channel(channel_data)
+      response = post_to_api_method.call(
+        "/#{name}", channel_data
+      )
+      channel = Channel.new(channel_data)
+      channel.channel_type = self
+      channel
+    end
+    
+    def self.find_by_name(name)
+      object_hash = get_from_api_method.call(
+        "/#{name}/by_name"
+      )
+      new(object_hash)
+    end
+
+  end
+end

data/lib/driftrock-service/driftrock_model/company.rb

@@ -0,0 +1,16 @@
+module Driftrock::Service::DriftrockModel
+  class Company
+    include Driftrock::Service::DriftrockModel
+    set_api_path "/dashboard_api/company"    
+
+    attr_reader :id, :name
+
+    def add_user(user)
+      response = post_to_api_method.call(
+        '/add_user', {user_to_add_id: user.id}
+      )
+      response['status'] == 'success'
+    end
+
+  end
+end

data/lib/driftrock-service/driftrock_model/driftrock_app.rb

@@ -0,0 +1,68 @@
+module Driftrock::Service::DriftrockModel
+  class DriftrockApp
+    include Driftrock::Service::DriftrockModel
+    set_api_path "/dashboard_api/driftrock_app"
+    attr_reader :id, :name, :description, :long_description, :visible, :active,
+      :logo, :url, :salt, :app_id, :api_token, :requires_twitter_data,
+      :requires_facebook_data, :requires_adwords_data,
+      :requires_conversion_data, :requires_user_data, :user_has_activated
+
+    def activate
+      post_to_api_method.call("/#{id}/activate")
+    end
+
+    def auth_token(timestamp)
+      response = post_to_api_method.call(
+            "/#{id}/auth_token", 
+           {timestamp: timestamp})
+      response['token']
+    end
+    
+    def show_url
+      timestamp = DateTime.now
+      token = auth_token(timestamp)
+      query_str = {
+        timestamp: timestamp,
+        company_id: ::Driftrock::Service::DriftrockApi.instance.current_company_id,
+        token: token,
+        user_id: ::Driftrock::Service::DriftrockApi.instance.current_user_id
+      }.to_query
+      url+"?"+query_str
+    end
+    
+    def logout_url
+      url+"/driftrock_logout"
+    end
+
+    def status_url
+      url+"/driftrock_app_status"
+    end
+    
+    def status_check(http_method = HTTParty.public_method(:get))
+     status = :ok
+     begin
+       status_text = http_method.call(status_url)
+       status = :not_ok if status_text.strip != "OK"
+     rescue Errno::ECONNREFUSED => e
+       status = :not_available
+     end
+     status
+    end 
+    
+    def self.find_by_app_id(app_id)
+      object_hash = get_from_api_method.call("/#{app_id}/by_app_id")
+      new(object_hash)
+    end
+
+    def self.all_apps
+      array_of_app_hashes = get_from_api_method.call("/apps", {}, 
+                                                      '/dashboard_api/visitor')
+      array_of_app_hashes = array_of_app_hashes.symbolize_keys[:apps]
+      array_of_app_hashes.map do |app_hash|
+        app_hash.symbolize_keys!
+        new(app_hash)
+      end
+    end 
+
+  end
+end  

data/lib/driftrock-service/driftrock_model/user.rb

@@ -0,0 +1,53 @@
+module Driftrock::Service::DriftrockModel
+  class User
+    include Driftrock::Service::DriftrockModel
+    set_api_path "/dashboard_api/user"
+    attr_reader :id, :session_id, :first_name, :last_name, :email
+
+    def admin?
+      @check_admin
+    end
+
+    def self.login(validation_data)
+      post_to_api_method.call("/login", validation_data)
+      #Get session id
+    end
+
+    def self.find_by_email(email)
+      object_hash = get_from_api_method.call("/#{email}/by_email")
+      new(object_hash)
+    end
+
+    def self.find_by_session_id(session_id)
+      object_hash = get_from_api_method.call("/#{session_id}")
+      new(object_hash)
+    end 
+
+
+    def user_admin?
+      response = get_from_api_method.call("/#{session_id}/is_admin") 
+      response['is_admin'] =~ /true/
+    end
+    
+    def add_company(company_data)
+      post_to_api_method.call("/company", company_data.merge({
+        user_id: session_id
+      }))
+    end
+
+    def company(company_id)
+      company_hsh = get_from_api_method.call("/company/#{company_id}", 
+                               {user_id: session_id})
+      Company.new(company_hsh)
+    end
+    
+    def companies
+      company_arr = get_from_api_method.call("/companies", 
+                               {user_id: session_id})
+      company_arr.map do |company_hash|
+        Company.new(company_hash)
+      end
+    end
+
+  end
+end  

data/lib/driftrock-service/driftrock_model.rb

@@ -0,0 +1,101 @@
+module Driftrock::Service::DriftrockModel
+  module ClassMethods
+    def set_post_to_api_method(method)
+      @post_to_api_method = method
+    end
+
+    def set_put_to_api_method(method)
+      @put_to_api_method = method
+    end
+    
+    def set_get_from_api_method(method)
+      @get_from_api_method = method
+    end
+
+    def post_to_api_method
+      @post_to_api_method ||= self.public_method(:model_post)
+      @post_to_api_method
+    end
+
+    def put_to_api_method
+      @put_to_api_method ||= self.public_method(:model_put)
+      @put_to_api_method
+    end
+    
+    def get_from_api_method
+      @get_from_api_method ||= self.public_method(:model_get)
+      @get_from_api_method
+    end
+
+    def set_api_path(path)
+      @api_path = path
+    end
+
+    def api_path
+      @api_path ||= "/"
+      @api_path
+    end
+
+    def find(id)     
+      object_hash = get_from_api_method.call("/#{id}")
+      new(object_hash)                                       
+    end                                                       
+
+    def all    
+      object_arr = get_from_api_method.call("/")         
+      object_arr.map do |object_hash|      
+        new(object_hash)
+      end      
+    end
+
+    def create(data)
+      post_to_api_method.call("/new", data)
+    end
+
+    def model_post(path, opts={}, root_path=api_path)
+      post(root_path+path, opts)
+    end
+
+    def model_put(path, opts={}, root_path=api_path)
+      put(root_path+path, opts)
+    end
+    
+    def model_get(path, opts={}, root_path=api_path)
+      get(root_path+path, opts)
+    end
+
+    def model_name
+      self.to_s.gsub(/.*\:\:/, "").downcase
+    end
+
+  end
+
+  def initialize(object_hash)
+    if object_hash.respond_to?(:symbolize_keys!)
+      object_hash.symbolize_keys!
+    else
+      symbolise_keys(object_hash)
+    end
+    object_hash.each do |(key, value)|
+      instance_variable_set(("@"+key.to_s).to_sym, value)
+    end
+  end
+
+  
+  def self.included(base)
+    base.extend ClassMethods
+    base.extend Driftrock::Service::Api
+    base.send(:include, Driftrock::Service::Api)
+  end
+
+  def get_from_api_method
+    self.class.get_from_api_method
+  end
+  def post_to_api_method
+    self.class.post_to_api_method
+  end
+  def put_to_api_method
+    self.class.put_to_api_method
+  end
+
+end

data/lib/driftrock-service/version.rb

@@ -1,5 +1,5 @@
 module Driftrock
   module Service
-    VERSION = "0.3.3"
+    VERSION = "0.4.0"
   end
 end

data/lib/driftrock-service.rb

@@ -10,46 +10,19 @@ require "driftrock-service/api/puller"
 require "driftrock-service/errors/driftrock_error"
 require "driftrock-service/driftrock_logger"
 require "driftrock-service/driftrock_app"
+require "driftrock-service/driftrock_api"
 
 
 module Driftrock
   module Service      
     
     module ClassMethods
-      def acts_as_driftrock_app
+      def add_driftrock_app_rails_filters
         if respond_to?(:before_filter)
           include Driftrock::Service::DriftrockApp
           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 acts_as_driftrock_website
-        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_website_visitor_model
-        include Driftrock::Service::Api::Visitor
-        extend Driftrock::Service::Api::Visitor
-      end
-
-      def acts_as_driftrock_admin
-        include Driftrock::Service::Api::Admin
-      end
-
-      def acts_as_driftrock_puller
-        include Driftrock::Service::Api::Puller
-      end 
     end
     
     def self.included(base)

data/spec/models/channel_spec.rb

@@ -0,0 +1,60 @@
+require 'website_spec_helper'
+describe DriftrockModel::Channel do
+  before do
+    @post_method = mock(:post)
+    @get_method = mock(:get)
+    @put_method = mock(:put)
+    DriftrockModel::Channel.set_post_to_api_method @post_method
+    DriftrockModel::Channel.set_put_to_api_method @put_method
+    DriftrockModel::Channel.set_get_from_api_method @get_method
+    @test_channel = DriftrockModel::Channel.new({
+      id: 1
+    })
+    @test_channel_type = DriftrockModel::ChannelType.new({
+      id: 1,
+      name: "google_analytics"
+    })
+    @test_channel.channel_type = @test_channel_type
+  end
+  
+  it "should be able to add a profile id to a channel" do
+    @post_method.should_receive(:call).with(
+      "/#{@test_channel_type.name}/profile", {profile_id: "test"}).
+      and_return({'status' => 'success'})
+    @test_channel.set_profile_id("test")
+    @test_channel.profile_id.should == "test"
+  end
+
+  it "should be able to get a channel by channel type name" do
+    @get_method.should_receive(:call).with(
+      "/#{@test_channel_type.name}"
+    ).and_return({id: 1})
+    channel_type_get = mock(:channel_type_get)
+    channel_type_get.should_receive(:call).with(
+      "/#{@test_channel_type.name}/by_name"
+    ).and_return({id:1, name: "google_analytics"})
+    DriftrockModel::ChannelType.set_get_from_api_method(channel_type_get)
+    channel =DriftrockModel::Channel.
+      find_by_channel_type_name(@test_channel_type.name)
+    channel.id.should == 1
+  end
+
+  it "should be able to get all channel types" do
+    @get_method.should_receive(:call).with(
+      "/types"
+    ).and_return([{id: 1, name: "google_analytics"}])
+    types = DriftrockModel::Channel.channel_types
+    types.size.should == 1
+    types.first.name.should == "google_analytics"
+  end
+
+  it "should be able to replace a channel token" do
+    tkn = {token: "hello", token_expiry: DateTime.now, expires_in: 3600}
+    @put_method.should_receive(:call).with(
+      "/#{@test_channel_type.name}/profile", tkn
+    ).and_return("status" => "success")
+    @test_channel.update_token(tkn)
+    @test_channel.token.should == "hello"
+  end
+
+end

data/spec/models/channel_type_spec.rb

@@ -0,0 +1,17 @@
+require 'website_spec_helper'
+describe DriftrockModel::ChannelType do
+  before do
+    @post_method = mock(:post)
+    @get_method = mock(:get)
+    DriftrockModel::Channel.set_post_to_api_method @post_method
+    DriftrockModel::Channel.set_get_from_api_method @get_method
+    @test_channel = DriftrockModel::Channel.new({
+      id: 1
+    })
+    @test_channel_type = DriftrockModel::ChannelType.new({
+      id: 1,
+      name: "google_analytics"
+    })
+    @test_channel.channel_type = @test_channel_type
+  end
+end

data/spec/models/company_spec.rb

@@ -0,0 +1,33 @@
+require 'website_spec_helper'
+
+describe DriftrockModel::Company do
+  before do
+    @post_method = mock(:post)
+    @get_method = mock(:get)
+    DriftrockModel::Company.set_post_to_api_method @post_method
+    DriftrockModel::Company.set_get_from_api_method @get_method
+    @test_company = DriftrockModel::Company.new({id: 1, name: "test"})
+    @test_user = DriftrockModel::User.new({id: 1, first_name: "test_user"})
+  end
+
+
+  it "should allow the retrieval of a company by its id" do
+    @get_method.should_receive(:call).
+      with("/1").and_return({id: 1, name: "test"})
+    DriftrockModel::Company.find(1).name.should == "test"
+  end
+
+  it "should allow the retrieval of multiple companies" do
+    companies = [{id: 1, name: "test"},{id: 2, name: "test2"}]
+    @get_method.should_receive(:call).
+      with("/").and_return(companies)
+    DriftrockModel::Company.all.last.name.should == "test2"
+  end
+
+  it "should allow a user to be added to a company" do
+    @post_method.should_receive(:call).
+      with("/add_user", {:user_to_add_id=>1}).and_return({'status' => 'success'})
+    @test_company.add_user(@test_user).should be_true
+  end
+
+end

data/spec/models/driftrock_app_spec.rb

@@ -0,0 +1,16 @@
+require 'website_spec_helper'
+describe DriftrockModel::DriftrockApp do
+  before do
+    @post_method = mock(:post)
+    @get_method = mock(:get)
+    DriftrockModel::DriftrockApp.set_post_to_api_method @post_method
+    DriftrockModel::DriftrockApp.set_get_from_api_method @get_method
+  end
+
+  it "should be able to get an app by its app_id" do
+    @get_method.should_receive(:call).with("/string-app-id/by_app_id").
+      and_return({id: 1, name: "test-app"})
+    DriftrockModel::DriftrockApp.find_by_app_id("string-app-id").id.should == 1
+  end
+
+end

data/spec/models/user_spec.rb

@@ -0,0 +1,12 @@
+require 'website_spec_helper'
+
+describe DriftrockModel::User do
+  before do
+    @post_method = mock(:post)
+    @get_method = mock(:get)
+    DriftrockModel::User.set_post_to_api_method @post_method
+    DriftrockModel::User.set_get_from_api_method @get_method
+  end
+
+
+end

data/spec/spec_helper.rb

@@ -1,9 +1,20 @@
 require 'driftrock-service'
-require File.join(File.dirname(__FILE__), *%w[models administrative_api_test.rb])
+require 'rspec/autorun'    
+Dir[File.dirname(__FILE__) + '/helpers/*.rb'].each {|file| require file }
+Dir[File.dirname(__FILE__) + '/builders/*.rb'].each {|file| require file }
 
-Driftrock::Service::Config.init do |config|
-  config.base_url = "http://localhost:9393"
-  config.salt = "3kllki3weid9n3rljcw932oknc2ico23nlckno2i3f2on2o4ilknc2il3jp23mn"
-  config.api_token = "45asf42cwewfwf234/sfw34"
-  config.app_id = "23df434v34gdfnrnrt/regergw4"
+include Driftrock::Service
+    
+RSpec.configure do |config|
+    
+  config.before(:suite) do 
+  end
+    
+  config.before(:each) do  
+  end
+
+  config.after(:each) do   
+  end
+
+  config.order = "random"  
 end

data/spec/website_spec_helper.rb

@@ -0,0 +1,2 @@
+require 'spec_helper'
+DriftrockApi.website_api("test-user-id", "test-company=id")

metadata

@@ -1,56 +1,51 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: driftrock-service
-version: !ruby/object:Gem::Version
-  version: 0.3.3
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: 0.4.0
 platform: ruby
-authors:
+authors: 
 - Max
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-03 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-06-04 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: httparty
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id002 !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
 description: Gem for talking to the driftrock api
-email:
+email: 
 - max.dupenois@forward.co.uk
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
+- .rspec
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -65,38 +60,56 @@ files:
 - lib/driftrock-service/api/website.rb
 - lib/driftrock-service/config.rb
 - lib/driftrock-service/connector.rb
+- lib/driftrock-service/driftrock_api.rb
 - lib/driftrock-service/driftrock_app.rb
 - lib/driftrock-service/driftrock_logger.rb
+- lib/driftrock-service/driftrock_model.rb
+- lib/driftrock-service/driftrock_model/channel.rb
+- lib/driftrock-service/driftrock_model/channel_type.rb
+- lib/driftrock-service/driftrock_model/company.rb
+- lib/driftrock-service/driftrock_model/driftrock_app.rb
+- lib/driftrock-service/driftrock_model/user.rb
 - lib/driftrock-service/errors/driftrock_error.rb
 - lib/driftrock-service/version.rb
-- spec/administrative_api_spec.rb
-- spec/models/administrative_api_test.rb
+- spec/models/channel_spec.rb
+- spec/models/channel_type_spec.rb
+- spec/models/company_spec.rb
+- spec/models/driftrock_app_spec.rb
+- spec/models/user_spec.rb
 - spec/spec_helper.rb
+- spec/website_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:
-- spec/administrative_api_spec.rb
-- spec/models/administrative_api_test.rb
+test_files: 
+- spec/models/channel_spec.rb
+- spec/models/channel_type_spec.rb
+- spec/models/company_spec.rb
+- spec/models/driftrock_app_spec.rb
+- spec/models/user_spec.rb
 - spec/spec_helper.rb
+- spec/website_spec_helper.rb

data/spec/administrative_api_spec.rb

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

data/spec/models/administrative_api_test.rb

@@ -1,8 +0,0 @@
-class AdministrativeApiTest
-  include Driftrock::Service::Api::Website
-
-  def test
-    list_apps 
-  end
-
-end