dymos 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ba92ec5ad7a14cc2a8a2290558dc84803396a74
-  data.tar.gz: bf890a934267cfe7aee6aa06408f9fc3412c7ada
+  metadata.gz: 4c246a1228f4ef98b4e464d5d96baed0110d1ba1
+  data.tar.gz: 91a67b4c79e361b7691db2c397e3249767024413
 SHA512:
-  metadata.gz: a376e42a0ade618cec85b5606bc7f15d71551a5fa70f9645c5f99bc41a6b2c274d1ee12c40bbf68cb6086729d915cee7fd5f71e7793225d050b9635255f7dbe9
-  data.tar.gz: 6da39b940196b74d02df13df03cbd1567b28792dece6139483cf0d241b6363464fb1525c76c6c3b984f9c35ed8ec2b009e19c77f4a3a2d18eed7da492af41edf
+  metadata.gz: 5c117aa6a02e90ec45e10e55abd146c1a0535ccd12250c356136f24a3c661a89e64ffd05958cb231e766387f81b49df24f80ac21724e402e9db7b116c818a8ca
+  data.tar.gz: 6c81c795420bc400f3b18faa74a485f6b6bbf8ce4a3f1bde63de0170025f7709f76ddd01db51041236fcc8d09e5a44e582b973815727f2a3a93bc3b3f1a103c0

data/lib/dymos/model.rb

@@ -54,7 +54,8 @@ module Dymos
       @fields ||= {}
       @fields[attr]={
         type: type,
-        default: default
+        default: default,
+        desc:desc
       }
       define_attribute_methods attr
 
@@ -76,7 +77,9 @@ module Dymos
         end
 
       }
+      define_singleton_method("#{attr}_type") { type }
       define_method("#{attr}_type") { type }
+      define_singleton_method("#{attr}_desc") { desc }
       define_method("#{attr}_desc") { desc }
       define_method("#{attr}?") do
         val = self.send attr
@@ -115,7 +118,7 @@ module Dymos
 
     def attributes(raw=false)
       attrs = {}
-      @attributes.keys.each do |name|
+      self.class.fields.keys.each do |name|
         attrs[name] = send "#{name}", raw if respond_to? "#{name}"
       end
       attrs

data/lib/dymos/version.rb

@@ -1,3 +1,3 @@
 module Dymos
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/spec/lib/dymos/model_spec.rb

@@ -174,7 +174,16 @@ describe Dymos::Model do
   describe :attributes do
     it 'まとめて取得' do
       model = DummyUser.new(sample_user_hash)
-      expect(model.attributes).to eq(sample_user_hash)
+      expect(model.attributes).to eq(
+                                    id:'hoge',
+                                    name:'太郎',
+                                    email:'hoge@example.net',
+                                    list:Set['a', 'b', 'c'],
+                                    count:10,
+                                    enable:false,
+                                    created_at:nil,
+                                    updated_at:nil
+                                  )
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dymos
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - hoshina85
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-13 00:00:00.000000000 Z
+date: 2014-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler