discerner 2.0.4 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88645173fdadecf73aa691ce4c08988b0ec45edb
-  data.tar.gz: 992a3eff4bdf48feba80dd6f2361f2012df547c6
+  metadata.gz: d003dc673d344a81ba57493c85359cb204d4ec25
+  data.tar.gz: e640b76a3ac01c8651a0daf029fbced903dccac4
 SHA512:
-  metadata.gz: b6a923211f3551ae3f713cf65c5fcf75437a0b6d9a328bd198fbd11ac094120d6d858fc4e5192e991fc159e138072e4679722baf2870ae92a05b2a3202ca97a6
-  data.tar.gz: c6fbc44e44cc98dc4a295a8110315cedbfa22a71411ec9efddb177b3c43a29a5cc1ecf2cce9db2d4175a59d32ac36b4bbdb23cf1b8ffe4e180770c7078f76a9b
+  metadata.gz: 965d91c637899dd9d029de35bb03181605bccc6ae5bd76c0742a41f179ebb3b0fc2f747d4e0f853d158ffbd685a253c0edae7fab75f55d097733bea966c7ee23
+  data.tar.gz: 218fb8fdcc5d94e91bb2056214f86f137749ab79d8f157ebb468abd50b230aed202659a61a4209f3b32f297f7e46ae68124df42a7bb4ba96fb54bf37bcd4880b

data/app/models/discerner/search_namespace.rb

@@ -0,0 +1,5 @@
+module Discerner
+  class SearchNamespace < ActiveRecord::Base
+    include Discerner::Methods::Models::SearchNamespace
+  end
+end

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

@@ -11,14 +11,14 @@
       %td{colspan: '4'}
         No qualifying searches found
     - else
-      - @discernerSearchCombinationsTemplate = generate_nested_attributes_template(f, :search_combinations, 'search_combination')
+      - @discernerSearchCombinationsTemplate = discerner_generate_nested_attributes_template(f, :search_combinations, 'search_combination')
       = f.fields_for :search_combinations, f.object.search_combinations.ordered_by_display_order do |search_combination|
         = render partial: 'search_combination_fields', locals: { f: search_combination }
 
       %tfoot
         %tr
           %td{ colspan: '4', class: 'add_search_combinations_link' }
-            = link_to_add_fields "Add search", :search_combinations
+            = discerner_link_to_add_fields "Add search", :search_combinations
 .clear
 
 :javascript

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

@@ -13,12 +13,12 @@
   %tfoot
     %tr
       %td{ colspan: '4', class: 'add_search_parameters_link' }
-        = link_to_add_fields "Add criteria", :search_parameters
+        = discerner_link_to_add_fields "Add criteria", :search_parameters
 .clear
 
 :javascript
   $(function () {
-    var discernerSearchParametersTemplate = '#{generate_nested_attributes_template(f, :search_parameters, 'search_parameter')}',
+    var discernerSearchParametersTemplate = '#{discerner_generate_nested_attributes_template(f, :search_parameters, 'search_parameter')}',
     parametersUrl = decodeURIComponent('#{values_parameters_url(parameter_id: ':question_id', format: 'json')}'); // used to generate parameter values for list parameters
 
     new Discerner.SearchParameter.UI({

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

@@ -10,7 +10,7 @@
         %td
           = search.display_name
         %td
-          = format_datetime(search.updated_at)
+          = discerner_format_datetime(search.updated_at)
         %td
           = link_to 'Open', edit_search_path(search), class: 'show_link icon_link'
           = link_to 'Export options', export_parameters_path(search), class: 'options_link icon_link' if export_discerner_results?

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

@@ -6,7 +6,7 @@
         = f.object.warnings.full_messages.join(', ')
 
 - unless f.blank?
-  - search_combination_id = nested_record_id(f, :search_combination)
+  - search_combination_id = discerner_nested_record_id(f, :search_combination)
   %tr{ id: "#{search_combination_id}", class: "search_combination fields #{'error' if f.object.warnings.any?}" }
     %td.combined_search_operator
       %span
@@ -18,5 +18,5 @@
         -#= f.select(:operator_id, operator_options('search'))
         = f.select(:combined_search_id, combined_searches_options(@discerner_search), { include_blank: true },{ class: 'search_combinations_combobox_autocompleter' })
     %td.remove
-      = link_to_remove_fields 'Remove', f, :search_combinations
+      = discerner_link_to_remove_fields 'Remove', f, :search_combinations
     %td

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

@@ -1,4 +1,4 @@
-- search_parameter_id = nested_record_id(f, :search_parameter)
+- search_parameter_id = discerner_nested_record_id(f, :search_parameter)
 
 - if f.object.disabled? && f.object.warnings.any?
   %tr.error
@@ -29,7 +29,7 @@
 
         .div-instruction-bar
   %td.remove
-    = link_to_remove_fields 'Remove', f, :search_parameters
+    = discerner_link_to_remove_fields 'Remove', f, :search_parameters
   %td.parameter_values
     .search_parameter_values
       %table{ class: 'records' }
@@ -37,11 +37,11 @@
           = f.fields_for :search_parameter_values, f.object.search_parameter_values.ordered_by_display_order do |search_parameter_value_form|
             = render partial: 'search_parameter_value_fields', locals: { f: search_parameter_value_form }
       %span{ class: 'add_header'}
-        = link_to_add_fields "Add selection", :search_parameter_values, {style: "display:none;"}
+        = discerner_link_to_add_fields "Add selection", :search_parameter_values, {style: "display:none;"}
 
 :javascript
   $(function () {
-    var searchParameterValuesTemplate = '#{generate_nested_attributes_template(f, :search_parameter_values, "search_parameter_value")}',
+    var searchParameterValuesTemplate = '#{discerner_generate_nested_attributes_template(f, :search_parameter_values, "search_parameter_value")}',
       container = $('##{search_parameter_id}'),
       parametersUrl = decodeURIComponent('#{values_parameters_url(parameter_id: ':question_id', search_parameter_value_id: ':search_parameter_value_id')}'), // used to generate parameter values for combobox parameters
       searchParameterUI = new Discerner.SearchParameterValue.UI({ container: container, searchParameterValuesTemplate: searchParameterValuesTemplate, parametersUrl: parametersUrl });

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

@@ -1,4 +1,4 @@
-- search_parameter_value_id = nested_record_id(f, :search_parameter_value)
+- search_parameter_value_id = discerner_nested_record_id(f, :search_parameter_value)
 - if f.object.disabled? && f.object.warnings.any?
   %tr.error
     %td
@@ -24,7 +24,7 @@
     %td.additional_value
       = f.text_field :additional_value
     %td.remove
-      = link_to_remove_fields 'Remove', f, :search_parameter_values
+      = discerner_link_to_remove_fields 'Remove', f, :search_parameter_values
 
   - else # this part is used for rendering existing parameter values
     - parameter = f.object.search_parameter.parameter
@@ -39,13 +39,13 @@
         %span{ class: 'parameter_value_text' }
           = f.object.parameter_value.name
       %td{class: "remove", class: "invisible"}
-        = link_to_remove_fields 'Remove', f, :search_parameter_values
+        = discerner_link_to_remove_fields 'Remove', f, :search_parameter_values
 
     - when 'combobox'
       %td.parameter_value
         = render partial: 'discerner/parameters/values_autocompleter', locals: {parameter: parameter, f: f, search_parameter_value_id: search_parameter_value_id}
       %td.remove
-        = link_to_remove_fields 'Remove', f, :search_parameter_values
+        = discerner_link_to_remove_fields 'Remove', f, :search_parameter_values
 
     - else
       %td.operator
@@ -58,5 +58,5 @@
       %td{class: "additional_value #{'invisible' unless f.object.operator && f.object.operator.operator_type == 'range'}"}
         = f.text_field :additional_value, class: "#{type == 'date' ? 'datepicker' : nil}"
       %td.remove
-        = link_to_remove_fields 'Remove', f, :search_parameter_values
+        = discerner_link_to_remove_fields 'Remove', f, :search_parameter_values
 

data/db/migrate/20140915032427_create_discerner_search_namespaces.rb

@@ -0,0 +1,9 @@
+class CreateDiscernerSearchNamespaces < ActiveRecord::Migration
+  def change
+    create_table :discerner_search_namespaces do |t|
+      t.integer :search_id
+      t.string :namespace_type
+      t.integer :namespace_id
+    end
+  end
+end

data/db/migrate/20140915032608_replace_namespace_columns_with_label_for_searches.rb

@@ -0,0 +1,37 @@
+class ReplaceNamespaceColumnsWithLabelForSearches < ActiveRecord::Migration
+  def up
+    add_column :discerner_searches, :label, :string
+
+    Discerner::Search.transaction do
+      Discerner::Search.all.each do |search|
+        if !search.namespace_id.blank?
+          search.search_namespaces << Discerner::SearchNamespace.create(namespace_type: search.namespace_type, namespace_id: search.namespace_id)
+        elsif !search.namespace_type.blank?
+          search.label = search.namespace_type
+        end
+        search.save!
+      end
+      remove_column :discerner_searches, :namespace_type
+      remove_column :discerner_searches, :namespace_id
+    end
+  end
+
+  def down
+    add_column :discerner_searches, :namespace_id, :integer
+    add_column :discerner_searches, :namespace_type, :string
+
+    Discerner::Search.transaction do
+      Discerner::Search.all.each do |search|
+        if search.search_namespaces.any?
+          search.namespace_id = search.search_namespaces.first.namespace_id
+          search.namespace_type = search.search_namespaces.first.namespace_type
+        elsif !search.label.blank?
+          search.namespace_type = search.label
+        end
+        search.save!
+      end
+    end
+
+    remove_column :discerner_searches, :label
+  end
+end

data/lib/discerner/methods/helpers/searches_helper.rb

@@ -6,7 +6,7 @@ module Discerner
           "discerner/dictionaries/#{@discerner_search.dictionary.parameterized_name}/results"
         end
 
-        def generate_nested_attributes_template(f, association, association_prefix = nil )
+        def discerner_generate_nested_attributes_template(f, association, association_prefix = nil )
           if association_prefix.nil?
             association_prefix = association.to_s.singularize
           end
@@ -17,22 +17,18 @@ module Discerner
           escape_javascript(fields)
         end
 
-        def link_to_add_fields(name, association, html_options={})
+        def discerner_link_to_add_fields(name, association, html_options={})
           css_class = html_options[:class] || ' '
           css_class += "add_#{association.to_s} add add_link icon_link"
           html_options[:class] = css_class
           link_to(name, 'javascript:void(0);', html_options)
         end
 
-        def link_to_remove_fields(name, f, association)
+        def discerner_link_to_remove_fields(name, f, association)
           f.hidden_field(:_destroy) + link_to(name, "javascript:void(0);", class: "delete_#{association.to_s} delete_link icon_link")
         end
 
-        def link_to_soft_delete_fields(name, f, association)
-          f.hidden_field(:soft_delete) + link_to(name, "javascript:void(0);", class: "delete_#{association.to_s} delete_link icon_link")
-        end
-
-        def nested_record_id(builder, assocation)
+        def discerner_nested_record_id(builder, assocation)
           builder.object.id.nil? ? "new_nested_record" : "#{assocation.to_s.singularize}_#{builder.object.id}"
         end
 
@@ -131,11 +127,11 @@ module Discerner
           link_to "Export options", export_parameters_path(@discerner_search), class: "discerner-button discerner-button-positive"
         end
 
-        def format_datetime(datetime)
+        def discerner_format_datetime(datetime)
           datetime.strftime("%m/%d/%Y %I:%M %p") if datetime
         end
 
-        def format_date(date)
+        def discerner_format_date(date)
           date.strftime("%m/%d/%Y") if date
         end
       end

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

@@ -12,6 +12,7 @@ module Discerner
           base.send :has_many, :search_combinations,  inverse_of: :search
           base.send :has_many, :combined_searches,    through: :search_combinations
           base.send :has_many, :export_parameters,    inverse_of: :search
+          base.send :has_many, :search_namespaces,    inverse_of: :search
 
           # Validations
           base.send :validates, :dictionary, presence: { message: "for search can't be blank" }

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

@@ -0,0 +1,12 @@
+module Discerner
+  module Methods
+    module Models
+      module SearchNamespace
+        def self.included(base)
+          base.send :belongs_to, :search
+          base.send :belongs_to, :namespace, polymorphic: true
+        end
+      end
+    end
+  end
+end

data/lib/discerner/version.rb

@@ -1,3 +1,3 @@
 module Discerner
-  VERSION = "2.0.4"
+  VERSION = "2.0.5"
 end

data/lib/generators/discerner/install/install_generator.rb

@@ -120,6 +120,7 @@ module Discerner
         copy_file "models/search_combination.rb", "#{path}/search_combination.rb"
         copy_file "models/search_parameter_value.rb", "#{path}/search_parameter_value.rb"
         copy_file "models/search_parameter.rb", "#{path}/search_parameter.rb"
+        copy_file "models/search_namespace.rb", "#{path}/search_namespace.rb"
         copy_file "models/search.rb", "#{path}/search.rb"
       end
 

data/lib/generators/discerner/install/templates/models/search_namespace.rb

@@ -0,0 +1,5 @@
+module Discerner
+  class SearchNamespace < ActiveRecord::Base
+    include Discerner::Methods::Models::SearchNamespace
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: discerner
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors:
 - Michael Gurley, Yulia Bushmanova
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-08 00:00:00.000000000 Z
+date: 2014-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -375,6 +375,7 @@ files:
 - app/models/discerner/parameter_value_category.rb
 - app/models/discerner/search.rb
 - app/models/discerner/search_combination.rb
+- app/models/discerner/search_namespace.rb
 - app/models/discerner/search_parameter.rb
 - app/models/discerner/search_parameter_value.rb
 - app/views/discerner/export_parameters/index.html.haml
@@ -434,6 +435,8 @@ files:
 - db/migrate/20140227191827_remove_blank_parameter_values_from_export_parameters.rb
 - db/migrate/20140815214547_add_namespace_to_discerner_searches.rb
 - 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/seeds.rb
 - lib/discerner.rb
 - lib/discerner/engine.rb
@@ -452,6 +455,7 @@ files:
 - lib/discerner/methods/models/parameter_value_category.rb
 - lib/discerner/methods/models/search.rb
 - lib/discerner/methods/models/search_combination.rb
+- lib/discerner/methods/models/search_namespace.rb
 - lib/discerner/methods/models/search_parameter.rb
 - lib/discerner/methods/models/search_parameter_value.rb
 - lib/discerner/methods/models/soft_delete.rb
@@ -480,6 +484,7 @@ files:
 - lib/generators/discerner/install/templates/models/parameter_value_category.rb
 - lib/generators/discerner/install/templates/models/search.rb
 - lib/generators/discerner/install/templates/models/search_combination.rb
+- lib/generators/discerner/install/templates/models/search_namespace.rb
 - lib/generators/discerner/install/templates/models/search_parameter.rb
 - lib/generators/discerner/install/templates/models/search_parameter_value.rb
 - lib/generators/discerner/install/templates/views/layouts/searches.html.erb
@@ -506,7 +511,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: Rails engine that provides dictionary-based search functionality