dymos 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bcc2ca53b227af59529709c865fbec440d59b561
-  data.tar.gz: ae44901535497e1e3c0d771aa89167c82659d9fb
+  metadata.gz: bf372b964ae4ad9a7daf6fce92ec70b57350b50a
+  data.tar.gz: 1f5f8471eeb4e88db89fcb64a801249f8084377f
 SHA512:
-  metadata.gz: 163fafcafb4f7d3b9501a85a39f209aa5bf003af6cb7eb9d262178fca672d4b2a6d953dd0cd1b162678bde892f7eb73ce8f182928fa0fd2722f989b01f1a436d
-  data.tar.gz: c2e1d1b19404ec4fc4d94575393eea33841c32b67b19d8e5913df4c2253ac1c2a2b6b76ced15cca79459ff49207ff3c0e78fac002f3953c0dbb500deadc01b60
+  metadata.gz: 8dfe884a6015ca023dfcba429f5cecbf9c1a3a95ff7afff42f177d561e50526ba81fd692b2aa700b8784d5152f32db9a86ef36f15a5dbd4f3a1c37ee207e4791
+  data.tar.gz: 0265d0d9a54599f0ce3158b47eea72cf54b8b3a1740935b64024d9cd1a3bbb1469d321e687a092454ad9d77dec34e5314a2a24b5af26deb68d065babb0ccef3c

data/dymos.gemspec

@@ -26,5 +26,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "timecop"
   spec.add_development_dependency "activemodel", '~> 4.1.5'
 
-  spec.add_dependency "aws-sdk-core", "2.0.0.rc15"
+  spec.add_dependency "aws-sdk-core", "2.0.0"
 end

data/lib/dymos/model.rb

@@ -22,11 +22,13 @@ module Dymos
           default: default
       }
       define_attribute_methods attr
-      define_method(attr) {|raw=false|
+      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
         end

data/lib/dymos/query/query.rb

@@ -26,12 +26,15 @@ module Dymos
       end
 
       def query
-        {
+        data = {
             table_name: @table_name.to_s,
-            index_name: @index_name.to_s,
             key_conditions: @key,
             consistent_read: false
         }
+        if @index_name.present?
+          data[:index_name] = @index_name.to_s
+        end
+        data
       end
     end
   end

data/lib/dymos/version.rb

@@ -1,3 +1,3 @@
 module Dymos
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/spec/lib/dymos/model_spec.rb

@@ -5,6 +5,7 @@ describe Dymos::Model do
     field :name, :string
     field :email, :string
     field :list, :string_set
+    field :count, :integer
 
     field :created_at, :time
     field :updated_at, :time
@@ -23,7 +24,7 @@ describe Dymos::Model do
   end
 
   def sample_user_hash
-    {id: 'hoge', name: '太郎', email: 'hoge@example.net', list: Set['a', 'b', 'c']}
+    {id: 'hoge', name: '太郎', email: 'hoge@example.net', count: 10, list: Set['a', 'b', 'c']}
   end
 
   before :all do
@@ -35,17 +36,17 @@ 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: '三郎'})
@@ -53,26 +54,26 @@ describe Dymos::Model do
 
     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 }
 
   describe :fields do
     it do
-      expect(DummyUser.fields.keys).to eq([:id, :name, :email, :list, :created_at, :updated_at])
+      expect(DummyUser.fields.keys).to eq([:id, :name, :email, :list, :count, :created_at, :updated_at])
     end
   end
   describe "クラスマクロのデフォルト値" do
@@ -150,6 +151,7 @@ describe Dymos::Model do
       expect(model.id).to eq('hoge')
       expect(model.name).to eq('太郎')
       expect(model.email).to eq('hoge@example.net')
+      expect(model.count).to eq(10)
       expect(model.list).to eq(Set['a', 'b', 'c'])
     end
   end

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

@@ -48,12 +48,27 @@ describe Dymos::Query::Query do
     class TestItem < Dymos::Model
       table :test_query_item
       field :id, :string
-      field :other_id, :number
+      field :other_id, :integer
     end
   end
 
   let(:client) { Aws::DynamoDB::Client.new }
   describe :put_item do
+    it "ハッシュ+レンジ検索" do
+      items = TestItem.query.key_conditions(
+          id: "== hoge",
+          category_id:"== 0"
+      ).execute
+      expect(items.first.id).to eq('hoge')
+      expect(items.first.other_id).to eq(1)
+    end
+
+    it "ハッシュのみ検索" do
+      items = TestItem.query.key_conditions(
+          id: "== hoge"
+      ).execute
+      expect(items.length).to eq(6)
+    end
     describe "クエリ生成" do
       describe "グローバルセカンダリインデックスを利用した検索" do
         let(:query) {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dymos
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - hoshina85
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-24 00:00:00.000000000 Z
+date: 2014-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0.rc15
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0.rc15
+        version: 2.0.0
 description: aws-sdk-core-ruby dynamodb client wrapper
 email:
 - hoshina85@gmail.com