engine-rea 0.2.2 → 0.3.0

data/.rspec

@@ -0,0 +1 @@
+--color --format documentation

data/Gemfile

@@ -3,8 +3,9 @@ source "http://ruby.taobao.org"
 # Example:
 #   gem "activesupport", ">= 2.3.5"
 
-gem "rails", ">=3.2.0"
+gem "rails", "~>3.2.8"
 gem "capybara", ">= 0.4.0"
+gem 'globalize3'
 
 group :development,:test do
   gem "database_cleaner"
@@ -12,7 +13,7 @@ group :development,:test do
   gem 'factory_girl_rails'
   gem 'minitest'
   gem "rspec-rails", ">= 2.8.0"
-  gem "sqlite3-ruby"
+  gem "sqlite3"
   gem "with_model", '>= 0.1.5'
   gem "generator_spec"
   gem "rdoc", "~> 3.12"

data/Gemfile.lock

@@ -1,31 +1,31 @@
 GEM
   remote: http://ruby.taobao.org/
   specs:
-    actionmailer (3.2.3)
-      actionpack (= 3.2.3)
+    actionmailer (3.2.8)
+      actionpack (= 3.2.8)
       mail (~> 2.4.4)
-    actionpack (3.2.3)
-      activemodel (= 3.2.3)
-      activesupport (= 3.2.3)
+    actionpack (3.2.8)
+      activemodel (= 3.2.8)
+      activesupport (= 3.2.8)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
-      journey (~> 1.0.1)
+      journey (~> 1.0.4)
       rack (~> 1.4.0)
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.1.2)
-    activemodel (3.2.3)
-      activesupport (= 3.2.3)
+      sprockets (~> 2.1.3)
+    activemodel (3.2.8)
+      activesupport (= 3.2.8)
       builder (~> 3.0.0)
-    activerecord (3.2.3)
-      activemodel (= 3.2.3)
-      activesupport (= 3.2.3)
+    activerecord (3.2.8)
+      activemodel (= 3.2.8)
+      activesupport (= 3.2.8)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.3)
-      activemodel (= 3.2.3)
-      activesupport (= 3.2.3)
-    activesupport (3.2.3)
+    activeresource (3.2.8)
+      activemodel (= 3.2.8)
+      activesupport (= 3.2.8)
+    activesupport (3.2.8)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     addressable (2.2.8)
@@ -53,6 +53,10 @@ GEM
       rails (>= 3.0, < 4.0)
       rspec-rails
     git (1.2.5)
+    globalize3 (0.2.0)
+      activemodel (>= 3.0.0)
+      activerecord (>= 3.0.0)
+      paper_trail (~> 2)
     hike (1.2.1)
     i18n (0.6.0)
     jeweler (1.8.3)
@@ -60,18 +64,21 @@ GEM
       git (>= 1.2.5)
       rake
       rdoc
-    journey (1.0.3)
-    json (1.7.3)
+    journey (1.0.4)
+    json (1.7.5)
     libwebsocket (0.1.3)
       addressable
     mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.18)
+    mime-types (1.19)
     minitest (3.0.0)
     multi_json (1.3.6)
     nokogiri (1.5.2)
+    paper_trail (2.6.4)
+      activerecord (~> 3.0)
+      railties (~> 3.0)
     polyglot (0.3.3)
     rack (1.4.1)
     rack-cache (1.2)
@@ -80,21 +87,21 @@ GEM
       rack
     rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.2.3)
-      actionmailer (= 3.2.3)
-      actionpack (= 3.2.3)
-      activerecord (= 3.2.3)
-      activeresource (= 3.2.3)
-      activesupport (= 3.2.3)
+    rails (3.2.8)
+      actionmailer (= 3.2.8)
+      actionpack (= 3.2.8)
+      activerecord (= 3.2.8)
+      activeresource (= 3.2.8)
+      activesupport (= 3.2.8)
       bundler (~> 1.0)
-      railties (= 3.2.3)
-    railties (3.2.3)
-      actionpack (= 3.2.3)
-      activesupport (= 3.2.3)
+      railties (= 3.2.8)
+    railties (3.2.8)
+      actionpack (= 3.2.8)
+      activesupport (= 3.2.8)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
-      thor (~> 0.14.6)
+      thor (>= 0.14.6, < 2.0)
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
@@ -128,9 +135,7 @@ GEM
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     sqlite3 (1.3.6)
-    sqlite3-ruby (1.3.3)
-      sqlite3 (>= 1.3.3)
-    thor (0.14.6)
+    thor (0.16.0)
     tilt (1.3.3)
     treetop (1.4.10)
       polyglot
@@ -152,14 +157,14 @@ DEPENDENCIES
   database_cleaner
   factory_girl_rails
   generator_spec
+  globalize3
   jeweler (>= 1.8.3)
   minitest
-  rails (>= 3.2.0)
+  rails (~> 3.2.8)
   rdoc (~> 3.12)
   rspec-rails (>= 2.8.0)
   simplecov
   spork (~> 1.0rc)
   sqlite3
-  sqlite3-ruby
   watchr
   with_model (>= 0.1.5)

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.3.0

data/app/models/rea/categories_entity.rb

@@ -0,0 +1,7 @@
+module Rea
+  class CategoriesEntity < ActiveRecord::Base
+    belongs_to :entity, :polymorphic=>true
+    belongs_to :category
+    attr_accessible :entity_type, :entity_id
+  end
+end

data/app/models/rea/category.rb

@@ -1,13 +1,24 @@
 module Rea
   class Category < ActiveRecord::Base
-    include ::Rea::AspectType::Classification::Category
-    belongs_to :category_type
-    has_many :category_members, :class_name=>::Rea::CategoryMember.name
-    belongs_to :parent_category, :class_name=>self.name, :foreign_key=>:category_id
-    has_many :child_categories, :class_name=>self.name
+    #translates :name
     has_and_belongs_to_many :groups
+    belongs_to :classification
+    belongs_to :parent, :foreign_key=>'parent_id', :class_name=>self.name
+    has_many :children, :foreign_key=>'parent_id', :class_name=>self.name
+    has_many :categories_entities
+    attr_accessible :name, :parent_id, :classification_id, :group_ids, :locale
 
-    attr_accessible :name, :category_type_id, :category_id
-
+    def self.for entity_or_class, attribute
+      group_ids =
+	(entity_or_class.is_a? Class) ? [entity_or_class.default_group.id] : entity_or_class.group_ids
+      class_name = 
+	(entity_or_class.is_a? Class) ? entity_or_class.name : entity_or_class.class.name
+      entity = entity_or_class
+      self.joins(:groups, :classification).where(
+	:"rea_groups.id"=>group_ids,
+	:"rea_classifications.name"=>attribute,
+	:"rea_classifications.type_name"=>class_name
+      )
+    end
   end
 end

data/app/models/rea/classification.rb

@@ -0,0 +1,7 @@
+module Rea
+  class Classification < ActiveRecord::Base
+    #translates :name
+    has_many :categories
+    attr_accessible :auto, :name, :type_name, :locale
+  end
+end

data/app/models/rea/entities_group.rb

@@ -0,0 +1,7 @@
+module Rea
+  class EntitiesGroup < ActiveRecord::Base
+    belongs_to :entity, :polymorphic=>true
+    belongs_to :group
+    attr_accessible :entity_type, :entity_id
+  end
+end

data/app/models/rea/group.rb

@@ -1,22 +1,10 @@
 module Rea
   class Group < ActiveRecord::Base
-    attr_accessor :category_ids_csv
-    attr_accessible :name, :group_type_id, :category_ids_csv
+    #translates :name
     has_and_belongs_to_many :categories
-    belongs_to :group_type
-    has_many :category_types, :through=>:categories
-
-    before_validation do
-      logger.debug "before validation" + self.category_ids_csv
-      return unless self.category_ids_csv
-      ids = self.category_ids_csv.split(/,/)
-      ids = ids.delete_if { |id| id =~ /T/ }
-      self.category_ids = ids
-    end
-
-    def category_ids_csv
-      @category_ids_csv ||= category_ids.join ','
-    end
-
+    belongs_to :parent, :foreign_key=>'parent_id', :class_name=>self.name
+    has_many :children, :foreign_key=>'parent_id', :class_name=>self.name
+    has_many :entities_groups
+    attr_accessible :name, :type_name, :parent_id
   end
 end

data/app/models/rea/rea.rb

@@ -0,0 +1,7 @@
+module Rea
+  module Rea
+    def self.table_name_prefix
+      'rea_'
+    end
+  end
+end

data/config/locales/en.yml

@@ -2,3 +2,5 @@ en:
   activerecord:
     models:
       rea/category: "Category"
+      rea/classification: "Classification"
+      rea/group: "Group"

data/config/locales/zh-CN.yml

@@ -1,32 +1,31 @@
 zh-CN:
   activerecord:
     models:
-      rea/category_type:
-        one: "分类类型"
-        other: "分类类型"
-      rea/category:
-        one: "分类"
-        other: "分类"
-      rea/identifier:
-        one: "标识码"
-        other: "标识码"
-      rea/group:
-        one: "分组"
-        other: "分组"
-      rea/group_type:
-        one: "分组类型"
-        other: "分组类型"
+      rea/category: "分类"
+      rea/identifier: "标识码"
+      rea/group: "分组"
 
     attributes:
       rea/category_type:
-        name: "名称"
+        name: "标识"
+        display_name: "名称"
         categories: "分类"
       rea/category:
-        name: "名称"
+        name: "标识"
+        display_name: "名称"
         category_type: "分类类型"
         parent_category: "上级分类"
+      rea/group_type:
+        name: "标识"
+        display_name: "名称"
+        groups: "分组"
+      rea/group:
+        name: "标识"
+        display_name: "名称"
+        group_type: "分组类型"
       rea/identifier:
         name: "名称"
+        display_name: "名称"
         value_reset_rule: "值重置规则"
         id_rule: "标识码规则"
         last_value: "最新值"

data/db/migrate/20121129100245_create_rea_groups.rb

@@ -0,0 +1,18 @@
+class CreateReaGroups < ActiveRecord::Migration
+  def up
+    create_table :rea_groups do |t|
+      t.string :name
+      t.string :type_name
+      t.references :parent
+
+      t.timestamps
+    end
+    add_index :rea_groups, :parent_id
+#    Rea::Group.create_translation_table! :name=>:string
+  end
+
+  def down
+    drop_table :rea_groups
+ #   Rea::Group.drop_translation_table!
+  end
+end

data/db/migrate/20121129100748_create_rea_categories.rb

@@ -0,0 +1,19 @@
+class CreateReaCategories < ActiveRecord::Migration
+  def up
+    create_table :rea_categories do |t|
+      t.string :name
+      t.references :parent
+      t.references :classification
+
+      t.timestamps
+    end
+    add_index :rea_categories, :parent_id
+    add_index :rea_categories, [:name, :classification_id], :unique=>true
+#    ::Rea::Category.create_translation_table! :name=>:string
+  end
+
+  def down
+    drop_table :rea_categories
+#    ::Rea::Category.drop_translation_table! 
+  end
+end

data/db/migrate/20121129101744_create_rea_classifications.rb

@@ -0,0 +1,29 @@
+class CreateReaClassifications < ActiveRecord::Migration
+  def up
+    create_table :rea_classifications do |t|
+      t.string :name
+      t.string :type_name
+      t.boolean :auto
+
+      t.timestamps
+    end
+
+    add_index :rea_classifications, [:name, :type_name]
+
+    create_table :categories_groups do |t|
+      t.references :category
+      t.references :group
+    end
+
+    add_index :categories_groups, [:category_id, :group_id], :name=>"idx_categories_groups"
+
+#    ::Rea::Classification.create_translation_table! :name=>:string
+
+  end
+
+  def down
+    drop_table :rea_classifications
+    drop_table :categories_groups
+#    ::Rea::Classification.drop_translation_table! 
+  end
+end

data/db/migrate/20121130051633_create_rea_entities_groups.rb

@@ -0,0 +1,13 @@
+class CreateReaEntitiesGroups < ActiveRecord::Migration
+  def change
+    create_table :rea_entities_groups do |t|
+      t.references :entity
+      t.string :entity_type
+      t.references :group
+
+      t.timestamps
+    end
+    add_index :rea_entities_groups, :entity_id
+    add_index :rea_entities_groups, :group_id
+  end
+end

data/db/migrate/20121130100600_create_rea_categories_entities.rb

@@ -0,0 +1,13 @@
+class CreateReaCategoriesEntities < ActiveRecord::Migration
+  def change
+    create_table :rea_categories_entities do |t|
+      t.references :entity
+      t.string :entity_type
+      t.references :category
+
+      t.timestamps
+    end
+    add_index :rea_categories_entities, :entity_id
+    add_index :rea_categories_entities, :category_id
+  end
+end

data/engine-rea.gemspec

@@ -5,17 +5,18 @@
 
 Gem::Specification.new do |s|
   s.name = "engine-rea"
-  s.version = "0.2.2"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ryan Wong"]
-  s.date = "2012-07-18"
+  s.date = "2012-12-14"
   s.description = "\n    follow REA model\n\t"
   s.email = "lazing@gmail.com"
   s.extra_rdoc_files = [
     "README.md"
   ]
   s.files = [
+    ".rspec",
     ".watchr",
     "Gemfile",
     "Gemfile.lock",
@@ -28,51 +29,29 @@ Gem::Specification.new do |s|
     "app/assets/stylesheets/rea/application.css",
     "app/controllers/rea/application_controller.rb",
     "app/helpers/rea/application_helper.rb",
+    "app/models/rea/categories_entity.rb",
     "app/models/rea/category.rb",
-    "app/models/rea/category_member.rb",
-    "app/models/rea/category_type.rb",
+    "app/models/rea/classification.rb",
+    "app/models/rea/entities_group.rb",
     "app/models/rea/group.rb",
-    "app/models/rea/group_type.rb",
-    "app/models/rea/identifier.rb",
-    "app/views/layouts/rea/application.html.erb",
+    "app/models/rea/rea.rb",
     "config/locales/en.yml",
     "config/locales/zh-CN.yml",
     "config/routes.rb",
-    "db/migrate/20120601074531_create_rea_category_types.rb",
-    "db/migrate/20120601074540_create_rea_categories.rb",
-    "db/migrate/20120605023205_create_rea_category_members.rb",
-    "db/migrate/20120605030658_create_rea_groups.rb",
-    "db/migrate/20120605082028_create_rea_identifiers.rb",
-    "db/migrate/20120717080004_create_rea_group_types.rb",
+    "db/migrate/20121129100245_create_rea_groups.rb",
+    "db/migrate/20121129100748_create_rea_categories.rb",
+    "db/migrate/20121129101744_create_rea_classifications.rb",
+    "db/migrate/20121130051633_create_rea_entities_groups.rb",
+    "db/migrate/20121130100600_create_rea_categories_entities.rb",
     "engine-rea.gemspec",
     "lib/engine-rea.rb",
     "lib/generators/rea/install/USAGE",
     "lib/generators/rea/install/install_generator.rb",
     "lib/rails_patch.rb",
     "lib/rea.rb",
+    "lib/rea/active_record_ext.rb",
     "lib/rea/application.rb",
-    "lib/rea/aspect_type.rb",
-    "lib/rea/aspect_type/base.rb",
-    "lib/rea/aspect_type/classification.rb",
-    "lib/rea/aspect_type/description.rb",
-    "lib/rea/aspect_type/due_date.rb",
-    "lib/rea/aspect_type/identification.rb",
     "lib/rea/engine.rb",
-    "lib/rea/meta_type.rb",
-    "lib/rea/meta_type/agent.rb",
-    "lib/rea/meta_type/commitment.rb",
-    "lib/rea/meta_type/contract.rb",
-    "lib/rea/meta_type/conversion.rb",
-    "lib/rea/meta_type/entity.rb",
-    "lib/rea/meta_type/event.rb",
-    "lib/rea/meta_type/exchange.rb",
-    "lib/rea/meta_type/group.rb",
-    "lib/rea/meta_type/process.rb",
-    "lib/rea/meta_type/resource.rb",
-    "lib/rea/meta_type/schedule.rb",
-    "lib/rea/meta_type/type.rb",
-    "lib/rea/model.rb",
-    "lib/rea/plugins/active_model.rb",
     "lib/rea/settings.rb",
     "lib/tasks/cucumber.rake",
     "lib/tasks/rea_tasks.rake",
@@ -114,48 +93,35 @@ Gem::Specification.new do |s|
     "spec/dummy/script/rails",
     "spec/factories/rea_resources.rb",
     "spec/generators/rea/install/install_generator_spec.rb",
-    "spec/models/rea/category_member_spec.rb",
+    "spec/models/rea/categories_entity_spec.rb",
     "spec/models/rea/category_spec.rb",
-    "spec/models/rea/category_type_spec.rb",
+    "spec/models/rea/classification_spec.rb",
+    "spec/models/rea/entities_group_spec.rb",
     "spec/models/rea/group_spec.rb",
-    "spec/models/rea/group_type_spec.rb",
-    "spec/models/rea/identifier_spec.rb",
+    "spec/rea/active_record_ext_spec.rb",
     "spec/rea/application_spec.rb",
-    "spec/rea/aspect_type/classification_spec.rb",
-    "spec/rea/aspect_type/due_date_spec.rb",
-    "spec/rea/aspect_type/identification_spec.rb",
-    "spec/rea/aspect_type_spec.rb",
     "spec/rea/engine_spec.rb",
-    "spec/rea/meta_type/agent_spec.rb",
-    "spec/rea/meta_type/commitment_spec.rb",
-    "spec/rea/meta_type/contract_spec.rb",
-    "spec/rea/meta_type/entity_spec.rb",
-    "spec/rea/meta_type/event_spec.rb",
-    "spec/rea/meta_type/group_spec.rb",
-    "spec/rea/meta_type/process_spec.rb",
-    "spec/rea/meta_type/resource_spec.rb",
-    "spec/rea/meta_type_spec.rb",
-    "spec/rea/model_spec.rb",
     "spec/spec_helper.rb"
   ]
   s.homepage = "http://github.com/lazing/engine-rea"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.21"
+  s.rubygems_version = "1.8.24"
   s.summary = "Rails Engine for MDA pattern Resource Event Agent"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rails>, [">= 3.2.0"])
+      s.add_runtime_dependency(%q<rails>, ["~> 3.2.8"])
       s.add_runtime_dependency(%q<capybara>, [">= 0.4.0"])
+      s.add_runtime_dependency(%q<globalize3>, [">= 0"])
       s.add_development_dependency(%q<database_cleaner>, [">= 0"])
       s.add_development_dependency(%q<sqlite3>, [">= 0"])
       s.add_development_dependency(%q<factory_girl_rails>, [">= 0"])
       s.add_development_dependency(%q<minitest>, [">= 0"])
       s.add_development_dependency(%q<rspec-rails>, [">= 2.8.0"])
-      s.add_development_dependency(%q<sqlite3-ruby>, [">= 0"])
+      s.add_development_dependency(%q<sqlite3>, [">= 0"])
       s.add_development_dependency(%q<with_model>, [">= 0.1.5"])
       s.add_development_dependency(%q<generator_spec>, [">= 0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
@@ -165,14 +131,15 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<spork>, ["~> 1.0rc"])
       s.add_development_dependency(%q<watchr>, [">= 0"])
     else
-      s.add_dependency(%q<rails>, [">= 3.2.0"])
+      s.add_dependency(%q<rails>, ["~> 3.2.8"])
       s.add_dependency(%q<capybara>, [">= 0.4.0"])
+      s.add_dependency(%q<globalize3>, [">= 0"])
       s.add_dependency(%q<database_cleaner>, [">= 0"])
       s.add_dependency(%q<sqlite3>, [">= 0"])
       s.add_dependency(%q<factory_girl_rails>, [">= 0"])
       s.add_dependency(%q<minitest>, [">= 0"])
       s.add_dependency(%q<rspec-rails>, [">= 2.8.0"])
-      s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
+      s.add_dependency(%q<sqlite3>, [">= 0"])
       s.add_dependency(%q<with_model>, [">= 0.1.5"])
       s.add_dependency(%q<generator_spec>, [">= 0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
@@ -183,14 +150,15 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<watchr>, [">= 0"])
     end
   else
-    s.add_dependency(%q<rails>, [">= 3.2.0"])
+    s.add_dependency(%q<rails>, ["~> 3.2.8"])
     s.add_dependency(%q<capybara>, [">= 0.4.0"])
+    s.add_dependency(%q<globalize3>, [">= 0"])
     s.add_dependency(%q<database_cleaner>, [">= 0"])
     s.add_dependency(%q<sqlite3>, [">= 0"])
     s.add_dependency(%q<factory_girl_rails>, [">= 0"])
     s.add_dependency(%q<minitest>, [">= 0"])
     s.add_dependency(%q<rspec-rails>, [">= 2.8.0"])
-    s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
+    s.add_dependency(%q<sqlite3>, [">= 0"])
     s.add_dependency(%q<with_model>, [">= 0.1.5"])
     s.add_dependency(%q<generator_spec>, [">= 0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])

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

@@ -3,7 +3,7 @@ class Rea::InstallGenerator < Rails::Generators::Base
   source_root File.expand_path('../../../../../db/migrate', __FILE__)
   def self.next_migration_number(path)
     unless @prev_migration_nr
-      @prev_migration_nr = Time.now.utc.strftime("%Y%m%d%H%M%S").to_i
+      @prev_migration_nr = Time.parse("2012-10-10").utc.strftime("%Y%m%d%H%M%S").to_i
     else
       @prev_migration_nr += 1
     end
@@ -19,10 +19,10 @@ class Rea::InstallGenerator < Rails::Generators::Base
   end
 
   def install_rea_initializer
-    initializer "rea.rb" do |data|
-      data = ""
-      data << "Rea.setup do |application|\n"
+    initializer "rea.rb" do
+      data = "Rea.setup do |application|\n"
       data << "end"
+      data
     end
   end
 end