dymos 0.1.4 → 0.2.0

data/spec/lib/dymos/data.yml

@@ -0,0 +1,154 @@
+ProductCatalog:
+ -
+   Id: 101
+   Title: "Book 101 Title"
+   ISBN: "111-1111111111"
+   Authors: "Author 1"
+   Price: -2
+   Dimensions: "8.5 x 11.0 x 0.5"
+   PageCount: 500
+   InPublication: 1
+   ProductCategory: "Book"
+ -
+   Id: 102
+   Title: "Book 102 Title"
+   ISBN: "222-2222222222"
+   Authors: [ "Author 1", "Author 2" ]
+   Price: 20
+   Dimensions: "8.5 x 11.0 x 0.8"
+   PageCount: 600
+   InPublication: 1
+   ProductCategory: "Book"
+ -
+   Id: 103
+   Title: "Book 103 Title"
+   ISBN: "333-3333333333"
+   Authors: [ "Author 1", "Author2", "Author 3" ]
+   Price: 200
+   Dimensions: "8.5 x 11.0 x 1.5"
+   PageCount: "700 InPublication: 0"
+   ProductCategory: "Book"
+ -
+   Id: 201
+   Title: "18-Bicycle 201"
+   Description: "201 description"
+   BicycleType: "Road"
+   Brand: "Brand-Company A"
+   Price: 100
+   Gender: "M"
+   Color: [ "Red", "Black" ]
+   ProductCategory: "Bike"
+ -
+   Id: 202
+   Title: "21-Bicycle 202"
+   Description: "202 description"
+   BicycleType: "Road"
+   Brand: "Brand-Company A"
+   Price: 200
+   Gender: "M"
+   Color: [ "Green", "Black" ]
+   ProductCategory: "Bike"
+ -
+   Id: 203
+   Title: "19-Bicycle 203"
+   Description: "203 description"
+   BicycleType: "Road"
+   Brand: "Brand-Company B"
+   Price: 300
+   Gender: "W"
+   Color: [ "Red", "Green", "Black" ]
+   ProductCategory: "Bike"
+ -
+   Id: 204
+   Title: "18-Bicycle 204"
+   Description: "204 description"
+   BicycleType: "Mountain"
+   Brand: "Brand-Company B"
+   Price: 400
+   Gender: "W"
+   Color: [ "Red" ]
+   ProductCategory: "Bike"
+ -
+   Id: 205
+   Title: "20-Bicycle 205"
+   Description: "205 description"
+   BicycleType: "Hybrid"
+   Brand: "Brand-Company C" 
+   Price: 500
+   Gender: "B" 
+   Color: [ "Red", "Black" ]
+   ProductCategory: "Bike"
+
+Forum:
+  -
+    Name: 'DynamoDB'
+    Category: "Amazon Web Services"
+    Threads: 3
+    Messages: 4
+    Views: 1000
+    LastPostBy: "User A"
+    LastPostDateTime:  "2012-01-03T00:40:57.165Z"
+  -
+    Name: 'Amazon S3'
+    Category: "AWS"
+    Threads: 1
+
+Thread:
+  -
+    ForumName: "DynamoDB"
+    Subject: "DynamoDB Thread 1"
+    Message: "DynamoDB thread 1 message text"
+    LastPostedBy: "User A"
+    Views: 0
+    Replies: 0
+    Answered: 0
+    Tags: [ "index", "primarykey", "table" ]
+    LastPostDateTime:  "2012-01-03T00:40:57.165Z"
+  -
+    ForumName: "DynamoDB"
+    Subject: "DynamoDB Thread 2"
+    Message: "DynamoDB thread 2 message text"
+    LastPostedBy: "User A"
+    Views: 0
+    Replies: 0
+    Answered: 0
+    Tags: [ "index", "primarykey", "rangekey" ]
+    LastPostDateTime:  "2012-01-03T00:40:57.165Z"
+  -
+    ForumName: "Amazon S3"
+    Subject: "Amazon S3 Thread 1"
+    Message: "Amazon S3 Thread 1 message text"
+    LastPostedBy: "User A"
+    Views: 0
+    Replies: 0
+    Answered: 0
+    Tags: [ "largeobject", "multipart upload" ]
+    LastPostDateTime:  "2012-01-03T00:40:57.165Z"
+
+Reply:
+  -
+    Id: "DynamoDB#DynamoDB Thread 1"
+    ReplyDateTime: "2011-12-11T00:40:57.165Z"
+    Message: "DynamoDB Thread 1 Reply 1 text"
+    PostedBy: "User A"
+  -
+    Id: "DynamoDB#DynamoDB Thread 1"
+    ReplyDateTime: "2011-12-18T00:40:57.165Z"
+    Message: "DynamoDB Thread 1 Reply 1 text"
+    PostedBy: "User A"
+  -
+    Id: "DynamoDB#DynamoDB Thread 1"
+    ReplyDateTime: "2011-12-25T00:40:57.165Z"
+    Message: "DynamoDB Thread 1 Reply 3 text"
+    PostedBy: "User B"
+  -
+    Id: "DynamoDB#DynamoDB Thread 2"
+    ReplyDateTime: "2011-12-25T00:40:57.165Z"
+    Message: "DynamoDB Thread 2 Reply 1 text"
+    PostedBy: "User A"
+  -
+    Id: "DynamoDB#DynamoDB Thread 2"
+    ReplyDateTime: "2012-01-03T00:40:57.165Z"
+    Message: "DynamoDB Thread 2 Reply 2"
+    PostedBy: "User A"
+                  

data/spec/lib/dymos/model_spec.rb

@@ -41,14 +41,8 @@ describe Dymos::Model do
   end
 
   before :all do
-    Aws.config[:region] = 'us-west-1'
-    Aws.config[:endpoint] = 'http://localhost:4567'
-    Aws.config[:access_key_id] = 'XXX'
-    Aws.config[:secret_access_key] = 'XXX'
-    client = Aws::DynamoDB::Client.new
-
-    client.delete_table(table_name: 'dummy') if client.list_tables[:table_names].include?('dummy')
-    client.create_table(
+    @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'}
@@ -60,15 +54,15 @@ describe Dymos::Model do
         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.delete_table(table_name: 'post') if client.list_tables[:table_names].include?('post')
-    client.create_table(
+    @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.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'},
@@ -188,10 +182,10 @@ describe Dymos::Model do
 
     describe :describe do
       it "table情報を得る" do
-        model = DummyUser.new
-        expect(model.describe_table[:table][:table_name]).to eq('dummy')
-        expect(model.describe_table[:table][:key_schema].first[:attribute_name]).to eq('id')
-        expect(model.describe_table[:table][:key_schema].first[:key_type]).to eq('HASH')
+        describe=DummyUser.describe
+        expect(describe[:table][:table_name]).to eq('dummy')
+        expect(describe[:table][:key_schema].first[:attribute_name]).to eq('id')
+        expect(describe[:table][:key_schema].first[:key_type]).to eq('HASH')
       end
     end
 
@@ -209,7 +203,7 @@ describe Dymos::Model do
 
     describe :find do
       it "ユーザを抽出" do
-        user = DummyUser.get.key(id: 'hoge').execute
+        user = DummyUser.find('hoge')
         expect(user.id).to eq('hoge')
         expect(user.name).to eq('太郎')
       end
@@ -241,7 +235,7 @@ describe Dymos::Model do
         user.save!
         user.email = 'hoge@sample.net'
         Timecop.freeze(now+1)
-        user.save!
+        user.update!
         expect(user.created_at.to_s).to eq(now.to_s)
         expect(user.updated_at.to_s).not_to eq(now.to_s)
       end
@@ -282,7 +276,7 @@ describe Dymos::Model do
 
     describe "DBから引いたモデル" do
       it "" do
-        user = DummyUser.get.key(id: 'hoge').execute
+        user = DummyUser.find('hoge')
         expect(user.changes).to eq({})
         expect(user.changed?).to eq(false)
         user.id = 1
@@ -304,19 +298,19 @@ describe Dymos::Model do
 
       describe "DBから引いたモデル" do
         it do
-          user = DummyUser.get.key(id: 'musashi').execute
+          user = DummyUser.find('musashi')
           expect(user.new_record?).to eq(false)
           expect(user.destroyed?).to eq(false)
           expect(user.persisted?).to eq(true)
           user.delete
           expect(user.destroyed?).to eq(true)
-          expect(DummyUser.get.key(id: 'musashi').execute).to eq(nil)
+          expect(DummyUser.find('musashi')).to eq(nil)
         end
         it 'enableはBoolとして扱われる' do
-          user = DummyUser.get.key(id: 'enable_id').execute
+          user = DummyUser.find('enable_id')
           expect(user.enable).to eq(true)
           expect(user.enable?).to eq(true)
-          user = DummyUser.get.key(id: 'disable_id').execute
+          user = DummyUser.find('disable_id')
           expect(user.enable).to eq(false)
           expect(user.enable?).to eq(false)
         end
@@ -355,7 +349,7 @@ describe Dymos::Model do
       expect(result).to eq(false)
     end
     it "DummyTableをsave!すると例外を返す" do
-      expect{DummyTable.new.save!}.to raise_error
+      expect { DummyTable.new.save! }.to raise_error
     end
   end
 end

data/spec/lib/dymos/query/create_table_spec.rb

@@ -0,0 +1,56 @@
+describe Dymos::Query::CreateTable do
+
+  describe 'build query' do
+    let(:builder) { Dymos::Query::CreateTable.new }
+
+    it 'create文生成(スループットデフォルト値)' do
+      builder.name('test_create_table').attributes(id: 'S').keys(id: 'HASH')
+      expect(builder.build).to eq({:table_name => "test_create_table", :attribute_definitions => [{:attribute_name => "id", :attribute_type => "S"}], :key_schema => [{:attribute_name => "id", :key_type => "HASH"}], :provisioned_throughput => {:read_capacity_units => 10, :write_capacity_units => 5}})
+      @client.delete_table(table_name: 'test_create_table') if @client.list_tables[:table_names].include?('test_create_table')
+      @client.create_table(builder.build)
+    end
+
+    it '複雑なクエリ(インデックスのprojection省略するとALLになる)' do
+      builder.name('test_create_table')
+        .attributes(id1: 'S', id2: 'S', id3: 'N')
+        .keys(id1: 'HASH', id2: 'RANGE')
+        .throughput(read: 20, write: 20)
+        .gsi([{name: 'gsi_1', keys: {id2: 'HASH'}, projection: {type: 'INCLUDE', attributes: ['item1', 'item2']}, throughput: {read: 10, write: 10}}])
+        .lsi([{name: 'lsi_1', keys: {id1: 'HASH', id3: 'RANGE'}, throughput: {read: 40, write: 40}}])
+      query = builder.build(provisioned_throughput: {read_capacity_units: 1, write_capacity_units: 1})
+
+      expect(query).to eq({:table_name => "test_create_table",
+                           :attribute_definitions => [{:attribute_name => "id1",
+                                                       :attribute_type => "S"},
+                                                      {:attribute_name => "id2",
+                                                       :attribute_type => "S"},
+                                                      {:attribute_name => "id3",
+                                                       :attribute_type => "N"}],
+                           :key_schema => [{:attribute_name => "id1",
+                                            :key_type => "HASH"},
+                                           {:attribute_name => "id2",
+                                            :key_type => "RANGE"}],
+                           :provisioned_throughput => {:read_capacity_units => 1,
+                                                       :write_capacity_units => 1},
+                           :global_secondary_indexes => [{:index_name => "gsi_1",
+                                                          :key_schema => [{:attribute_name => "id2",
+                                                                           :key_type => "HASH"}],
+                                                          :projection => {:projection_type => "INCLUDE",
+                                                                          :non_key_attributes => ["item1",
+                                                                                                  "item2"]},
+                                                          :provisioned_throughput => {:read_capacity_units => 10,
+                                                                                      :write_capacity_units => 10}}],
+                           :local_secondary_indexes => [{:index_name => "lsi_1",
+                                                         :key_schema => [{:attribute_name => "id1",
+                                                                          :key_type => "HASH"},
+                                                                         {:attribute_name => "id3",
+                                                                          :key_type => "RANGE"}],
+                                                         :projection => {:projection_type => "ALL"}}]})
+
+      @client.delete_table(table_name: 'test_create_table') if @client.list_tables[:table_names].include?('test_create_table')
+      @client.create_table(query)
+    end
+  end
+
+end
+

data/spec/lib/dymos/query/delete_item_spec.rb

@@ -1,90 +1,33 @@
 describe Dymos::Query::DeleteItem do
-  before :all do
-    Aws.config[:region] = 'us-west-1'
-    Aws.config[:endpoint] = 'http://localhost:4567'
-    Aws.config[:access_key_id] = 'XXX'
-    Aws.config[:secret_access_key] = 'XXX'
+  describe 'build query', order: :defined do
+    let(:builder) { Dymos::Query::DeleteItem.new }
+    let(:table) { 'test_delete_item_table' }
 
-    client = Aws::DynamoDB::Client.new
-    client.delete_table(table_name: 'test_delete_item') if client.list_tables[:table_names].include?('test_delete_item')
-    client.create_table(
-        table_name: 'test_delete_item',
-        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: 'test_delete_item', item: {id: 'hoge', name: '太郎'})
-    client.put_item(table_name: 'test_delete_item', item: {id: 'fuga', count: 0})
-    client.put_item(table_name: 'test_delete_item', item: {id: 'poyo', name: '可奈'})
-    client.put_item(table_name: 'test_delete_item', item: {id: 'puyo', name: '志保'})
-    client.put_item(table_name: 'test_delete_item', item: {id: 'piyo', name: '杏奈', count: 10})
-    client.put_item(table_name: 'test_delete_item', item: {id: 'puni', name: '美奈子', count: 10, text: "hoge"})
+    it do
+      @client.delete_table(table_name: table) if @client.list_tables[:table_names].include?(table)
+      query=Dymos::Query::CreateTable.new.name(table).attributes(id: 'S').keys(id: 'HASH').build
+      @client.create_table(query)
+      @client.put_item(table_name: table, item: {id: 'hoge', param1: 101, param2: 201, param3: "hoge", param4: [1, 0, 1]})
+      @client.put_item(table_name: table, item: {id: 'fuga', param1: 102, param2: 202, param3: "fuga", param4: [1, 0, 2]})
+      @client.put_item(table_name: table, item: {id: 'piyo', param1: 103, param2: 203, param3: "piyo", param4: [1, 0, 3]})
+    end
 
-    class TestItem < Dymos::Model
-      table :test_delete_item
-      field :id, :string
-      field :name, :string
-      field :count, :string
+    it :key do
+      builder.name(table).key(id: 'hoge').return_values(:ALL_OLD)
+      result = @client.delete_item(builder.build)
+      expect(result[:attributes]["id"]).to eq("hoge")
     end
-  end
 
-  let(:client) { Aws::DynamoDB::Client.new }
-  describe :put_item do
-    describe "クエリ生成" do
-      let(:query) { TestItem.delete.key(id: "hoge") }
-      it :query do
-        expect(query.query).to eq({
-                                      table_name: "test_delete_item",
-                                      key: {id: "hoge"},
-                                      return_values: "ALL_OLD",
-                                  })
-      end
-      it "成功すると削除したアイテムを返す" do
-        res = query.execute client
-        expect(res.id).to eq("hoge")
-      end
+    it :expected do
 
-      describe "既存のアイテムを削除" do
-        describe "return_values :ALL_OLD" do
-          it "条件なし" do
-            query = TestItem.delete.key(id: "poyo")
-            res = query.execute client
-            expect(res.id).to eq("poyo")
-            expect(TestItem.get.key(id: "poyo").execute).to eq(nil)
-          end
+      builder.name(table).key(id: 'fuga').return_values(:ALL_OLD).expected(param1: 0)
+      expect { @client.delete_item(builder.build) }.to raise_error(Aws::DynamoDB::Errors::ConditionalCheckFailedException)
 
-          it "条件付き" do
-            query = TestItem.delete.key(id: "fuga").expected(count: "== 0")
-            res = query.execute
-            expect(res.id).to eq("fuga")
-            expect(TestItem.get.key(id: "fuga").execute).to eq(nil)
-          end
-          it "条件付き2" do
-            query = TestItem.delete.key(id: "puyo").expected(count: 'is_null')
-            res = query.execute
-            expect(res.id).to eq("puyo")
-            expect(TestItem.get.key(id: "puyo").execute).to eq(nil)
-          end
-          it "複数条件条件付き" do
-            query = TestItem.delete.key(id: "puni").expected(count: '== 10', text: '== hoge')
-            res = query.execute
-            expect(res.id).to eq("puni")
-            expect(TestItem.get.key(id: "puni").execute).to eq(nil)
-          end
-          it "条件付き失敗" do
-            query = TestItem.delete.key(id: "piyo").expected(count: "== 1")
-            res = query.execute
-            expect(res).to eq(false)
-          end
-        end
-      end
+      builder.name(table).key(id: 'fuga').return_values(:ALL_OLD).expected(param1: 102)
+      result = @client.delete_item(builder.build)
+      expect(result[:attributes]["id"]).to eq("fuga")
     end
+
   end
 end
 

data/spec/lib/dymos/query/describe_spec.rb

@@ -1,47 +1,13 @@
 describe Dymos::Query::Describe do
-  before :all do
-    Aws.config[:region] = 'us-west-1'
-    Aws.config[:endpoint] = 'http://localhost:4567'
-    Aws.config[:access_key_id] = 'XXX'
-    Aws.config[:secret_access_key] = 'XXX'
 
-    client = Aws::DynamoDB::Client.new
-    client.delete_table(table_name: 'test_get_item') if client.list_tables[:table_names].include?('test_get_item')
-    client.create_table(
-        table_name: 'test_get_item',
-        attribute_definitions: [
-            {attribute_name: 'id', attribute_type: 'S'},
-            {attribute_name: 'category_id', attribute_type: 'N'},
-        ],
-        key_schema: [
-            {attribute_name: 'id', key_type: 'HASH'},
-            {attribute_name: 'category_id', key_type: 'RANGE'}
-        ],
-        provisioned_throughput: {
-            read_capacity_units: 1,
-            write_capacity_units: 1,
-        })
-    client.put_item(table_name: 'test_get_item', item: {id: 'hoge', category_id: 0, name: '太郎'})
-    client.put_item(table_name: 'test_get_item', item: {id: 'hoge', category_id: 1})
+  describe 'build query', order: :defined do
+    let(:builder) { Dymos::Query::Describe.new }
 
-    class TestItem < Dymos::Model
-      table :test_get_item
-      field :id, :string
+    it do
+      builder.name('Thread')
+      result = @client.describe_table(builder.build)
+      expect(result.table[:table_name]).to eq('Thread')
     end
   end
-
-  let(:client) { Aws::DynamoDB::Client.new }
-  describe :describe do
-
-    it :query do
-      expect(TestItem.describe.query).to eq(table_name: "test_get_item")
-    end
-
-    it :execute do
-      result=TestItem.describe.execute
-      expect(result[:table][:attribute_definitions]).to eq([{:attribute_name => "id", :attribute_type => "S"}, {:attribute_name => "category_id", :attribute_type => "N"}])
-    end
-
-  end
 end
 

data/spec/lib/dymos/query/get_item_spec.rb

@@ -1,56 +1,17 @@
 describe Dymos::Query::GetItem do
-  before :all do
-    Aws.config[:region] = 'us-west-1'
-    Aws.config[:endpoint] = 'http://localhost:4567'
-    Aws.config[:access_key_id] = 'XXX'
-    Aws.config[:secret_access_key] = 'XXX'
 
-    client = Aws::DynamoDB::Client.new
-    client.delete_table(table_name: 'test_get_item') if client.list_tables[:table_names].include?('test_get_item')
-    client.create_table(
-        table_name: 'test_get_item',
-        attribute_definitions: [
-            {attribute_name: 'id', attribute_type: 'S'},
-            {attribute_name: 'category_id', attribute_type: 'N'},
-        ],
-        key_schema: [
-            {attribute_name: 'id', key_type: 'HASH'},
-            {attribute_name: 'category_id', key_type: 'RANGE'}
-        ],
-        provisioned_throughput: {
-            read_capacity_units: 1,
-            write_capacity_units: 1,
-        })
-    client.put_item(table_name: 'test_get_item', item: {id: 'hoge', category_id: 0, name: '太郎'})
-    client.put_item(table_name: 'test_get_item', item: {id: 'hoge', category_id: 1})
+  describe 'build query' do
+    let(:builder) { Dymos::Query::GetItem.new }
 
-    class TestItem < Dymos::Model
-      table :test_get_item
-      field :id, :string
-      field :category_id, :number
+    subject { @client.get_item(builder.build).item }
+    it do
+      builder.name('Reply').key(Id: "DynamoDB#DynamoDB Thread 1", ReplyDateTime: "2011-12-18T00:40:57.165Z").attributes(:ReplyDateTime, "Message")
+
+      is_expected.to eq({"ReplyDateTime" => "2011-12-18T00:40:57.165Z", "Message" => "DynamoDB Thread 1 Reply 1 text"})
     end
   end
 
-  let(:client) { Aws::DynamoDB::Client.new }
-  describe :put_item do
-    describe "クエリ生成" do
-      it "追加のみ" do
-        query = TestItem.get.key(id: 'hoge', category_id: 1)
-        expect(query.query).to eq({
-                                      table_name: "test_get_item",
-                                      key: {id: "hoge", category_id: 1},
-                                      consistent_read: true,
-                                  })
-        # p client.scan(table_name: "test_get_item")
-        res = query.execute client
-        expect(res.id).to eq('hoge')
-        expect(res.metadata).to eq(consumed_capacity: nil)
-
-        # expect(res).to eq({})
-        # p client.scan(table_name:"test_get_item")
-      end
 
-    end
-  end
 end
 
+