datamappify 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5cd51d61440490e0e15894ce7243cb4c324945b5
-  data.tar.gz: cbbf430016eaf1c88b181806e3901a009ce9028f
+  metadata.gz: bc8a8e06dc185a6fe88c046e23a6fb1a43c6cfbb
+  data.tar.gz: 9f54cf6189cf5f4fcf91d2bc4a3c71bfea2df191
 SHA512:
-  metadata.gz: 55ecbac18bf660597c7494a12b9adf88a1597202388ae131305653c2e5902d4d455d284b37bc1ebd0e4bec82b408ea4e778198df07e4c819c264af34658a3200
-  data.tar.gz: 5bbc77d5ef8a8522e66461bead4a94490932138464f27d912593d8bf5ef26414bb26712c63b2f2ce234ed48b99f1fe37d5ee58959057c94f471799983282c2b8
+  metadata.gz: 04f4bc8a8219f3d2c7c51dba054c374bf8045e6f8bf7a59713d0ff3a5e023e25135ad8696e7be16c3336203f6fa8721aabd529cd67088245fb4f712581472e83
+  data.tar.gz: 8f22447c5b5b7fd54b900e064a25cee0c320eecd9396a1339fd3179127697d6cf8d387426937d42f41a5fd3f2044ef7a92e7532c37d2e4914624f95c811b87a5

data/.travis.yml

@@ -2,3 +2,5 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
+script:
+  - bundle exec rake --trace

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## master
 
+## 0.10.0 [2013-03-16]
+
+- Refactored `Repository`. `Entity` can now have attributes sourced from different `Data` objects.
+- Removed relationships support - the effort required to make it work is not worth it.
+
 ## 0.9.0 [2013-03-14]
 
 - A total rewrite as a proof-of-concept based on the repository pattern.

data/README.md

@@ -36,26 +36,22 @@ Or install it yourself as:
 
 ## Usage
 
-Model:
+### Entity
 
 ```ruby
 class User
   include Datamappify::Entity
 
   attribute :first_name, String
-  attribute :last_name, String
-  attribute :age, Integer
+  attribute :last_name,  String
+  attribute :gender,     String
+  attribute :age,        Integer
+  attribute :passport,   Integer
 
-  # ActiveModel::Validations rules are wrapped in the `validations` block
-  validations do
-    validates :first_name, :presence => true
-  end
-
-  # ActiveRelation collections are wrapped in the `relationships` block
-  relationships do
-    has_one  :role
-    has_many :comments
-  end
+  validates :first_name, :presence => true,
+                         :length   => { :minimum => 2 }
+  validates :passport,   :presence => true,
+                         :length   => { :minimum => 8 }
 
   def full_name
     "#{first_name} #{last_name}"
@@ -63,37 +59,59 @@ class User
 end
 ```
 
-Corresponding repository:
+### Repository
 
 ```ruby
-user_repository = Datamappify::Repository.new(User)
+class UserRepository
+  include Datamappify::Repository
+
+  # specify the entity class
+  for_entity User
+
+  # specify any attributes that need to be mapped
+  #
+  # for example:
+  #   - 'gender' is mapped to the 'User' ActiveRecord class and its 'sex' attribute
+  #   - 'passport' is mapped to the 'UserPassport' ActiveRecord class and its 'number' attribute
+  #   - attributes not specified here are mapped automatically (in this case, 'User')
+  map_attribute :gender,   'User#sex'
+  map_attribute :passport, 'UserPassport#number'
+end
+
+user_repository = UserRepository.instance
 ```
 
-Retrieving records:
+#### Retrieving an entity
 
 ```ruby
 user = user_repository.find(1)
 ```
 
-Saving/updating a record:
+#### Saving/updating an entity
 
 ```ruby
 user_repository.save(user)
 ```
 
-Destroying a record:
+#### Destroying an entity
+
+Note that due to the attributes mapping, any data found in mapped ActiveRecord objects are not touched.
 
 ```ruby
 user_repository.destroy(user)
 ```
 
+## Changelog
+
+Refer to [CHANGELOG](CHANGELOG.md).
+
 ## Todo
 
-- Entity should dictate Data, so schema and migrations should be automatically generated
-- Support for `set_primary_key` (currently the PK is hard coded to `id`)
-- Support for HABTM association type
-- Support for entity attribute and data column mapping
-- Repository should handle asscociated data
+- Perform `save` in a transaction.
+- Hooks for persistence (`before_save` and `after_save`, etc).
+- Track dirty entity attributes to avoid unnecessary DB queries.
+- Support for configurable primary keys and foreign keys.
+- Entity should dictate Data, so schema and migrations should be automatically generated.
 
 ## Similar Projects
 

data/Rakefile

@@ -12,7 +12,7 @@ begin
 
   desc "Run cane to check quality metrics"
   Cane::RakeTask.new(:quality) do |cane|
-    cane.abc_max       = 8
+    cane.abc_max       = 10
     cane.no_doc        = true
     cane.style_glob    = './lib/**/*.rb'
     cane.style_measure = 120

data/datamappify.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
   spec.add_development_dependency "minitest"
   spec.add_development_dependency "minitest-colorize"
+  spec.add_development_dependency "m"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "cane"

data/lib/datamappify/data/base.rb

@@ -1,10 +1,6 @@
-require 'datamappify/data/association_methods'
-
 module Datamappify
   module Data
     class Base < ActiveRecord::Base
-      extend Data::AssociationMethods
-
       self.abstract_class = true
     end
   end

data/lib/datamappify/data/errors.rb

@@ -0,0 +1,18 @@
+module Datamappify
+  module Data
+    class Error < StandardError
+    end
+
+    class EntityInvalid < Error
+      def initialize(entity)
+        super entity.errors.full_messages.join(', ')
+      end
+    end
+
+    class EntityNotSaved < Error
+    end
+
+    class EntityNotDestroyed < Error
+    end
+  end
+end

data/lib/datamappify/data.rb

@@ -1,3 +1,4 @@
+require 'datamappify/data/errors'
 require 'datamappify/data/base'
 
 module Datamappify

data/lib/datamappify/entity.rb

@@ -1,43 +1,14 @@
 require 'virtus'
-require 'datamappify/entity/association_methods'
 
 module Datamappify
   module Entity
     def self.included(klass)
       klass.class_eval do
         include Virtus
+        include Virtus::Equalizer.new(inspect)
+        include ActiveModel::Validations
 
         attribute :id, Integer
-
-        extend Behaviour
-        extend Structure
-        extend AssociationMethods
-      end
-    end
-
-    module Behaviour
-      def self.extended(klass)
-        klass.class_eval do
-          include ActiveModel::Validations
-        end
-      end
-
-      attr_accessor :stored_validations
-
-      def validations(&block)
-        self.stored_validations = block
-
-        instance_eval(&block)
-      end
-    end
-
-    module Structure
-      attr_accessor :stored_relationships
-
-      def relationships(&block)
-        self.stored_relationships = block
-
-        instance_eval(&block)
       end
     end
   end

data/lib/datamappify/repository/attribute_source_data_class_builder.rb

@@ -0,0 +1,23 @@
+module Datamappify
+  module Repository
+    class AttributeSourceDataClassBuilder
+      class << self
+        def build(data_class_name, data_fields_mapping)
+          @data_class_name = data_class_name
+
+          build_data_class unless data_class_is_defined?
+        end
+
+        private
+
+        def build_data_class
+          Data.const_set(@data_class_name, Class.new(Data::Base))
+        end
+
+        def data_class_is_defined?
+          Data.const_defined?(@data_class_name, false)
+        end
+      end
+    end
+  end
+end

data/lib/datamappify/repository/attributes_mapper.rb

@@ -0,0 +1,51 @@
+require 'datamappify/repository/attribute_source_data_class_builder'
+
+module Datamappify
+  module Repository
+    class AttributesMapper
+      def initialize(repository)
+        @repository = repository
+
+        map_entity_attributes
+      end
+
+      def build_data_classes
+        @repository.data_mapping.each do |data_class_name, data_fields_mapping|
+          AttributeSourceDataClassBuilder.build(data_class_name, data_fields_mapping)
+        end
+      end
+
+      private
+
+      def map_entity_attributes
+        map_non_custom_entity_attributes
+        map_custom_entity_attributes
+      end
+
+      def map_non_custom_entity_attributes
+        @repository.data_mapping[@repository.entity_class.name] = {}
+
+        non_custom_attributes.each do |attribute_name|
+          @repository.data_mapping[@repository.entity_class.name][attribute_name] = attribute_name
+        end
+      end
+
+      def non_custom_attributes
+        @repository.entity_class.attribute_set.entries.map(&:name) - @repository.custom_attributes_mapping.keys
+      end
+
+      def map_custom_entity_attributes
+        @repository.custom_attributes_mapping.each do |attribute_name, source|
+          map_custom_entity_attribute(attribute_name, source)
+        end
+      end
+
+      def map_custom_entity_attribute(attribute_name, source)
+        data_class_name, data_field_name = source.split('#')
+
+        @repository.data_mapping[data_class_name] ||= {}
+        @repository.data_mapping[data_class_name][data_field_name.to_sym] = attribute_name
+      end
+    end
+  end
+end

data/lib/datamappify/repository/dsl.rb

@@ -0,0 +1,13 @@
+module Datamappify
+  module Repository
+    module DSL
+      def for_entity(entity_class)
+        self.entity_class = entity_class
+      end
+
+      def map_attribute(attribute, source)
+        self.custom_attributes_mapping[attribute] = source
+      end
+    end
+  end
+end

data/lib/datamappify/repository/persistence.rb

@@ -1,37 +1,124 @@
 module Datamappify
-  class Repository
+  module Repository
     module Persistence
-      [:save, :save!].each do |save_method_name|
-        define_method save_method_name do |entity_or_collection|
-          entity = collection = entity_or_collection
-
-          if collection.is_a?(Array)
-            collection.map { |e| send(save_method_name, e) }
-          elsif entity.id
-            update_data_record(save_method_name, entity)
-          else
-            create_data_record(save_method_name, entity)
+      def find(id_or_ids)
+        if id_or_ids.is_a?(Array)
+          find_many(id_or_ids)
+        else
+          find_one(id_or_ids)
+        end
+      end
+
+      def save(entity)
+        create_or_update(entity)
+      rescue Datamappify::Data::EntityInvalid
+        false
+      end
+
+      def save!(entity)
+        save(entity) || raise(Datamappify::Data::EntityNotSaved)
+      end
+
+      def destroy(id_or_entity)
+        default_data_class.send :destroy, extract_entity_id(id_or_entity)
+      end
+
+      def destroy!(id_or_entity)
+        destroy(id_or_entity) || raise(Datamappify::Data::EntityNotDestroyed)
+      end
+
+      def method_missing(symbol, *args)
+        default_data_class.send symbol, *args
+      end
+
+      private
+
+      def find_many(ids)
+        ids.map { |id| find_one(id) }
+      end
+
+      def find_one(id)
+        entity_class.new data_mapping_walker(data_mapping, id)
+      end
+
+      def create_or_update(entity)
+        raise Datamappify::Data::EntityInvalid.new(entity) if entity.invalid?
+
+        entity.id ? update(entity) : create(entity)
+      end
+
+      def create(entity)
+        entity_class.new data_mapping_walker(data_mapping, nil, entity.attributes)
+      end
+
+      def update(entity)
+        entity_class.new data_mapping_walker(data_mapping, entity.id, entity.attributes)
+      end
+
+      def data_mapping_walker(data_mapping, id, updated_attributes = nil)
+        composed_attributes = {}
+
+        data_mapping.each do |data_class_name, data_fields_mapping|
+          id     = find_data_object_id(data_class_name, id)
+          values = extract_data_field_values(data_class_name, id, updated_attributes, data_fields_mapping)
+
+          data_fields_with_values = {}
+
+          data_fields_mapping.each_with_index do |(data_field_name, attribute_name), index|
+            composed_attributes[attribute_name] = data_fields_with_values[data_field_name] = values[index]
           end
+
+          if id && updated_attributes
+            update_data_object(data_class_name, id, data_fields_with_values)
+          end
+        end
+
+        composed_attributes
+      end
+
+      def default_data_class
+        data_class(entity_class.name)
+      end
+
+      def data_class(data_class_name)
+        "Datamappify::Data::#{data_class_name}".constantize
+      end
+
+      def foreign_key_field_name
+        "#{entity_class.name.underscore}_id"
+      end
+
+      def find_data_object_id(data_class_name, id)
+        if entity_class.name == data_class_name
+          id
+        else
+          data_class(data_class_name).where(foreign_key_field_name => id).pluck(:id).first
         end
       end
 
-      [:destroy, :destroy!].each do |destroy_method_name|
-        define_method destroy_method_name do |entity_or_id|
-          data_class.send(destroy_method_name, extract_entity_id(entity_or_id))
+      def extract_data_field_values(data_class_name, id, updated_attributes, data_fields_mapping)
+        if updated_attributes.nil?
+          find_data_field_values_from_db(data_class_name, id, data_fields_mapping.keys)
+        else
+          find_data_field_values_from_attributes(updated_attributes, data_fields_mapping.values)
         end
       end
 
-      private
+      def find_data_field_values_from_db(data_class_name, id, data_field_names)
+        data_class(data_class_name).where(:id => id).pluck(*data_field_names).flatten
+      end
+
+      def find_data_field_values_from_attributes(attributes, attribute_names)
+        attribute_names.map { |name| attributes[name] }
+      end
 
-      def create_data_record(save_method_name, entity)
-        data_object = data_class.new(entity.attributes)
-        data_object.send(save_method_name) && data_object.entity
+      def update_data_object(data_class_name, id, data_fields_with_values)
+        data_object = data_class(data_class_name).find_or_initialize_by(:id => id)
+        data_object.update_attributes data_fields_with_values
       end
 
-      def update_data_record(save_method_name, entity)
-        data_object = data_class.find(entity.id)
-        data_object.update_attributes(entity.attributes)
-        data_object.send(save_method_name) && data_object.entity
+      def extract_entity_id(id_or_entity)
+        id_or_entity.is_a?(Integer) ? id_or_entity : id_or_entity.id
       end
     end
   end

data/lib/datamappify/repository.rb

@@ -1,65 +1,28 @@
+require 'singleton'
 require 'datamappify/repository/persistence'
+require 'datamappify/repository/dsl'
+require 'datamappify/repository/attributes_mapper'
 
 module Datamappify
-  class Repository
+  module Repository
     include Persistence
 
-    def initialize(entity_class)
-      @entity_class = entity_class
+    def self.included(klass)
+      klass.class_eval do
+        mattr_accessor :entity_class
+        mattr_accessor :custom_attributes_mapping
+        mattr_accessor :data_mapping
 
-      unless data_class_is_defined?
-        apply_validations_to_data_class
-        apply_relationships_to_data_class
-        add_entity_to_data_class
-      end
-    end
-
-    def find(entity_or_id)
-      data_class.find(extract_entity_id(entity_or_id))
-    end
-
-    def method_missing(symbol, *args)
-      data_class.send symbol, *args
-    end
-
-    private
-
-    def data_class_is_defined?
-      Data.const_defined?(@entity_class.name, false)
-    end
-
-    def apply_validations_to_data_class
-      if @entity_class.stored_validations
-        data_class.class_eval(&@entity_class.stored_validations)
-      end
-    end
-
-    def apply_relationships_to_data_class
-      if @entity_class.stored_relationships
-        data_class.class_eval(&@entity_class.stored_relationships)
-      end
-    end
-
-    def add_entity_to_data_class
-      data_class.class_eval <<-CODE
-        def entity
-          #{@entity_class.name}.new(attributes)
-        end
-      CODE
-    end
+        klass.custom_attributes_mapping = {}
+        klass.data_mapping = {}
 
-    def data_class
-      @data_class ||= begin
-        if data_class_is_defined?
-          Data.const_get(@entity_class.name, false)
-        else
-          Data.const_set(@entity_class.name, Class.new(Data::Base))
-        end
+        include Singleton
+        extend DSL
       end
     end
 
-    def extract_entity_id(entity_or_id)
-      entity_or_id.is_a?(Integer) ? entity_or_id : entity_or_id.id
+    def initialize
+      AttributesMapper.new(self).build_data_classes
     end
   end
 end

data/lib/datamappify/version.rb

@@ -1,3 +1,3 @@
 module Datamappify
-  VERSION = '0.9.0'
+  VERSION = '0.10.0'
 end

data/spec/entity_spec.rb

@@ -27,57 +27,13 @@ describe Datamappify::Entity do
   end
 
   describe "validations" do
-    it "requires first name" do
-      user.first_name = nil
+    it "validates attributes" do
       user.valid?.must_equal false
 
       user.first_name = 'Fred'
+      user.passport = 'FREDWU42'
       user.valid?.must_equal true
     end
   end
-
-  describe "relationships" do
-    describe "getters" do
-      it "belongs_to" do
-        comment.user.must_be_kind_of User
-      end
-
-      it "has_one" do
-        user.role.must_be_kind_of Role
-      end
-
-      it "has_many" do
-        user.comments.must_be_kind_of Array
-        user.comments.must_be_empty
-      end
-    end
-
-    describe "setters" do
-      let(:entity) { Object.new }
-
-      it "belongs_to" do
-        comment.user = entity
-        comment.user.must_be_kind_of Object
-        comment.user.must_equal entity
-      end
-
-      it "has_one" do
-        user.role = entity
-        user.role.must_be_kind_of Object
-        user.role.must_equal entity
-      end
-
-      it "has_many" do
-        user.comments << entity
-        user.comments << entity
-        user.comments.must_be_kind_of Array
-        user.comments.count.must_equal 2
-        user.comments[0].must_equal entity
-
-        user.comments = [entity]
-        user.comments.count.must_equal 1
-      end
-    end
-  end
 end
 

data/spec/repository/persistence_spec.rb

@@ -0,0 +1,68 @@
+require_relative '../spec_helper'
+
+describe Datamappify::Repository do
+  let(:user_repository) { UserRepository.instance }
+  let(:user)            { User.new(:id => 1, :first_name => 'Fred', :passport => 'FREDWU42') }
+  let(:user_valid)      { User.new(:first_name => 'Batman', :passport => 'ARKHAMCITY') }
+  let(:user_invalid)    { User.new(:first_name => 'a') }
+
+  let(:has_db_user) do
+    Datamappify::Data::User.create!(:first_name => 'Fred')
+    Datamappify::Data::UserPassport.create!(:number => 'FREDWU42', :user_id => 1)
+  end
+
+  before do
+    user_repository
+  end
+
+  it "#find" do
+    has_db_user
+
+    user_repository.find(1).must_equal user
+    user_repository.find([1]).must_equal [user]
+  end
+
+  it "#save success" do
+    new_user = user_repository.save(user_valid)
+    new_user.must_be_kind_of User
+    new_user.first_name.must_equal 'Batman'
+  end
+
+  it "#save! failure" do
+    -> { user_repository.save!(user_invalid) }.must_raise Datamappify::Data::EntityNotSaved
+  end
+
+  it "updates an existing record" do
+    has_db_user
+
+    user.first_name = 'Steve'
+    user.gender = 'male'
+    user.passport = 'LOCOMOTE'
+
+    updated_user = user_repository.save(user)
+    updated_user.first_name.must_equal 'Steve'
+    updated_user.gender.must_equal 'male'
+    updated_user.passport.must_equal 'LOCOMOTE'
+
+    persisted_user = user_repository.find(user.id)
+    persisted_user.first_name.must_equal 'Steve'
+    persisted_user.gender.must_equal 'male'
+    persisted_user.passport.must_equal 'LOCOMOTE'
+
+    user_repository.count.must_equal 1
+  end
+
+  it "#destroy via id" do
+    has_db_user
+
+    user_repository.destroy!(1)
+    user_repository.count.must_equal 0
+  end
+
+  it "#destroy via entity" do
+    has_db_user
+
+    user_repository.destroy!(user)
+    user_repository.count.must_equal 0
+  end
+end

data/spec/repository_spec.rb

@@ -1,23 +1,26 @@
 require_relative 'spec_helper'
 
 describe Datamappify::Repository do
-  let(:user_repository)    { Datamappify::Repository.new(User) }
-  let(:comment_repository) { Datamappify::Repository.new(Comment) }
-  let(:role_repository)    { Datamappify::Repository.new(Role) }
+  let(:user_repository)    { UserRepository.instance }
+  let(:comment_repository) { CommentRepository.instance }
+  let(:role_repository)    { RoleRepository.instance }
+  let(:group_repository)   { GroupRepository.instance }
+
+  before do
+    user_repository
+    comment_repository
+    role_repository
+    group_repository
+  end
 
   describe "ActiveRecord data objects" do
     it "defines the Data::User class after the repository is initialised" do
-      user_repository
       Datamappify::Data.const_defined?(:User, false).must_equal true
     end
 
     describe "data objects" do
       subject { Datamappify::Data::User }
 
-      before do
-        user_repository
-      end
-
       it "inherites from Datamappify::Data::Base" do
         subject.superclass.must_equal Datamappify::Data::Base
         subject.ancestors.must_include ActiveRecord::Base
@@ -26,29 +29,6 @@ describe Datamappify::Repository do
       it "has 'users' as the table name" do
         subject.table_name.must_equal 'users'
       end
-
-      describe "relationships" do
-        let(:user)    { Datamappify::Data::User.new }
-        let(:comment) { Datamappify::Data::Comment.new }
-        let(:role)    { Datamappify::Data::Role.new }
-
-        it "belongs_to" do
-          assert_correct_associated_data_class_name(comment, :user, 'Datamappify::Data::User')
-          comment.user.must_be_nil
-        end
-
-        it "has_one" do
-          assert_correct_associated_data_class_name(user, :role, 'Datamappify::Data::Role')
-          user.role.must_be_nil
-        end
-
-        it "has_many" do
-          assert_correct_associated_data_class_name(user, :comments, 'Datamappify::Data::Comment')
-          assert_correct_associated_data_class_name(role, :users, 'Datamappify::Data::User')
-          user.comments.must_be_empty
-          role.users.must_be_empty
-        end
-      end
     end
 
     def assert_correct_associated_data_class_name(klass, association_name, data_class_name)

data/spec/spec_helper.rb

@@ -13,7 +13,7 @@ end
 
 require File.expand_path('../../lib/datamappify', __FILE__)
 
-Dir[File.expand_path('../support/**/*', __FILE__)].each { |f| require f }
+Dir[File.expand_path('../support/**/*.rb', __FILE__)].each { |f| require f }
 
 DatabaseCleaner.strategy = :truncation
 

data/spec/support/active_record_tables.rb

@@ -15,6 +15,7 @@ ActiveRecord::Migration.suppress_messages do
     create_table :users do |t|
       t.string :first_name, :null => false
       t.string :last_name
+      t.string :sex
       t.integer :age
       t.references :role
       t.timestamps
@@ -22,7 +23,7 @@ ActiveRecord::Migration.suppress_messages do
 
     create_table :comments do |t|
       t.string :content
-      t.references :user
+      t.belongs_to :user
       t.timestamps
     end
 
@@ -30,5 +31,21 @@ ActiveRecord::Migration.suppress_messages do
       t.string :name
       t.timestamps
     end
+
+    create_table :groups do |t|
+      t.string :name
+      t.timestamps
+    end
+
+    create_table :groups_users do |t|
+      t.belongs_to :user
+      t.belongs_to :group
+    end
+
+    create_table :user_passports do |t|
+      t.string :number
+      t.belongs_to :user
+      t.timestamps
+    end
   end
 end

data/spec/support/{comment.rb → entities/comment.rb}

@@ -2,8 +2,4 @@ class Comment
   include Datamappify::Entity
 
   attribute :content, String
-
-  relationships do
-    belongs_to :user
-  end
 end

data/spec/support/entities/group.rb

@@ -0,0 +1,5 @@
+class Group
+  include Datamappify::Entity
+
+  attribute :name, String
+end

data/spec/support/{role.rb → entities/role.rb}

@@ -2,8 +2,4 @@ class Role
   include Datamappify::Entity
 
   attribute :name, String
-
-  relationships do
-    has_many :users
-  end
 end

data/spec/support/entities/user.rb

@@ -0,0 +1,18 @@
+class User
+  include Datamappify::Entity
+
+  attribute :first_name, String
+  attribute :last_name,  String
+  attribute :gender,     String
+  attribute :age,        Integer
+  attribute :passport,   Integer
+
+  validates :first_name, :presence => true,
+                         :length   => { :minimum => 2 }
+  validates :passport,   :presence => true,
+                         :length   => { :minimum => 8 }
+
+  def full_name
+    "#{first_name} #{last_name}"
+  end
+end

data/spec/support/repositories/comment_repository.rb

@@ -0,0 +1,7 @@
+require_relative '../entities/comment'
+
+class CommentRepository
+  include Datamappify::Repository
+
+  for_entity Comment
+end

data/spec/support/repositories/group_repository.rb

@@ -0,0 +1,7 @@
+require_relative '../entities/group'
+
+class GroupRepository
+  include Datamappify::Repository
+
+  for_entity Group
+end

data/spec/support/repositories/role_repository.rb

@@ -0,0 +1,7 @@
+require_relative '../entities/role'
+
+class RoleRepository
+  include Datamappify::Repository
+
+  for_entity Role
+end

data/spec/support/repositories/user_repository.rb

@@ -0,0 +1,10 @@
+require_relative '../entities/user'
+
+class UserRepository
+  include Datamappify::Repository
+
+  for_entity User
+
+  map_attribute :gender,   'User#sex'
+  map_attribute :passport, 'UserPassport#number'
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datamappify
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Fred Wu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-14 00:00:00.000000000 Z
+date: 2013-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: virtus
@@ -120,6 +120,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: m
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -212,23 +226,28 @@ files:
 - datamappify.gemspec
 - lib/datamappify.rb
 - lib/datamappify/data.rb
-- lib/datamappify/data/association_methods.rb
 - lib/datamappify/data/base.rb
+- lib/datamappify/data/errors.rb
 - lib/datamappify/entity.rb
-- lib/datamappify/entity/associated_collection.rb
-- lib/datamappify/entity/associated_entity.rb
-- lib/datamappify/entity/association_methods.rb
 - lib/datamappify/repository.rb
+- lib/datamappify/repository/attribute_source_data_class_builder.rb
+- lib/datamappify/repository/attributes_mapper.rb
+- lib/datamappify/repository/dsl.rb
 - lib/datamappify/repository/persistence.rb
 - lib/datamappify/version.rb
 - spec/entity_spec.rb
-- spec/repository/finders_and_persistence_spec.rb
+- spec/repository/persistence_spec.rb
 - spec/repository_spec.rb
 - spec/spec_helper.rb
 - spec/support/active_record_tables.rb
-- spec/support/comment.rb
-- spec/support/role.rb
-- spec/support/user.rb
+- spec/support/entities/comment.rb
+- spec/support/entities/group.rb
+- spec/support/entities/role.rb
+- spec/support/entities/user.rb
+- spec/support/repositories/comment_repository.rb
+- spec/support/repositories/group_repository.rb
+- spec/support/repositories/role_repository.rb
+- spec/support/repositories/user_repository.rb
 homepage: https://github.com/fredwu/datamappify
 licenses:
 - MIT
@@ -255,10 +274,15 @@ specification_version: 4
 summary: Separate domain logic from data persistence.
 test_files:
 - spec/entity_spec.rb
-- spec/repository/finders_and_persistence_spec.rb
+- spec/repository/persistence_spec.rb
 - spec/repository_spec.rb
 - spec/spec_helper.rb
 - spec/support/active_record_tables.rb
-- spec/support/comment.rb
-- spec/support/role.rb
-- spec/support/user.rb
+- spec/support/entities/comment.rb
+- spec/support/entities/group.rb
+- spec/support/entities/role.rb
+- spec/support/entities/user.rb
+- spec/support/repositories/comment_repository.rb
+- spec/support/repositories/group_repository.rb
+- spec/support/repositories/role_repository.rb
+- spec/support/repositories/user_repository.rb

data/lib/datamappify/data/association_methods.rb

@@ -1,29 +0,0 @@
-module Datamappify
-  module Data
-    module AssociationMethods
-      def belongs_to(name, scope = nil, options = {})
-        build_associated_repository(name)
-
-        super(name, scope = nil, options)
-      end
-
-      def has_one(name, scope = nil, options = {})
-        build_associated_repository(name)
-
-        super(name, scope = nil, options)
-      end
-
-      def has_many(name, scope = nil, options = {}, &extension)
-        build_associated_repository(name)
-
-        super(name, scope = nil, options, &extension)
-      end
-
-      private
-
-      def build_associated_repository(entity_or_collection_name)
-        Datamappify::Repository.new(entity_or_collection_name.to_s.classify.constantize)
-      end
-    end
-  end
-end

data/lib/datamappify/entity/associated_collection.rb

@@ -1,28 +0,0 @@
-module Datamappify
-  module Entity
-    class AssociatedCollection
-      def initialize(context, name)
-        build_collection_getter(context, name)
-        build_collection_setter(context, name)
-      end
-
-      private
-
-      def build_collection_getter(context, name)
-        context.class_eval <<-CODE
-          def #{name}
-            @#{name} ||= []
-          end
-        CODE
-      end
-
-      def build_collection_setter(context, name)
-        context.class_eval <<-CODE
-          def #{name}=(collection)
-            @#{name} = collection
-          end
-        CODE
-      end
-    end
-  end
-end

data/lib/datamappify/entity/associated_entity.rb

@@ -1,28 +0,0 @@
-module Datamappify
-  module Entity
-    class AssociatedEntity
-      def initialize(context, name)
-        build_entity_getter(context, name)
-        build_entity_setter(context, name)
-      end
-
-      private
-
-      def build_entity_getter(context, name)
-        context.class_eval <<-CODE
-          def #{name}
-            @#{name} ||= "#{name}".classify.constantize.new
-          end
-        CODE
-      end
-
-      def build_entity_setter(context, name)
-        context.class_eval <<-CODE
-          def #{name}=(entity)
-            @#{name} = entity
-          end
-        CODE
-      end
-    end
-  end
-end

data/lib/datamappify/entity/association_methods.rb

@@ -1,20 +0,0 @@
-require 'datamappify/entity/associated_entity'
-require 'datamappify/entity/associated_collection'
-
-module Datamappify
-  module Entity
-    module AssociationMethods
-      def belongs_to(name, *args)
-        AssociatedEntity.new(self, name)
-      end
-
-      def has_one(name, *args)
-        AssociatedEntity.new(self, name)
-      end
-
-      def has_many(name, *args)
-        AssociatedCollection.new(self, name)
-      end
-    end
-  end
-end

data/spec/repository/finders_and_persistence_spec.rb

@@ -1,71 +0,0 @@
-require_relative '../spec_helper'
-
-describe Datamappify::Repository do
-  let(:user_repository) { Datamappify::Repository.new(User) }
-  let(:user)            { user_repository.first }
-  let(:user_valid)      { User.new(:first_name => 'Batman') }
-  let(:user_invalid)    { User.new(:first_name => 'a') }
-
-  before do
-    user_repository
-    Datamappify::Data::User.create!(:first_name => 'Fred')
-  end
-
-  describe "single record" do
-    it "#find via id" do
-      user_repository.find(1).must_equal user
-    end
-
-    it "#find via entity" do
-      user_repository.find(user.entity).must_equal user
-    end
-
-    it "#save success" do
-      new_user = user_repository.save(user_valid)
-      new_user.must_be_kind_of User
-      new_user.first_name.must_equal 'Batman'
-    end
-
-    it "#save! failure" do
-      -> { user_repository.save!(user_invalid) }.must_raise ActiveRecord::RecordInvalid
-    end
-
-    it "updates an existing record" do
-      user.first_name = 'Steve'
-      changed_user = User.new(user.attributes)
-      user_repository.save(changed_user).first_name.must_equal 'Steve'
-      user_repository.count.must_equal 1
-    end
-
-    it "#destroy via id" do
-      user_repository.destroy(1)
-      user_repository.count.must_equal 0
-    end
-
-    it "#destroy via entity" do
-      user_repository.destroy(user.entity)
-      user_repository.count.must_equal 0
-    end
-  end
-
-  describe "collection records" do
-    it "#find" do
-      user_repository.all.must_be_kind_of ActiveRecord::Relation::ActiveRecord_Relation_Datamappify_Data_User
-      user_repository.count.must_equal 1
-    end
-
-    it "#save" do
-      new_user_entity = user.entity
-      new_user_entity.id = nil
-
-      new_users = user_repository.save([new_user_entity, user_valid])
-      new_users[0].first_name.must_equal 'Fred'
-      new_users[1].first_name.must_equal 'Batman'
-
-      user_repository.count.must_equal 3
-      user_repository.all[0].first_name.must_equal 'Fred'
-      user_repository.all[1].first_name.must_equal 'Fred'
-      user_repository.all[2].first_name.must_equal 'Batman'
-    end
-  end
-end

data/spec/support/user.rb

@@ -1,21 +0,0 @@
-class User
-  include Datamappify::Entity
-
-  attribute :first_name, String
-  attribute :last_name, String
-  attribute :age, Integer
-
-  validations do
-    validates :first_name, :presence => true,
-                           :length   => { :minimum => 2 }
-  end
-
-  relationships do
-    has_one  :role
-    has_many :comments
-  end
-
-  def full_name
-    "#{first_name} #{last_name}"
-  end
-end