foreman_opensearch 0.0.1 → 0.0.3

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NjU2Yjg0YTQ1Y2EwMjk0MTk1YmU0MjI1ODQ2YjU3NTVhYjhjOWQ0Yg==
-  data.tar.gz: !binary |-
-    YjFkM2FhZjk2MmViZWEyODNiNjNhMjA5OTBkYmY3NTUxMjU1OTVjYg==
+SHA1:
+  metadata.gz: da534ff54f4f3590fc5e53264c36c5b6317a1429
+  data.tar.gz: f9a85cc8dd70bd4184969eb6ba359361a7fdb737
 SHA512:
-  metadata.gz: !binary |-
-    ODUzMDBkYTE5MzM2MDRkMjczNGYzZGJkYjQwYTIxOTQ4MDkyMmYzODM1ZmU4
-    NGY4ODkzMTE1MmRlYzEwM2ZlOTdiYWYwNTg0NjU1NzQxYjY1YzliNWVhZGRm
-    Y2Q2NDcyZWM3ZWQ2YjdkMDI4ODBkZTUxMTlhYTEzZTY0N2EzY2U=
-  data.tar.gz: !binary |-
-    MjgwN2UyNTJlZmZhN2EyMDFhYzA4MDFjNWE0YWViOWVhNzJmZmRjY2VhZWNm
-    ZDk1MjUxOTQ2OTBiZGFhYTU3ZDNkYmVjNGFjMzc1NGEyMzUyODg2YWVkYmJj
-    OGExYzJiZWVmYTRjMDY3ODJkZDBhM2Q3ODBmNjA5N2M0MzdkNjg=
+  metadata.gz: b86a2d2195981fb9470eb23c3a0e546165ef5e6f4de14599c625f0c4ec2f11174e551c771dc023902fbccdca91b0d2749b9170bb7439c1652b0cea3b6c651fc4
+  data.tar.gz: 21b6ca6a2f8e1cf2f65c8196aa8f4de45bd643011aae28bf27da805768caad28807441c43c73f219a31363eff2cba69c2cf1aeb43b84a64c8e7c5f0d638c54c3

data/app/controllers/foreman_opensearch/opensearch_controller.rb

@@ -7,5 +7,10 @@ module ForemanOpensearch
 
     def description
     end
+
+    def autocomplete
+      items = [params[:q], ['hosts:', 'users:']]
+      render :json => items
+    end
   end
 end

data/app/overrides/layouts/base/custom_link.html.erb.deface

@@ -1,4 +1,9 @@
 <!-- insert_bottom 'head' -->
-<link rel="search" href="<%= url_for :controller => 'ForemanOpensearch/opensearch', :action => :description, :format => 'xml', :only_path => false %>" 
-      type="application/opensearchdescription+xml" 
-      title="foreman" />
+<%= tag('link',
+        {
+          rel: 'search',
+          type: 'application/opensearchdescription+xml',
+          title: 'foreman',
+          href: foreman_opensearch_description_url(format: 'xml')
+        })
+%>

data/app/views/foreman_opensearch/opensearch/description.xml.erb

@@ -5,5 +5,10 @@
  <Description>Search for foreman objects. Use "controller!search_term" form.</Description>
  <Tags>foreman</Tags>
  <Url type="text/html"
-      template="<%= url_for :controller => 'ForemanOpensearch/opensearch', :action => :search, :only_path => false %>?q={searchTerms}"/>
-</OpenSearchDescription>
+      template="<%= foreman_opensearch_search_url %>?q={searchTerms}"/>
+  <Url type="application/x-suggestions+json" 
+       method="GET" 
+       template="<%= foreman_opensearch_autocomplete_url %>">
+    <Param name="q" value="{searchTerms}"/>
+  </Url>
+</OpenSearchDescription>

data/config/routes.rb

@@ -1,6 +1,7 @@
 Rails.application.routes.draw do
-  scope module: 'ForemanOpensearch' do
-    get 'search', to: 'opensearch#search'
-    get 'opensearch/description', to: 'opensearch#description'
+  namespace :foreman_opensearch do
+    get 'search', controller: 'opensearch', action: :search
+    get 'description', to: 'opensearch#description'
+    get 'autocomplete', to: 'opensearch#autocomplete'
   end
 end

data/lib/foreman_opensearch/engine.rb

@@ -11,10 +11,11 @@ module ForemanOpensearch
 
     # Add any db migrations
     initializer 'foreman_opensearch.load_app_instance_data' do |app|
-      app.config.paths['db/migrate'] += ForemanOpensearch::Engine.paths['db/migrate'].existent
+      # No migrations needed
+      # app.config.paths['db/migrate'] += ForemanOpensearch::Engine.paths['db/migrate'].existent
     end
 
-    initializer 'foreman_opensearch.register_plugin', after: :finisher_hook do |_app|
+    initializer 'foreman_opensearch.register_plugin', before: :finisher_hook do |_app|
       Foreman::Plugin.register :foreman_opensearch do
         requires_foreman '>= 1.4'
       end

data/lib/foreman_opensearch/version.rb

@@ -1,3 +1,3 @@
 module ForemanOpensearch
-  VERSION = '0.0.1'
+  VERSION = '0.0.3'
 end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: foreman_opensearch
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors:
 - Shim Shtein
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-12 00:00:00.000000000 Z
+date: 2016-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Small plugin that publishes opensearch XML file declaration.
@@ -89,17 +89,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Foreman plugin to enable omnibox/search box integration.
@@ -107,4 +107,3 @@ test_files:
 - test/test_plugin_helper.rb
 - test/unit/foreman_opensearch_test.rb
 - test/factories/foreman_opensearch_factories.rb
-has_rdoc: