abstractor 1.0.22 → 1.0.23

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDdjMTlhOGQ5ZDUwZTFiYzllM2VlMjJiMTlmN2Q1ZmM4MTExYmZkZA==
+    NjVhYzRjMmQyYTc3MGFiNWQ4OWRkODQ1NmI2OTUyN2JkZTJjMmJlYg==
   data.tar.gz: !binary |-
-    MDFiZTgwYWM3MjhjMTk4ZTc4MWVmNmNjYjMzMDRjY2YyZjM2Mjk4MQ==
+    OGQ2ODg1YTA4OTEwNTMzMGRiMmM0MzQzNjBlNWVlMDBjZGUxN2NmYQ==
 SHA512:
   metadata.gz: !binary |-
-    YmE5Yzk3YzIzZjM1MTY1M2I4NjZmYTNlNzMwZTBmYjE2NGNhOTViYTBiZTgx
-    M2RkOTRhZmMwZjY2ZGZiODVhNGFlNjMyYWIwNWY3OWM1YWRkY2ZjZmI3OTY4
-    OGM1N2UzNjNjMmEyNDhmZDRlMDBhNDNkMjExNjk3MWE3ZDMwM2Q=
+    YzlhMjAxNTdhZGY4ODZmMjhkZGQzZTgyOTM3ZGJhNjIwZjUyYjYxZjA3OTVl
+    M2ExNTRjNjhhZWRiZDA4Zjk2YWZiOTY3MDFhMWUyNzMyMTY5NmZkNGNlNWQz
+    ZDZmNjY4YzhiZGFhZTNhNTJjNjEwNmU0OWM3YTEzOGJhMDg3NjE=
   data.tar.gz: !binary |-
-    NWVhNWJiZGYxN2M5YWU3YzU5YmUyZDEwZWZlMWRhZDExMmVkOTdkMzQ0NTNl
-    ZmI0ZmU4NjZmZjY3NTUwYWM4ZDMyY2FlNWVhZDI2MTBjMmI3OGM0ZmRiN2Nh
-    ZWJmOGM4YmE5NWUwNzM0YjcwZDEyZDQ2YjAwMWQ3YWM4OTk5MmY=
+    YjQzY2RjMjI3ZTAxZDlkNDdkMDk5MmI5ZjAwY2U1OGQ4YzM0MWZlZDIyODYy
+    ODRkZjZhZWE1MWQ1NDlkM2YxYzBhNmZiM2YyM2Y1YTE3ZTRhYTBjNGE1NDZm
+    YWZjMjhiN2E4Mjg4ZTRiMGMyNzNmYWExNTljNjcxMDBmMzA1ZTI=

data/app/assets/stylesheets/abstractor/abstractor_abstractions.css

@@ -32,10 +32,6 @@
   padding: 0.75em 0.5em 0.4em 0.5em;
 }
 
-.abstractor_abstractions fieldset .delete_link {
-  float: right;
-}
-
 .abstractor_abstractions fieldset input.combobox {
   vertical-align: bottom;
   width: 12em !important;
@@ -311,4 +307,7 @@ span.tooltip_img {
 
 .abstractor_abstraction_actions {
   float: right;
+}
+.abstractor_abstraction_actions a {
+  margin: .25em;
 }

data/app/views/abstractor/abstractor_abstraction_groups/_form.html.haml

@@ -7,9 +7,7 @@
 
   .abstractor_abstraction_actions
     = link_to 'Not applicable group ', Abstractor::UserInterface.abstractor_relative_path(abstractor.abstractor_abstraction_group_path(abstractor_abstraction_group, abstractor_abstraction_value: 'not applicable')), :confirm => 'Are you sure?', :method => :put, :class => "icon_link update_link", :remote => true
-    %br
     = link_to 'Unknown group ', Abstractor::UserInterface.abstractor_relative_path(abstractor.abstractor_abstraction_group_path(abstractor_abstraction_group, abstractor_abstraction_value: 'unknown')), :confirm => 'Are you sure?', :method => :put, :class => "icon_link update_link", :remote => true
     - if abstractor_abstraction_group.removable?
-      %br
       = link_to 'Delete group', Abstractor::UserInterface.abstractor_relative_path(abstractor.abstractor_abstraction_group_path(abstractor_abstraction_group)), :confirm => 'Are you sure?', :method => :delete, :class => "icon_link delete_link", :remote => true
   %hr

data/app/views/abstractor/abstractor_abstractions/_list.html.haml

@@ -1,7 +1,6 @@
 - about ||= @about
 .abstractor_abstractions
   = link_to 'Not applicable all', Abstractor::UserInterface.abstractor_relative_path(abstractor.update_all_abstractor_abstractions_path(about_type: about.class, about_id: about.id, abstractor_abstraction_value: 'not applicable')), :confirm => 'Are you sure?', :method => :put, :class => "icon_link update_link"
-  %br
   = link_to 'Unknown all', Abstractor::UserInterface.abstractor_relative_path(abstractor.update_all_abstractor_abstractions_path(about_type: about.class, about_id: about.id, abstractor_abstraction_value: 'unknown')), :confirm => 'Are you sure?', :method => :put, :class => "icon_link update_link"
   - abstractor_subject_groups = Abstractor::AbstractorSubjectGroup.joins(:abstractor_subjects).where(:abstractor_subjects => {:subject_type => about.class}).order('abstractor_subject_groups.id').not_deleted.to_a.uniq
   - abstractor_subject_groups.each do |abstractor_subject_group|

data/app/views/abstractor/abstractor_abstractions/edit.html.haml

@@ -24,6 +24,9 @@
       - when 'list'
         - values = abstraction_schema.abstractor_object_values.sort_by(&:value)
         = f.select :value, values.map{|s| [s.value, s.value]}, {:include_blank => true}, :class => "combobox"
+      - when 'dynamic list'
+        - values = abstractor_abstraction.about.send(abstractor_abstraction.abstractor_subject.dynamic_list_method).sort_by { |l| l[:value] }
+        = f.select :value, values.map{|s| [s[:value], s[:id]]}, {:include_blank => true}, :class => "combobox"
       - when 'boolean'
         - ['true', 'false'].each do |value|
           = f.radio_button :value, value

data/db/migrate/20140716184049_add_dynamic_list_method_to_abstractor_subjects.rb

@@ -0,0 +1,5 @@
+class AddDynamicListMethodToAbstractorSubjects < ActiveRecord::Migration
+  def change
+    add_column :abstractor_subjects, :dynamic_list_method, :string
+  end
+end

data/lib/abstractor/methods/models/abstractor_subject.rb

@@ -19,7 +19,7 @@ module Abstractor
           base.send :has_many, :subject_relations,  :class_name => "Abstractor::AbstractorSubjectRelation", :foreign_key => "subject_id"
 
 
-          base.send :attr_accessible, :abstractor_abstraction_schema, :abstractor_abstraction_schema_id, :abstractor_rule_type, :abstractor_rule_type_id, :subject_type
+          base.send :attr_accessible, :abstractor_abstraction_schema, :abstractor_abstraction_schema_id, :abstractor_rule_type, :abstractor_rule_type_id, :subject_type, :dynamic_list_method
           base.send(:include, InstanceMethods)
         end
 

data/lib/abstractor/setup.rb

@@ -8,6 +8,7 @@ module Abstractor
       Abstractor::AbstractorObjectType.find_or_create_by_value('string')
       Abstractor::AbstractorObjectType.find_or_create_by_value('radio button list')
       Abstractor::AbstractorObjectType.find_or_create_by_value('date')
+      Abstractor::AbstractorObjectType.find_or_create_by_value('dynamic list')
 
       puts 'Setting up AbstractorRuleType'
       Abstractor::AbstractorRuleType.find_or_create_by_name_and_description(name: 'name/value', description:'search for value associated with name')

data/lib/abstractor/version.rb

@@ -1,3 +1,3 @@
 module Abstractor
-  VERSION = '1.0.22'
+  VERSION = '1.0.23'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: abstractor
 version: !ruby/object:Gem::Version
-  version: 1.0.22
+  version: 1.0.23
 platform: ruby
 authors:
 - Michael Gurley, Yulia Bushmanova
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-19 00:00:00.000000000 Z
+date: 2014-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -483,6 +483,7 @@ files:
 - db/migrate/20131228041945_create_abstractor_suggestion_sources.rb
 - db/migrate/20140618140759_add_custom_method_to_abstractor_abstraction_sources.rb
 - db/migrate/20140618140828_add_custom_method_to_abstractor_suggestion_sources.rb
+- db/migrate/20140716184049_add_dynamic_list_method_to_abstractor_subjects.rb
 - db/seeds.rb
 - lib/abstractor.rb
 - lib/abstractor/abstractable.rb