id 0.0.5 → 0.0.6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    id (0.0.4)
+    id (0.0.5)
       activesupport
 
 GEM

data/id.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'id'
-  s.version       = '0.0.5'
+  s.version       = '0.0.6'
   s.date          = '2013-03-28'
   s.summary       = "Simple models based on hashes"
   s.description   = "Developed at On The Beach Ltd. Contact russell.dunphy@onthebeach.co.uk"

data/lib/id/all.rb

@@ -1,3 +1,4 @@
 require_relative 'missing_attribute_error'
+require_relative 'hashifier'
 require_relative 'model/all'
 require_relative 'model'

data/lib/id/hashifier.rb

@@ -0,0 +1,23 @@
+module Id
+  class Hashifier
+
+    def initialize(data)
+      @data = data
+    end
+
+    def hashify
+      Hash[data.map { |k, v| [ k.to_s, as_data(v) ] }]
+    end
+
+    private
+
+    def as_data(v)
+      case v
+      when Id::Model then v.data
+      when Array then v.first.is_a?(Id::Model) ? v.map(&:data) : v
+      else v end
+    end
+
+    attr_reader :data
+  end
+end

data/lib/id/model.rb

@@ -3,7 +3,7 @@ module Id
     attr_reader :data
 
     def initialize(data)
-      @data = Hash[data.map { |k, v| [k.to_s, v.is_a?(Id::Model) ? v.data : v] }]
+      @data = Hashifier.new(data).hashify
     end
 
     def set(values)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: id
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -76,6 +76,7 @@ files:
 - id.gemspec
 - lib/id.rb
 - lib/id/all.rb
+- lib/id/hashifier.rb
 - lib/id/missing_attribute_error.rb
 - lib/id/model.rb
 - lib/id/model/all.rb