datamappify 0.10.0 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc8a8e06dc185a6fe88c046e23a6fb1a43c6cfbb
-  data.tar.gz: 9f54cf6189cf5f4fcf91d2bc4a3c71bfea2df191
+  metadata.gz: ef8038f0a59981b26cab34b79e9358f9333d476d
+  data.tar.gz: d39950946d1bafd3232ad8188242e1bb8e3b150f
 SHA512:
-  metadata.gz: 04f4bc8a8219f3d2c7c51dba054c374bf8045e6f8bf7a59713d0ff3a5e023e25135ad8696e7be16c3336203f6fa8721aabd529cd67088245fb4f712581472e83
-  data.tar.gz: 8f22447c5b5b7fd54b900e064a25cee0c320eecd9396a1339fd3179127697d6cf8d387426937d42f41a5fd3f2044ef7a92e7532c37d2e4914624f95c811b87a5
+  metadata.gz: d41dc6a2da7f5fa2f72e1a6c3b9a7a6d6e3c68fe741a5845bd31f1081914343916a91b4f74b63c4f678b37e2b8dcdb2870830ad92d8cb31d9b738d3bccedffd4
+  data.tar.gz: 14c092eda2c25e9d8b71853dd691ad7ffaf0b2fd63c3d6248654bfcc349c6e68b613d761b6732a9fcfa2b2a0edf923c8d28d1e17c91ea524c7079eab3e64b1e8

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## master
 
+## 0.10.1 [2013-03-16]
+
+- Fixed `#save` for creating new objects.
+- `#save` now performs in a transaction.
+
 ## 0.10.0 [2013-03-16]
 
 - Refactored `Repository`. `Entity` can now have attributes sourced from different `Data` objects.

data/README.md

@@ -46,7 +46,7 @@ class User
   attribute :last_name,  String
   attribute :gender,     String
   attribute :age,        Integer
-  attribute :passport,   Integer
+  attribute :passport,   String
 
   validates :first_name, :presence => true,
                          :length   => { :minimum => 2 }
@@ -107,7 +107,7 @@ Refer to [CHANGELOG](CHANGELOG.md).
 
 ## Todo
 
-- Perform `save` in a transaction.
+- Enforce attribute type casting.
 - 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.

data/Rakefile

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

data/datamappify.gemspec

@@ -26,7 +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 "testrbl"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "cane"

data/lib/datamappify/repository/persistence.rb

@@ -34,11 +34,11 @@ module Datamappify
       private
 
       def find_many(ids)
-        ids.map { |id| find_one(id) }
+        ids.map { |id| find_one(id) }.compact
       end
 
       def find_one(id)
-        entity_class.new data_mapping_walker(data_mapping, id)
+        exists?(id) ? entity_class.new(data_mapping_walker(data_mapping, id)) : nil
       end
 
       def create_or_update(entity)
@@ -55,22 +55,27 @@ module Datamappify
         entity_class.new data_mapping_walker(data_mapping, entity.id, entity.attributes)
       end
 
-      def data_mapping_walker(data_mapping, id, updated_attributes = nil)
+      def data_mapping_walker(data_mapping, main_object_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)
+        default_data_class.transaction do
 
-          data_fields_with_values = {}
+          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_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
+            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)
+            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
@@ -84,16 +89,12 @@ module Datamappify
         "Datamappify::Data::#{data_class_name}".constantize
       end
 
-      def foreign_key_field_name
-        "#{entity_class.name.underscore}_id"
+      def key_field_name(data_class_name)
+        entity_class.name == data_class_name ? :id : foreign_key_field_name
       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
+      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)
@@ -112,8 +113,19 @@ module Datamappify
         attribute_names.map { |name| attributes[name] }
       end
 
-      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)
+      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
 

data/lib/datamappify/version.rb

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

data/spec/repository/persistence_spec.rb

@@ -2,12 +2,12 @@ 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)            { User.new(:id => 1, :first_name => 'Fred', :gender => 'male', :passport => 'FREDWU42') }
+  let(:user_valid)      { User.new(:first_name => 'Batman', :gender => 'male', :passport => 'ARKHAMCITY') }
   let(:user_invalid)    { User.new(:first_name => 'a') }
 
   let(:has_db_user) do
-    Datamappify::Data::User.create!(:first_name => 'Fred')
+    Datamappify::Data::User.create!(:first_name => 'Fred', :sex => 'male')
     Datamappify::Data::UserPassport.create!(:number => 'FREDWU42', :user_id => 1)
   end
 
@@ -15,38 +15,65 @@ describe Datamappify::Repository do
     user_repository
   end
 
-  it "#find" do
-    has_db_user
+  describe "#find" do
+    it "found" do
+      has_db_user
 
-    user_repository.find(1).must_equal user
-    user_repository.find([1]).must_equal [user]
-  end
+      user_repository.find(1).must_equal user
+      user_repository.find([1]).must_equal [user]
+    end
+
+    it "not found" do
+      user_repository.find(1).must_equal nil
+    end
+
+    it "partial found collection" do
+      has_db_user
 
-  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'
+      user_repository.find([1, 2]).must_equal [user]
+    end
   end
 
-  it "#save! failure" do
-    -> { user_repository.save!(user_invalid) }.must_raise Datamappify::Data::EntityNotSaved
+  describe "#save" do
+    it "success" do
+      user_repository.save(user_valid)
+      user_repository.count.must_equal 1
+
+      new_user = user_repository.find(1)
+      new_user.must_be_kind_of User
+      new_user.first_name.must_equal 'Batman'
+      new_user.passport.must_equal 'ARKHAMCITY'
+    end
+
+    it "failure" do
+      -> { user_repository.save!(user_invalid) }.must_raise Datamappify::Data::EntityNotSaved
+    end
+
+    it "transaction" do
+      user_valid.driver_license = 'DEVOPS'
+      -> { user_repository.save(user_valid) }.must_raise ActiveRecord::StatementInvalid
+
+      user_repository.count.must_equal 0
+      Datamappify::Data::UserPassport.count.must_equal 0
+      Datamappify::Data::UserDriverLicense.count.must_equal 0
+    end
   end
 
   it "updates an existing record" do
     has_db_user
 
-    user.first_name = 'Steve'
-    user.gender = 'male'
+    user.first_name = 'Vivian'
+    user.gender = 'female'
     user.passport = 'LOCOMOTE'
 
     updated_user = user_repository.save(user)
-    updated_user.first_name.must_equal 'Steve'
-    updated_user.gender.must_equal 'male'
+    updated_user.first_name.must_equal 'Vivian'
+    updated_user.gender.must_equal 'female'
     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.first_name.must_equal 'Vivian'
+    persisted_user.gender.must_equal 'female'
     persisted_user.passport.must_equal 'LOCOMOTE'
 
     user_repository.count.must_equal 1

data/spec/support/active_record_tables.rb

@@ -15,7 +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.string :sex,        :null => false
       t.integer :age
       t.references :role
       t.timestamps
@@ -47,5 +47,12 @@ ActiveRecord::Migration.suppress_messages do
       t.belongs_to :user
       t.timestamps
     end
+
+    create_table :user_driver_licenses do |t|
+      t.string :number
+      t.string :expiry, :null => false
+      t.belongs_to :user
+      t.timestamps
+    end
   end
 end

data/spec/support/entities/user.rb

@@ -1,11 +1,12 @@
 class User
   include Datamappify::Entity
 
-  attribute :first_name, String
-  attribute :last_name,  String
-  attribute :gender,     String
-  attribute :age,        Integer
-  attribute :passport,   Integer
+  attribute :first_name,     String
+  attribute :last_name,      String
+  attribute :gender,         String
+  attribute :age,            Integer
+  attribute :passport,       String
+  attribute :driver_license, String
 
   validates :first_name, :presence => true,
                          :length   => { :minimum => 2 }

data/spec/support/repositories/user_repository.rb

@@ -5,6 +5,7 @@ class UserRepository
 
   for_entity User
 
-  map_attribute :gender,   'User#sex'
-  map_attribute :passport, 'UserPassport#number'
+  map_attribute :gender,         'User#sex'
+  map_attribute :passport,       'UserPassport#number'
+  map_attribute :driver_license, 'UserDriverLicense#number'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datamappify
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors:
 - Fred Wu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-15 00:00:00.000000000 Z
+date: 2013-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: virtus
@@ -121,7 +121,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: m
+  name: testrbl
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='