search-kit 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e885ffbac473291386f4b7629cbef29e0f720c8
-  data.tar.gz: eb250e6aa6300ca73ff6d55e11812a1fdfda3485
+  metadata.gz: 3ee72c3e484109f7d168a4c38def107a4aba6405
+  data.tar.gz: 6c5a06d38106c3db998d2998a808ba509d8aed10
 SHA512:
-  metadata.gz: eb3fe55a47646cdfbde1fef77ee991e31479c6452c129d5f89d96d32491def796b0ee160e086cc0b9ed4ca3196ab8a72d87de2729f32b2b9ea284c29c16b1cbb
-  data.tar.gz: abf621d8a58167a6e38657f8b0f78406f4dd85985551fbe88e63fffabc8e035c28ca5c659f904dff9b65fbff865f477fdd8291e8e2107412463741ecf2ac11f2
+  metadata.gz: 76ea4042783f93b854d90a053c781f9eb2c80d70d015395be62246b356b560c0ea71dd7b8e2d43741b7602f7c56310950758125cb57f3e4b06bd3cea9d6224e4
+  data.tar.gz: 99f49469151c8977dc9a440cab9ac0ec4ca36d3e9eb9bfcc882761ff59a312ffbb6c9e534231ad323a7415bd943d897348661540ea52e05b50f2eb5816fbb705

data/lib/search_kit.rb

@@ -21,19 +21,12 @@ module SearchKit
   extend Configuration
 
   configure do |config|
-    config.app_uri = ENV.fetch("APP_URI", "http://localhost:8080")
-    config.app_env = ENV.fetch("APP_ENV", "development")
-    config.app_dir = ENV.fetch("APP_DIR", nil) || Dir.pwd
-    config.verbose = ENV.fetch("APP_VERBOSE", true)
-
-    config.log_dir = ENV.fetch("LOG_DIR") do
-      Dir.mkdir('log') unless Dir.exist?('log')
-
-      'log'
-    end
-
-    config.config_dir     = File.join(config.app_dir, "config")
-    config.token_strategy = -> token { nil }
+    config.app_dir    = fetch("APP_DIR")
+    config.app_env    = fetch("APP_ENV")
+    config.app_uri    = fetch("APP_URI")
+    config.config_dir = File.join(config.app_dir, "config")
+    config.log_dir    = fetch("LOG_DIR")
+    config.verbose    = fetch("APP_VERBOSE")
   end
 
   I18n.load_path += Dir.glob(File.join(config.config_dir, "locales/*.yml"))

data/lib/search_kit/cli.rb

@@ -2,6 +2,8 @@ require 'thor'
 
 module SearchKit
   class CLI < Thor
+    include Messaging
+
     desc "documents", "Manage individual SearchKit documents"
     subcommand "documents", SearchKit::Documents::CLI
 
@@ -14,8 +16,18 @@ module SearchKit
     desc "search", "Quickly search your indices"
     subcommand "search", SearchKit::Search::CLI
 
-    desc "config", "Configure your SearchKit settings"
-    def config
+    desc "config SETTING [VALUE]", "Configure or view your SearchKit settings"
+    def config(setting, value = nil)
+      if value
+        SearchKit.set_config(setting, value)
+        info "Set #{setting}: #{value}"
+      else
+        value = SearchKit.show_config(setting)
+        info "SearchKit settings for #{setting}:"
+        info " - ~/.search-kit/config.yml: #{value}"
+        info " - ENV: #{ENV.fetch(setting.upcase, "Not set")}"
+        info " - Runtime: #{SearchKit.config.send(setting)}"
+      end
     end
   end
 end

data/lib/search_kit/configuration.rb

@@ -1,6 +1,7 @@
 require 'ostruct'
 require 'yaml'
 require 'uri'
+require 'user_config'
 
 module SearchKit
   module Configuration
@@ -10,7 +11,48 @@ module SearchKit
     end
 
     def config
-      @config ||= OpenStruct.new
+      return @config if @config
+      root   = UserConfig.new(".search-kit")
+      yaml   = root['config.yml']
+      config = OpenStruct.new
+
+      yaml.each { |key, value| config.send("#{key}=", value) }
+      @config = config
+    end
+
+    def set_config(key, value)
+      root = UserConfig.new(".search-kit")
+      yaml = root['config.yml']
+
+      yaml[key] = value
+      yaml.save
+    end
+
+    def show_config(key)
+      root = UserConfig.new(".search-kit")
+      root['config.yml'][key]
+    end
+
+    def fetch(key)
+      ENV.fetch(key, show_config(key.downcase) || default(key.to_sym))
+    end
+
+    private
+
+    def default(key)
+      default_table = {
+        APP_URI:     "http://localhost:8080",
+        APP_ENV:     "development",
+        APP_DIR:     File.expand_path("../../", __dir__),
+        APP_VERBOSE: true,
+        LOG_DIR:     default_log_dir
+      }.fetch(key, nil)
+    end
+
+    def default_log_dir
+      Dir.mkdir('log') unless Dir.exist?('log')
+
+      'log'
     end
 
   end

data/lib/search_kit/documents.rb

@@ -9,7 +9,8 @@ module SearchKit
     attr_reader :connection
 
     def initialize
-      @connection = SearchKit::Client.connection
+      uri = [SearchKit.config.app_uri, "documents"].join("/")
+      @connection = Faraday.new(uri)
     end
 
     def create(slug, options)

data/lib/search_kit/events.rb

@@ -6,15 +6,17 @@ module SearchKit
   class Events
     autoload :CLI,     'search_kit/events/cli'
     autoload :Publish, 'search_kit/events/publish'
+    autoload :Poll,    'search_kit/events/poll'
 
     attr_reader :connection
 
     def initialize
-      @connection = SearchKit::Client.connection
+      uri = [SearchKit.config.app_uri, "events"].join("/")
+      @connection = Faraday.new(uri)
     end
 
     def complete(id)
-      response = connection.delete("/api/events/#{id}")
+      response = connection.delete(id)
       body     = JSON.parse(response.body, symbolize_names: true)
 
       fail Errors::EventNotFound if response.status == 404
@@ -23,13 +25,13 @@ module SearchKit
     end
 
     def index
-      response = connection.get('/api/events')
+      response = connection.get
 
       JSON.parse(response.body, symbolize_names: true)
     end
 
     def show(id)
-      response = connection.get("/api/events/#{id}")
+      response = connection.get(id)
       body     = JSON.parse(response.body, symbolize_names: true)
 
       fail Errors::EventNotFound if response.status == 404
@@ -38,7 +40,7 @@ module SearchKit
     end
 
     def pending(channel)
-      response = connection.get("/api/events?filter[channel]=#{channel}")
+      response = connection.get('', "filter[channel]" => channel)
 
       JSON.parse(response.body, symbolize_names: true)
     end

data/lib/search_kit/events/poll.rb

@@ -0,0 +1,32 @@
+module SearchKit
+  class Events
+    # This file houses the polling loop of the Event service.
+    #
+    class Poll
+      autoload :Process, 'search_kit/events/poll/process'
+
+      def self.perform(channel, &block)
+        new(channel, &block).perform
+      end
+
+      attr_reader :block, :channel
+
+      def initialize(channel, &block)
+        @block   = block
+        @channel = channel
+      end
+
+      def perform
+        loop do
+          process_queue
+          sleep 1
+        end
+      end
+
+      def process_queue
+        SearchKit::Events::Poll::Process.perform(channel, &block)
+      end
+
+    end
+  end
+end

data/lib/search_kit/events/poll/process.rb

@@ -0,0 +1,42 @@
+module SearchKit
+  class Events
+    class Poll
+      # The logic of interacting with the event service to retrieve and process
+      # events is contained here.
+      #
+      class Process
+        def self.perform(channel, &block)
+          new(channel, &block).perform
+        end
+
+        attr_reader :block, :channel, :client
+
+        def initialize(channel, &block)
+          @block   = block
+          @channel = channel
+          @client  = SearchKit::Events.new
+        end
+
+        def perform
+          events.each do |event|
+            begin
+              block.call(event)
+            rescue
+              raise
+            else
+              client.complete(event.id)
+            end
+          end
+        end
+
+        private
+
+        def events
+          response = client.pending(channel)
+          response.fetch(:data, []).map { |raw| OpenStruct.new(raw) }
+        end
+      end
+
+    end
+  end
+end

data/lib/search_kit/indices.rb

@@ -9,7 +9,8 @@ module SearchKit
     attr_reader :connection
 
     def initialize
-      @connection = SearchKit::Client.connection
+      uri = [SearchKit.config.app_uri, "indices"].join("/")
+      @connection = Faraday.new(uri)
     end
 
     def show(slug)

data/lib/search_kit/search.rb

@@ -9,7 +9,8 @@ module SearchKit
     attr_reader :connection
 
     def initialize
-      @connection ||= SearchKit::Client.connection
+      uri = [SearchKit.config.app_uri, "search"].join("/")
+      @connection = Faraday.new(uri)
     end
 
     def search(slug, options)

data/lib/search_kit/version.rb

@@ -12,7 +12,7 @@ module SearchKit
   module VERSION
     MAJOR = 0
     MINOR = 0
-    TINY  = 1
+    TINY  = 2
     PRE   = nil
 
     STRING = [ MAJOR, MINOR, TINY, PRE ].compact.join(".")

data/search-kit.gemspec

@@ -28,6 +28,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "ansi", "~> 1.5"
   spec.add_dependency "faraday", "~> 0.9"
   spec.add_dependency "thor", "~> 0.19"
+  spec.add_dependency "user_config", "~> 0.0"
   spec.add_dependency "i18n", "~> 0.7"
 
   spec.add_development_dependency "bundler", "~> 1.8"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: search-kit
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Joseph McCormick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-17 00:00:00.000000000 Z
+date: 2015-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ansi
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.19'
+- !ruby/object:Gem::Dependency
+  name: user_config
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
@@ -186,7 +200,6 @@ files:
 - config/locales/en.yml
 - lib/search_kit.rb
 - lib/search_kit/cli.rb
-- lib/search_kit/client.rb
 - lib/search_kit/configuration.rb
 - lib/search_kit/documents.rb
 - lib/search_kit/documents/cli.rb
@@ -198,6 +211,8 @@ files:
 - lib/search_kit/events/cli/pending.rb
 - lib/search_kit/events/cli/publish.rb
 - lib/search_kit/events/cli/status.rb
+- lib/search_kit/events/poll.rb
+- lib/search_kit/events/poll/process.rb
 - lib/search_kit/events/publish.rb
 - lib/search_kit/indices.rb
 - lib/search_kit/indices/cli.rb

data/lib/search_kit/client.rb

@@ -1,9 +0,0 @@
-require 'faraday'
-
-module SearchKit
-  module Client
-    def self.connection
-      @connection ||= Faraday.new(SearchKit.config.app_uri)
-    end
-  end
-end