roqua-core-api 0.0.25 → 0.0.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7110f0db271cc5c78369d2dcc5f788da9d965097
-  data.tar.gz: 9925a6328dd33176e147b12d5c996e1c8e798b3d
+  metadata.gz: 601eda66c40f7460205cf7cb85a05fbe36845a14
+  data.tar.gz: 79814be6c1ceb439979413e512732ab2b8bebac8
 SHA512:
-  metadata.gz: 82e7756d106c5023ab0f9b7710a652ec0f454a1d314db93466a84fe91c9f4df2976107c2a2529d45ac6fc9f75d7b0d618d11499aa06627dce274141b002d5ded
-  data.tar.gz: 4dff71200b5528b02e093c6e21b2caeea1dd529f44b7e2ad251c97e568dedb254915ed239c3368203170f8b66cf29d0f1a9ca9352dfeed363d679725dc08b557
+  metadata.gz: d2887a4630ec97c1bab5b1334642fedd9ca86c39c2723ae7cdb86b23b63d55e2da46d63a03f31ad697fcb871681d778beb9a36dbbf68a91ae975c214f961409b
+  data.tar.gz: 4b2ddc7d569abc704bcf899c4d2f3ca21c2e93b4f62a44e28d15e7c12f87b542fa5e8abfad236265fc6f18412179d2ba966d310e97d177ed283f7b9895572b09

data/ChangeLog.md

@@ -1,3 +1,7 @@
+### 0.0.26 / 2014-04-17
+
+* Fixed Person.birthdate being settable by birthdate(1i) type params
+
 ### 0.0.25 / 2014-03-26
 
 * added dossiers list

data/README.md

@@ -23,7 +23,10 @@ TODO: Description
 
 ### Translations
 
-Make sure you have the standard active validations translations (errors.messages) and add to it a translations for errors.messages.invalid_email.
+Make sure you have the standard active validations translations (errors.messages) and add to it a translations for:
+
+* errors.messages.invalid_email
+* errors.messages.invalid_date
 
 ## Copyright
 

data/lib/roqua/core_api/models/active_virtus.rb

@@ -0,0 +1,43 @@
+require 'virtus'
+
+class Roqua::CoreApi::Models::ActiveVirtus
+  extend  ActiveModel::Naming
+  extend  ActiveModel::Translation
+  include ActiveModel::Validations
+  include ActiveModel::Conversion
+  include ActiveModel::Serialization
+  include Virtus.model
+
+  def attributes=(params)
+    set_rails_dates(params)
+    super
+  end
+
+  def assign_attributes(params = {})
+    self.attributes = params
+  end
+
+  private
+
+  # set Date and DateTime attributes by "name(1i)" style params
+  def set_rails_dates(params)
+    self.class.attribute_set.select do |a|
+      a.type.primitive <= Date && params.has_key?("#{a.name}(1i)")
+    end.each do |a|
+      set_date(a.name, params)
+    end
+  end
+
+  def set_date(attribute, params)
+    self[attribute] = {
+      year:  params.fetch("#{attribute}(1i)"),
+      month: params.fetch("#{attribute}(2i)", 1),
+      day:   params.fetch("#{attribute}(3i)", 1),
+      hour:  params.fetch("#{attribute}(4i)", 0),
+      min:   params.fetch("#{attribute}(5i)", 0),
+      sec:   params.fetch("#{attribute}(6i)", 0)
+    }
+  rescue
+    errors.add(attribute, I18n.t("errors.messages.invalid_date"))
+  end
+end

data/lib/roqua/core_api/models/person.rb

@@ -1,13 +1,6 @@
 require 'virtus'
 
-class Roqua::CoreApi::Models::Person
-  extend  ActiveModel::Naming
-  extend  ActiveModel::Translation
-  include ActiveModel::Validations
-  include ActiveModel::Conversion
-  include ActiveModel::Serialization
-  include Virtus.model
-
+class Roqua::CoreApi::Models::Person < Roqua::CoreApi::Models::ActiveVirtus
   attribute :id, String
   attribute :role, String
   attribute :firstname, String
@@ -28,10 +21,6 @@ class Roqua::CoreApi::Models::Person
 
   validates :role, inclusion: { in: %w( professional patient parent ) }
 
-  def assign_attributes(params = {})
-    self.attributes = params
-  end
-
   def persisted?
     id.present?
   end

data/lib/roqua/core_api/models.rb

@@ -1,4 +1,5 @@
 require 'roqua/core_api/models/dossier_group'
 require 'roqua/core_api/models/dossier'
 require 'active_model'
+require 'roqua/core_api/models/active_virtus'
 require 'roqua/core_api/models/person'

data/lib/roqua/core_api/version.rb

@@ -1,5 +1,5 @@
 module Roqua
   module CoreApi
-    VERSION = '0.0.25'
+    VERSION = '0.0.26'
   end
 end

data/spec/lib/roqua/core_api/models/active_virtus_spec.rb

@@ -0,0 +1,35 @@
+require 'spec_helper'
+
+module Roqua
+  module CoreApi
+    module Models
+      describe ActiveVirtus do
+        class Foo < ActiveVirtus
+          attribute :datetime, DateTime
+          attribute :date, Date
+        end
+
+        subject { Foo.new }
+
+        describe 'Date' do
+          it 'can be set by date(i1) params' do
+            subject.attributes = { 'date(1i)' => '1999', 'date(2i)' => '12', 'date(3i)' => '8'}
+            expect(subject.date).to eq Date.new(1999, 12, 8)
+          end
+          it 'sets an error if the date is invalid' do
+            subject.attributes = { 'date(1i)' => '1999', 'date(2i)' => '12', 'date(3i)' => '32'}
+            expect(subject.errors[:date][0]).to match 'invalid_date'
+          end
+        end
+
+        describe 'DateTime' do
+          it 'can be set by datetime(i1) params' do
+            subject.attributes = { 'datetime(1i)' => '1999', 'datetime(2i)' => '12', 'datetime(3i)' => '8',
+                                   'datetime(4i)' => '22', 'datetime(5i)' => '23', 'datetime(6i)' => '24'}
+            expect(subject.datetime).to eq DateTime.new(1999, 12, 8, 22, 23, 24)
+          end
+        end
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -8,3 +8,5 @@ require 'roqua-core-api'
 include Roqua::CoreApi
 include Roqua::CoreApi::Sessions
 include Roqua::CoreApi::Models
+
+I18n.default_locale = :nl

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roqua-core-api
 version: !ruby/object:Gem::Version
-  version: 0.0.25
+  version: 0.0.26
 platform: ruby
 authors:
 - Marten Veldthuis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-26 00:00:00.000000000 Z
+date: 2014-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -187,6 +187,7 @@ files:
 - lib/roqua/core_api/create_dossier_group.rb
 - lib/roqua/core_api/dossiers.rb
 - lib/roqua/core_api/models.rb
+- lib/roqua/core_api/models/active_virtus.rb
 - lib/roqua/core_api/models/dossier.rb
 - lib/roqua/core_api/models/dossier_group.rb
 - lib/roqua/core_api/models/person.rb
@@ -208,6 +209,7 @@ files:
 - spec/fabricators/oauth_session_fabricator.rb
 - spec/lib/roqua/core_api/create_dossier_group_spec.rb
 - spec/lib/roqua/core_api/create_dossier_spec.rb
+- spec/lib/roqua/core_api/models/active_virtus_spec.rb
 - spec/lib/roqua/core_api/models/person_spec.rb
 - spec/lib/roqua/core_api/send_email_to_spec.rb
 - spec/lib/roqua/core_api/send_invite_email_spec.rb
@@ -246,6 +248,7 @@ test_files:
 - spec/fabricators/oauth_session_fabricator.rb
 - spec/lib/roqua/core_api/create_dossier_group_spec.rb
 - spec/lib/roqua/core_api/create_dossier_spec.rb
+- spec/lib/roqua/core_api/models/active_virtus_spec.rb
 - spec/lib/roqua/core_api/models/person_spec.rb
 - spec/lib/roqua/core_api/send_email_to_spec.rb
 - spec/lib/roqua/core_api/send_invite_email_spec.rb