driftrock-service 0.4.14 → 0.4.15

data/lib/driftrock-service/driftrock_model.rb

@@ -41,7 +41,7 @@ module Driftrock::Service::DriftrockModel
         object_hash = get_from_api_method.call("/#{type}/#{args.first}")
         new(object_hash)
       else
-        super
+        super(method_sym, *args)
       end
     end
 
@@ -88,7 +88,6 @@ module Driftrock::Service::DriftrockModel
     else
       symbolise_keys(object_hash)
     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) }

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

@@ -4,20 +4,22 @@ module Driftrock::Service::DriftrockModel
     set_api_path "/dashboard_api/company"    
 
     attr_reader :id, :name
-    
+
+    def initialize(object_hash)
+      super(object_hash)
+      if @data_sources
+        @channels = @data_sources.map do |channel_data|
+          build_channel_from_data(channel_data)
+        end
+      end
+    end
+
     def channels(refresh=false)
       unless @channels && !refresh
         @channels = []
         response = get_from_api_method.call('/channels')
         response.each do |channel_data|
-          channel_data = symbolise_keys(channel_data)
-          channel = Channel.new({
-            profile_id: channel_data[:profile],
-          })
-          channel.channel_type = ChannelType.new({
-            name: channel_data[:type]
-          })
-          @channels << channel
+          @channels << build_channel_from_data(channel_data)
         end
       end
       @channels
@@ -59,12 +61,28 @@ module Driftrock::Service::DriftrockModel
       !found
     end
 
-    def add_user(user)
+    def invite_user(email)
       response = post_to_api_method.call(
-        '/add_user', {user_to_add_id: user.id}
+        '/invite_user', {user_to_invite_email: email}
       )
-      response['status'] == 'success'
+      invitation = symbolise_keys(response)
+      if invitation[:has_user].is_a?(String)
+        invitation[:has_user] = !!(invitation[:has_user] =~ /true/i)
+      end
+      invitation
     end
+    private
 
+    def build_channel_from_data(channel_data)
+      channel_data = symbolise_keys(channel_data)
+      channel = Channel.new({
+        profile_id: channel_data[:profile],
+      })
+      channel.channel_type = ChannelType.new({
+        name: channel_data[:type]
+      })
+      channel
+    end
+      
   end
 end

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

@@ -0,0 +1,11 @@
+module Driftrock::Service::DriftrockModel
+  class CompanyInvite
+    include Driftrock::Service::DriftrockModel
+    set_api_path "/dashboard_api/invite"
+    attr_reader :invite_code, :email, :has_user, :company
+    def initialize(object_hash)
+      super(object_hash)
+      @company = Company.new(company)
+    end
+  end
+end

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

@@ -6,12 +6,14 @@ module Driftrock::Service::DriftrockModel
 
     [:twitter, :facebook, :adwords, :conversion, :user].each do |data_type|
       define_method("requires_#{data_type}_data?".to_sym) do
-        requirement = method("requirement_for_#{data_type}_data").call
+        req_method_sym = "requirement_for_#{data_type}_data".to_sym
+        requirement = respond_to?(req_method_sym) ? send(req_method_sym) : :none
         requirement = requirement ? requirement.to_sym : :none
         requirement == :requires
       end
       define_method("uses_#{data_type}_data?".to_sym) do
-        requirement = method("requirement_for_#{data_type}_data").call
+        req_method_sym = "requirement_for_#{data_type}_data".to_sym
+        requirement = respond_to?(req_method_sym) ? send(req_method_sym) : :none
         requirement = requirement ? requirement.to_sym : :none
         [:requires, :optional].include?(requirement)
       end

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

@@ -2,7 +2,15 @@ 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
+    attr_reader :id, :session_id, :first_name, :last_name, :email, :invites
+
+    def initialize(object_hash)
+      super(object_hash)
+      @invites = [] unless invites && invites.is_a?(Array)
+      @invites = invites.map do |invite|
+        CompanyInvite.new(invite)
+      end
+    end
 
     def admin?
       @check_admin
@@ -13,22 +21,29 @@ module Driftrock::Service::DriftrockModel
       #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_invite(invite_code)
+      post_to_api_method.call("/invitation/#{invite_code}/add")
+    end
+
+
+    def accept_invitation(company_id)
+      post_to_api_method.call("/invitation/#{company_id}/accept")
+    end
     
+    def reject_invitation(company_id)
+      post_to_api_method.call("/invitation/#{company_id}/reject")
+    end
+
     def add_company(company_data)
       post_to_api_method.call("/company", company_data.merge({
         user_id: session_id

data/lib/driftrock-service/version.rb

@@ -1,5 +1,5 @@
 module Driftrock
   module Service
-    VERSION = "0.4.14"
+    VERSION = "0.4.15"
   end
 end

data/spec/models/company_spec.rb

@@ -26,8 +26,8 @@ describe DriftrockModel::Company do
 
   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
+      with("/invite_user", {:user_to_invite_email=>@test_user.email}).and_return({'status' => 'success'})
+    @test_company.invite_user(@test_user.email).should be_true
   end
 
   it "should be have knowledge of which channels it has access to" do

data/spec/models/driftrock_app_spec.rb

@@ -8,7 +8,7 @@ describe DriftrockModel::DriftrockApp do
   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").
+    @get_method.should_receive(:call).with("/app_id/string-app-id").
       and_return({id: 1, name: "test-app"})
     DriftrockModel::DriftrockApp.find_by_app_id("string-app-id").id.should == 1
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: driftrock-service
 version: !ruby/object:Gem::Version
-  version: 0.4.14
+  version: 0.4.15
   prerelease: 
 platform: ruby
 authors:
@@ -75,6 +75,7 @@ files:
 - 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/company_invite.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