driftrock-service 0.4.4 → 0.4.5

data/lib/driftrock-service/driftrock_api.rb

@@ -12,13 +12,13 @@ module Driftrock::Service
     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
@@ -29,10 +29,8 @@ module Driftrock::Service
       api
     end
 
-    def self.admin_api
-      api = new
-      api.extend(Driftrock::Service::Api::Admin)
-      api
+    def self.admin_api(user)
+      new(user)
     end
 
     def self.puller_api
@@ -41,15 +39,5 @@ module Driftrock::Service
       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

@@ -8,8 +8,7 @@ module Driftrock::Service
       token     = params[:token]
       expected_token = token_for(timestamp, company_id)
       if token != expected_token
-        redirect_to Driftrock::Service::Config.website_location+
-                    "?unauthorised=true"
+        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/driftrock_model/admin/driftrock_app.rb

@@ -0,0 +1,14 @@
+module Driftrock
+  module Admin
+    module DriftrockModel
+      class DriftrockApp
+        include ::Driftrock::Service::DriftrockModel
+        set_api_path "/admin/apps"
+
+        def self.update(id, app_data)
+          put_to_api_method.call("/#{id}", app_data)
+        end
+      end
+    end
+  end
+end

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

@@ -1,6 +1,7 @@
 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,

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

@@ -2,10 +2,6 @@ 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")
@@ -54,9 +50,8 @@ module Driftrock::Service::DriftrockModel
       new(object_hash)
     end
 
-    def self.all_apps
-      array_of_app_hashes = get_from_api_method.call("/apps", {}, 
-                                                      '/dashboard_api/visitor')
+    def self.all_for_current_user
+      array_of_app_hashes = get_from_api_method.call("/apps_for_current_user")
       array_of_app_hashes.map do |app_hash|
         app_hash.symbolize_keys!
         new(app_hash)

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

@@ -0,0 +1,13 @@
+module Driftrock
+  module Visitor
+    module DriftrockModel
+
+      class DriftrockApp
+        include ::Driftrock::Service::DriftrockModel
+        set_api_path "/dashboard_api/visitor/apps"
+      end
+
+    end
+  end
+
+end

data/lib/driftrock-service/driftrock_model.rb

@@ -1,5 +1,6 @@
 module Driftrock::Service::DriftrockModel
-  module ClassMethods
+
+  module DependencyInjection
     def set_post_to_api_method(method)
       @post_to_api_method = method
     end
@@ -7,7 +8,7 @@ module Driftrock::Service::DriftrockModel
     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
@@ -21,36 +22,41 @@ module Driftrock::Service::DriftrockModel
       @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
+  end
 
-    def set_api_path(path)
-      @api_path = path
-    end
-
-    def api_path
-      @api_path ||= "/"
-      @api_path
-    end
-
-    def find(id)     
+  module ActiveRecordSimulator
+    def find(id)
       object_hash = get_from_api_method.call("/#{id}")
-      new(object_hash)                                       
-    end                                                       
+      new(object_hash)
+    end
 
-    def all    
-      object_arr = get_from_api_method.call("/")         
-      object_arr.map do |object_hash|      
+    def all
+      object_arr = get_from_api_method.call("/")
+      object_arr.map do |object_hash|
         new(object_hash)
-      end      
+      end
     end
 
     def create(data)
       post_to_api_method.call("/new", data)
     end
+  end
+
+  module ClassMethods
+
+    def set_api_path(path)
+      @api_path = path
+    end
+
+    def api_path
+      @api_path ||= "/"
+      @api_path
+    end
 
     def model_post(path, opts={}, root_path=api_path)
       post(root_path+path, opts)
@@ -64,10 +70,6 @@ module Driftrock::Service::DriftrockModel
       get(root_path+path, opts)
     end
 
-    def model_name
-      self.to_s.gsub(/.*\:\:/, "").downcase
-    end
-
   end
 
   def initialize(object_hash)
@@ -78,11 +80,15 @@ module Driftrock::Service::DriftrockModel
     end
     object_hash.each do |(key, value)|
       instance_variable_set(("@"+key.to_s).to_sym, value)
+      instance_var_reader = lambda { instance_variable_get("@" + key.to_s) }
+      self.class.send(:define_method, key.to_s, instance_var_reader)
     end
   end
 
   
   def self.included(base)
+    base.extend DependencyInjection
+    base.extend ActiveRecordSimulator
     base.extend ClassMethods
     base.extend Driftrock::Service::Api
     base.send(:include, Driftrock::Service::Api)
@@ -91,9 +97,11 @@ module Driftrock::Service::DriftrockModel
   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

data/lib/driftrock-service/version.rb

@@ -1,5 +1,5 @@
 module Driftrock
   module Service
-    VERSION = "0.4.4"
+    VERSION = "0.4.5"
   end
 end

data/lib/driftrock-service.rb

@@ -4,7 +4,6 @@ require "driftrock-service/connector"
 require "driftrock-service/api"
 require "driftrock-service/api/website"
 require "driftrock-service/api/visitor"
-require "driftrock-service/api/admin"
 require "driftrock-service/api/data"
 require "driftrock-service/api/puller"
 require "driftrock-service/errors/driftrock_error"
@@ -12,6 +11,17 @@ require "driftrock-service/driftrock_logger"
 require "driftrock-service/driftrock_app"
 require "driftrock-service/driftrock_api"
 
+require "driftrock-service/driftrock_model"
+require "driftrock-service/driftrock_model/driftrock_app"
+
+def require_all(directory_location)
+  folder_glob = File.join(File.dirname(__FILE__), directory_location, *%w[** *.rb])
+  Dir[folder_glob].each do |file|
+    require file
+  end
+end
+
+require_all "driftrock-service/driftrock_model"
 
 module Driftrock
   module Service      

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.4.5
   prerelease: 
-  version: 0.4.4
 platform: ruby
-authors: 
+authors:
 - Max
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-06-05 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-06-06 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
 - .rspec
 - Gemfile
@@ -53,7 +59,6 @@ files:
 - driftrock-service.gemspec
 - lib/driftrock-service.rb
 - lib/driftrock-service/api.rb
-- lib/driftrock-service/api/admin.rb
 - lib/driftrock-service/api/data.rb
 - lib/driftrock-service/api/puller.rb
 - lib/driftrock-service/api/visitor.rb
@@ -64,11 +69,13 @@ files:
 - lib/driftrock-service/driftrock_app.rb
 - lib/driftrock-service/driftrock_logger.rb
 - lib/driftrock-service/driftrock_model.rb
+- lib/driftrock-service/driftrock_model/admin/driftrock_app.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/driftrock_model/visitor/driftrock_app.rb
 - lib/driftrock-service/errors/driftrock_error.rb
 - lib/driftrock-service/version.rb
 - spec/models/channel_spec.rb
@@ -80,32 +87,29 @@ files:
 - 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: 
+test_files:
 - spec/models/channel_spec.rb
 - spec/models/channel_type_spec.rb
 - spec/models/company_spec.rb

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

@@ -1,23 +0,0 @@
-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 update_app(id, app_data)
-          put(URLs::APPS + "/#{id}", app_data)
-        end
-
-      end
-    end
-  end
-end