From 24fccf4e294c828f1146e62a99291a7a03a1a053 Mon Sep 17 00:00:00 2001 From: renoke Date: Fri, 6 Mar 2009 17:00:10 +0100 Subject: [PATCH] remove table tramp_rule from migration --- generators/tramp/templates/create_tramp.rb | 16 +--------------- lib/tramp/models/rule.rb | 2 +- lib/tramp/module/rule/rule_utilities.rb | 4 ++++ 3 files changed, 6 insertions(+), 16 deletions(-) diff --git a/generators/tramp/templates/create_tramp.rb b/generators/tramp/templates/create_tramp.rb index 4d129a4..a122d47 100644 --- a/generators/tramp/templates/create_tramp.rb +++ b/generators/tramp/templates/create_tramp.rb @@ -48,20 +48,7 @@ def self.up t.datetime "updated_at" end - create_table "tramp_rules" do |t| - t.string "code" - t.string "label" - t.date "date_begin" - t.date "date_end" - t.string "amount" - t.string "parameter" - t.string "entry" - t.integer "event_type_id" - t.string "type" - t.datetime "created_at" - t.datetime "updated_at" - end - + create_table "tramp_currencies" do |t| t.string 'name' t.string 'alphabetic_code' @@ -86,7 +73,6 @@ def self.down drop_table :tramp_entries drop_table :tramp_events drop_table :tramp_movements - drop_table :tramp_rules drop_table :tramp_currencies end end \ No newline at end of file diff --git a/lib/tramp/models/rule.rb b/lib/tramp/models/rule.rb index 5cd3561..261292e 100644 --- a/lib/tramp/models/rule.rb +++ b/lib/tramp/models/rule.rb @@ -1,6 +1,6 @@ module Tramp module Model - class Rule #< ActiveRecord::Base + class Rule include Tramp::Rule::InstanceMethods extend Tramp::Rule::ClassMethods diff --git a/lib/tramp/module/rule/rule_utilities.rb b/lib/tramp/module/rule/rule_utilities.rb index 87ea99f..19ef040 100644 --- a/lib/tramp/module/rule/rule_utilities.rb +++ b/lib/tramp/module/rule/rule_utilities.rb @@ -2,6 +2,10 @@ module Tramp module Rule module Utilities + + def rule(name, &block) + Tramp::Model::Rule.new(name, block) + end def to_hash(string) instance_eval("{"+string+"}")