tr8n_core 4.2 → 4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0baac64dd209fa38abfdbd9e9b74dc73a8bef620
-  data.tar.gz: 9c3aee8e89c3aad83151f5ce1ec5970d96de34e5
+  metadata.gz: 4677e94f7e97da4ce77e060fe72c2bef2db5ca94
+  data.tar.gz: 3f05a3e92037e05497c4c005e48ff2ccdbf348a5
 SHA512:
-  metadata.gz: b8c57324b77a158776980bcbac2d4d439d150105aa2fabf3baeaf33c6f920ad04f7d064d263ed6e1f7db23cbaed62601bff4a5ea6b264f0f66b6d38aa5d7c78d
-  data.tar.gz: 1eb5e3b4a46aa22dbf63a99ae85755ac821e22bcb84f9e14206162d1cc447c644e79c0fe199123a12dec6e06f1c5338af4dc44e9027333030a8c63762bfc5f3d
+  metadata.gz: 2aaa9a7bc5eb6000bc0b43314bad5e8352f7a484ac3eb83e0038de4b5503ff1e0849a17ea3b6bf47ce1b554ed3d8614e28f35a039049aab981d4fd6112e278eb
+  data.tar.gz: 7d3580bbc2b8acd859dce089ae21a4d0a6a7a93bf23ffea275564443733442f8243adac54d2ba1669a6209696741cadb5c8290e9bfefdb500c70025da00f3f9d

data/lib/tr8n/api/client.rb

@@ -39,16 +39,19 @@ class Tr8n::Api::Client < Tr8n::Base
   attributes :application
 
   def access_token
+    return Tr8n::Session.access_token if Tr8n::Session.access_token
+
     application.access_token ||= begin
-      Tr8n.cache.fetch("#{application.key}/access_token") do
+      token = Tr8n.cache.fetch("#{application.key}/access_token") do
         api('oauth/token', {
           :client_id      => application.key,
           :client_secret  => application.secret,
           :grant_type     => :client_credentials
         }, {:method => :post})
       end
+      Tr8n::Session.access_token = token['access_token']
+      Tr8n::Session.access_token
     end
-    application.access_token['access_token']
   end
 
   def results(path, params = {}, opts = {})
@@ -63,6 +66,14 @@ class Tr8n::Api::Client < Tr8n::Base
     api(path, params, opts.merge(:method => :post))
   end
 
+  def put(path, params = {}, opts = {})
+    api(path, params, opts.merge(:method => :put))
+  end
+
+  def delete(path, params = {}, opts = {})
+    api(path, params, opts.merge(:method => :delete))
+  end
+
   def self.error?(data)
     not data['error'].nil?
   end
@@ -128,10 +139,18 @@ class Tr8n::Api::Client < Tr8n::Base
     path = prepare_api_path(path)
     params = params.merge(:access_token => access_token) unless path.index('oauth')
 
+    if opts[:method] == :post
+      params = params.merge(:api_key => application.key)
+    end
+
     Tr8n.logger.trace_api_call(path, params, opts) do
       begin
         if opts[:method] == :post
           response = connection.post(path, params)
+        elsif opts[:method] == :put
+          response = connection.put(path, params)
+        elsif opts[:method] == :delete
+          response = connection.delete(path, params)
         else
           response = connection.get(path, params)
         end
@@ -147,6 +166,8 @@ class Tr8n::Api::Client < Tr8n::Base
       raise Tr8n::Exception.new("Error: #{response.body}")
     end
 
+    return if response.body.nil? or response.body == ''
+
     begin
       data = JSON.parse(response.body)
     rescue Exception => ex

data/lib/tr8n/application.rb

@@ -47,6 +47,7 @@ class Tr8n::Application < Tr8n::Base
   def fetch
     update_attributes(api_client.get('applications/current', {:definition => true}, {:cache_key => self.class.cache_key}))
   rescue Tr8n::Exception => ex
+    pp ex, ex.backtrace
     Tr8n.logger.error("Failed to load application: #{ex}")
     self
   end

data/lib/tr8n/session.rb

@@ -39,7 +39,7 @@ module Tr8n
   class Session
     # Session Attributes - Move to Session
     attr_accessor :application, :current_user, :current_locale, :current_language, :current_translator,
-                  :current_source, :current_component, :block_options, :cookie_params, :access_token
+                  :current_source, :current_component, :block_options, :cookie_params, :access_token, :tools_enabled
 
     def self.access_token
       @access_token
@@ -56,8 +56,25 @@ module Tr8n
       secret  = opts[:secret] || Tr8n.config.application[:secret]
       host    = opts[:host]   || Tr8n.config.application[:host]
 
+      Tr8n::Session.access_token ||= begin
+        self.access_token = opts[:token] || Tr8n.config.application[:token]
+        self.access_token ||= opts[:access_token] || Tr8n.config.application[:access_token]
+      end
+
+      Tr8n.cache.reset_version
+
+      self.application = Tr8n.memory.fetch(Tr8n::Application.cache_key) do
+        Tr8n::Application.new(:host => host, :key => key, :secret => secret, :access_token => Tr8n::Session.access_token).fetch
+      end
+
+      if Tr8n.cache.read_only?
+        self.class.access_token = self.application.access_token
+      end
+
+      # Tr8n.logger.info(self.cookie_params.inspect)
+
       self.cookie_params = begin
-        cookie_name = "tr8n_#{key}"
+        cookie_name = "tr8n_#{self.application.key}"
         if opts[:cookies] and opts[:cookies][cookie_name]
           begin
             HashWithIndifferentAccess.new(Tr8n::Utils.decode_and_verify_params(opts[:cookies][cookie_name], secret))
@@ -70,28 +87,16 @@ module Tr8n
         end
       end
 
-      # Tr8n.logger.info(self.cookie_params.inspect)
-
-      self.access_token = opts[:access_token]
+      self.tools_enabled = opts[:tools_enabled]
       self.current_user = opts[:user]
       self.current_source = opts[:source] || '/tr8n/core'
       self.current_component = opts[:component]
-      self.current_locale = self.cookie_params[:locale] || opts[:locale] || Tr8n.config.default_locale
+      self.current_locale = opts[:locale] || self.cookie_params[:locale] || Tr8n.config.default_locale
 
       if self.cookie_params['translator']
         self.current_translator = Tr8n::Translator.new(self.cookie_params['translator'])
       end
 
-      Tr8n.cache.reset_version
-
-      self.application = Tr8n.memory.fetch(Tr8n::Application.cache_key) do
-        Tr8n::Application.new(:host => host, :key => key, :secret => secret, :access_token => self.class.access_token).fetch
-      end
-
-      if Tr8n.cache.read_only?
-        self.class.access_token = self.application.access_token
-      end
-
       if self.current_translator
         self.current_translator.application = self.application
       end
@@ -99,6 +104,10 @@ module Tr8n
       self.current_language = self.application.language(self.current_locale)
     end
 
+    def tools_enabled?
+      self.tools_enabled
+    end
+
     def reset
       self.application= nil
       self.current_user= nil
@@ -106,6 +115,7 @@ module Tr8n
       self.current_translator= nil
       self.current_source= nil
       self.current_component= nil
+      self.tools_enabled= nil
       self.block_options= nil
     end
 

data/lib/tr8n/utils.rb

@@ -92,31 +92,32 @@ module Tr8n
     end
 
     def self.sign_and_encode_params(params, secret)
-      payload = params.merge(:algorithm => 'HMAC-SHA256', :ts => Time.now.to_i).to_json
-      payload = Base64.encode64(payload)
+      URI::encode(Base64.encode64(params.to_json))
 
-      sig = OpenSSL::HMAC.digest('sha256', secret, payload)
-      encoded_sig = Base64.encode64(sig)
-
-      URI::encode(Base64.encode64("#{encoded_sig}.#{payload}"))
+      #payload = params.merge(:algorithm => 'HMAC-SHA256', :ts => Time.now.to_i).to_json
+      #payload = Base64.encode64(payload)
+      #sig = OpenSSL::HMAC.digest('sha256', secret, payload)
+      #encoded_sig = Base64.encode64(sig)
+      #URI::encode(Base64.encode64("#{encoded_sig}.#{payload}"))
     end
 
     def self.decode_and_verify_params(signed_request, secret)
-      signed_request = URI::decode(signed_request)
-      signed_request = Base64.decode64(signed_request)
-
-      parts = signed_request.split('.')
-      return JSON.parse(Base64.decode64(parts.first)) if parts.size == 1
-
-      encoded_sig = parts.first
-      payload = parts.last
-      expected_sig = OpenSSL::HMAC.digest('sha256', secret, payload)
-      expected_sig = Base64.encode64(expected_sig)
-      if expected_sig != encoded_sig
-        raise Tr8n::Exception.new('Bad signature')
-      end
-
-      JSON.parse(Base64.decode64(payload))
+      payload = URI::decode(signed_request)
+      payload = Base64.decode64(payload)
+      JSON.parse(payload)
+
+      #parts = signed_request.split('.')
+      #return JSON.parse(Base64.decode64(parts.first)) if parts.size == 1
+      #encoded_sig = parts.first
+      #payload = parts.last
+      #expected_sig = OpenSSL::HMAC.digest('sha256', secret, payload)
+      #expected_sig = Base64.encode64(expected_sig)
+      #if expected_sig != encoded_sig
+      #  raise Tr8n::Exception.new('Bad signature')
+      #end
+      #JSON.parse(Base64.decode64(payload))
+    rescue Exception => ex
+      {}
     end
 
     def self.split_sentences(paragraph)

data/lib/tr8n_core/version.rb

@@ -30,5 +30,5 @@
 #++
 
 module Tr8nCore
-  VERSION = '4.2'
+  VERSION = '4.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tr8n_core
 version: !ruby/object:Gem::Version
-  version: '4.2'
+  version: '4.3'
 platform: ruby
 authors:
 - Michael Berkovich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-06 00:00:00.000000000 Z
+date: 2015-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday