dymos 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f19efc160366df30ebdf4cf8bddf10b96d7bc52
-  data.tar.gz: fe07218445f99d87f4e43eba77e01fa75d8a18e0
+  metadata.gz: 036d8dac33aac8670a6e98ebc1b5edd52acb193f
+  data.tar.gz: bbcc269f35f7a4a717a62937e07281efd24e0f03
 SHA512:
-  metadata.gz: 587a325be4f0e04bea0987a232cf3e8a82763db102c02cb3fc54e434284533e45967237af8f18360ac3b2ab21da005df4675190d830f06bec05bdc166a833fa2
-  data.tar.gz: 2435827548726a4c26a45e3743dc214e193f0a61746260ea8ec88284b1abdec30be0573a07188117d3d303b81a6beb9bc576bc93e84e25ab375c008fd7e6d0e9
+  metadata.gz: 6e60e93b0a7b52e8758d2e62e5c3a3d2c2a810edee67fa0986257651158e2b4e61dffd3617ab65da12709fdc964d534274082cffc9744a8fdfaf7c3affaf57f3
+  data.tar.gz: ac6f103586f8d7d60f28670032e6c4bed0f0fd365dd950f4e739548865fccdaf2c5e7d8b93589283b20a9f45ddaf4e81a4d5d98d7c7399ca790217efe4eb5c6f

data/lib/dymos/model.rb

@@ -5,6 +5,7 @@ module Dymos
   class Model
     include ActiveModel::Model
     extend Dymos::Command
+    attr_accessor :metadata
 
     def initialize(params={})
       @attributes = {}

data/lib/dymos/query/builder.rb

@@ -22,7 +22,7 @@ module Dymos
 
       end
 
-      def execute(client = nil)
+      def raw_execute(client=nil)
         client ||= Aws::DynamoDB::Client.new
         begin
           before_send_query command, query
@@ -31,32 +31,50 @@ module Dymos
         rescue Aws::DynamoDB::Errors::ConditionalCheckFailedException
           return false
         end
+        res
+      end
+
+      def execute(client = nil)
+        res = raw_execute client
+
+        return false unless res
+
         if @class_name.present?
-          if res.data.respond_to? :items
+          if res.data.respond_to? :items # scan, query
+            metadata = extract(res, :items)
             res.data[:items].map do |datum|
               obj = Object.const_get(@class_name).new
               obj.attributes = datum
+              obj.metadata = metadata
               obj
             end
-          elsif res.data.respond_to? :attributes
+          elsif res.data.respond_to? :attributes # put_item, update_item
             return nil if res.attributes.nil?
             obj = Object.const_get(@class_name).new
             obj.attributes = res.attributes
+            obj.metadata = extract(res, :attributes)
             obj
           elsif res.respond_to? :data
-            if res.data.respond_to? :item
+            if res.data.respond_to? :item # get_item
               obj = Object.const_get(@class_name).new
               obj.attributes = res.data.item
+              obj.metadata = extract(res, :item)
               obj
             else
-              res.data.to_hash
+              res.data.to_hash # describe
             end
           end
         else
-          res.data
+          res.data.to_hash #list_tables
         end
 
       end
+
+      def extract(res, ignoreKey)
+        keys = res.data.members.reject { |a| a == ignoreKey }
+        array=keys.map { |k| [k, res.data[k]] }
+        array.reduce({}) { |hash, value| hash.merge({value[0] => value[1]}) }
+      end
     end
   end
 end

data/lib/dymos/version.rb

@@ -1,3 +1,3 @@
 module Dymos
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

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

@@ -14,52 +14,10 @@ describe Dymos::Query::Builder do
     end
 
     it "execute" do
-      client = Aws::DynamoDB::Client.new
-      expect(query.execute(client).methods.include? :table_names).to eq(true)
+      result = query.execute
+      expect(result.include? :table_names).to eq(true)
     end
   end
 
-  describe :put_item do
-    before :all do
-      client = Aws::DynamoDB::Client.new
-      # client.delete_table(table_name: 'test_put_item') if client.list_tables[:table_names].include?('test_put_item')
-      # client.create_table(
-      #     table_name: 'test_put_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_put_item', item: {id: 'hoge', name: '太郎'})
-      # client.put_item(table_name: 'test_put_item', item: {id: 'fuga', name: '次郎'})
-      # client.put_item(table_name: 'test_put_item', item: {id: 'piyo', name: '三郎'})
-    end
-    let(:client) { Aws::DynamoDB::Client.new }
-    let(:query) { Dymos::Query::Builder.new(:put_item, "test_put_item") }
-
-    it 'put' do
-      # User.put.item(id:"hoge",name:"太郎").expected(id:'hoge')
-      # query.query = {
-      #     table_name: query.table_name,
-      #     item: {
-      #         id: "hoge",
-      #         name: "太郎2",
-      #     },
-      #     expected: {
-      #         id: Dymos::Query::Expect.new(:s).condition(:==, 'hoge').data,
-      #         name: Dymos::Query::Expect.new(:s).condition(:==, '太郎2').data,
-      #     },
-      #     return_values: "ALL_OLD",
-      # }
-      # result = query.execute client
-      # expect(result).to eq('hoge')
-    end
-
-  end
 end
 

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

@@ -38,7 +38,8 @@ describe Dymos::Query::Describe do
     end
 
     it :execute do
-      expect(TestItem.describe.execute[:table][:attribute_definitions]).to eq([{:attribute_name => "id", :attribute_type => "S"}, {:attribute_name => "category_id", :attribute_type => "N"}])
+      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

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

@@ -43,7 +43,7 @@ describe Dymos::Query::GetItem do
         # 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")

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

@@ -73,15 +73,16 @@ describe Dymos::Query::PutItem do
     #                             })
     # end
 
-    # it "条件ありput_item実行 成功すると古いデータを返す" do
-    #   query = TestPutItem.put.item(id: "hoge", name: "次郎").expected(name: "== 太郎")
-    #   result = query.execute client
-    #   expect(result.attributes).to eq({id: "hoge", name: "太郎"})
-    # end
+    it "条件ありput_item実行 成功すると古いデータを返す" do
+      query = TestItem.put.item(id: "hoge", name: "次郎").expected(name: "== 太郎")
+      result = query.execute client
+      expect(result.attributes).to eq({id: "hoge", name: "太郎"})
+      expect(result.metadata).to eq(consumed_capacity: nil, item_collection_metrics: nil)
+    end
 
     describe "条件指定" do
       it "undefined operator" do
-        expect{TestItem.put.item(id: "fuga", category_id: 1).expected(category_id: "= 1")}.to raise_error(ArgumentError)
+        expect { TestItem.put.item(id: "fuga", category_id: 1).expected(category_id: "= 1") }.to raise_error(ArgumentError)
       end
 
       describe :== do
@@ -95,6 +96,7 @@ describe Dymos::Query::PutItem do
         it :execute do
           result = query.execute client
           expect(result.attributes).to eq({id: "fuga", category_id: 1})
+          expect(result.metadata).to eq(consumed_capacity: nil, item_collection_metrics: nil)
         end
         it :error do
           query = TestItem.put.item(id: "fuga", category_id: 1).expected(category_id: "== 2")

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

@@ -80,6 +80,7 @@ describe Dymos::Query::Query do
         it :execute do
           res = query.execute client
           expect(res.size).to eq(3)
+          expect(res.first.metadata).to eq(count: 3, scanned_count: 3, last_evaluated_key: nil, consumed_capacity: nil)
         end
 
 

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

@@ -41,7 +41,9 @@ describe Dymos::Query::Scan do
     end
 
     it :execute do
-      expect(TestItem.scan.execute.size).to eq(5)
+      res=TestItem.scan.execute
+      expect(res.size).to eq(5)
+      expect(res.first.metadata).to eq(count: 5, scanned_count: 5, last_evaluated_key: nil, consumed_capacity: nil)
     end
 
   end

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

@@ -109,6 +109,7 @@ describe Dymos::Query::UpdateItem do
             it "成功すると新しいアイテムを返す" do
               res = query.execute client
               expect(res.name).to eq("百合子")
+              expect(res.metadata[:consumed_capacity]).to eq(nil)
             end
           end
         end

metadata

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