dynamosaurus 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 274b730e40fab7105a116ae009d17a1407bb5e90
-  data.tar.gz: 7e8d5b5d78047e5eb5eeeb2cee5278ec2c5735fd
+  metadata.gz: 61f38932ba6096baa0ae0952bb548637b2829640
+  data.tar.gz: dc8455607eaad41f4c7ad2f1a8657c0f8b9770c0
 SHA512:
-  metadata.gz: caa0fb68c56a7bfa4fb7ac73f667089891975fdb7cfeeaebc05f92268d7afa2596138537da4675bfbd26e7c6e2d2258ad348f2dc310e8b0e30ba78d791c76b54
-  data.tar.gz: a5d5d146c0399aaa0e3e869be0e41d9d385e44d25399aea762d0646d7f09aced7239baebc1f284be90bbc93c968aaf065dc5c5672d855e7dae026b46ba5df645
+  metadata.gz: 981993c41a99915f41d1b610d19cba3af6ccb944b8f255bea5ce3965ad190a38d96aa8f4b5ba5b730f6225fa8c8dd4b6a76703d24b40f87d866bb266f5a367af
+  data.tar.gz: 839c4eaa14d3adc3bf7d406cf8791284e5c66950313c2b25d794b8b8f0ea0275233f76e2c75a3e88def82a4f206558d17fc77b7c47a58a027ac94ecf07950c12

data/.editorconfig

@@ -0,0 +1,13 @@
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+
+tab_width = 4

data/lib/dynamosaurus/dynamo_base.rb

@@ -6,11 +6,11 @@ module Dynamosaurus
       :string => :s,
       :number => :n
     }
-   
+
     def dynamo_db
       self.class.dynamo_db
     end
-  
+
     def initialize params
       data = params[:data] if params[:data]
       @data = Dynamosaurus::DynamoBase.res2hash(data)
@@ -19,7 +19,7 @@ module Dynamosaurus
     def table_name
       self.class.table_name
     end
-    
+
     def [] key
       @data[key]
     end
@@ -27,7 +27,7 @@ module Dynamosaurus
     def []=(key,value)
       @data[key] = value
     end
-    
+
     def data
       @data
     end
@@ -35,7 +35,7 @@ module Dynamosaurus
     def exist?
       ! @data.empty?
     end
-    
+
     def empty?
       @data.empty?
     end
@@ -43,7 +43,7 @@ module Dynamosaurus
     def try name
       @data[name.to_s]
     end
-    
+
     def method_missing(name, *params)
       name = name.to_s[0..-2] if name.to_s[-1] == "="
       if exist? and @data.has_key?(name.to_s)
@@ -56,7 +56,7 @@ module Dynamosaurus
         super
       end
     end
-    
+
     def key
       return @key if @key
       @key = self.class.get_key
@@ -88,7 +88,7 @@ module Dynamosaurus
           :action => "PUT"
         }
       end
-      
+
       query = {
         :table_name => self.class.table_name,
         :key => keys,
@@ -126,7 +126,7 @@ module Dynamosaurus
         }
         @data.delete(k.to_s)
       end
-      
+
       res = dynamo_db.update_item(
         :table_name => self.class.table_name,
         :key => keys,

data/lib/dynamosaurus/dynamo_class.rb

@@ -32,9 +32,13 @@ module Dynamosaurus
       end
 
       def table_name
-        (@table_prefix || name.downcase.split("::").last) + (ENV['DYNAMODB_SUFFIX'] || "_local")
+        if @table && @table.has_key?(:name) && !@table[:name].empty?
+          @table[:name].to_s
+        else
+          (@table_prefix || name.downcase.split("::").last) + (ENV['DYNAMODB_SUFFIX'] || "_local")
+        end
       end
-      
+
       def dynamo_db
         return @dynamo_db if @dynamo_db
         if Aws::config.empty?
@@ -47,11 +51,15 @@ module Dynamosaurus
         end
       end
 
+      def table options = {}
+        @table ||= options
+      end
+
       def key k, type, range_key=nil, range_key_type=nil
         @key = [k, Dynamosaurus::DynamoBase::TYPES[type]]
         @key << range_key << Dynamosaurus::DynamoBase::TYPES[range_key_type] if range_key
       end
-      
+
       def get_key
        @key
       end
@@ -67,20 +75,20 @@ module Dynamosaurus
           :write_capacity_units => 10
         }
 
-        @schema[:key_schema]  << { 
+        @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]  << { 
+          @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|
@@ -107,7 +115,7 @@ module Dynamosaurus
               }
               @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
@@ -121,7 +129,7 @@ module Dynamosaurus
                 :projection_type => "KEYS_ONLY",
               },
             }
-            index_schema[:key_schema] =[ 
+            index_schema[:key_schema] =[
               {
                 :key_type => "HASH",
                 :attribute_name => s_index_value[0]
@@ -138,13 +146,13 @@ module Dynamosaurus
 
         @schema
       end
-      
+
       def global_index index_name, key, key_type, range_key=nil, range_key_type=nil
         @global_index = {} if @global_index.nil?
         @global_index[index_name] = [key, Dynamosaurus::DynamoBase::TYPES[key_type]]
         @global_index[index_name] << range_key <<  Dynamosaurus::DynamoBase::TYPES[range_key_type] if range_key
       end
-      
+
       def get_global_indexes
         (@global_index) ? @global_index : {}
 
@@ -189,7 +197,7 @@ module Dynamosaurus
       def table_prefix name
         @table_prefix = name
       end
-      
+
       def key_list
         keys = get_key + get_secondary_indexes.values.flatten
         list = {}
@@ -205,7 +213,7 @@ module Dynamosaurus
         return new_hash if hash.nil?
         hash
       end
-      
+
 
       def query_without_index value, option
         keys = {}
@@ -238,7 +246,7 @@ module Dynamosaurus
 
         item_key = get_item_key(value)
         Dynamosaurus.logger << "get_item #{table_name} #{item_key}"
-      
+
         res = dynamo_db.get_item(
           :table_name => table_name,
           :key => item_key
@@ -246,14 +254,14 @@ module Dynamosaurus
         if res.item
           new :data => res.item
         else
-          nil  
+          nil
         end
       end
-      
+
       def get_from_index hash, option={}
         if index = get_index(hash)
           keys = {}
-          
+
           index[:keys].each do |key|
             keys[key] = {
               :comparison_operator => "EQ",
@@ -273,7 +281,7 @@ module Dynamosaurus
               :comparison_operator => "EQ",
               :attribute_value_list => [ v.to_s ]
             }
-          end 
+          end
           Dynamosaurus.logger << "query local_index #{table_name} #{keys}"
           query keys, index, option
         end
@@ -335,7 +343,7 @@ module Dynamosaurus
           my_keys = []
           keys[get_key[0]].each do |key1|
             keys[get_key[2]].each do |key2|
-              my_keys << { 
+              my_keys << {
                 get_key[0].to_s => key1,
                 get_key[2].to_s => key2,
               }
@@ -349,7 +357,7 @@ module Dynamosaurus
               :keys => my_keys
             }
           })
-        
+
         if res.responses[table_name]
           return res.responses[table_name].map{|item|
             new :data => item
@@ -382,9 +390,9 @@ module Dynamosaurus
           }
         end
       end
-      
+
       def put hash, num_hash={}, return_values=nil
-        
+
         new_hash = {}
         hash.each{|key, value|
           new_hash[key] = value unless value.nil?
@@ -392,7 +400,7 @@ module Dynamosaurus
         num_hash.merge({:updated_at => Time.now.to_i}).each{|key, value|
           new_hash[key] = value.to_i unless value.nil?
         } if num_hash
-        
+
         res = dynamo_db.put_item(
           :table_name => table_name,
           :item => new_hash,
@@ -403,17 +411,17 @@ module Dynamosaurus
       def save hash, num_hash={}, return_values=nil
         put(hash, num_hash, return_values)
         my_keys = get_key
-        
+
         if my_keys.size == 4
           get([hash[my_keys[0]], hash[my_keys[2]]])
         else
           get(hash[my_keys[0]])
         end
       end
-      
+
       def add key=[], attribute_nums={}, options={}
         Dynamosaurus.logger << "update"
-        
+
         attribute_updates = {}
         attribute_nums.each do |k, v|
           attribute_updates[k.to_s] = {
@@ -421,10 +429,10 @@ module Dynamosaurus
             :action => "ADD"
           }
         end
-        
+
         class_key = get_key
         keys = {
-          class_key[0].to_sym => key.is_a?(Array) ? key[0] : key 
+          class_key[0].to_sym => key.is_a?(Array) ? key[0] : key
         }
         keys[class_key[2].to_sym] = key[1]  if class_key.size > 2
 
@@ -435,7 +443,7 @@ module Dynamosaurus
         }
         query = query.merge(options)
         res = dynamo_db.update_item(query)
-        
+
       end
 
       def delete_item value

data/lib/dynamosaurus/version.rb

@@ -1,3 +1,3 @@
 module Dynamosaurus
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/spec/dynamosaurus_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Dynamosaurus do
-  before(:all) do  
+  before(:all) do
     ENV['DYNAMODB_SUFFIX'] = "_local"
 
     Aws.config = {
@@ -12,7 +12,7 @@ describe Dynamosaurus do
     Dynamosaurus::DynamoBase.create_tables
   end
 
-  after(:all) do  
+  after(:all) do
     connect = Dynamosaurus::DynamoBase.dynamo_db
     Dynamosaurus::DynamoBase.tables.each do |table_name|
       connect.delete_table(:table_name => table_name)
@@ -39,7 +39,7 @@ describe Dynamosaurus do
     SimpleOrderedKVS.put({:simple_key => "key", :simple_id => "3"})
     sleep 1
     SimpleOrderedKVS.put({:simple_key => "key", :simple_id => "2"})
-    
+
     orderd_items = SimpleOrderedKVS.get({
       :index => "updated_at_index",
       :simple_key => "key"
@@ -123,29 +123,67 @@ describe Dynamosaurus do
     kvs.delete
     kvs = SimpleKVS.get("key3")
     expect(kvs).to be_nil
-    
+
   end
 
-  it 'comment test' do
-    expect(Comment.first).to be_nil
-    expect(Comment.get(["1", "1"])).to be_nil
+  shared_examples_for 'Basic CRUD' do
+    it 'should work in a sequence' do
+      expect(Object.const_get(model_name.to_s).first).to be_nil
+      expect(Object.const_get(model_name.to_s).get(["1", "1"])).to be_nil
 
-    Comment.put({:content_id => "1", :message_id => "1", :user_id => "abc"})
-    expect(Comment.first.content_id).to eq "1"
+      Object.const_get(model_name.to_s).put({:content_id => "1", :message_id => "1", :user_id => "abc"})
+      expect(Object.const_get(model_name.to_s).first.content_id).to eq "1"
 
-    kvs = Comment.get(["1", "1"])
-    expect(kvs.content_id).to eq "1"
+      kvs = Object.const_get(model_name.to_s).get(["1", "1"])
+      expect(kvs.content_id).to eq "1"
 
-    kvs = Comment.get(["2", "2"])
-    expect(kvs).to be_nil
+      kvs = Object.const_get(model_name.to_s).get(["2", "2"])
+      expect(kvs).to be_nil
+    end
+  end
+
+  describe 'global secondary index' do
+    it_should_behave_like 'Basic CRUD' do
+      let!(:model_name) { 'Comment' }
+    end
+
+    context 'when 2 records exist' do
+      before do
+        Comment.put({:content_id => "1", :message_id => "2", :user_id => "abc"})
+        Comment.put({:content_id => "1", :message_id => "3", :user_id => "xyz"})
+      end
+
+      subject { Comment.get({:user_id => "abc"}).size }
 
-    Comment.put({:content_id => "1", :message_id => "2", :user_id => "abc"})
-    Comment.put({:content_id => "1", :message_id => "3", :user_id => "xyz"})
-    
-    # global secondary index
-    comments = Comment.get({:user_id => "abc"})
-    expect(comments.size).to eq 2
+      it{ is_expected.to eq 2 }
+    end
+  end
+
+  describe 'table options' do
+    context 'when table-name is given' do
+      class DynamoModelWithTableField < Dynamosaurus::DynamoBase
+        table name: 'table_name'
+        key :content_id, :string, :message_id, :string
+      end
 
+      it_should_behave_like 'Basic CRUD' do
+        let!(:model_name) { 'DynamoModelWithTableField' }
+      end
+
+      it { expect(DynamoModelWithTableField.table_name).to eq 'table_name' }
+    end
+
+    context 'when table-name is not given' do
+      class DynamoModelWithoutTableField < Dynamosaurus::DynamoBase
+        key :content_id, :string, :message_id, :string
+      end
+
+      it_should_behave_like 'Basic CRUD' do
+        let!(:model_name) { 'DynamoModelWithoutTableField' }
+      end
+
+      it { expect(DynamoModelWithoutTableField.table_name).to eq 'dynamomodelwithouttablefield_local' }
+    end
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dynamosaurus
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Isamu Arimoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-05 00:00:00.000000000 Z
+date: 2016-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -73,6 +73,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .editorconfig
 - .gitignore
 - .rspec
 - .travis.yml