From f1b53f69a1b6cc1a228107f280bc8e03274ea2fd Mon Sep 17 00:00:00 2001 From: Braulio Bhavamitra Date: Sun, 12 Jul 2015 22:04:26 -0300 Subject: [PATCH] rails4: fix migration errors with Noosfero::Plugin::ActiveRecord --- config/initializers/plugins.rb | 1 - lib/noosfero/plugin.rb | 1 - lib/noosfero/plugin/active_record.rb | 7 ------- plugins/bsc/lib/bsc_plugin/contract.rb | 4 +++- plugins/bsc/lib/bsc_plugin/sale.rb | 4 +++- plugins/comment_classification/lib/comment_classification_plugin/label.rb | 3 ++- plugins/comment_classification/lib/comment_classification_plugin/status.rb | 3 ++- plugins/custom_forms/lib/custom_forms_plugin/form.rb | 3 ++- plugins/custom_forms/lib/custom_forms_plugin/submission.rb | 3 ++- plugins/foo/lib/foo_plugin/bar.rb | 3 ++- plugins/oauth_client/lib/oauth_client_plugin/provider.rb | 2 +- plugins/oauth_client/lib/oauth_client_plugin/user_provider.rb | 2 +- plugins/shopping_cart/lib/shopping_cart_plugin/purchase_order.rb | 2 +- plugins/sniffer/lib/sniffer_plugin/opportunity.rb | 2 +- plugins/sniffer/lib/sniffer_plugin/profile.rb | 2 +- plugins/spaminator/lib/spaminator_plugin/report.rb | 4 +++- plugins/sub_organizations/lib/sub_organizations_plugin/approve_paternity_relation.rb | 3 ++- plugins/sub_organizations/lib/sub_organizations_plugin/relation.rb | 3 ++- plugins/tolerance_time/lib/tolerance_time_plugin/publication.rb | 3 ++- plugins/tolerance_time/lib/tolerance_time_plugin/tolerance.rb | 4 +++- 20 files changed, 33 insertions(+), 26 deletions(-) delete mode 100644 lib/noosfero/plugin/active_record.rb diff --git a/config/initializers/plugins.rb b/config/initializers/plugins.rb index 6e6ef6f..4422f60 100644 --- a/config/initializers/plugins.rb +++ b/config/initializers/plugins.rb @@ -1,7 +1,6 @@ require 'noosfero/plugin' require 'noosfero/plugin/hot_spot' require 'noosfero/plugin/manager' -require 'noosfero/plugin/active_record' require 'noosfero/plugin/mailer_base' require 'noosfero/plugin/settings' require 'noosfero/plugin/spammable' diff --git a/lib/noosfero/plugin.rb b/lib/noosfero/plugin.rb index 105e189..ac12a34 100644 --- a/lib/noosfero/plugin.rb +++ b/lib/noosfero/plugin.rb @@ -713,6 +713,5 @@ end require 'noosfero/plugin/hot_spot' require 'noosfero/plugin/manager' -require 'noosfero/plugin/active_record' require 'noosfero/plugin/mailer_base' require 'noosfero/plugin/settings' diff --git a/lib/noosfero/plugin/active_record.rb b/lib/noosfero/plugin/active_record.rb deleted file mode 100644 index 563371b..0000000 --- a/lib/noosfero/plugin/active_record.rb +++ /dev/null @@ -1,7 +0,0 @@ -class Noosfero::Plugin::ActiveRecord < ActiveRecord::Base - - def self.inherited(child) - self.table_name = child.name.gsub('::','_').underscore.pluralize - end - -end diff --git a/plugins/bsc/lib/bsc_plugin/contract.rb b/plugins/bsc/lib/bsc_plugin/contract.rb index 71b44f9..7245be8 100644 --- a/plugins/bsc/lib/bsc_plugin/contract.rb +++ b/plugins/bsc/lib/bsc_plugin/contract.rb @@ -1,4 +1,5 @@ -class BscPlugin::Contract < Noosfero::Plugin::ActiveRecord +class BscPlugin::Contract < ActiveRecord::Base + validates_presence_of :bsc, :client_name has_many :sales, :class_name => 'BscPlugin::Sale' @@ -81,4 +82,5 @@ class BscPlugin::Contract < Noosfero::Plugin::ActiveRecord def total_price sales.inject(0) {|result, sale| sale.price*sale.quantity + result} end + end diff --git a/plugins/bsc/lib/bsc_plugin/sale.rb b/plugins/bsc/lib/bsc_plugin/sale.rb index e6d5ba1..95b5eb4 100644 --- a/plugins/bsc/lib/bsc_plugin/sale.rb +++ b/plugins/bsc/lib/bsc_plugin/sale.rb @@ -1,4 +1,5 @@ -class BscPlugin::Sale < Noosfero::Plugin::ActiveRecord +class BscPlugin::Sale < ActiveRecord::Base + validates_presence_of :product, :contract validates_uniqueness_of :product_id, :scope => :contract_id validates_numericality_of :quantity, :only_integer => true, :greater_than_or_equal_to => 0 @@ -16,4 +17,5 @@ class BscPlugin::Sale < Noosfero::Plugin::ActiveRecord before_update do |contract| contract.updated_at ||= Time.now.utc end + end diff --git a/plugins/comment_classification/lib/comment_classification_plugin/label.rb b/plugins/comment_classification/lib/comment_classification_plugin/label.rb index 32b1674..405cfb2 100644 --- a/plugins/comment_classification/lib/comment_classification_plugin/label.rb +++ b/plugins/comment_classification/lib/comment_classification_plugin/label.rb @@ -1,4 +1,4 @@ -class CommentClassificationPlugin::Label < Noosfero::Plugin::ActiveRecord +class CommentClassificationPlugin::Label < ActiveRecord::Base belongs_to :owner, :polymorphic => true @@ -9,4 +9,5 @@ class CommentClassificationPlugin::Label < Noosfero::Plugin::ActiveRecord attr_accessible :name, :enabled, :color COLORS = ['red', 'green', 'yellow', 'gray', 'blue'] + end diff --git a/plugins/comment_classification/lib/comment_classification_plugin/status.rb b/plugins/comment_classification/lib/comment_classification_plugin/status.rb index aa3c34c..7fa1f5e 100644 --- a/plugins/comment_classification/lib/comment_classification_plugin/status.rb +++ b/plugins/comment_classification/lib/comment_classification_plugin/status.rb @@ -1,4 +1,4 @@ -class CommentClassificationPlugin::Status < Noosfero::Plugin::ActiveRecord +class CommentClassificationPlugin::Status < ActiveRecord::Base belongs_to :owner, :polymorphic => true @@ -7,4 +7,5 @@ class CommentClassificationPlugin::Status < Noosfero::Plugin::ActiveRecord validates_presence_of :name scope :enabled, -> { where enabled: true } + end diff --git a/plugins/custom_forms/lib/custom_forms_plugin/form.rb b/plugins/custom_forms/lib/custom_forms_plugin/form.rb index eb7ee01..5530bf2 100644 --- a/plugins/custom_forms/lib/custom_forms_plugin/form.rb +++ b/plugins/custom_forms/lib/custom_forms_plugin/form.rb @@ -1,4 +1,5 @@ -class CustomFormsPlugin::Form < Noosfero::Plugin::ActiveRecord +class CustomFormsPlugin::Form < ActiveRecord::Base + belongs_to :profile has_many :fields, :order => 'position', :class_name => 'CustomFormsPlugin::Field', :dependent => :destroy diff --git a/plugins/custom_forms/lib/custom_forms_plugin/submission.rb b/plugins/custom_forms/lib/custom_forms_plugin/submission.rb index b02cd82..87c74a7 100644 --- a/plugins/custom_forms/lib/custom_forms_plugin/submission.rb +++ b/plugins/custom_forms/lib/custom_forms_plugin/submission.rb @@ -1,4 +1,5 @@ -class CustomFormsPlugin::Submission < Noosfero::Plugin::ActiveRecord +class CustomFormsPlugin::Submission < ActiveRecord::Base + belongs_to :form, :class_name => 'CustomFormsPlugin::Form' belongs_to :profile diff --git a/plugins/foo/lib/foo_plugin/bar.rb b/plugins/foo/lib/foo_plugin/bar.rb index a6904d9..fe084cf 100644 --- a/plugins/foo/lib/foo_plugin/bar.rb +++ b/plugins/foo/lib/foo_plugin/bar.rb @@ -1,2 +1,3 @@ -class FooPlugin::Bar < Noosfero::Plugin::ActiveRecord +class FooPlugin::Bar < ActiveRecord::Base + end diff --git a/plugins/oauth_client/lib/oauth_client_plugin/provider.rb b/plugins/oauth_client/lib/oauth_client_plugin/provider.rb index 0b7373f..c737053 100644 --- a/plugins/oauth_client/lib/oauth_client_plugin/provider.rb +++ b/plugins/oauth_client/lib/oauth_client_plugin/provider.rb @@ -1,4 +1,4 @@ -class OauthClientPlugin::Provider < Noosfero::Plugin::ActiveRecord +class OauthClientPlugin::Provider < ActiveRecord::Base belongs_to :environment diff --git a/plugins/oauth_client/lib/oauth_client_plugin/user_provider.rb b/plugins/oauth_client/lib/oauth_client_plugin/user_provider.rb index 77b2bda..cc87905 100644 --- a/plugins/oauth_client/lib/oauth_client_plugin/user_provider.rb +++ b/plugins/oauth_client/lib/oauth_client_plugin/user_provider.rb @@ -1,4 +1,4 @@ -class OauthClientPlugin::UserProvider < Noosfero::Plugin::ActiveRecord +class OauthClientPlugin::UserProvider < ActiveRecord::Base belongs_to :user, :class_name => 'User' belongs_to :provider, :class_name => 'OauthClientPlugin::Provider' diff --git a/plugins/shopping_cart/lib/shopping_cart_plugin/purchase_order.rb b/plugins/shopping_cart/lib/shopping_cart_plugin/purchase_order.rb index e201b74..31d4d1f 100644 --- a/plugins/shopping_cart/lib/shopping_cart_plugin/purchase_order.rb +++ b/plugins/shopping_cart/lib/shopping_cart_plugin/purchase_order.rb @@ -1,4 +1,4 @@ -class ShoppingCartPlugin::PurchaseOrder < Noosfero::Plugin::ActiveRecord +class ShoppingCartPlugin::PurchaseOrder < ActiveRecord::Base belongs_to :customer, :class_name => "Profile" belongs_to :seller, :class_name => "Profile" diff --git a/plugins/sniffer/lib/sniffer_plugin/opportunity.rb b/plugins/sniffer/lib/sniffer_plugin/opportunity.rb index ca954f8..79aae48 100644 --- a/plugins/sniffer/lib/sniffer_plugin/opportunity.rb +++ b/plugins/sniffer/lib/sniffer_plugin/opportunity.rb @@ -1,4 +1,4 @@ -class SnifferPlugin::Opportunity < Noosfero::Plugin::ActiveRecord +class SnifferPlugin::Opportunity < ActiveRecord::Base set_table_name :sniffer_plugin_opportunities diff --git a/plugins/sniffer/lib/sniffer_plugin/profile.rb b/plugins/sniffer/lib/sniffer_plugin/profile.rb index 24290a2..fe64a5d 100644 --- a/plugins/sniffer/lib/sniffer_plugin/profile.rb +++ b/plugins/sniffer/lib/sniffer_plugin/profile.rb @@ -1,4 +1,4 @@ -class SnifferPlugin::Profile < Noosfero::Plugin::ActiveRecord +class SnifferPlugin::Profile < ActiveRecord::Base set_table_name :sniffer_plugin_profiles diff --git a/plugins/spaminator/lib/spaminator_plugin/report.rb b/plugins/spaminator/lib/spaminator_plugin/report.rb index fccde7c..84d34b4 100644 --- a/plugins/spaminator/lib/spaminator_plugin/report.rb +++ b/plugins/spaminator/lib/spaminator_plugin/report.rb @@ -1,4 +1,5 @@ -class SpaminatorPlugin::Report < Noosfero::Plugin::ActiveRecord +class SpaminatorPlugin::Report < ActiveRecord::Base + serialize :failed, Hash belongs_to :environment @@ -29,4 +30,5 @@ class SpaminatorPlugin::Report < Noosfero::Plugin::ActiveRecord # TODO Implement some decent visualization inspect end + end diff --git a/plugins/sub_organizations/lib/sub_organizations_plugin/approve_paternity_relation.rb b/plugins/sub_organizations/lib/sub_organizations_plugin/approve_paternity_relation.rb index 03375fa..568b9e9 100644 --- a/plugins/sub_organizations/lib/sub_organizations_plugin/approve_paternity_relation.rb +++ b/plugins/sub_organizations/lib/sub_organizations_plugin/approve_paternity_relation.rb @@ -1,4 +1,5 @@ -class SubOrganizationsPlugin::ApprovePaternityRelation < Noosfero::Plugin::ActiveRecord +class SubOrganizationsPlugin::ApprovePaternityRelation < ActiveRecord::Base + belongs_to :task belongs_to :parent, :polymorphic => true belongs_to :child, :polymorphic => true diff --git a/plugins/sub_organizations/lib/sub_organizations_plugin/relation.rb b/plugins/sub_organizations/lib/sub_organizations_plugin/relation.rb index bdb6421..306127f 100644 --- a/plugins/sub_organizations/lib/sub_organizations_plugin/relation.rb +++ b/plugins/sub_organizations/lib/sub_organizations_plugin/relation.rb @@ -1,4 +1,5 @@ -class SubOrganizationsPlugin::Relation < Noosfero::Plugin::ActiveRecord +class SubOrganizationsPlugin::Relation < ActiveRecord::Base + belongs_to :parent, :polymorphic => true belongs_to :child, :polymorphic => true diff --git a/plugins/tolerance_time/lib/tolerance_time_plugin/publication.rb b/plugins/tolerance_time/lib/tolerance_time_plugin/publication.rb index cc44adc..b52b36e 100644 --- a/plugins/tolerance_time/lib/tolerance_time_plugin/publication.rb +++ b/plugins/tolerance_time/lib/tolerance_time_plugin/publication.rb @@ -1,4 +1,5 @@ -class ToleranceTimePlugin::Publication < Noosfero::Plugin::ActiveRecord +class ToleranceTimePlugin::Publication < ActiveRecord::Base + belongs_to :target, :polymorphic => true validates_presence_of :target_id, :target_type validates_uniqueness_of :target_id, :scope => :target_type diff --git a/plugins/tolerance_time/lib/tolerance_time_plugin/tolerance.rb b/plugins/tolerance_time/lib/tolerance_time_plugin/tolerance.rb index 2efc24a..c938a23 100644 --- a/plugins/tolerance_time/lib/tolerance_time_plugin/tolerance.rb +++ b/plugins/tolerance_time/lib/tolerance_time_plugin/tolerance.rb @@ -1,8 +1,10 @@ -class ToleranceTimePlugin::Tolerance < Noosfero::Plugin::ActiveRecord +class ToleranceTimePlugin::Tolerance < ActiveRecord::Base + belongs_to :profile validates_presence_of :profile_id validates_uniqueness_of :profile_id validates_numericality_of :content_tolerance, :only_integer => true, :allow_nil => true validates_numericality_of :comment_tolerance, :only_integer => true, :allow_nil => true attr_accessible :profile, :content_tolerance, :comment_tolerance + end -- libgit2 0.21.2