mints 0.0.19 → 0.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb39e61077ebde851f278b96e82be85962bdacd093158d179cc5107bf3a4c5b2
-  data.tar.gz: f5d84797fc4526b3f8c2164d79062b0035db452c0a3a62d02967e33f1649a78b
+  metadata.gz: 805f9ad3f355a55e73dfeea6ace38749e32fdb5eb8427f003bd520fcd04204e6
+  data.tar.gz: b5aeb908efaf757a6bb1acb32c57a0330cc597549acdc9b539a048aacf1e3211
 SHA512:
-  metadata.gz: 8c902cadde2d3951e9aecf9e6a81f86f7af47224071a14ff0ea9b72fc4f2607f2c60729d2ce4843dbdf0d9e582135fba51cf84b37ed6d6908227e5438a217e4a
-  data.tar.gz: faed4589390dbe456f973212e9e2deaa759082f2ed02c6aedfea493147b80d3935261a50ce6d9d41b77a2e5b9fd2e9ef456b19e80914118f8e5c49d9a94b3684
+  metadata.gz: 1d98cb6dd69f6e9e1e56f67ad1a352e865f8b71fea0ce1c4d207a78959ff3a28cdbda7aed3058a0b57f3d26ab9bff459de1cc7256ebd2268046c166e2d9afa22
+  data.tar.gz: 6bef5686332e40cf0c838bb0a7a32db247841864c3ac79e31f5eb0bfd934d13abd2e4061be0fa006f74f7b3ac2302ee613401958789da3b99d79492329b467a6

data/lib/client.rb

@@ -11,17 +11,21 @@ module Mints
       attr_accessor :session_token
       attr_accessor :contact_token_id
 
-      def initialize(host, api_key, scope = nil, session_token = nil, contact_token_id = nil, debug = false)
+      def initialize(host, api_key, scope = nil, session_token = nil, contact_token_id = nil, visit_id = nil, debug = false)
           @host = host
           @api_key = api_key
           @session_token = session_token
           @contact_token_id = contact_token_id
+          @visit_id = visit_id
           @debug = debug
           self.set_scope(scope)
       end
 
-      def raw(action, url, options = nil, data = nil, base_url = nil, compatibility_options = {})
-      base_url = @base_url if !base_url
+      def raw(action, url, options = nil, data = nil, base_url = nil, compatibility_options = {}, only_tracking = false)
+        if compatibility_options === nil
+          compatibility_options = {}
+        end
+        base_url = @base_url if !base_url
         uri = ""
         if (options && options.class == Hash)
           if (options[:jfilters] && options[:jfilters].class == Hash)
@@ -51,8 +55,18 @@ module Mints
                     if @redis_server.get(full_url)
                       response = @redis_server.get(full_url)
                       result_from_cache = true
-                    else 
-                      response = self.send("#{@scope}_#{action}", "#{full_url}", compatibility_options)
+
+                      headers = nil
+                      if only_tracking
+                        headers = {"Only-Tracking" => "true"}
+                      end
+                      #when is already in redis notify to California to register the object usage
+                      cali_response = self.send("#{@scope}_#{action}", "#{full_url}", headers, compatibility_options)
+                      if @debug
+                        puts "CALI RESPONSE: #{cali_response}"
+                      end
+                    else
+                      response = self.send("#{@scope}_#{action}", "#{full_url}", nil, compatibility_options)
                       @redis_server.setex(full_url,time,response)
                     end
                     break
@@ -63,7 +77,7 @@ module Mints
           end
 
           if !url_need_cache
-            response = self.send("#{@scope}_#{action}", "#{full_url}", compatibility_options)
+            response = self.send("#{@scope}_#{action}", "#{full_url}", nil, compatibility_options)
           end
 
         elsif action === 'create' or action === 'post'
@@ -88,7 +102,6 @@ module Mints
       end
   
       def method_missing(name, *args, &block)
-        puts name
         name.to_s.include?("__") ? separator = "__" : separator = "_"        
         # split the name to identify their elements
         name_spplited = name.to_s.split(separator)
@@ -124,7 +137,7 @@ module Mints
             uri.query_values = args[1]
           end
           url = self.get_url(route, object, uri, slug)
-          response = self.send("#{@scope}_#{action}", url, compatibility_options)
+          response = self.send("#{@scope}_#{action}", url, nil, compatibility_options)
         elsif action == "post" or action == "create"
           if args[1].class == Hash
             uri.query_values = args[1]
@@ -239,15 +252,20 @@ module Mints
       end
 
       # Start contact context
-      def contact_get(url, compatibility_options)
-        headers = {
+      def contact_get(url, headers = nil, compatibility_options)
+        h = {
           "ApiKey" => @api_key,
           "Accept" => "application/json",
           "ContactToken" => @contact_token_id
         }
-        headers["Content-Type"] = "application/json" unless compatibility_options['no_content_type']
-        headers["Authorization"] = "Bearer #{@session_token}" if @session_token
-        return self.http_get(url, headers)
+        h["Content-Type"] = "application/json" unless compatibility_options['no_content_type']
+        h["Authorization"] = "Bearer #{@session_token}" if @session_token
+        if headers
+          headers.each do |k,v|
+            h[k] = v
+          end
+        end
+        return self.http_get(url, h)
       end
 
       def contact_post(url, data, compatibility_options)
@@ -273,14 +291,19 @@ module Mints
       end
 
       # Start User context
-      def user_get(url, compatibility_options)
-        headers = {
+      def user_get(url, headers = nil, compatibility_options)
+        h = {
           "Accept" => "application/json",
           "ApiKey" => @api_key
         }
-        headers["Content-Type"] = "application/json" unless compatibility_options['no_content_type']
-        headers["Authorization"] = "Bearer #{@session_token}" if @session_token
-        return self.http_get(url, headers)
+        h["Content-Type"] = "application/json" unless compatibility_options['no_content_type']
+        h["Authorization"] = "Bearer #{@session_token}" if @session_token
+        if headers
+          headers.each do |k,v|
+            h[k] = v
+          end
+        end
+        return self.http_get(url, h)
       end
 
       def user_post(url, data, compatibility_options)
@@ -321,6 +344,7 @@ module Mints
         }
         h["Content-Type"] = "application/json" unless compatibility_options['no_content_type']
         h["ContactToken"] = @contact_token_id if @contact_token_id
+        h["Visit-Id"] = @visit_id if @visit_id
         if headers
           headers.each do |k,v|
             h[k] = v

data/lib/contact.rb

@@ -16,7 +16,7 @@ module Mints
     # ==== Return
     # Returns a Contact object
     def initialize(host, api_key, session_token = nil, contact_token_id = nil, debug = false)
-      @client = Mints::Client.new(host, api_key, "contact", session_token, contact_token_id, debug)
+      @client = Mints::Client.new(host, api_key, "contact", session_token, contact_token_id, nil, debug)
     end
 
     ##

data/lib/mints/controllers/base_api_controller.rb

@@ -116,7 +116,8 @@ module Mints
     def set_mints_pub_client
       
       # Initialize mints pub client, credentials taken from mints_config.yml.erb file
-      @mints_pub = Mints::Pub.new(@host, @api_key, nil, @debug)
+      @visit_id = cookies[:mints_visit_id] ? cookies[:mints_visit_id] : nil
+      @mints_pub = Mints::Pub.new(@host, @api_key, nil, @visit_id, @debug)
       # Set contact token from cookie
       @mints_pub.client.session_token = @contact_token
     end

data/lib/mints/controllers/base_controller.rb

@@ -73,7 +73,7 @@ module Mints
         puts "FULLPATH REQUEST: #{request.fullpath}"
         puts "HEADERS REQUEST: #{request.headers}"
         puts "IP REQUEST: #{request.ip}"
-        puts "REQUEST IP ADRESS: #{request['ip_address']}"
+        puts "REQUEST IP ADDRESS: #{request['ip_address']}"
         puts "REQUEST REMOTE IP: #{request['remote_ip']}"
       end
       response = @mints_pub.register_visit(request)
@@ -82,7 +82,11 @@ module Mints
       end
       @contact_token = response['contact_token'] ? response['contact_token'] : response['user_token']
       @visit_id = response['visit_id']
+      if @debug
+        puts "VISIT ID: #{@visit_id}"
+      end
       cookies.permanent[:mints_contact_id] = { value: @contact_token, secure: true, httponly: true }
+      cookies.permanent[:mints_visit_id] = { value: @visit_id, secure: true, httponly: true }
     end
 
     ##
@@ -99,7 +103,8 @@ module Mints
         raise 'MintsBadCredentialsError'
       end
       # Initialize mints pub client, credentials taken from mints_config.yml.erb file
-      @mints_pub = Mints::Pub.new(@host, @api_key, @contact_token, @debug)
+      @visit_id = cookies[:mints_visit_id] ? cookies[:mints_visit_id] : nil
+      @mints_pub = Mints::Pub.new(@host, @api_key, @contact_token, @visit_id, @debug)
       # Set contact token from cookie
       @mints_pub.client.session_token = @contact_token
     end

data/lib/pub.rb

@@ -83,8 +83,8 @@ module Mints
     #
     # ==== Return
     # Returns a Client object.
-    def initialize(host, api_key, contact_token_id = nil,  debug = false)
-      @client = Mints::Client.new(host, api_key, 'public', nil, contact_token_id, debug)
+    def initialize(host, api_key, contact_token_id = nil, visit_id = nil, debug = false)
+      @client = Mints::Client.new(host, api_key, 'public', nil, contact_token_id, visit_id, debug)
     end
     
     ##
@@ -165,7 +165,7 @@ module Mints
     # ==== Example
     #     @mints_pub.get_story("story_slug")
     def get_story(slug, options = nil)
-      return @client.raw("get", "/content/stories/#{slug}", options)
+      return @client.raw("get", "/content/stories/#{slug}", options, nil, nil, nil, true)
     end
 
     ##
@@ -192,7 +192,7 @@ module Mints
     # ==== Example
     #     @mints_pub.get_form("form_slug")
     def get_form(slug, options = nil)
-      return @client.raw("get", "/content/forms/#{slug}", options)
+      return @client.raw("get", "/content/forms/#{slug}", options, nil, nil, nil, true)
     end
 
     ##
@@ -240,15 +240,16 @@ module Mints
       return @client.raw("get", "/content/content-instances/#{slug}", options)
     end
 
+    #TODO: This method is commented for future use
     ##
     # === Get Content Pages.
     # Get all content pages.
     #
     # ==== Parameters
     # options:: (Hash) -- List of {Resource collection Options}[#class-Mints::Pub-label-Resource+collections+options+] shown above can be used as parameter.
-    def get_content_pages(options = nil)
-      return @client.raw("get", "/content/content-pages", options)
-    end
+    # def get_content_pages(options = nil)
+      #return @client.raw("get", "/content/content-pages", options)
+    #end
 
     ##
     # === Get Content Page.
@@ -261,7 +262,7 @@ module Mints
     # ==== Example
     #     @mints_pub.get_content_page("test-page")
     def get_content_page(slug, options = nil)
-      return @client.raw("get", "/content/content-pages/#{slug}", options)
+      return @client.raw("get", "/content/content-pages/#{slug}", options, nil, nil, nil, true)
     end
 
     ##
@@ -301,7 +302,7 @@ module Mints
     # ==== Example
     #     @mints_pub.get_product("product_slug")
     def get_product(slug, options = nil)
-      return @client.raw("get", "/ecommerce/products/#{slug}", options)
+      return @client.raw("get", "/ecommerce/products/#{slug}", options, nil, nil, nil, true)
     end
 
     ##

data/lib/user/content/pages.rb

@@ -1,11 +1,11 @@
 module Pages
     ##
-    # == Pages
+    # == Content Pages
     #
 
     ###
     # === Get page groups.
-    # Get page groups.
+    # Get content page groups.
     #
     # ==== Example
     #     @data = @mints_user.get_page_groups
@@ -14,7 +14,7 @@ module Pages
     end
 
     # === Get pages.
-    # Get a collection of pages.
+    # Get a collection of content pages.
     #
     # ==== Example
     #     @data = @mints_user.get_pages
@@ -23,7 +23,7 @@ module Pages
     end
 
     # === Get page.
-    # Get a page.
+    # Get a content page.
     #
     # ==== Parameters
     # id:: (Integer) -- Page id.
@@ -35,7 +35,7 @@ module Pages
     end
 
     # === Create page.
-    # Create a page with data.
+    # Create a content page with data.
     #
     # ==== Parameters
     # data:: (Hash) -- Data to be submited.
@@ -52,7 +52,7 @@ module Pages
     end
 
     # === Update page.
-    # Update a page info.
+    # Update a content page info.
     #
     # ==== Parameters
     # id:: (Integer) -- Page id.
@@ -68,7 +68,7 @@ module Pages
     end
 
     # === Delete page.
-    # Delete a page.
+    # Delete a content page.
     #
     # ==== Parameters
     # id:: (Integer) -- Page id.

data/lib/user.rb

@@ -48,7 +48,7 @@ module Mints
 
     attr_reader :client
     def initialize(host, api_key, session_token = nil, debug = false)
-      @client = Mints::Client.new(host, api_key, 'user', session_token, nil, debug)
+      @client = Mints::Client.new(host, api_key, 'user', session_token, nil, nil, debug)
     end
 
     def login(email, password)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mints
 version: !ruby/object:Gem::Version
-  version: 0.0.19
+  version: 0.0.20
 platform: ruby
 authors:
 - Ruben Gomez Garcia, Omar Mora, Luis Payan, Oscar Castillo