dymos 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c0c0a46aa4fd1522baccf359d95557969ef7b84
-  data.tar.gz: ce4dddfca46a0a4531633111ff41221821307972
+  metadata.gz: 0f19efc160366df30ebdf4cf8bddf10b96d7bc52
+  data.tar.gz: fe07218445f99d87f4e43eba77e01fa75d8a18e0
 SHA512:
-  metadata.gz: 51158e3ba9bbe24135f76217f825fa11282bfce214f993ed2a92a1b01de54ed0d554137add7b387658dfd287e2dba741dde117a3528fb59012756d17adef4807
-  data.tar.gz: 4c654ea7370834f50eff5f83e7562ec77ba68d595a8fa0d26b6cd30898d5c674974f5ff863a45351a58e9d47504dfefef98f8f84709c0dbd7d687fe9aaa33e59
+  metadata.gz: 587a325be4f0e04bea0987a232cf3e8a82763db102c02cb3fc54e434284533e45967237af8f18360ac3b2ab21da005df4675190d830f06bec05bdc166a833fa2
+  data.tar.gz: 2435827548726a4c26a45e3743dc214e193f0a61746260ea8ec88284b1abdec30be0573a07188117d3d303b81a6beb9bc576bc93e84e25ab375c008fd7e6d0e9

data/lib/dymos.rb

@@ -4,6 +4,8 @@ require "dymos/query/builder"
 require "dymos/query/put_item"
 require "dymos/query/update_item"
 require "dymos/query/get_item"
+require "dymos/query/describe"
+require "dymos/query/scan"
 require "dymos/query/query"
 require "dymos/attribute"
 require "dymos/command"

data/lib/dymos/command.rb

@@ -21,12 +21,12 @@ module Dymos
       Dymos::Query::Query.new(:query, table_name, class_name)
     end
 
-    def scan
-
-    end
-
     def describe
+      Dymos::Query::Describe.new(:describe_table, table_name, class_name)
+    end
 
+    def scan
+      Dymos::Query::Scan.new(:scan, table_name, class_name)
     end
   end
 end

data/lib/dymos/model.rb

@@ -40,31 +40,15 @@ module Dymos
     end
 
     def self.all
-      klass = new
-      result = klass.dynamo.scan({table_name: klass.table_name})
-      result.data[:items].map! { |data|
-        model = Object.const_get(klass.class_name).new
-        model.attributes=data
-        model
-      }
+      self.scan.execute
     end
 
-    def self.find(key1, key2=nil, consistent_read: true)
-      klass = new
-      indexes = klass.global_indexes
+    def self.find(key1, key2=nil)
+      indexes = new.global_indexes
       keys={}
-      keys[indexes.first[:attribute_name]] = key1
-      keys[indexes.last[:attribute_name]] = key2 if indexes.size > 1
-
-      res = klass.dynamo.get_item(
-          table_name: klass.table_name,
-          key:  keys,
-         # attributes_to_get: klass.attributes.keys,
-          consistent_read: consistent_read,
-          return_consumed_capacity: 'TOTAL'
-      )
-      klass.attributes = res.data.item
-      klass
+      keys[indexes.first[:attribute_name].to_sym] = key1
+      keys[indexes.last[:attribute_name].to_sym] = key2 if indexes.size > 1
+      self.get.key(keys).execute
     end
 
     def save

data/lib/dymos/query/builder.rb

@@ -14,9 +14,20 @@ module Dymos
 
       end
 
-      def execute(client)
+      def before_send_query(command, query)
+
+      end
+
+      def after_send_query(command, query)
+
+      end
+
+      def execute(client = nil)
+        client ||= Aws::DynamoDB::Client.new
         begin
+          before_send_query command, query
           res = client.send command, query
+          after_send_query command, query
         rescue Aws::DynamoDB::Errors::ConditionalCheckFailedException
           return false
         end
@@ -32,6 +43,14 @@ module Dymos
             obj = Object.const_get(@class_name).new
             obj.attributes = res.attributes
             obj
+          elsif res.respond_to? :data
+            if res.data.respond_to? :item
+              obj = Object.const_get(@class_name).new
+              obj.attributes = res.data.item
+              obj
+            else
+              res.data.to_hash
+            end
           end
         else
           res.data

data/lib/dymos/query/describe.rb

@@ -0,0 +1,11 @@
+module Dymos
+  module Query
+    class Describe < ::Dymos::Query::Builder
+      def query
+        {
+            table_name: @table_name.to_s
+        }
+      end
+    end
+  end
+end

data/lib/dymos/query/scan.rb

@@ -0,0 +1,19 @@
+module Dymos
+  module Query
+    class Scan < ::Dymos::Query::Builder
+
+      def limit(params)
+        @limit = params
+        self
+      end
+
+      def query
+        data = {
+            table_name: @table_name.to_s,
+        }
+        data[:limit] = @limit if @limit.present?
+        data
+      end
+    end
+  end
+end

data/lib/dymos/version.rb

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

data/spec/lib/dymos/model_spec.rb

@@ -154,7 +154,7 @@ describe Dymos::Model do
 
     describe :find do
       it "ユーザを抽出" do
-        user = DummyUser.find('hoge')
+        user = DummyUser.get.key(id:'hoge').execute
         expect(user.id).to eq('hoge')
         expect(user.name).to eq('太郎')
       end

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

@@ -0,0 +1,46 @@
+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})
+
+    class TestItem < Dymos::Model
+      table :test_get_item
+      field :id, :string
+    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
+      expect(TestItem.describe.execute[: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

@@ -41,8 +41,8 @@ describe Dymos::Query::GetItem do
                                       consistent_read: true,
                                   })
         # p client.scan(table_name: "test_get_item")
-        # res = query.execute client
-        # p res
+        res = query.execute client
+        expect(res.id).to eq('hoge')
 
 
         # expect(res).to eq({})

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

@@ -0,0 +1,49 @@
+describe Dymos::Query::Scan 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})
+    client.put_item(table_name: 'test_get_item', item: {id: 'hoge', category_id: 2})
+    client.put_item(table_name: 'test_get_item', item: {id: 'hoge', category_id: 3})
+    client.put_item(table_name: 'test_get_item', item: {id: 'hoge', category_id: 4})
+
+    class TestItem < Dymos::Model
+      table :test_get_item
+      field :id, :string
+    end
+  end
+
+  let(:client) { Aws::DynamoDB::Client.new }
+  describe :scan do
+
+    it :query do
+      expect(TestItem.scan.limit(100).query).to eq(table_name: "test_get_item", limit: 100)
+    end
+
+    it :execute do
+      expect(TestItem.scan.execute.size).to eq(5)
+    end
+
+  end
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dymos
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - hoshina85
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-05 00:00:00.000000000 Z
+date: 2014-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -129,19 +129,23 @@ files:
 - lib/dymos/model.rb
 - lib/dymos/query/attribute.rb
 - lib/dymos/query/builder.rb
+- lib/dymos/query/describe.rb
 - lib/dymos/query/expect.rb
 - lib/dymos/query/get_item.rb
 - lib/dymos/query/put_item.rb
 - lib/dymos/query/query.rb
+- lib/dymos/query/scan.rb
 - lib/dymos/query/update_item.rb
 - lib/dymos/version.rb
 - spec/lib/dymos/model_spec.rb
 - spec/lib/dymos/query/attribute_spec.rb
 - spec/lib/dymos/query/builder_spec.rb
+- spec/lib/dymos/query/describe_spec.rb
 - spec/lib/dymos/query/expect_spec.rb
 - spec/lib/dymos/query/get_item_spec.rb
 - spec/lib/dymos/query/put_item_spec.rb
 - spec/lib/dymos/query/query_spec.rb
+- spec/lib/dymos/query/scan_spec.rb
 - spec/lib/dymos/query/update_item_spec.rb
 - spec/spec_helper.rb
 homepage: ''
@@ -172,9 +176,11 @@ test_files:
 - spec/lib/dymos/model_spec.rb
 - spec/lib/dymos/query/attribute_spec.rb
 - spec/lib/dymos/query/builder_spec.rb
+- spec/lib/dymos/query/describe_spec.rb
 - spec/lib/dymos/query/expect_spec.rb
 - spec/lib/dymos/query/get_item_spec.rb
 - spec/lib/dymos/query/put_item_spec.rb
 - spec/lib/dymos/query/query_spec.rb
+- spec/lib/dymos/query/scan_spec.rb
 - spec/lib/dymos/query/update_item_spec.rb
 - spec/spec_helper.rb