lymbix 0.3.7 → 0.4.0

data/Changelog

@@ -1,3 +1,4 @@
+v0.4.0 - re-factored whole gem, implemented methods for 2.1 version 
 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

data/lib/lymbix.rb

@@ -1,11 +1,6 @@
 $:.unshift(File.dirname(__FILE__)) unless $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 require 'lymbix/configuration'
-require 'lymbix/user'
 require 'lymbix/request'
 require 'lymbix/response'
-require 'lymbix/word'
-require 'lymbix/base'
-require 'lymbix/connotative_category'
-require 'lymbix/tweet'
-require 'lymbix/data_point'
+require 'lymbix/base'

data/lib/lymbix/base.rb

@@ -1,261 +1,85 @@
 module Lymbix
 
+=begin rdoc
+The Base class is the most used class in the Lymbix gem.
+It incorporates all the methods used to tonalize.
+
+To begin using the base class, you must authenticate using one of the authenticate methods and store the results in a variable. 
+On a successful authentication, you can start calling tonalize methods immediatly.
+=end
+
   class Base
-    attr_accessor :auth_key, :app_id, :lymbix_user_id, :error_messages, :user
-    
-    def initialize(options)
-      unless options[:error_messages]
-        @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
-        end
-      else
-        @error_messages = options[:error_messages]
-      end
-    end
-    
-    def open_bar_auth_key(options)
-      response = Lymbix::Request.new(:post, 'open_bar_auth_key', {:lymbix_user_id => options[:lymbix_user_id], :auth_key => options[:auth_key], :app_id => options[:app_id]}, :app_id => options[:app_id], :other_app_id => options[:other_app_id]).run
-      response.data["auth_key"]
-    end
-    
-    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, :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
-    
-    def word_count      
-      response = request(:get, 'word_count').data
-      response["count"].to_i
-    end
-    
-    def contribution_count      
-      response = request(:get, 'contribution_count').data
-      response["contribution_count"].to_i
-    end
-    
-    def toneaday_daily_best      
-      response = request(:get, 'toneaday_daily_best').data
-      puts response["daily_toneaday_user_id"].to_i
-      [response["daily_toneaday_user_id"].to_i, response["daily_toneaday_contribution_count"].to_i]
-    end
-    
-    def toneaday_weekly_best      
-      response =  request(:get, 'toneaday_weekly_best').data
-      [response["weekly_toneaday_user_id"].to_i, response["weekly_toneaday_contribution_count"].to_i]
-    end
-    
-    def user_contribution_count(user_id)      
-      response = request(:get, "contribution_count/#{user_id}").data
-      response["contribution_count"].to_i
-    end
-    
-    def tonalized_words_count
-      response = request(:get, 'tonalized_words').data
-      response["tonalized_words_count"].to_i
-    end
+    # The user's authentication key
+    attr_accessor :auth_key      
+    # Error messages that were caught during the authentication
+    attr_accessor :error_messages        
+    # API Version
     
-    def word_top_random
-      response = request(:get, 'word_top_random')
-      Word.new(:id => response.data["id"], :word => response.data["word"], :is_external => response.data["is_external"], :is_phrase => response.data["is_phrase"])
+    def initialize(auth_key)
+        @auth_key = auth_key
     end
-    
-    def gold_word_top_random
-      response = request(:get, 'gold_word_top_random')
-      Word.new(:id => response.data["id"], :word => response.data["word"], :is_external => response.data["is_external"], :is_phrase => response.data["is_phrase"])
+                
+    # Tonalizes text using version 2.1 of ToneAPI
+    def tonalize(article, return_fields = [], accept_type = "application/json")
+      @version = 2.1
+      accept_type == "application/xml" ? return_fields = return_fields_xml(return_fields) : return_fields = return_fields_json(return_fields)
+      response = request(:post, 'tonalize',{:article => article, :return_fields => return_fields}, {:accept => accept_type}).data
     end
     
-    
-    def word_lookup(word)
-      response = request(:get, "lookup/#{URI.escape(word)}")
-      if response.data
-        Word.new(:id => response.data["id"], :word => response.data["word"], :is_external => response.data["is_external"], :is_phrase => response.data["is_phrase"])
-      else
-        nil
-      end
-    end
-    
-    def add_word(word, definition, is_phrase = false)
-      ActiveRecord::Base.logger.info "ADD_WORD START"
-      response = request(:post, 'words', {:word => word, :definition => definition, :is_external => true, :is_phrase => is_phrase}) 
-      ActiveRecord::Base.logger.info "ADD_WORD END #{response.inspect}"
-      Word.new(:id => response.data["id"], :word => response.data["word"], :is_external => response.data["is_external"], :is_phrase => response.data["is_phrase"])
-    end
-    
-    def bad_ratings_count(user_id,last_checkout_date)
-      response = request(:get, "bad_ratings_count/#{user_id}/#{last_checkout_date}")
-    end
-    
-    def expunge(word)
-      response = request(:post,'expunge', {:word => word})
-    end
-    
-    # MODERATION
-      
-    def approve_tonecheck_beta(user_id)
-      response = request(:post, 'approve_tonecheck_beta', {:user_id => user_id})
+    # Tonalizes text using version 2.0 of ToneAPI
+    def tonalize_article(article, accept_type = "application/json")
+      @version = 2.0
+      response = request(:post, 'tonalize_article',{:article => article}, {:accept => accept_type}).data
     end
         
-    def reset_tonecheck_beta(user_id)
-      response = request(:post, 'reset_tonecheck_beta', {:user_id => user_id})
+    # Tonalizes mutliple articles using version 2.1 of ToneAPI. With the return_fields param you can now specify which field to get back from the API.
+    def tonalize_multiple(articles, return_fields = [], accept_type = "application/json")
+      @version = 2.1
+      accept_type == "application/xml" ? return_fields = return_fields_xml(return_fields) : return_fields = return_fields_json(return_fields)
+      accept_type == "application/xml" ? articles = articles_xml(articles) : articles = articles_json(articles)
+      response = request(:post, 'tonalize_multiple',{:articles => articles, :return_fields => return_fields}, {:accept => accept_type}).data
     end
     
-    def tonecheck_beta_count
-      response = request(:get, 'tonecheck_beta_count', {:app_id => @app_id})
-      response.data['tonecheck_beta_count']
+    # Tonalizes article using version 2.1 of ToneAPI. With the return_fields param you can now specify which field to get back from the API.
+    # The detailed response includes the tonalization data for the article and all sentences found in the article
+    def tonalize_detailed(article, return_fields = [], accept_type = "application/json")
+      @version = 2.1
+      accept_type == "application/xml" ? return_fields = return_fields_xml(return_fields) : return_fields = return_fields_json(return_fields)
+      response = request(:post, 'tonalize_detailed',{:article => article, :return_fields => return_fields}, {:accept => accept_type}).data
     end
     
-    def tonecheck_beta
-      response = request(:get, 'tonecheck_beta', {:app_id => @app_id})
-      response.data['tonecheck_beta']
-    end
-    
-    def moderated_count
-      response = request(:get, 'moderated_count', {:app_id => @app_id})
-      response.data['moderated_count']
-    end
+    # Flags a phrase to be re-evaluated
+    def flag_response(phrase, api_method_requested, api_version, callback_url = nil)
+      @version = 2.1
+      response = request(:post, 'flag_response', {:phrase => phrase, :api_method_requested => api_method_requested, :api_version => api_version, :callback_url => callback_url}).data
+    end 
     
-    def unmoderated_count
-      response = request(:get, 'unmoderated_count', {:app_id => @app_id})
-      response.data['unmoderated_count'] 
-    end
-    
-    def moderated
-      response = request(:get, 'moderated', {:app_id => @app_id})
-      response.data['moderated']
-    end
-    
-    def unmoderated
-      response = request(:get, 'unmoderated', {:app_id => @app_id})
-      response.data['unmoderated'] 
-    end
-    
-    def user_data_points(user_id, page = 1, earnings_in_cents = 0)
-      response = request(:get, "user_data_points/#{user_id}/#{page}/#{earnings_in_cents}", {:app_id => @app_id})
-      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']
-    end
-    
-    def find_user_by_id(user_id)
-      response = request(:post, "find_user_by_id", {:app_id => @app_id, :user_id => user_id})
-      response.data['user']
-    end
-    
-    def find_users_by_ids(user_ids)
-      response = request(:post, "find_users_by_ids", {:app_id => @app_id, :user_ids => user_ids.join(',')})
-      response.data['users']
-    end
-    
-    def archive_user_data(user_id)
-      response = request(:post, "archive_user_data/#{user_id}", {:app_id => @app_id})
-      response
-    end
-    
-    # END
-    
-    def word_data(phrase)
-      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 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
-    end
-    
-    def tonalize_paragraph(paragraph)
-      response = request(:post, 'tonalize_paragraph', {:paragraph => paragraph}, {:version => 2}).data
-    end
-    
-    def tone_alternates(phrase)
-      response = request(:post, 'suggestions',{:phrase => phrase}).data
-    end
-    
-    def suggest_alternates(phrase,alternates)
-      response = request(:post, 'suggest_alternates',{:phrase => phrase, :alternates => alternates}).data
-    end
-    
-    def tonalize_article(article)
-      response = request(:post, 'tonalize_article',{:article => article},{:version => 2}).data
-    end
-    
-    def all_connotative_categories
-      response = request(:get, 'connotative_categories')
-      all_cc = []
-      response.data.each do |cc|
-        all_cc << ConnotativeCategory.new(:id => cc["id"], :name => cc["name"], :is_positive => cc["is_positive"])
-      end
-      all_cc
-    end
-    
-    def top_tweet
-      response = request(:get, 'top_tweet').data
-      tweet = Tweet.new(:id => response["id"], :is_user_created => response["is_user_created"], :tweet => response["tweet"], :requested_count => response["requested_count"])
-      tweet.instance_variable_set(:@phrases_found,response["phrases_found"])
-      return tweet
+    private
+    def request(action, method, data, headers = {})
+      Lymbix::Request.new(action, method, {:app_id => @app_id, :auth_key => @auth_key, :version => @version, :accept_type => headers[:accept]}, data).run
     end
     
-    def dominant_words(phrase)
-      response = request(:post, 'dominant_words',{:phrase => phrase}).data
+    def return_fields_xml(return_fields)
+      xml = "<return_fields>"
+      return_fields.each {|field| xml << "<field>" + field + "</field>"}
+      xml << "</return_fields>"
+      xml
     end
     
-    def swap_groups(lymbix_user_id, group_remove, group_add)
-      response = request(:post, 'swap_groups', {:lymbix_user_id => lymbix_user_id, :group_remove => group_remove, :group_add => group_add})
+    def return_fields_json(return_fields)
+      return_fields.to_json
     end
     
-    def phrase_search(query)
-      response = request(:post, "phrase_search", {:app_id => @app_id, :query => query})
-      response.data['phrases']
+    def articles_xml(articles)
+      xml = "<articles>"
+      articles.each {|article| xml << "<article>" + article + "</article>"}
+      xml << "</articles>"
+      xml
     end
     
-    private
-    def request(action, method, data = nil,headers = nil)
-      if headers
-        Lymbix::Request.new(action, method, {:app_id => @app_id, :auth_key => @auth_key, :lymbix_user_id => @lymbix_user_id, :version => headers[:version]}, data).run
-      else
-        Lymbix::Request.new(action, method, {:app_id => @app_id, :auth_key => @auth_key, :lymbix_user_id => @lymbix_user_id, :version => 1}, data).run
-      end
+    def articles_json(articles)
+      articles.to_json
     end
-
   end
 
 end

data/lib/lymbix/request.rb

@@ -15,7 +15,7 @@ module Lymbix
     
     def connection
       options = {}
-      options[:headers] = {:accept => "application/json", :APP_ID => self.header_hash[:app_id].to_s, :LYMBIX_USER_ID => self.header_hash[:lymbix_user_id], :AUTHENTICATION => self.header_hash[:auth_key], :VERSION => self.header_hash[:version]}            
+      options[:headers] = {:accept => self.header_hash[:accept_type], :AUTHENTICATION => self.header_hash[:auth_key], :VERSION => self.header_hash[:version]}            
       RestClient::Resource.new(self.url, options)
     end
     
@@ -23,32 +23,14 @@ module Lymbix
       case(self.http_method)
       when :get
         self.connection[self.method].get do |resp|
-          begin
-          case resp.code 
-            when 200
-              self.response = resp.body
-            when 401
-              raise RestClient::Unauthorized
-            end
-          rescue
-            puts resp.inspect
-          end
+          self.response = resp.body
         end
       when :post
         self.connection[self.method].post(object) do |resp|
-          begin
-          case resp.code 
-            when 200
-              self.response = resp.body
-            when 401
-              raise RestClient::Unauthorized
-            end
-          rescue
-            puts resp.inspect
-          end
+          self.response = resp.body
         end
       end
       Response.new(self.response)
     end
   end
-end
+end

data/lib/lymbix/response.rb

@@ -20,11 +20,11 @@ module Lymbix
           end
         rescue
         @success = false
-        @data = response
+        @data = response.to_s
         end
       else
         @success = false
-        @data = nil
+        @data = response.to_s
       end
     end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: lymbix
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 15
   prerelease: false
   segments: 
   - 0
-  - 3
-  - 7
-  version: 0.3.7
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Patrick Roy
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-14 00:00:00 -03:00
+date: 2010-12-17 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -37,13 +37,8 @@ files:
 - lib/lymbix/configuration.rb
 - lib/lymbix.rb
 - lib/lymbix/base.rb
-- lib/lymbix/connotative_category.rb
-- lib/lymbix/data_point.rb
 - lib/lymbix/request.rb
 - lib/lymbix/response.rb
-- lib/lymbix/tweet.rb
-- lib/lymbix/user.rb
-- lib/lymbix/word.rb
 has_rdoc: true
 homepage: http://www.lymbix.com/
 licenses: []

data/lib/lymbix/connotative_category.rb

@@ -1,15 +0,0 @@
-module Lymbix
-
-  class ConnotativeCategory
-
-    attr_accessor :id, :name, :is_positive
-
-    def initialize(options)
-      @id = options[:id]
-      @name = options[:name]
-      @is_positive = options[:is_positive]
-    end
-
-  end
-end
-

data/lib/lymbix/data_point.rb

@@ -1,61 +0,0 @@
-module Lymbix
-
-  class DataPoint
-
-    attr_accessor :id, :word_id, :definition_id, :category_id, :data, :created_at, :updated_at, :user_id, :auth_key, :app_id, :lymbix_user_id
-
-    def initialize(data = nil)
-      if data
-        @id = data[:id]
-        @word_id = data[:word_id]
-        @definition_id = data[:definition_id]
-        @category_id = data[:category_id]
-        @data = data[:data]
-        @created_at = data[:created_at]
-        @updated_at = data[:updated_at]
-        @user_id = data[:user_id]
-        @app_id = data[:app_id]
-        @auth_key = data[:auth_key]
-        @lymbix_user_id = data[:lymbix_user_id]
-      end
-    end
-    
-    def self.create(data)
-      categories_data = "{"
-      data[:data_points].each do |dp|
-        categories_data << ":category_id_#{dp[:category_id]} => #{dp[:data]},"
-      end
-      categories_data.chop!
-      categories_data << "}"
-      response = Lymbix::Request.new(:post, "data_points",{:app_id => data[:app_id], :auth_key => data[:auth_key], :lymbix_user_id => data[:lymbix_user_id]}, {:worker_id => data[:worker_id], :phrase => data[:phrase], :start_rate_time => data[:start_rate_time], :end_rate_time => data[:end_rate_time], :word_id => data[:word_id], :definition_id => data[:definition_id], :user_id => data[:user_id], :lymbix_user_id => data[:lymbix_user_id]}.merge!(eval(categories_data))).run
-    end
-    
-    def save
-      response = Lymbix::Request.new(:post, "data_points",{:app_id => @app_id, :auth_key => @auth_key, :lymbix_user_id => @lymbix_user_id}, {:word_id => @word_id, :definition_id => @definition_id, :category_id => @category_id, :data => @data, :user_id => @user_id}).run
-      DataPoint.new(:id => response.data["id"], :word_id => response.data["word_id"], :definition_id => response.data["definition_id"], :category_id => response.data["category_id"], :data => response.data["data"], :created_at => response.data["created_at"], :updated_at => response.data["updated_at"], :user_id => response.data["user_id"], :lymbix_user_id => response.data["lymbix_user_id"])
-    end
-
-  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

data/lib/lymbix/tweet.rb

@@ -1,15 +0,0 @@
-module Lymbix
-
-  class Tweet
-
-    attr_accessor :id, :is_user_created, :tweet, :requested_count
-
-    def initialize(options)
-      @id = options[:id]
-      @is_user_created = options[:is_user_created]
-      @tweet = options[:tweet]
-      @requested_count = options[:requested_count]
-    end
-
-  end
-end

data/lib/lymbix/user.rb

@@ -1,98 +0,0 @@
-module Lymbix
-  class User
-    attr_accessor :auth_key, :name, :error_messages, :age, :country, :state, :gender, :first_language, :year_of_birth, :education, :level, :strikes, :lymbix_user_id, :activated_at, :email, :is_admin, :app_member
-    
-    def initialize(options)
-      @auth_key = options["auth_key"] || options[:auth_key]
-      @name = options["name"] || options[:name]
-      @age = options["age"] || options[:age]
-      @country = options["country"] || options[:country]
-      @state = options["state"] || options[:state]
-      @gender = options["gender"] || options[:gender]
-      @first_language = options["first_language"] || options[:first_language]
-      @level = options["level"] || options[:level]
-      @strikes = options["strikes"] || options[:strikes]
-      @year_of_birth  = options["year_of_birth"] || options[:year_of_birth]
-      @education = options["education"] || options[:education]
-      @error_messages = options[:error_messages]
-      @lymbix_user_id = options["id"] || options[:lymbix_user_id]
-      @activated_at = options["activated_at"] || options[:activated_at]
-      @email = options["email"] || options[:email]
-      @is_admin = options["is_admin"] || options[:is_admin]
-    end
-    
-    def self.auth_login(auth_key, app_id)
-        response = Lymbix::Request.new(:post, 'auth_login', {:app_id => app_id}, {:auth_key => auth_key}).run
-        self.new(response.data.to_hash)
-      rescue Exception => ex
-        self.new(:error_messages => ["#{ex.message}"])
-    end
-    
-    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"])
-    rescue Exception => ex    
-      self.new(:error_messages => ["#{ex.message}"])
-    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        
-        self.new(response.data.to_hash)
-      rescue Exception => ex        
-        self.new(:error_messages => [ex.message])
-      end
-    end
-    
-    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
-        self.new(:error_messages => [ex.message])
-      end
-    end
-    
-    def self.find_or_create(params)
-      
-      begin
-        # response = Lymbix::Request.new(:post, 'find_user', {:app_id => @app_id, :auth_key => @auth_key, :lymbix_user_id => @lymbix_user_id}, {:email => params[:user][:email]}).run
-        response = Lymbix::Request.new(:post, 'find_user', {:app_id => params[:app_id]}, {:email => params[:user][:email]}).run
-        
-        ActiveRecord::Base.logger.info "!! REQUEST DONE - #{response.inspect}"
-        
-        unless response.data["email"]          
-          response = Lymbix::Request.new(:post, 'users', {:app_id => params[:app_id]}, params[:user]).run #unless response.data['auth_key']
-          if response.data["error_messages"]
-            return self.new(:error_messages => response.data["error_messages"])
-          end
-        end
-        
-        self.new(response.data.to_hash)
-      rescue Exception => ex
-        ActiveRecord::Base.logger.info "!! REQUEST FAIL - #{ex.message}"
-        
-        self.new(:error_messages => [ex.message])
-      end
-    end
-    
-    def self.update(params)
-      response = Lymbix::Request.new(:post, 'update_user', {:lymbix_user_id => params[:lymbix_user_id], :app_id => params[:app_id], :auth_key => params[:auth_key]}, {:email => params[:email], :name => params[:name], :password => params[:password], :password_confirmation => params[:password_confirmation], :age => params[:age], :country => params[:country], :state => params[:state], :gender => params[:gender], :first_language => params[:first_language], :year_of_birth => params[:year_of_birth], :education => params[:education]}).run
-      if response.success
-        self.new(:auth_key => response.data['auth_key'], :level => response.data['level'], :strikes => response.data['strikes'], :name => response.data['name'],:age => response.data['age'], :country => response.data['country'], :state => response.data['state'],:name => response.data['name'], :gender => response.data['gender'], :first_language => response.data['first_language'], :education => response.data['education'], :year_of_birth => response.data['year_of_birth'] , :error_messages => [])
-      else
-        self.new(:error_messages => response.data.errors)
-      end
-    end
-    
-    def self.request_tonecheck_beta(params)
-      response = Lymbix::Request.new(:post, 'request_tonecheck_beta', {:app_id => params[:app_id], :auth_key => params[:auth_key]}, {:user_id => params[:user_id]}).run      
-      response.data['user']
-    end
-  end
-
-end

data/lib/lymbix/word.rb

@@ -1,78 +0,0 @@
-module Lymbix
-
-  class Word
-
-    attr_reader :id, :word, :is_external, :is_phrase
-
-    def initialize(data)
-      @id = data[:id]
-      @word = word = data[:word]
-      @is_external = data[:is_external]
-      @is_phrase = data[:is_phrase]
-    end
-
-  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