dynamosaurus 0.0.2 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 070ed235ecd54d002a4af5a36cb42ac7c0052c7a
-  data.tar.gz: 604cb47dc88d5ea6b28db9f313a43f0b55fee132
+  metadata.gz: e81e590f83bc8e851d2f00f30b65929119499ef0
+  data.tar.gz: 86d65100146300d2a89334c6715f5f0ffbbba5ec
 SHA512:
-  metadata.gz: 60a53aaf8e3651d4e778c2b9c2bcbc1439819dbbba4afb475055fcc046b54c0141c6d33b20a0f8a3978a199d7159dedbe3a48cb614f9d6d448e6329a4a517272
-  data.tar.gz: 8bca0a468f5261405dc01dfec37c501571994018921a31bc400c0cdff40e93485d916db0b49139565fc86f0579228439cdc74aab2cad5bcb427b2a293bb3bad7
+  metadata.gz: b061ce9dd7f87f1dffd49a35dbef571088397ed573e3fde419183fe732f01d8a449e56cbf8aac2989218b5d9174f159174e73475376393fdd5376a36dc21bdcf
+  data.tar.gz: c017a40360ae6d47fe64e1e383d4bdc0dada2ad191eb718946df5395512f4e012109f8f7c190fb476bf14692c874cd61319f42712e14b90ac5199470da2db38c

data/README.md

@@ -1,5 +1,7 @@
 # Dynamosaurus
 
+Dynamosaurus is Amazon DynamoDB ORMapper.
+
 ## Installation
 
 Add this line to your application's Gemfile:

data/lib/dynamosaurus/dynamo_class.rb

@@ -15,7 +15,7 @@ module Dynamosaurus
         Dynamosaurus::DynamoBase.all_models.each do |model_class|
           if tables.index(model_class.table_name).nil?
             table = dynamo_db.create_table(
-              model_class.get_table_schema
+              model_class.schema
             )
           end
         end
@@ -52,12 +52,86 @@ module Dynamosaurus
        @key
       end
 
-      def table_schema schema = {}
-        @schema = schema
-      end
-
-      def get_table_schema
+      def schema
+        @schema = {}
         @schema[:table_name] = table_name
+        @schema[:key_schema] = []
+        @schema[:attribute_definitions] = []
+
+        @schema[:provisioned_throughput] = {
+          :read_capacity_units => 10,
+          :write_capacity_units => 10
+        }
+
+        @schema[:key_schema]  << { 
+          :key_type => "HASH",
+          :attribute_name => get_key[0].to_s
+        }
+        @schema[:attribute_definitions] << {:attribute_name => get_key[0].to_s, :attribute_type => get_key[1].to_s.upcase}
+
+        if get_key.size == 4
+          @schema[:key_schema]  << { 
+            :key_type => "RANGE",
+            :attribute_name => get_key[2].to_s
+          }
+          @schema[:attribute_definitions] << {:attribute_name => get_key[2].to_s, :attribute_type => get_key[3].to_s.upcase}
+        end
+        
+        unless get_global_indexes.empty?
+          @schema[:global_secondary_indexes] = []
+          get_global_indexes.each do |g_index|
+            index_schema = {
+              :index_name => g_index[0],
+              :key_schema => [],
+              :projection => {
+                :projection_type => "KEYS_ONLY",
+              },
+              :provisioned_throughput => {
+                :read_capacity_units => 10,
+                :write_capacity_units => 10
+              },
+            }
+            index_schema[:key_schema] << {
+              :key_type => "HASH",
+              :attribute_name => g_index[1][0]
+            }
+            @schema[:attribute_definitions] << {:attribute_name => g_index[1][0].to_s, :attribute_type => g_index[1][1].to_s.upcase}
+            if g_index[1].size == 4
+              index_schema[:key_schema] << {
+                :key_type => "RANGE",
+                :attribute_name => g_index[1][2]
+              }
+              @schema[:attribute_definitions] << {:attribute_name => g_index[1][2].to_s, :attribute_type => g_index[1][3].to_s.upcase}
+            end
+            
+            @schema[:global_secondary_indexes] << index_schema
+          end
+        end
+        unless get_secondary_indexes.empty?
+          @schema[:local_secondary_indexes] = []
+          get_secondary_indexes.each do |s_index_key, s_index_value|
+            index_schema = {
+              :index_name => s_index_key,
+              :key_schema => [],
+              :projection => {
+                :projection_type => "KEYS_ONLY",
+              },
+            }
+            index_schema[:key_schema] =[ 
+              {
+                :key_type => "HASH",
+                :attribute_name => s_index_value[0]
+              },
+              {
+                :key_type => "RANGE",
+                :attribute_name => s_index_value[2]
+              }
+            ]
+            @schema[:attribute_definitions] << {:attribute_name => s_index_value[2].to_s, :attribute_type => s_index_value[3].to_s.upcase}
+            @schema[:local_secondary_indexes] << index_schema
+          end
+        end
+
         @schema
       end
       
@@ -87,8 +161,12 @@ module Dynamosaurus
         @secondary_index[name]
       end
 
+      def get_indexes
+        get_secondary_indexes.merge(get_global_indexes)
+      end
+
       def get_index hash
-        get_secondary_indexes.merge(get_global_indexes).each{|key, value|
+        get_indexes.each{|key, value|
           if hash.size == 1 && hash.keys.first == value.first
             return {
               :index_name => key,

data/lib/dynamosaurus/version.rb

@@ -1,3 +1,3 @@
 module Dynamosaurus
-  VERSION = "0.0.2"
+  VERSION = "0.0.4"
 end

data/spec/testmodel.rb

@@ -2,102 +2,14 @@
 
 class SimpleKVS < Dynamosaurus::DynamoBase
   key :simple_key, :string
-
-  table_schema   :key_schema => 
-    [
-    { :key_type => "HASH",
-      :attribute_name => "simple_key"
-    }
-    ],
-  :provisioned_throughput => {
-    :read_capacity_units => 100,
-    :write_capacity_units => 10
-  },
-  :attribute_definitions => [
-    {:attribute_name => "simple_key", :attribute_type => "S"},
-  ]
 end
 
 class SimpleOrderedKVS < Dynamosaurus::DynamoBase
   key :simple_key, :string, :simple_id, :string
   secondary_index :updated_at_index, :updated_at, :number
-
-  table_schema :key_schema => 
-    [
-    { :key_type => "HASH",
-      :attribute_name => "simple_key"
-    },
-    { :key_type => "RANGE",
-      :attribute_name => "simple_id"},
-    ],
-  :provisioned_throughput => {
-    :read_capacity_units => 20,
-    :write_capacity_units => 10
-  },
-  :attribute_definitions => [
-    {:attribute_name => "simple_key", :attribute_type => "S"},
-    {:attribute_name => "simple_id", :attribute_type => "S"},
-    {:attribute_name => "updated_at", :attribute_type => "N"},
-  ],
-  :local_secondary_indexes => [
-    {
-      :index_name => "updated_at_index",
-      :key_schema => [
-                      { :key_type => "HASH",
-                        :attribute_name => "simple_key"},
-        
-                      {
-                        :key_type => "RANGE",
-                        :attribute_name => "updated_at"
-                      }
-      ],
-      :projection => {
-        :projection_type => "ALL"
-      },
-    },
-  ]
 end
 
 class Comment < Dynamosaurus::DynamoBase
   key :content_id, :string, :message_id, :string
   global_index :user_index, :user_id, :string
-
-  table_schema :key_schema => 
-    [
-    { 
-      :key_type => "HASH",
-      :attribute_name => "content_id"
-        },
-        {
-          :key_type => "RANGE",
-          :attribute_name => "message_id"
-        }
-        ],
-      :provisioned_throughput => {
-        :read_capacity_units => 100,
-        :write_capacity_units => 10
-      },
-      :attribute_definitions => [
-        {:attribute_name => "content_id", :attribute_type => "S"},
-        {:attribute_name => "message_id", :attribute_type => "S"},
-        {:attribute_name => "user_id", :attribute_type => "S"},
-      ],
-      :global_secondary_indexes => [
-        {
-          :index_name => "user_index",
-          :key_schema => [
-            {
-              :key_type => "HASH",
-              :attribute_name => "user_id"
-            },
-          ],
-          :projection => {
-            :projection_type => "KEYS_ONLY",
-          },
-          :provisioned_throughput => {
-            :read_capacity_units => 50,
-            :write_capacity_units => 10
-          },
-        },
-      ]
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dynamosaurus
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
 platform: ruby
 authors:
 - Isamu Arimoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-17 00:00:00.000000000 Z
+date: 2015-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler