dymos 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d120f06017607fb9eac8f20c509a8b7fc5251578
-  data.tar.gz: 308faec3aef05cbc5d43de8d835879627ede7b7f
+  metadata.gz: 912347a161333fca91118262b83e43abe53d2d89
+  data.tar.gz: 18e35289cca3e09a2d8f4695772685fa3260717b
 SHA512:
-  metadata.gz: 0c263b7024367346b0d221f5bef727c5ea03facf99db2f10e15c48952345890c4936e6c503bb05c2e02045b04d72d5f9be214ce5c556819676a5eb4666f496ff
-  data.tar.gz: 915eda6da5fd254b974d9ac05e9dbf8f86315b4c59c9bfc6d39d361621222a01e5597a499b9ba4dacccd05e633b36e87de02aa884decc3862c9377f899c5eb91
+  metadata.gz: e1a4c85c416d29fa8f7f4a2e9d5a654c5c68aac9b48a5d0490596b8cbed2441c277a1421666e06772d10873492006ae6976c79972a60a2f30852bc5c17b93a22
+  data.tar.gz: 822c361c91bc0f0b62f3adc39964ebaaef8b1c177ce234345978cd880bc00481075584259ea02a6275ed39ca70c1ccaa9092fbde25eeadb44a8e1582a5d272e7

data/lib/dymos.rb

@@ -25,6 +25,8 @@ module Aws
         alias :orig_format :format
         def format(obj)
           case obj
+            when TrueClass then { n:"1" }
+            when FalseClass then { n:"0" }
             when Time then { s: obj.iso8601 }
             else
               orig_format obj

data/lib/dymos/model.rb

@@ -15,27 +15,42 @@ module Dymos
       super
     end
 
-    def self.field(attr, type, default: nil, desc:nil)
+    def self.field(attr, type, default: nil, desc: nil)
+      fail StandardError('attribute name is invalid') if attr =~ /[\!\?]$/
+      fail StandardError('require "default" option') if(type == :bool && default.nil?)
+
       @fields ||= {}
       @fields[attr]={
-          type: type,
-          default: default
+        type: type,
+        default: default
       }
       define_attribute_methods attr
       define_method(attr) { |raw=false|
-        val=read_attribute(attr) || default
-        return val if raw
-        if type == :time && val.present?
-          Time.parse val
-        elsif type == :integer && val.present?
-          val.to_i
-        else
-          val
+        val = read_attribute(attr) || default
+        return val if raw || !val.present?
+
+        case type
+          when :bool
+            to_b(val)
+          when :time
+            Time.parse val
+          when :integer
+            val.to_i
+          else
+            val
         end
+
       }
       define_method("#{attr}_type") { type }
       define_method("#{attr}_desc") { desc }
-      define_method("#{attr}?") { !read_attribute(attr).nil? }
+      define_method("#{attr}?") do
+        val = self.send attr
+        if type == :bool
+          val
+        else
+          !val.nil?
+        end
+      end
       define_method("#{attr}=") do |value, initialize=false|
         value = value.iso8601 if self.class.fields.include?(attr) && value.is_a?(Time)
         write_attribute(attr, value, initialize)
@@ -123,5 +138,15 @@ module Dymos
       @attributes[name.to_sym] = value
     end
 
+    def to_b(val)
+      compare_value = val.class == String ? val.downcase : val
+      case compare_value
+        when "yes", "true", "ok", true, "1", 1, :true, :ok, :yes
+          true
+        else
+          false
+      end
+    end
+
   end
 end

data/lib/dymos/version.rb

@@ -1,3 +1,3 @@
 module Dymos
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/spec/lib/dymos/model_spec.rb

@@ -1,4 +1,16 @@
 describe Dymos::Model do
+  describe "不正なfield" do
+    it "末尾に?は使えない" do
+      expect { Class.new(Dymos::Model) do
+        field "hoge?", :string
+      end }.to raise_error
+    end
+    it "type:boolには初期値が必須" do
+      expect { Class.new(Dymos::Model) do
+        field "hoge", :bool
+      end }.to raise_error
+    end
+  end
   class DummyUser < Dymos::Model
     table :dummy
     field :id, :string, desc: 'hoge'
@@ -6,6 +18,7 @@ describe Dymos::Model do
     field :email, :string
     field :list, :string_set
     field :count, :integer
+    field :enable, :bool, default: false
 
     field :created_at, :time
     field :updated_at, :time
@@ -51,6 +64,8 @@ describe Dymos::Model do
     client.put_item(table_name: 'dummy', item: {id: 'fuga', name: '次郎'})
     client.put_item(table_name: 'dummy', item: {id: 'piyo', name: '三郎'})
     client.put_item(table_name: 'dummy', item: {id: 'musashi', name: '巴'}) #削除用
+    client.put_item(table_name: 'dummy', item: {id: 'enable_id', name: 'enable', enable:1})
+    client.put_item(table_name: 'dummy', item: {id: 'disable_id', name: 'disable', enable:0})
 
     client.delete_table(table_name: 'post') if client.list_tables[:table_names].include?('post')
     client.create_table(
@@ -73,7 +88,7 @@ describe Dymos::Model do
 
   describe :fields do
     it do
-      expect(DummyUser.fields.keys).to eq([:id, :name, :email, :list, :count, :created_at, :updated_at])
+      expect(DummyUser.fields.keys).to eq([:id, :name, :email, :list, :count, :enable, :created_at, :updated_at])
     end
   end
   describe "クラスマクロのデフォルト値" do
@@ -93,7 +108,12 @@ describe Dymos::Model do
     it "bodyは'none'を返す" do
       expect(DummyModel.new.body).to eq('none')
     end
-
+    it "enable?はfalseを返す" do
+      model = DummyUser.new
+      expect(model.enable?).to eq(false)
+      model.enable = true
+      expect(model.enable?).to eq(true)
+    end
     it "上書きすることができる" do
       model = DummyModel.new
       model.id=1
@@ -201,6 +221,7 @@ describe Dymos::Model do
         user.id = 'aiueo'
         user.name = '四郎'
         user.email = 'hoge@sample.net'
+        user.enable = true
         expect(user.created_at).to eq(nil)
         now = Time.now
         Timecop.freeze(now)
@@ -229,7 +250,7 @@ describe Dymos::Model do
     describe :all do
       it "すべてのユーザを抽出" do
         users = DummyUser.all
-        expect(users.size).to eq(5)
+        expect(users.size).to eq(7)
       end
     end
 
@@ -291,6 +312,14 @@ describe Dymos::Model do
           expect(user.destroyed?).to eq(true)
           expect(DummyUser.get.key(id: 'musashi').execute).to eq(nil)
         end
+        it 'enableはBoolとして扱われる' do
+          user = DummyUser.get.key(id: 'enable_id').execute
+          expect(user.enable).to eq(true)
+          expect(user.enable?).to eq(true)
+          user = DummyUser.get.key(id: 'disable_id').execute
+          expect(user.enable).to eq(false)
+          expect(user.enable?).to eq(false)
+        end
       end
     end
   end

metadata

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