freyja 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 793946965d3f701738e4127d69927cbd9bfd52eb
-  data.tar.gz: 706adbacae21a749f4e4725b9caa8fc9f166aee1
+  metadata.gz: c6a7b8de4b0382de4e7c66cfe731448619e210b1
+  data.tar.gz: 6a422a739eb93b7720e09dd5113d52e293ac8ab7
 SHA512:
-  metadata.gz: 66adebcbbbe3a47a55452824c5d3f790718fdd1b083558312a0dfe0422a43d8bf39fe14bef1f9210150bc5483e62b21b84e3bd2ea80d102ee55639de165fa2d7
-  data.tar.gz: aa6d25a18e1d7eb9ddcdd4d045d1ec1e003004ac5bdc004518ea01fa0f8173a01d7a6c935ed1717c7308faa57f9e80aa4db4941e62fd5111234145bad3940624
+  metadata.gz: 60b00780ae04677841518ff88ee83796a4f182818afbd5d990e792aa32e54c8ff25ee888d8a31c810cb8d915ec150ba90a3c5ec5d4ed54fa53f7cbf717939b7d
+  data.tar.gz: fceb24bac57703487d74d3b490c3f3e13219d8633daa88ef37df107c83ae322bd9af18a0fecc589e933cf3318b3b6b07dddcea9e39630dcd8c58608a92b8425f

data/lib/freyja/base.rb

@@ -10,6 +10,22 @@ class Freyja::Base
     @attributes = args
   end
 
+  def self.defaults
+    @defaults
+  end
+
+  def self.set_default(attribute, value)
+    make_sure_defaults_is_set
+
+    @defaults[attribute] = value
+  end
+
+  def self.default(attribute)
+    make_sure_defaults_is_set
+
+    defaults[attribute]
+  end
+
   def self.has_one(attribute, translator = nil)
     @has_one ||= []
     @has_one << {
@@ -53,7 +69,7 @@ class Freyja::Base
         if self.respond_to?(attr)
           result[attr] = send(attr)
         else
-          result[attr] = source[attr]
+          result[attr] = source[attr] || self.class.default(attr)
         end
       end
     end
@@ -66,7 +82,7 @@ class Freyja::Base
         if self.respond_to?(attr)
           value = send(attr)
         else
-          value = source[attr]
+          value = source[attr] || self.class.default(attr)
         end
         if value.present?
           if association[:class]
@@ -89,7 +105,7 @@ class Freyja::Base
         if self.respond_to?(attr)
           value = send(attr)
         else
-          value = source[attr]
+          value = source[attr] || self.class.default(attr)
         end
         if value.present?
           if association[:class]
@@ -115,4 +131,9 @@ class Freyja::Base
     end
   end
 
-end
+  private
+
+  def self.make_sure_defaults_is_set
+    @defaults ||= HashWithIndifferentAccess.new
+  end
+end

data/lib/freyja/version.rb

@@ -1,3 +1,3 @@
 module Freyja
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: freyja
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Stanislav Spiridonov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-13 00:00:00.000000000 Z
+date: 2016-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -52,7 +52,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Freyja, Njord`s daughter