engine-rea 0.2.1 → 0.2.2

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/app/models/rea/category.rb

@@ -2,8 +2,12 @@ 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
+    has_and_belongs_to_many :groups
+
     attr_accessible :name, :category_type_id, :category_id
+
   end
 end

data/app/models/rea/category_member.rb

@@ -1,6 +1,7 @@
 module Rea
   class CategoryMember < ActiveRecord::Base
     # attr_accessible :title, :body
+    attr_accessible :category, :entity
     belongs_to :category
     belongs_to :entity, :polymorphic=>true
   end

data/app/models/rea/category_type.rb

@@ -1,7 +1,7 @@
 module Rea
   class CategoryType < ActiveRecord::Base
     include ::Rea::AspectType::Classification::CategoryType
-    has_many :categories
+    has_many :categories, :class_name=>::Rea::Category.name
     attr_accessible :name, :system, :automatic, :multiple
   end
 end

data/app/models/rea/group.rb

@@ -1,11 +1,22 @@
 module Rea
   class Group < ActiveRecord::Base
-    attr_accessible :name, :entity_types
-    has_many :category_types
-    has_many :group_entities
+    attr_accessor :category_ids_csv
+    attr_accessible :name, :group_type_id, :category_ids_csv
+    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
 
-    scope :groups, proc { |model_klass|
-      where("entity_types like ?", "%#{model_klass.name}%")
-    }
   end
 end

data/app/models/rea/group_type.rb

@@ -0,0 +1,7 @@
+module Rea
+  class GroupType < ActiveRecord::Base
+    attr_accessible :name
+    has_many :groups
+    accepts_nested_attributes_for :groups
+  end
+end

data/app/models/rea/identifier.rb

@@ -1,12 +1,20 @@
 require 'thread'
 module Rea
   class Identifier < ActiveRecord::Base
-    attr_accessible :name, :value_reset_rule, :id_rule
+    attr_accessible :name, :value_reset_rule, :id_rule, :last_value
     SEM = Mutex.new
 
     validates_presence_of :name, :id_rule
     validate :instance_validations
 
+    def next_id
+      self.instance_eval "\"#{id_rule}\"" if id_rule
+    end
+
+    def next_value
+      last_value + 1
+    end
+
     def generate
       SEM.synchronize do
         self.class.transaction do
@@ -14,9 +22,10 @@ module Rea
             self.last_value = 0 if self.instance_eval(value_reset_rule)
           end
           self.last_value = (self.last_value) || 0
-          self.last_value = self.last_value + 1
+          id = self.instance_eval "\"#{id_rule}\""
+          self.last_value = next_value
           self.save!
-          self.instance_eval "\"#{id_rule}\""
+          return id
         end
       end
     end

data/config/locales/en.yml

@@ -0,0 +1,4 @@
+en:
+  activerecord:
+    models:
+      rea/category: "Category"

data/config/locales/zh-CN.yml

@@ -0,0 +1,42 @@
+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: "分组类型"
+
+    attributes:
+      rea/category_type:
+        name: "名称"
+        categories: "分类"
+      rea/category:
+        name: "名称"
+        category_type: "分类类型"
+        parent_category: "上级分类"
+      rea/identifier:
+        name: "名称"
+        value_reset_rule: "值重置规则"
+        id_rule: "标识码规则"
+        last_value: "最新值"
+        next_id: "下一标识"
+        created_at: "创建时间"
+        updated_at: "更新时间"
+
+    errors:
+      models:
+        rea/identifier:
+          attributes:
+            id_rule:
+              malformed: "标识符格式不正确: %{error_message}"

data/db/migrate/20120601074531_create_rea_category_types.rb

@@ -1,7 +1,7 @@
 class CreateReaCategoryTypes < ActiveRecord::Migration
   def change
     create_table :rea_category_types do |t|
-      t.string :name
+      t.string :name, :null=>false
       t.boolean :system
       t.boolean :automatic
       t.boolean :multiple

data/db/migrate/20120601074540_create_rea_categories.rb

@@ -1,7 +1,7 @@
 class CreateReaCategories < ActiveRecord::Migration
   def change
     create_table :rea_categories do |t|
-      t.string :name
+      t.string :name, :null=>false
       t.references :category_type
       t.references :category
       t.timestamps

data/db/migrate/20120605030658_create_rea_groups.rb

@@ -1,9 +1,20 @@
 class CreateReaGroups < ActiveRecord::Migration
   def change
     create_table :rea_groups do |t|
-      t.string :name
-      t.string :entity_types
-      t.timestamps
+      t.string :name, :null=>false
+      t.references :group_type
     end
+
+    add_index :rea_groups, :group_type_id
+
+    create_table :categories_groups do |t|
+      t.references :category
+      t.references :group
+    end
+
+    add_index :categories_groups, :group_id
+    add_index :categories_groups, :category_id
+
+
   end
 end

data/db/migrate/20120605082028_create_rea_identifiers.rb

@@ -1,9 +1,9 @@
 class CreateReaIdentifiers < ActiveRecord::Migration
   def change
     create_table :rea_identifiers do |t|
-      t.string :name
+      t.string :name, :null=>false
       t.string :value_reset_rule
-      t.string :id_rule
+      t.string :id_rule, :null=>false
       t.integer :last_value, :default=>0
       t.timestamps
     end

data/db/migrate/20120717080004_create_rea_group_types.rb

@@ -0,0 +1,7 @@
+class CreateReaGroupTypes < ActiveRecord::Migration
+  def change
+    create_table :rea_group_types do |t|
+      t.string :name, :null=>false
+    end
+  end
+end

data/engine-rea.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "engine-rea"
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ryan Wong"]
-  s.date = "2012-06-19"
+  s.date = "2012-07-18"
   s.description = "\n    follow REA model\n\t"
   s.email = "lazing@gmail.com"
   s.extra_rdoc_files = [
@@ -32,42 +32,48 @@ Gem::Specification.new do |s|
     "app/models/rea/category_member.rb",
     "app/models/rea/category_type.rb",
     "app/models/rea/group.rb",
-    "app/models/rea/group_entity.rb",
+    "app/models/rea/group_type.rb",
     "app/models/rea/identifier.rb",
     "app/views/layouts/rea/application.html.erb",
+    "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/20120605030708_create_rea_group_entities.rb",
     "db/migrate/20120605082028_create_rea_identifiers.rb",
+    "db/migrate/20120717080004_create_rea_group_types.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/application.rb",
     "lib/rea/aspect_type.rb",
     "lib/rea/aspect_type/base.rb",
-    "lib/rea/aspect_type/classification_aspect.rb",
+    "lib/rea/aspect_type/classification.rb",
     "lib/rea/aspect_type/description.rb",
-    "lib/rea/aspect_type/due_date_type.rb",
-    "lib/rea/aspect_type/identifier_setup.rb",
-    "lib/rea/dsl.rb",
-    "lib/rea/dsl/behavioral.rb",
-    "lib/rea/dsl/structural.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",
     "lib/tasks/watchr.rake",
@@ -111,14 +117,25 @@ Gem::Specification.new do |s|
     "spec/models/rea/category_member_spec.rb",
     "spec/models/rea/category_spec.rb",
     "spec/models/rea/category_type_spec.rb",
-    "spec/models/rea/group_entity_spec.rb",
     "spec/models/rea/group_spec.rb",
+    "spec/models/rea/group_type_spec.rb",
     "spec/models/rea/identifier_spec.rb",
-    "spec/rea/dsl/behavioral_spec.rb",
-    "spec/rea/dsl/structural_spec.rb",
-    "spec/rea/dsl_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"

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

@@ -17,4 +17,12 @@ class Rea::InstallGenerator < Rails::Generators::Base
       migration_template path, "db/migrate/"+path.gsub(/\d+_([\w\d\.]+)/, '\1')
     end
   end
+
+  def install_rea_initializer
+    initializer "rea.rb" do |data|
+      data = ""
+      data << "Rea.setup do |application|\n"
+      data << "end"
+    end
+  end
 end

data/lib/rails_patch.rb

@@ -0,0 +1,26 @@
+module ActiveRecord
+  module AutosaveAssociation
+    def save_belongs_to_association(reflection)
+      association = association_instance_get(reflection.name)
+      record      = association && association.load_target
+      return if record.is_a? Array
+      if record && !record.destroyed?
+        autosave = reflection.options[:autosave]
+
+        if autosave && record.marked_for_destruction?
+          record.destroy
+        elsif autosave != false
+          saved = record.save(:validate => !autosave) if record.new_record? || (autosave && record.changed_for_autosave?)
+
+          if association.updated?
+            association_id = record.send(reflection.options[:primary_key] || :id)
+            self[reflection.foreign_key] = association_id
+            association.loaded!
+          end
+
+          saved if autosave
+        end
+      end
+    end
+  end
+end

data/lib/rea.rb

@@ -1,13 +1,37 @@
 require "rea/engine"
 
+require 'rails_patch'
+
 module Rea
-  autoload :Dsl, 'rea/dsl'
+  autoload :Model, 'rea/model'
   autoload :InstallGenerator, 'generators/rea/install/install_generator'
 
   autoload :AspectType, 'rea/aspect_type'
   autoload :MetaType, 'rea/meta_type'
 
+  autoload :Settings, 'rea/settings'
+  autoload :Application, 'rea/application'
+
   module Plugins
     autoload :ActiveModel, 'rea/plugins/active_model'
   end
+
+  class << self
+
+    attr_accessor :application
+
+    def application
+      @application ||= ::Rea::Application.new
+    end
+
+    def setup
+      puts "Loading Engine-Rea........"
+      application.setup!
+      yield(application)
+      application.prepare!
+    end
+
+    delegate :model, :to=>:application
+    delegate :context, :to=>:application
+  end
 end

data/lib/rea/application.rb

@@ -0,0 +1,86 @@
+module Rea
+  class Application
+    include ::Rea::Settings
+    include ::Rea::Model
+
+    setting :load_paths, [File.expand_path('app/rea', Rails.root)]
+
+    def setup!
+    end
+
+    def prepare!
+      remove_active_admin_load_paths_from_rails_autoload_and_eager_load
+      attach_reloader
+      load!
+    end
+
+    def loaded?
+      @@loaded ||= false
+    end
+
+    def load!
+      return if loaded?
+       # Load files
+      files_in_load_path.each{|file| load file }
+      @@loaded = true
+    end
+
+    def unload!
+      @@loaded = false
+    end
+
+    def files_in_load_path
+      load_paths.flatten.compact.uniq.collect{|path| Dir["#{path}/**/*.rb"] }.flatten
+    end
+
+
+    private
+    # Since we're dealing with all our own file loading, we need
+    #     # to remove our paths from the ActiveSupport autoload paths.
+    #         # If not, file naming becomes very important and can cause clashes.
+    def remove_active_admin_load_paths_from_rails_autoload_and_eager_load
+      ActiveSupport::Dependencies.autoload_paths.reject!{|path|
+        load_paths.include?(path) }
+        # Don't eagerload our configs, we'll deal with them ourselves
+        Rails.application.config.eager_load_paths = Rails.application.config.eager_load_paths.reject do |path|
+          load_paths.include?(path)
+        end
+    end
+
+    def attach_reloader
+      Rails32Reloader.new(Rails.application, Rea.application).attach!
+    end
+
+    class Rails32Reloader
+      attr_reader :rea_app, :rails_app, :rails_version
+
+      def initialize(rails_app, rea_app, rails_version = "3.2")
+        @rails_app = rails_app
+        @rea_app = rea_app
+        @rails_version = rails_version.to_s
+      end
+
+      def attach!
+        rea_app.load_paths.each do |path|
+          rails_app.config.watchable_dirs[path] = [:rb]
+        end
+
+        reloader = self
+
+        ActionDispatch::Reloader.to_prepare do
+          reloader.reload!
+        end
+      end
+
+      def reload!
+        rea_app.unload!
+        rea_app.load!
+      end
+
+      def major_rails_version
+        @rails_version[0..2]
+      end
+    end
+
+  end
+end