datamappify 0.10.1 → 0.20.0

data/spec/support/{active_record_tables.rb → tables/active_record.rb}

@@ -5,17 +5,15 @@ ActiveRecord::Migration.suppress_messages do
   )
 
   ActiveRecord::Schema.define(:version => 0) do
-    begin
-      drop_table :users
-      drop_table :comments
-      drop_table :roles
-    rescue
+    create_table :hero_users do |t|
+      t.string :first_name, :null => false
+      t.string :nickname
+      t.timestamps
     end
 
     create_table :users do |t|
       t.string :first_name, :null => false
-      t.string :last_name
-      t.string :sex,        :null => false
+      t.string :surname
       t.integer :age
       t.references :role
       t.timestamps
@@ -42,17 +40,25 @@ ActiveRecord::Migration.suppress_messages do
       t.belongs_to :group
     end
 
-    create_table :user_passports do |t|
+    create_table :user_driver_licenses do |t|
       t.string :number
+      t.string :expiry
       t.belongs_to :user
       t.timestamps
     end
 
-    create_table :user_driver_licenses do |t|
+    create_table :user_passports do |t|
       t.string :number
       t.string :expiry, :null => false
       t.belongs_to :user
       t.timestamps
     end
+
+    create_table :user_health_cares do |t|
+      t.string :number
+      t.string :expiry
+      t.belongs_to :user
+      t.timestamps
+    end
   end
 end

data/spec/support/tables/sequel.rb

@@ -0,0 +1,76 @@
+require 'sequel'
+
+DB = Sequel.sqlite
+
+DB.create_table :hero_user_last_names do
+  primary_key :id
+  String :last_name, :null => false
+  Integer :hero_user_id
+  DateTime :created_at
+  DateTime :updated_at
+end
+
+DB.create_table :users do
+  primary_key :id
+  String :first_name, :null => false
+  String :surname
+  Integer :age
+  foreign_key :role_id
+  DateTime :created_at
+  DateTime :updated_at
+end
+
+DB.create_table :comments do
+  primary_key :id
+  String :content
+  foreign_key :user_id
+  DateTime :created_at
+  DateTime :updated_at
+end
+
+DB.create_table :roles do
+  primary_key :id
+  String :name
+  DateTime :created_at
+  DateTime :updated_at
+end
+
+DB.create_table :groups do
+  primary_key :id
+  String :name
+  DateTime :created_at
+  DateTime :updated_at
+end
+
+DB.create_table :groups_users do
+  primary_key :id
+  foreign_key :user_id
+  foreign_key :group_id
+end
+
+DB.create_table :user_driver_licenses do
+  primary_key :id
+  String :number
+  String :expiry
+  foreign_key :user_id
+  DateTime :created_at
+  DateTime :updated_at
+end
+
+DB.create_table :user_passports do
+  primary_key :id
+  String :number
+  String :expiry, :null => false
+  foreign_key :user_id
+  DateTime :created_at
+  DateTime :updated_at
+end
+
+DB.create_table :user_health_cares do
+  primary_key :id
+  String :number
+  String :expiry
+  foreign_key :user_id
+  DateTime :created_at
+  DateTime :updated_at
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datamappify
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.20.0
 platform: ruby
 authors:
 - Fred Wu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-16 00:00:00.000000000 Z
+date: 2013-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: virtus
@@ -44,26 +44,6 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: '5'
-- !ruby/object:Gem::Dependency
-  name: activerecord
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 4.0.0.beta1
-    - - <
-      - !ruby/object:Gem::Version
-        version: '5'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 4.0.0.beta1
-    - - <
-      - !ruby/object:Gem::Version
-        version: '5'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -93,7 +73,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -107,7 +87,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest-colorize
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -121,7 +101,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: testrbl
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -135,7 +115,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: cane
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -149,7 +129,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -163,7 +143,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: cane
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -177,7 +157,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: sequel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -190,6 +170,26 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 4.0.0.beta1
+    - - <
+      - !ruby/object:Gem::Version
+        version: '5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 4.0.0.beta1
+    - - <
+      - !ruby/object:Gem::Version
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
@@ -218,6 +218,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
 - .travis.yml
 - CHANGELOG.md
 - Gemfile
@@ -226,28 +227,43 @@ files:
 - datamappify.gemspec
 - lib/datamappify.rb
 - lib/datamappify/data.rb
-- lib/datamappify/data/base.rb
 - lib/datamappify/data/errors.rb
+- lib/datamappify/data/provider/active_record.rb
+- lib/datamappify/data/provider/active_record/persistence.rb
+- lib/datamappify/data/provider/common/persistence.rb
+- lib/datamappify/data/provider/common/relational/persistence.rb
+- lib/datamappify/data/provider/common/relational/record/mapper.rb
+- lib/datamappify/data/provider/common/relational/record/writer.rb
+- lib/datamappify/data/provider/sequel.rb
+- lib/datamappify/data/provider/sequel/persistence.rb
 - lib/datamappify/entity.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/repository/mapping_hash.rb
+- lib/datamappify/util.rb
 - lib/datamappify/version.rb
 - spec/entity_spec.rb
 - spec/repository/persistence_spec.rb
 - spec/repository_spec.rb
 - spec/spec_helper.rb
-- spec/support/active_record_tables.rb
 - spec/support/entities/comment.rb
 - spec/support/entities/group.rb
+- spec/support/entities/hero_user.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
+- spec/support/repositories/active_record/comment_repository.rb
+- spec/support/repositories/active_record/group_repository.rb
+- spec/support/repositories/active_record/role_repository.rb
+- spec/support/repositories/active_record/user_repository.rb
+- spec/support/repositories/hero_user_repository.rb
+- spec/support/repositories/sequel/comment_repository.rb
+- spec/support/repositories/sequel/group_repository.rb
+- spec/support/repositories/sequel/role_repository.rb
+- spec/support/repositories/sequel/user_repository.rb
+- spec/support/tables/active_record.rb
+- spec/support/tables/sequel.rb
 homepage: https://github.com/fredwu/datamappify
 licenses:
 - MIT
@@ -277,12 +293,19 @@ test_files:
 - spec/repository/persistence_spec.rb
 - spec/repository_spec.rb
 - spec/spec_helper.rb
-- spec/support/active_record_tables.rb
 - spec/support/entities/comment.rb
 - spec/support/entities/group.rb
+- spec/support/entities/hero_user.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
+- spec/support/repositories/active_record/comment_repository.rb
+- spec/support/repositories/active_record/group_repository.rb
+- spec/support/repositories/active_record/role_repository.rb
+- spec/support/repositories/active_record/user_repository.rb
+- spec/support/repositories/hero_user_repository.rb
+- spec/support/repositories/sequel/comment_repository.rb
+- spec/support/repositories/sequel/group_repository.rb
+- spec/support/repositories/sequel/role_repository.rb
+- spec/support/repositories/sequel/user_repository.rb
+- spec/support/tables/active_record.rb
+- spec/support/tables/sequel.rb

data/lib/datamappify/data/base.rb

@@ -1,7 +0,0 @@
-module Datamappify
-  module Data
-    class Base < ActiveRecord::Base
-      self.abstract_class = true
-    end
-  end
-end

data/lib/datamappify/repository/persistence.rb

@@ -1,137 +0,0 @@
-module Datamappify
-  module Repository
-    module Persistence
-      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) }.compact
-      end
-
-      def find_one(id)
-        exists?(id) ? entity_class.new(data_mapping_walker(data_mapping, id)) : nil
-      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, main_object_id, updated_attributes = nil)
-        composed_attributes = {}
-
-        default_data_class.transaction do
-
-          data_mapping.each do |data_class_name, data_fields_mapping|
-            values = extract_data_field_values(
-              data_class_name, main_object_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 updated_attributes && data_fields_need_updating?(data_fields_with_values)
-              create_or_update_data_object(data_class_name, main_object_id, data_fields_with_values)
-            end
-          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 key_field_name(data_class_name)
-        entity_class.name == data_class_name ? :id : foreign_key_field_name
-      end
-
-      def foreign_key_field_name
-        "#{entity_class.name.underscore}_id".to_sym
-      end
-
-      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
-
-      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 data_fields_need_updating?(data_fields_with_values)
-        data_fields_with_values.values.compact.any?
-      end
-
-      def create_or_update_data_object(data_class_name, main_object_id, data_fields_with_values)
-        unless entity_class.name == data_class_name
-          data_fields_with_values[foreign_key_field_name] = main_object_id
-        end
-
-        data_object = data_class(data_class_name).find_or_initialize_by(
-          key_field_name(data_class_name) => main_object_id
-        )
-
-        data_object.update_attributes data_fields_with_values
-      end
-
-      def extract_entity_id(id_or_entity)
-        id_or_entity.is_a?(Integer) ? id_or_entity : id_or_entity.id
-      end
-    end
-  end
-end

data/spec/support/repositories/comment_repository.rb

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

data/spec/support/repositories/group_repository.rb

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

data/spec/support/repositories/role_repository.rb

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

data/spec/support/repositories/user_repository.rb

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