modelish 0.2.0 → 0.2.1

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## 0.2.1 (2012-3-8)
+
+* Bug fix to make behavior predictable for translated properties when both the property
+  name and the translated property name are present in an initialization hash (issue #5).
+* Modelish::Base#to_hash now processes the contents of Array-typed properties.
+
 ## 0.2.0 (2012-1-16)
 
 * Added support for mapping the same input property name to multiple outputs. This means that

data/lib/modelish/base.rb

@@ -11,6 +11,26 @@ module Modelish
     include Validations
     extend Configuration
 
+    def initialize(attributes = {}, &block)
+      super(&block)
+
+      self.class.defaults.each_pair do |prop, value|
+        self[prop] = value
+      end
+
+      attributes.delete_if do |k,v|
+        if self.class.translations.keys.include?(k.to_sym)
+          self[k]=v
+          true
+        end
+      end if attributes
+
+      attributes.each_pair do |att, value|
+        self[att] = value
+      end if attributes
+    end
+
+
     # Creates a new attribute.
     #
     # @param [Symbol] name the name of the property
@@ -53,7 +73,12 @@ module Modelish
       out = {}
       self.class.properties.each do |p|
         val = self.send(p)
-        out[p.to_s] = val.respond_to?(:to_hash) ? val.to_hash : val
+        if val.is_a?(Array)
+          out[p.to_s]||=[]
+          out[p.to_s].concat(val.collect{|x|x.respond_to?(:to_hash) ? x.to_hash : x})
+        else
+          out[p.to_s] = val.respond_to?(:to_hash) ? val.to_hash : val
+        end
       end
       out
     end

data/lib/modelish/version.rb

@@ -1,3 +1,3 @@
 module Modelish
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/modelish.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency('hashie', '~> 1.0')
+  s.add_dependency('hashie', '1.0.0')
 
   s.add_development_dependency('rspec','~> 2.5')
   s.add_development_dependency('yard', '~> 0.6')

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: modelish
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Maeve Revels
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-16 00:00:00 -08:00
+date: 2012-03-08 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,13 +24,14 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 23
         segments: 
         - 1
         - 0
-        version: "1.0"
+        - 0
+        version: 1.0.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency