discerner 2.0.10 → 2.0.11

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NzMxZmQzMjg2YmRmNmFjY2ZkZDE2NzFmZjJkZjNjMjNmOTg5MDkzNA==
-  data.tar.gz: !binary |-
-    MDNiZjQ3NzYwOGVmOWNmNjUxYTAyMjE0OGY2YTJmODY1MWNiZDdiZA==
+SHA1:
+  metadata.gz: 592df800d53af780b3baec193a23ba2953b92da4
+  data.tar.gz: 5ad7d4e54f1b7f63361f18b11fe85cc0d91d77d5
 SHA512:
-  metadata.gz: !binary |-
-    NTM1YTgwN2E3NzM5OGYwNzM2ZTRiMmEzMWJlZWY1NzM3ZWIzNjliMDk0M2Ex
-    ZTJhOTE4MDJiNGQwYzMzYWFmNGQ0NWQxYmQwYmYxYTlhODk0MjgzMDdjYWIw
-    YWMzNWRhNmMyMzZiMzNlYmM2OTRlZmZkM2FkZjViMDU2ZjgwNjE=
-  data.tar.gz: !binary |-
-    OWRlZDU2ZDY5OTg4NGQ3YzA2NmU0ZTE4NmNjODQ4ZTdiNzgzYzUzNTJkYzNk
-    MDExYmJiNmMwNTc3YTRkYzE2NDZiYWQzMDAzZmM0NTI1OWZkYWMxYWFlMDcz
-    YmI4ZjFiYTRiNjM0YzVlOGEyNWU5NmMxZDE2ZGYxNzU5OTViNDc=
+  metadata.gz: ed9694283fab0c7f9792b16d76bd096b452017300696412995a10e3fbb121c07a52f7359f67f31be03f78712839f72c8d30ba4834751e53bcb21adee296143d6
+  data.tar.gz: 2543e41b4c2cd78ec0231558a5df6ed97c20106681b0350f990a65b4c8b366e0efe975811629956f07c10eb59db4097a22762ea8395f38578ec9d7abc5166fdc

data/app/views/discerner/export_parameters/index.html.haml

@@ -26,7 +26,7 @@
                 %a{ class: "select_all_parameters", href: "#"}
                   Select all
 
-              - items = exportable_parameters(@discerner_search, c)
+              - items = exportable_parameters(@discerner_search, c).reject{|p| p.hidden_in_export}
               - columns_count = 3
               - items_rendered_count = 0
               - (0...columns_count).each do |i|

data/app/views/discerner/searches/_form.html.haml

@@ -1,4 +1,5 @@
 = image_tag 'discerner/ajax-loader.gif', class: 'discerner-spinner hide'
+
 - unless @discerner_search.blank?
   = render 'discerner/shared/error_messages', object: @discerner_search
 

data/app/views/discerner/searches/_list.html.haml

@@ -10,7 +10,7 @@
         %td
           = search.display_name
         %td
-          = discerner_format_datetime(search.updated_at)
+          = discerner_format_datetime(search.last_executed)
         %td
           = link_to 'Open', edit_search_path(search), class: 'discerner-show-link discerner-icon-link'
           = link_to 'Export options', export_parameters_path(search), class: 'discerner-options-link discerner-icon-link' if export_discerner_results?

data/db/migrate/20150109001646_add_hidden_to_discerner_parameters.rb

@@ -0,0 +1,11 @@
+class AddHiddenToDiscernerParameters < ActiveRecord::Migration
+  def change
+    add_column :discerner_parameters, :hidden_in_export, :boolean, default: false
+    add_column :discerner_parameters, :hidden_in_search, :boolean, default: false
+    Discerner::Parameter.all.each do |parameter|
+      parameter.hidden_in_export = false
+      parameter.hidden_in_search = false
+      parameter.save!
+    end
+  end
+end

data/db/migrate/20150225202449_add_last_executed_to_discerner_searches.rb

@@ -0,0 +1,5 @@
+class AddLastExecutedToDiscernerSearches < ActiveRecord::Migration
+  def change
+    add_column :discerner_searches, :last_executed, :datetime
+  end
+end

data/lib/discerner/methods/controllers/searches_controller.rb

@@ -46,6 +46,8 @@ module Discerner
               dictionary =  dictionary_model.new(@discerner_search)
               if dictionary.respond_to?('search')
                 @results = dictionary.search(params, dictionary_search_options)
+                @discerner_search.last_executed = Time.now
+                @discerner_search.save!
               else
                 error_message = "Model '#{dictionary_model_name}' instance does not respond to 'search' method. You need to implement it to be able to run search on this dictionary"
               end
@@ -81,7 +83,7 @@ module Discerner
           searches = searches.by_user(username) unless username.blank?
 
           searches = searches.where('discerner_searches.name like ?', '%' + params[:query] + '%') unless params[:query].blank?
-          @discerner_searches = searches.order("discerner_searches.updated_at DESC")
+          @discerner_searches = searches.order("discerner_searches.last_executed DESC")
         end
 
         def destroy

data/lib/discerner/methods/models/parameter.rb

@@ -20,8 +20,8 @@ module Discerner
           base.send :validate,  :validate_export_attributes
 
           # Scopes
-          base.send(:scope, :searchable, -> {base.not_deleted.where('search_model is not null and search_method is not null')})
-          base.send(:scope, :exportable, -> {base.not_deleted.where('export_model is not null and export_method is not null')})
+          base.send(:scope, :searchable, -> {base.not_deleted.where('search_model is not null and search_method is not null and hidden_in_search = ?', false)})
+          base.send(:scope, :exportable, -> {base.not_deleted.where('export_model is not null and export_method is not null and hidden_in_export = ?', false)})
 
           # Hooks
           base.send :after_commit, :cascade_delete_parameter_values, on: :update, if: Proc.new { |record| record.previous_changes.include?('deleted_at') }

data/lib/discerner/methods/models/parameter_category.rb

@@ -14,8 +14,8 @@ module Discerner
           base.send :validates, :dictionary, presence: { message: "for parameter category can't be blank" }
 
           # Scopes
-          base.send(:scope, :searchable, -> {base.includes(:parameters).where('discerner_parameters.search_model is not null and discerner_parameters.search_method is not null and discerner_parameters.deleted_at is null').references(:discerner_parameters)})
-          base.send(:scope, :exportable, -> {base.includes(:parameters).where('discerner_parameters.export_model is not null and discerner_parameters.export_method is not null and discerner_parameters.deleted_at is null').references(:discerner_parameters)})
+          base.send(:scope, :searchable, -> {base.includes(:parameters).where('discerner_parameters.search_model IS NOT NULL AND discerner_parameters.search_method IS NOT NULL AND discerner_parameters.deleted_at IS NULL AND discerner_parameters.hidden_in_search = ?', false).references(:discerner_parameters)})
+          base.send(:scope, :exportable, -> {base.includes(:parameters).where('discerner_parameters.export_model IS NOT NULL AND discerner_parameters.export_method IS NOT NULL AND discerner_parameters.deleted_at IS NULL AND discerner_parameters.hidden_in_export = ?', false).references(:discerner_parameters)})
           base.send(:scope, :ordered_by_name, -> {base.order('discerner_parameter_categories.name ASC')})
 
           # Hooks

data/lib/discerner/methods/models/parameter_value.rb

@@ -62,7 +62,8 @@ module Discerner
             if parameter.parameter_type.name == 'list'
               parameter.search_parameters.each do |sp|
                 if sp.search_parameter_values.where(parameter_value_id: id).blank?
-                  max_display_order = sp.search_parameter_values.ordered_by_display_order.last.display_order || -1
+                  last_search_parameter_value = sp.search_parameter_values.ordered_by_display_order.last
+                  max_display_order = last_search_parameter_value ? last_search_parameter_value.display_order : -1
                   sp.search_parameter_values.build(parameter_value_id: id, display_order: max_display_order + 1)
                   sp.save
                 end

data/lib/discerner/parser.rb

@@ -155,6 +155,7 @@ module Discerner
 
         parameter.search_model      = search_identifiers[:model].to_s
         parameter.search_method     = search_identifiers[:method].to_s
+        parameter.hidden_in_search  = search_identifiers[:hidden].blank? ? false : search_identifiers[:hidden]
         parameter.parameter_type    = find_or_initialize_parameter_type(search_identifiers[:parameter_type])
       end
 
@@ -165,6 +166,7 @@ module Discerner
 
         parameter.export_model      = export_identifiers[:model].to_s
         parameter.export_method     = export_identifiers[:method].to_s
+        parameter.hidden_in_export  = export_identifiers[:hidden].blank? ? false : export_identifiers[:hidden]
       end
 
       if parameter.new_record?

data/lib/discerner/version.rb

@@ -1,3 +1,3 @@
 module Discerner
-  VERSION = "2.0.10"
+  VERSION = "2.0.11"
 end

data/lib/generators/discerner/install/templates/dictionaries.yml

@@ -7,11 +7,13 @@
 #           - :name: string                                                     # used for display
 #             :unique_identifier:                                               # has to be unique within the dictionary
 #             :export:
-#               :model                                                          # name of the model to be used for exporting
-#               :method                                                         # name of the model method to be used for exporting
+#               :model: string                                                  # name of the model to be used for exporting
+#               :method: string                                                 # name of the model method to be used for exporting
+#               :hidden: boolean                                                # default: false. If set to true, parameter will be hidden from list of exportable parameters
 #             :search:                                                          # parameter search model and method combination has to be unique within the category
 #               :model: string                                                  # name of the model to be used for searching
 #               :method: string                                                 # name of the model method to be used for searching
+#               :hidden: boolean                                                # default: false. If set to true, parameter will be hidden from list of searchable parameters
 #               :parameter_type: numeric/date/list/combobox/text/string         # used to define applicable operators/display options. does not have to be restricted to the given list, but additional parameters will require adding operators to match
 #               :parameter_value_categories_source:                             # used to define parameter value categories
 #                 :model: string                                                # source model to be used to load parameter value categiories
@@ -234,3 +236,37 @@
               :method: text
               :parameter_type: text
 
+          - :name: "Hidden parameter"
+            :unique_identifier: hidden
+            :search:
+              :model: Book
+              :method: text
+              :parameter_type: text
+              :hidden: true
+            :export:
+              :model: Book
+              :method: text
+              :hidden: true
+
+          - :name: "Hidden from search parameter"
+            :unique_identifier: hidden_from_search
+            :search:
+              :model: Book
+              :method: text
+              :parameter_type: text
+              :hidden: true
+            :export:
+              :model: Book
+              :method: text
+
+          - :name: "Hidden from export parameter"
+            :unique_identifier: hidden_from_export
+            :search:
+              :model: Book
+              :method: text
+              :parameter_type: text
+            :export:
+              :model: Book
+              :method: text
+              :hidden: true
+

metadata

@@ -1,293 +1,293 @@
 --- !ruby/object:Gem::Specification
 name: discerner
 version: !ruby/object:Gem::Version
-  version: 2.0.10
+  version: 2.0.11
 platform: ruby
 authors:
 - Michael Gurley, Yulia Bushmanova
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-08 00:00:00.000000000 Z
+date: 2015-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.1'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.1'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.1.0
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.5
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.1
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.9
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.9
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.9
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.9
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.2
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.2
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.2
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.4.1
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.4.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.4.1
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.4.1
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.4.1
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.4.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.4.1
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.4.1
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.42.0
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.42.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.42.0
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.42.0
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.0
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.0
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: ansi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.3
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.3
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.3
 - !ruby/object:Gem::Dependency
   name: sprockets
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.12.1
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.12.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.12.1
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.12.1
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.7.4
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.7.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.7.4
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.7.4
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.2
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.2
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.2
 description: Discerner is an engine for Rails that provides basic search UI, search
@@ -431,6 +431,8 @@ files:
 - db/migrate/20140815214629_add_namespace_to_discerner_dictionaries.rb
 - db/migrate/20140915032427_create_discerner_search_namespaces.rb
 - db/migrate/20140915032608_replace_namespace_columns_with_label_for_searches.rb
+- db/migrate/20150109001646_add_hidden_to_discerner_parameters.rb
+- db/migrate/20150225202449_add_last_executed_to_discerner_searches.rb
 - db/seeds.rb
 - lib/discerner.rb
 - lib/discerner/engine.rb
@@ -495,17 +497,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Rails engine that provides dictionary-based search functionality