dymos 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 912347a161333fca91118262b83e43abe53d2d89
-  data.tar.gz: 18e35289cca3e09a2d8f4695772685fa3260717b
+  metadata.gz: 4f5e6582dcf6a0992c22f3d13d6fcb87fec0bd0f
+  data.tar.gz: bc4a0800891429d8a80eeeeb08c2250f594c3709
 SHA512:
-  metadata.gz: e1a4c85c416d29fa8f7f4a2e9d5a654c5c68aac9b48a5d0490596b8cbed2441c277a1421666e06772d10873492006ae6976c79972a60a2f30852bc5c17b93a22
-  data.tar.gz: 822c361c91bc0f0b62f3adc39964ebaaef8b1c177ce234345978cd880bc00481075584259ea02a6275ed39ca70c1ccaa9092fbde25eeadb44a8e1582a5d272e7
+  metadata.gz: 1053e6b53a07c7cd72357860c883e46b5d38151fb3fe0f0cca29391a36501814b21359442c21d20c64b0b1c875b37a3983020cc3cd705758104e2513883e32ce
+  data.tar.gz: 1204f174b48bc4a007bfa973738f5e4c06d03e7eab8e6a03e3c38dfefbd05935669ae833ee49c4407ab307e477d3a355aa947c47f8ca924c003d8d20fc04d8e7

data/lib/dymos/model.rb

@@ -5,10 +5,13 @@ module Dymos
   class Model
     include ActiveModel::Model
     include ActiveModel::Dirty
+    include ActiveModel::Callbacks
     include Dymos::Persistence
     extend Dymos::Command
     attr_accessor :metadata
 
+    define_model_callbacks :save
+
     def initialize(params={})
       @attributes={}
       send :attributes=, params, true
@@ -17,7 +20,7 @@ module Dymos
 
     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?)
+      fail StandardError('require "default" option') if (type == :bool && default.nil?)
 
       @fields ||= {}
       @fields[attr]={
@@ -25,10 +28,12 @@ module Dymos
         default: default
       }
       define_attribute_methods attr
+
+      define_model_callbacks attr
       define_method(attr) { |raw=false|
+        run_callbacks attr do
         val = read_attribute(attr) || default
         return val if raw || !val.present?
-
         case type
           when :bool
             to_b(val)
@@ -39,6 +44,7 @@ module Dymos
           else
             val
         end
+        end
 
       }
       define_method("#{attr}_type") { type }
@@ -51,9 +57,13 @@ module Dymos
           !val.nil?
         end
       end
+
+      define_model_callbacks :"set_#{attr}"
       define_method("#{attr}=") do |value, initialize=false|
+        run_callbacks :"set_#{attr}" do
         value = value.iso8601 if self.class.fields.include?(attr) && value.is_a?(Time)
         write_attribute(attr, value, initialize)
+        end
       end
     end
 

data/lib/dymos/persistence.rb

@@ -20,13 +20,17 @@ module Dymos
     end
 
     def save(*)
-      create_or_update
+      run_callbacks :save do
+        create_or_update
+      end
     rescue => e
       false
     end
 
     def save!(*)
-      create_or_update || raise(Dymos::RecordNotSaved)
+      run_callbacks :save do
+        create_or_update || raise(Dymos::RecordNotSaved)
+      end
     end
 
     def delete

data/lib/dymos/version.rb

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

data/spec/lib/dymos/model_spec.rb

@@ -49,39 +49,39 @@ describe Dymos::Model do
 
     client.delete_table(table_name: 'dummy') if client.list_tables[:table_names].include?('dummy')
     client.create_table(
-        table_name: 'dummy',
-        attribute_definitions: [
-            {attribute_name: 'id', attribute_type: 'S'}
-        ],
-        key_schema: [
-            {attribute_name: 'id', key_type: 'HASH'}
-        ],
-        provisioned_throughput: {
-            read_capacity_units: 1,
-            write_capacity_units: 1,
-        })
+      table_name: 'dummy',
+      attribute_definitions: [
+        {attribute_name: 'id', attribute_type: 'S'}
+      ],
+      key_schema: [
+        {attribute_name: 'id', key_type: 'HASH'}
+      ],
+      provisioned_throughput: {
+        read_capacity_units: 1,
+        write_capacity_units: 1,
+      })
     client.put_item(table_name: 'dummy', item: {id: 'hoge', name: '太郎', list: Set['a', 'b', 'c']})
     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.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(
-        table_name: 'post',
-        attribute_definitions: [
-            {attribute_name: 'id', attribute_type: 'S'},
-            {attribute_name: 'timestamp', attribute_type: 'N'},
-        ],
-        key_schema: [
-            {attribute_name: 'id', key_type: 'HASH'},
-            {attribute_name: 'timestamp', key_type: 'RANGE'},
-        ],
-        provisioned_throughput: {
-            read_capacity_units: 1,
-            write_capacity_units: 1,
-        })
+      table_name: 'post',
+      attribute_definitions: [
+        {attribute_name: 'id', attribute_type: 'S'},
+        {attribute_name: 'timestamp', attribute_type: 'N'},
+      ],
+      key_schema: [
+        {attribute_name: 'id', key_type: 'HASH'},
+        {attribute_name: 'timestamp', key_type: 'RANGE'},
+      ],
+      provisioned_throughput: {
+        read_capacity_units: 1,
+        write_capacity_units: 1,
+      })
   end
 
 #  let(:model) { Dummy.new }
@@ -323,5 +323,40 @@ describe Dymos::Model do
       end
     end
   end
+
+  describe :callbacks do
+    class DummyArticle < Dymos::Model
+      table :dummy
+      field :id, :integer
+      field :title, :string
+      field :updated_at, :time
+
+      after_set_title do
+        self.updated_at = Time.now
+      end
+    end
+    it 'タイトルが挿入されるとタイトルを2回繰り返して更新時間が自動的に挿入される' do
+      article = DummyArticle.new
+      expect(article.title).to eq(nil)
+      expect(article.updated_at).to eq(nil)
+      article.title="hoge"*2
+      expect(article.title).to eq("hogehoge")
+      expect(article.updated_at.class).to eq(Time)
+    end
+    class DummyTable < Dymos::Model
+      table :dummy
+      before_save do
+        fail StandardError
+      end
+    end
+    it "DummyTableをsaveするとfalseを返す" do
+      d = DummyTable.new
+      result=d.save
+      expect(result).to eq(false)
+    end
+    it "DummyTableをsave!すると例外を返す" do
+      expect{DummyTable.new.save!}.to raise_error
+    end
+  end
 end
 

metadata

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