Skip to content

Commit

Permalink
Merge pull request mbulat#20 from sidonath/rails4
Browse files Browse the repository at this point in the history
Remove protected_attributes for Rails 4
  • Loading branch information
mbulat committed Sep 17, 2013
2 parents 2af42e4 + dfa2b23 commit 0666d91
Show file tree
Hide file tree
Showing 6 changed files with 1 addition and 11 deletions.
3 changes: 0 additions & 3 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ PATH
remote: .
specs:
plutus (0.7.4)
protected_attributes (~> 1.0)
rails (>= 3.1, < 4.1)

GEM
Expand Down Expand Up @@ -51,8 +50,6 @@ GEM
minitest (4.7.5)
multi_json (1.7.9)
polyglot (0.3.3)
protected_attributes (1.0.3)
activemodel (>= 4.0.0, < 5.0)
rack (1.5.2)
rack-test (0.6.2)
rack (>= 1.0)
Expand Down
2 changes: 0 additions & 2 deletions app/models/plutus/account.rb
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@ module Plutus
#
# @author Michael Bulat
class Account < ActiveRecord::Base
attr_accessible :name, :contra

has_many :credit_amounts, :extend => AmountsExtension
has_many :debit_amounts, :extend => AmountsExtension
has_many :credit_transactions, :through => :credit_amounts, :source => :transaction
Expand Down
2 changes: 0 additions & 2 deletions app/models/plutus/amount.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ module Plutus
#
# @author Michael Bulat
class Amount < ActiveRecord::Base
attr_accessible :account, :amount, :transaction

belongs_to :transaction
belongs_to :account

Expand Down
2 changes: 0 additions & 2 deletions app/models/plutus/transaction.rb
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@ module Plutus
#
# @author Michael Bulat
class Transaction < ActiveRecord::Base
attr_accessible :description, :commercial_document

belongs_to :commercial_document, :polymorphic => true
has_many :credit_amounts, :extend => AmountsExtension
has_many :debit_amounts, :extend => AmountsExtension
Expand Down
2 changes: 1 addition & 1 deletion lib/plutus.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Plutus
require "rails"
require "protected_attributes"

module Plutus
class Engine < Rails::Engine
isolate_namespace Plutus
Expand Down
1 change: 0 additions & 1 deletion plutus.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ Gem::Specification.new do |s|
"README.markdown"
]
s.add_dependency("rails", ">= 3.1", '< 4.1')
s.add_dependency("protected_attributes", "~> 1.0")
s.add_development_dependency("sqlite3")
s.add_development_dependency("rspec", "~> 2.6")
s.add_development_dependency("rspec-rails", "~> 2.6")
Expand Down

0 comments on commit 0666d91

Please sign in to comment.