octocore 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d1f4c88b64f3726963a7cf4e37d4cef49805e1a
-  data.tar.gz: e19e8afbad72cf540160aaa734222372f573144a
+  metadata.gz: 9217fe8265f87093f929941062a52bd05862d089
+  data.tar.gz: 7ec1def0cdb3e175845776e940cf03db0cbb0e08
 SHA512:
-  metadata.gz: a4a271d640d85ee01633970a6f04461cd01f38d3661eb127305431aa6c1c034ad53b0469e78aaeb03e8e8cafec76abc88347120ed2a9de20748380aef24222ff
-  data.tar.gz: 76be710aa160fb1ae933efbd5e2cec0f08a42c5f4fb63ed9051c1b7243e2226d15ac8824c2d83d57c79518fdeae5d852953b99adc750516ea044f54561c0c14f
+  metadata.gz: 331f7b6fa6efe0fb5aeb185ade0e4eb58e3d8d476a1cc3cec524316beadda8ce8633371346a5df6f1e32e8d5027d39bc7ddde05baa9a43d27c4334fe3415b106
+  data.tar.gz: 4b2d77e6d28d57fbebc335ade50d0b371a7c6386a784d7864565bab7430efdd3d4fb29f411198649b30780d3efce60c253d3cefa459f331a80af8867e4777d37

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    octocore (0.0.4)
+    octocore (0.0.5)
       cequel (~> 1.9, >= 1.9.0)
       descriptive_statistics (~> 2.5.1, >= 2.5.0)
       elasticsearch (~> 1.0.17, >= 1.0.17)
@@ -118,6 +118,3 @@ DEPENDENCIES
   parallel_tests (~> 2.5.0, >= 2.5.0)
   rake
   rspec
-
-BUNDLED WITH
-   1.11.2

data/README.md

@@ -4,7 +4,15 @@ This is the Octomatic Enterprise Core gem. It provides most of the ORM stuff. Cl
 
 ## Installting
 
-- `gem install octocore`
+```bash
+gem install octocore
+```
+
+In case you are using bundler, you need to add something like this to your Gemfile:
+
+```ruby
+gem 'octocore', :git => 'git@github.com:octoai/gem-octocore.git'
+```
 
 
 
@@ -56,6 +64,6 @@ Octo.connect_with_config_file config_dir
 
 It ships with a utility called `fakestream`. It will automatically stream random data. To use just open your console and type
 
-```
+```bash
 $ fakestream /path/to/config/dir
 ```

data/lib/octocore.rb

@@ -135,6 +135,7 @@ module Octo
 
     self.logger.info('Setting callbacks.')
 
+    Octo::Callbacks.run_hook(:after_connect)
   end
 
   # Creates a logger for Octo

data/lib/octocore/callbacks.rb

@@ -11,7 +11,7 @@ module Octo
     included do
 
       define_hooks :after_app_init, :after_app_login, :after_app_logout,
-                   :after_page_view, :after_productpage_view
+                   :after_page_view, :after_productpage_view, :after_connect
 
       # Define the after_app_init hook
       after_app_init do |args|

data/lib/octocore/helpers/api_consumer_helper.rb

@@ -1,4 +1,3 @@
-require 'json'
 require 'set'
 
 module Octo

data/lib/octocore/helpers/kong_helper.rb

@@ -8,14 +8,17 @@ module Octo
   module Helpers
     module KongHelper
 
+      # The default URL for kong to connect to
+      KONG_URL = 'http://127.0.0.1:8001'
+
       # Fetch Kong URL
       # @return [String] Kong URL
       def kong_url
         kong_config = Octo.get_config :kong
-        if kong_config.has_key?(:url)
-          kong_config[:url]
-        else
-          'http://127.0.0.1:8001'
+        if kong_config.class == String
+          kong_config
+        elsif kong_config.class == Hash
+          kong_config.fetch :url, KONG_URL
         end
       end
 
@@ -26,13 +29,12 @@ module Octo
       # @return [Hash] Response
       def process_kong_request (url, method, payload)
         begin
-
           url = kong_url + url
           header = {
             'Accept' => 'application/json, text/plain, */*',
             'Content-Type' => 'application/json'
           }
-          uri = URI.parse(url)
+          uri = URI.parse(URI.encode(url.strip))
           http = Net::HTTP.new(uri.host,uri.port)
 
           case method
@@ -50,10 +52,16 @@ module Octo
             # Default Case
           end
 
-          req.body = "#{ payload.to_json }"
-          res = http.request(req)
-          JSON.parse(res.body) # Returned Data
+          puts "HTTP #{ method } to #{ uri.host}:#{ uri.port }. Body: #{ payload.to_json }"
+          body = "#{ payload.to_json }"
+          res = http.request(req, body)
+          if res.body
+            JSON.parse(res.body) # Returned Data
+          else
+            {}
+          end
         rescue Exception => e
+          puts "Exception: " + e.message.to_s + "\n" + e.backtrace_locations.join("\n")  + "}"
           { message: e.to_s }.to_json
         end
       end

data/lib/octocore/message_parser.rb

@@ -1,5 +1,4 @@
 require 'json'
-require 'set'
 
 module Octo
   # Message abstraction module 
@@ -93,6 +92,22 @@ module Octo
       def to_h
         parse(@message)
       end
+
+      # To get enterprise id
+      # @return [String] Enterprise Id
+      def eid
+        msg = to_json
+        enterprise = msg['enterprise']
+        raise StandardError, 'Parse Error' if enterprise.nil?
+
+        eid = if enterprise.has_key?'custom_id'
+                enterprise['custom_id']
+              elsif enterprise.has_key?'customId'
+                enterprise['customId']
+              end
+
+        eid
+      end
       
     end
   end

data/lib/octocore/models.rb

@@ -217,6 +217,7 @@ end
 
 
 require 'octocore/models/enterprise'
+require 'octocore/models/enterprise/adapter_details'
 require 'octocore/models/enterprise/api_event'
 require 'octocore/models/enterprise/api_hit'
 require 'octocore/models/enterprise/api_track'

data/lib/octocore/models/enterprise/adapter_details.rb

@@ -0,0 +1,18 @@
+require 'cequel'
+require 'octocore/record'
+
+module Octo
+	# Store adapter details of Enterprise
+  class AdapterDetails
+    include Cequel::Record
+    include Octo::Record
+
+    belongs_to :enterprise, class_name: 'Octo::Enterprise'
+
+    key :adapter_id, :int
+    key :enable, :boolean
+    
+    column :settings, :text
+
+  end
+end

data/lib/octocore/version.rb

@@ -1,4 +1,4 @@
 module Octo
   # The current version of the library
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octocore
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Pranav Prakash
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-09 00:00:00.000000000 Z
+date: 2016-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cequel
@@ -377,6 +377,7 @@ files:
 - lib/octocore/models.rb
 - lib/octocore/models/contactus.rb
 - lib/octocore/models/enterprise.rb
+- lib/octocore/models/enterprise/adapter_details.rb
 - lib/octocore/models/enterprise/api_event.rb
 - lib/octocore/models/enterprise/api_hit.rb
 - lib/octocore/models/enterprise/api_track.rb