lymbix 0.3.6 → 0.3.7

data/Changelog

@@ -1,3 +1,4 @@
+v0.3.7 - added endpoint attribute to Base for companies implementation
 v0.3.6 - added end and start time to data points coming from toneaday
 v.0.3.5 - added tonalize_article, tonalize_paragraph which belongs to the 2.0 version of gyrus, also modified the request to include the version header
 v.0.3.4 - fixed issue when setting host it still kept default host instead

data/lib/lymbix/base.rb

@@ -8,6 +8,7 @@ module Lymbix
         @auth_key = options[:auth_key]
         @app_id = options[:app_id]
         @lymbix_user_id = options[:lymbix_user_id]
+        @endpoint = options[:endpoint]
         @user = User.new(options[:user].merge({:auth_key => options[:auth_key]})) if options[:user]
         if @user
           @lymbix_user_id = @user.lymbix_user_id
@@ -25,13 +26,23 @@ module Lymbix
     def self.authenticate(email, password, app_id)
       response = Lymbix::Request.new(:post, 'authenticate', {:app_id => app_id}, {:app_id => app_id, :email => email, :password => password}).run
       hash_response = response.data.to_hash
-      self.new(:auth_key => hash_response["auth_key"], :app_id => app_id, :user => {:name => hash_response["name"], :age => hash_response["age"], :country => hash_response["country"], :state => hash_response["state"], :lymbix_user_id => hash_response["id"], :gender => hash_response["gender"], :error_messages => []})
+      self.new(:auth_key => hash_response["auth_key"], :app_id => app_id, :endpoint => hash_response["endpoint"], :user => {:name => hash_response["name"], :age => hash_response["age"], :country => hash_response["country"], :state => hash_response["state"], :lymbix_user_id => hash_response["id"], :gender => hash_response["gender"], :error_messages => []})
     rescue RestClient::Unauthorized
       self.new(:error_messages => "Wrong Password")
     rescue Exception => ex
       self.new(:error_messages => "#{ex.message} \n #{ex.backtrace}")
     end
     
+    def self.authenticate_from_auth_and_id(lymbix_user_id, auth_key, app_id)
+      ActiveRecord::Base.logger.info "self.authenticate_from_auth_and_id"
+      
+      response = Lymbix::Request.new(:post, 'authenticate_from_auth_and_id', {:app_id => app_id}, {:app_id => app_id, :lymbix_user_id => lymbix_user_id, :auth_key => auth_key}).run
+      hash_response = response.data.to_hash
+      self.new(:auth_key => hash_response["auth_key"], :app_id => app_id, :user => {:name => hash_response["name"], :age => hash_response["age"], :country => hash_response["country"], :state => hash_response["state"], :lymbix_user_id => hash_response["id"], :gender => hash_response["gender"], :error_messages => []})
+    rescue Exception => ex
+      self.new(:error_messages => "#{ex.message} \n #{ex.backtrace}")
+    end
+    
     def service_up
       response = request(:get, 'service_up').data
     end
@@ -147,6 +158,12 @@ module Lymbix
       response.data['data']
     end
     
+    def medulla_data_points(phrase)
+      response = request(:get, "medulla_data_points", {:app_id => @app_id, :phrase => phrase})
+      ActiveRecord::Base.logger.info "!!! medulla_data_points #{response.data['data']}"
+      response.data['data']
+    end
+    
     def user_search(query)
       response = request(:post, "user_search", {:app_id => @app_id, :query => query})
       response.data['users']
@@ -173,13 +190,13 @@ module Lymbix
       response = request(:post, 'word_data', {:phrase => phrase}).data
     end
     
-    def update_user_app_config(user_app_config_xml)
-      response = request(:post, 'update_user_app_config', {:user_app_config => user_app_config_xml},{:version => 2}).data
-    end
+    # def update_user_app_config(user_app_config_xml)
+    #       response = request(:post, 'update_user_app_config', {:user_app_config => user_app_config_xml},{:version => 2}).data
+    #     end
     
-    def checksum_user_app_config
-      response = request(:get, 'checksum_user_app_config',nil,{:version => 2}).data
-    end
+    # def checksum_user_app_config(checksum)
+    #               response = request(:post, 'checksum_user_app_config',{:checksum_user_app_config => checksum},{:version => 2}).data
+    #             end
     
     def tonalize_words(phrase)
       response = request(:post, 'tonalize_words', {:phrase => phrase}).data
@@ -225,6 +242,11 @@ module Lymbix
       response = request(:post, 'swap_groups', {:lymbix_user_id => lymbix_user_id, :group_remove => group_remove, :group_add => group_add})
     end
     
+    def phrase_search(query)
+      response = request(:post, "phrase_search", {:app_id => @app_id, :query => query})
+      response.data['phrases']
+    end
+    
     private
     def request(action, method, data = nil,headers = nil)
       if headers

data/lib/lymbix/configuration.rb

@@ -3,7 +3,7 @@ module Lymbix
   class Configuration
     
     attr_accessor :host
-    
+
     @@host = "https://gyrus.lymbix.com"
     
     def self.host

data/lib/lymbix/request.rb

@@ -3,7 +3,6 @@ require 'json'
 
 module Lymbix
   class Request
-    
     attr_accessor :url, :http_method, :response, :method, :object, :header_hash
     
     def initialize(http_method, method, header_hash, object = nil) #:nodoc:

data/lib/lymbix/user.rb

@@ -30,6 +30,7 @@ module Lymbix
     
     def self.authenticate(email, password, app_id)
       response = Lymbix::Request.new(:post, 'authenticate', {:app_id => app_id}, {:email => email, :password => password, :app_id => app_id}).run
+      ActiveRecord::Base.logger.info "!!! self.authenticate response.inspect"
       self.new(response.data.to_hash)
     rescue RestClient::Unauthorized      
       self.new(:error_messages => ["Wrong Password"])
@@ -38,16 +39,17 @@ module Lymbix
     end
     
     def self.enable_application(params)
-      begin
-        response = Lymbix::Request.new(:post, 'enable_application', {:app_id => params[:app_id]}, {:email => params[:email], :password => params[:password]}).run
+      begin        
+        response = Lymbix::Request.new(:post, 'enable_application', {:app_id => params[:app_id]}, {:email => params[:email], :password => params[:password]}).run        
         self.new(response.data.to_hash)
-      rescue Exception => ex
+      rescue Exception => ex        
         self.new(:error_messages => [ex.message])
       end
     end
     
-    def self.find_by_email(params)      
-      begin        
+    def self.find_by_email(params)
+      ActiveRecord::Base.logger.info "!!! self.find_by_email(params)  #{params[:email]}"
+      begin
         response = Lymbix::Request.new(:post, 'user_find_by_email', {:app_id => params[:app_id]}, {:email => params[:email]}).run
         self.new(response.data.to_hash)
       rescue Exception => ex

data/lib/lymbix.rb

@@ -8,211 +8,4 @@ require 'lymbix/word'
 require 'lymbix/base'
 require 'lymbix/connotative_category'
 require 'lymbix/tweet'
-require 'lymbix/data_point'
-
-# require 'rest_client'
-# require 'json'
-# require 'benchmark'
-# 
-# module Lymbix
-# 
-#   GYRUS_URL = "http://localhost:4567"
-#   FORNIX_URL = "http://localhost:9393"
-# 
-#   @@auth_token = ''
-#   @@response = nil
-# 
-#   cattr_accessor :auth_token
-# 
-# 
-#   def self.request(resource, action = "get", object = nil, fornix = false)
-#     result = nil
-#     connection = RestClient::Resource.new(fornix ? FORNIX_URL : GYRUS_URL, :headers => { :AUTHENTICATION => @@auth_token })
-#     case(action)
-#     when "get"
-#       result = connection[resource].get
-#     when "post"
-#       result = connection[resource].post object
-#     end
-#     result
-#   end
-# 
-#   #--------------------------------------------------------------------------
-#   # BaseObject
-#   #==========================================================================
-# 
-#   class BaseObject < Struct
-#   end
-# 
-#   #--------------------------------------------------------------------------
-#   # Users
-#   #==========================================================================
-#   
-#   User = BaseObject.new(:id, :login, :email, :gender, :country, :state, :age)
-#   
-#   class User
-# 
-#     def self.authenticate(login, password)
-#       resp = Lymbix::request("login", "post", {:login => login, :password => password}, true)
-#       return nil if resp == "null"
-# 
-#       user = JSON.load(resp)
-# 
-#       User.new(user["id"], user["login"], user["email"], user["gender"], user["country"], user["state"], user["age"])
-#     end
-# 
-#   end
-# 
-#   #--------------------------------------------------------------------------
-#   # Words
-#   #==========================================================================
-# 
-#   Word = BaseObject.new(:id, :word, :is_external, :is_phrase)
-# 
-#   #<struct Lymbix::Word id={:is_external=>false, :id=>34941, :word=>"demand"}, word=nil, is_external=nil>
-# 
-#   class Word
-# 
-#     def self.count
-#       resp = Lymbix::request('word_count')
-#     end
-# 
-#     def self.top_random
-#       resp = Lymbix::request('top_random')
-#       word = JSON.load(resp)
-# 
-#       return nil if word.nil? || word.empty?
-#       Word.new(word["id"], word["word"], word["is_external"], word["is_phrase"])
-#     end
-# 
-#     def self.add_word(word, definition, is_phrase = false)
-#       resp = Lymbix::request('words', 'post', {:word => word, :definition => definition, :is_external => true, :is_phrase => is_phrase})
-#       word = JSON.load(resp)
-#       return nil if word.nil? || word.empty?
-#       Word.new(word["id"], word["word"], word["is_external"], word["is_phrase"])
-#     end
-# 
-#     def self.lookup(word)
-#       resp = Lymbix::request("lookup/#{word}")
-#       return nil if resp == "null"
-# 
-#       word = JSON.load(resp)
-# 
-#       return nil if word.nil? || word.empty?
-#       Word.new(word["id"], word["word"], word["is_external"], word["is_phrase"])
-#     end
-# 
-#     def self.search(word)
-#       resp = Lymbix::request("search/#{word}")
-#       word = JSON.load(resp)
-# 
-#       return nil if word.nil? || word.empty?
-#       Word.new(word["id"], word["word"], word["is_external"], word["is_phrase"])
-#     end
-# 
-#     def self.find(word_id)
-#       resp = Lymbix::request("words/#{word_id}")
-#       word = JSON.load(resp)
-# 
-#       return nil if word.nil? || word.empty?
-#       Word.new(word["id"], word["word"], word["is_external"], word["is_phrase"])
-#     end
-# 
-#     def definitions
-#       Definition::list(self.id)
-#     end
-# 
-#   end
-# 
-#   #--------------------------------------------------------------------------
-#   # Tweets
-#   #==========================================================================
-# 
-#   Tweet = BaseObject.new(:id, :is_user_created, :tweet, :requested_count)
-# 
-#   class Tweet
-# 
-#     def self.top_tweet
-#       resp = Lymbix::request('top_tweet')
-#       resp = JSON.load(resp)
-# 
-#       return nil if resp.nil?
-#       Tweet.new(resp["id"], resp["is_user_created"], resp["tweet"], resp["requested_count"])
-#     end
-# 
-#   end
-# 
-# 
-#   #--------------------------------------------------------------------------
-#   # Definitions
-#   #==========================================================================
-# 
-#   Definition = BaseObject.new(:id, :pos, :category_id, :definition)
-# 
-#   class Definition
-# 
-#     def self.list(word_id)
-#       resp = Lymbix::request("word/#{word_id}/definitions")   #Change to Words
-#       definitions = JSON.load(resp)
-#       definition_list = []
-#       definitions.each do |definition|
-#         definition_list << Definition.new(definition["id"], definition["pos"], definition["category_id"], definition["definition"])
-#       end 
-#       definition_list
-#     end
-# 
-#     def self.find(definition_id)
-#       resp = Lymbix::request("definitions/#{definition_id}")
-#       definition = JSON.load(resp)
-#       Definition.new(definition["id"], definition["pos"], definition["category_id"], definition["definition"])
-#     end
-# 
-#   end
-# 
-#   #--------------------------------------------------------------------------
-#   # ConnotativeCategory
-#   #==========================================================================
-# 
-#   ConnotativeCategory = BaseObject.new(:id, :name, :is_positive)
-# 
-#   class ConnotativeCategory
-#     def self.all
-#       resp = Lymbix::request("connotative_categories")
-#       connotative_categories = JSON.load(resp)
-#       connotative_categories_list = []
-#       connotative_categories.each do |connotative_category|
-#         connotative_categories_list << ConnotativeCategory.new(connotative_category["id"], connotative_category["name"], connotative_category["is_positive"])
-#       end
-#       puts connotative_categories_list.inspect
-#       connotative_categories_list
-#     end
-# 
-#     def self.find(id)
-#       resp = Lymbix::request("connotative_categories/#{id}")
-#       connotative_category = JSON.load(resp)
-#       ConnotativeCategory.new(connotative_category["id"], connotative_category["name"], connotative_category["is_positive"])
-#     end
-#   end
-# 
-#   #--------------------------------------------------------------------------
-#   # DataPoint
-#   #==========================================================================
-# 
-#   DataPoint = BaseObject.new(:id, :word_id, :definition_id, :category_id, :data, :created_at, :updated_at, :user_id)
-# 
-#   class DataPoint
-#     def save
-#       resp = Lymbix::request("data_points", "post", {:word_id => self["word_id"], :definition_id => self["definition_id"], :category_id => self["category_id"], :data => self["data"], :user_id => self["user_id"]})
-#       data_point = JSON.load(resp)
-#       DataPoint.new(data_point["id"], data_point["word_id"], data_point["definition_id"], data_point["category_id"], data_point["data"], data_point["created_at"], data_point["updated_at"], data_point["user_id"])
-#     end
-# 
-#     def self.find(data_point_id)
-#       resp = Lymbix::request("data_points/#{data_point_id}")
-#       data_point = JSON.load(resp)
-#       DataPoint.new(data_point["id"], data_point["word_id"], data_point["definition_id"], data_point["category_id"], data_point["data"], data_point["created_at"], data_point["updated_at"], data_point["user_id"])
-#     end
-# 
-#   end
-# 
-# end
+require 'lymbix/data_point'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: lymbix
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 3
-  - 6
-  version: 0.3.6
+  - 7
+  version: 0.3.7
 platform: ruby
 authors: 
 - Patrick Roy