dymos 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c246a1228f4ef98b4e464d5d96baed0110d1ba1
-  data.tar.gz: 91a67b4c79e361b7691db2c397e3249767024413
+  metadata.gz: 222758f7001cee301006fcd83d6b59a1583347f2
+  data.tar.gz: 491976f1b67ffd4ea5a5450dc196f5a340b67086
 SHA512:
-  metadata.gz: 5c117aa6a02e90ec45e10e55abd146c1a0535ccd12250c356136f24a3c661a89e64ffd05958cb231e766387f81b49df24f80ac21724e402e9db7b116c818a8ca
-  data.tar.gz: 6c81c795420bc400f3b18faa74a485f6b6bbf8ce4a3f1bde63de0170025f7709f76ddd01db51041236fcc8d09e5a44e582b973815727f2a3a93bc3b3f1a103c0
+  metadata.gz: 2c86c507f99c19486796c40f4457bb75312786e6448b7c6e494aca27dedb1b9846ad6e9d4be114c1e9c45af9c2dd5a57782d248e5bb38361623d8d987f733488
+  data.tar.gz: d9486f95ff6ea81b7195b278decd4a757fab1062b808bf572c5ab96fab1d8d6779d3a507adf9f83c8ffa7329e616beab11c44babfe8384efc15846a98bdc7dd7

data/lib/dymos.rb

@@ -1,6 +1,7 @@
 require 'active_support/all'
 
 require "dymos/config"
+require "dymos/query/parameter/filter_expression"
 require "dymos/query/base"
 require "dymos/query/put_item"
 require "dymos/query/update_item"
@@ -17,6 +18,19 @@ require "dymos/client"
 require "dymos/version"
 
 module Dymos
+  def self.model_query_methods
+    @model_query_methods ||= ::Dymos::Query::Query.instance_methods(false)+
+      ::Dymos::Query::GetItem.instance_methods(false)+
+      ::Dymos::Query::Scan.instance_methods(false)+
+      ::Dymos::Query::Parameter::FilterExpression.instance_methods(false)
+
+  end
+
+  def self.model_update_query_methods
+    @model_update_query_methods ||= ::Dymos::Query::UpdateItem.instance_methods(false)+
+      ::Dymos::Query::PutItem.instance_methods(false)+
+      ::Dymos::Query::DeleteItem.instance_methods(false)
+  end
 end
 
 #Timeオブジェクト扱いたいのでアラウンドエイリアスで先に捕まえる
@@ -27,8 +41,6 @@ module Aws
         alias :orig_format :format
         def format(obj)
           case obj
-            when TrueClass then { n:"1" }
-            when FalseClass then { n:"0" }
             when Time then { s: obj.iso8601 }
             else
               orig_format obj

data/lib/dymos/model.rb

@@ -21,10 +21,7 @@ module Dymos
       attr_accessor :last_execute_query
 
       def method_missing(name, *args, &block)
-        methods ||= ::Dymos::Query::Query.instance_methods(false)+
-          ::Dymos::Query::GetItem.instance_methods(false)+
-          ::Dymos::Query::Scan.instance_methods(false)
-        if methods.include? name
+        if Dymos.model_query_methods.include? name
           @query||={}
           @query[name]=args
           self
@@ -35,10 +32,8 @@ module Dymos
     end
 
     def method_missing(name, *args, &block)
-      methods ||= ::Dymos::Query::UpdateItem.instance_methods(false)+
-        ::Dymos::Query::PutItem.instance_methods(false)+
-        ::Dymos::Query::DeleteItem.instance_methods(false)
-      if methods.include? name
+
+      if Dymos.model_update_query_methods.include? name
         @query||={}
         @query[name]=args
         self
@@ -49,7 +44,7 @@ module Dymos
 
     def self.field(attr, type, default: nil, desc: nil)
       fail StandardError('attribute name is invalid') if attr =~ /[\!\?]$/
-      fail StandardError('require "default" option') if (type == :bool && default.nil?)
+      fail StandardError('require "default" option') if (type == :boolean && default.nil?)
 
       @fields ||= {}
       @fields[attr]={
@@ -65,7 +60,7 @@ module Dymos
           val = read_attribute(attr) || default
           return val if raw || !val.present?
           case type
-            when :bool
+            when :boolean
               to_b(val)
             when :time
               Time.parse val
@@ -83,7 +78,7 @@ module Dymos
       define_method("#{attr}_desc") { desc }
       define_method("#{attr}?") do
         val = self.send attr
-        if type == :bool
+        if type == :boolean
           val
         else
           !val.nil?

data/lib/dymos/query/base.rb

@@ -18,6 +18,21 @@ module Dymos
         value = ::Dymos::Config.default[command.to_sym].merge value
         @query.merge value
       end
+
+      protected
+      def parse_condition(*values)
+        if values[1].class == Symbol
+          if values.count == 2
+            column, operator, value = values[0], values[1], nil
+          else
+            column, operator, value = values
+          end
+        else
+          column, operator, value = values[0], :eq, values[1]
+        end
+
+        [column, operator, value]
+      end
     end
   end
 end

data/lib/dymos/query/delete_item.rb

@@ -15,12 +15,8 @@ module Dymos
         self
       end
 
-      def add_expected(*value)
-        if value.count == 2
-          column, operator, value = value[0], :eq, value[1]
-        else
-          column, operator, value = value
-        end
+      def add_expected(*values)
+        column, operator, value = parse_condition(*values)
         @query[:expected] ||= {}
         @query[:expected].store(*_add_expected(column, operator, value))
         self

data/lib/dymos/query/parameter/filter_expression.rb

@@ -0,0 +1,35 @@
+module Dymos
+  module Query
+    module Parameter
+      module FilterExpression
+        def filter_expression(value)
+          @query[:filter_expression] = value
+          self
+        end
+
+        def expression_attribute_names(value)
+          names = value.deep_stringify_keys.map do |k, v|
+            k="##{k}" unless k[0] == "#"
+            [k, v]
+          end
+          @query[:expression_attribute_names] = Hash[*names.flatten]
+          self
+        end
+
+        def expression_attribute_values(value)
+          values = value.deep_stringify_keys.map do |k, v|
+            k=":#{k}" unless k[0] == ":"
+            [k, v]
+          end
+          @query[:expression_attribute_values] = Hash[*values.flatten]
+          self
+        end
+
+        alias :expression :filter_expression
+        alias :bind_names :expression_attribute_names
+        alias :bind_values :expression_attribute_values
+
+      end
+    end
+  end
+end

data/lib/dymos/query/put_item.rb

@@ -15,12 +15,8 @@ module Dymos
         self
       end
 
-      def add_expected(*value)
-        if value.count == 2
-          column, operator, value = value[0], :eq, value[1]
-        else
-          column, operator, value = value
-        end
+      def add_expected(*values)
+        column, operator, value = parse_condition(*values)
         @query[:expected] ||= {}
         @query[:expected].store(*_add_expected(column, operator, value))
         self

data/lib/dymos/query/query.rb

@@ -1,6 +1,7 @@
 module Dymos
   module Query
     class Query < Base
+      include Parameter::FilterExpression
 
       def command
         'query'
@@ -40,18 +41,13 @@ module Dymos
         self
       end
 
-      def add_conditions(*value)
-        if value.count == 2
-          column, operator, value = value[0], :eq, value[1]
-        else
-          column, operator, value = value
-        end
+      def add_conditions(*values)
+        column, operator, value = parse_condition(*values)
         @query[:key_conditions] ||= {}
         @query[:key_conditions].store(*_add_filter(column, operator, value))
         self
       end
 
-
       def comparison_operator(value)
         @query[:comparison_operator] = value.to_s.upcase
         self
@@ -63,12 +59,8 @@ module Dymos
         self
       end
 
-      def add_filter(*value)
-        if value.count == 2
-          column, operator, value = value[0], :eq, value[1]
-        else
-          column, operator, value = value
-        end
+      def add_filter(*values)
+        column, operator, value = parse_condition(*values)
         @query[:query_filter] ||= {}
         @query[:query_filter].store(*_add_filter(column, operator, value))
         filter_operator 'AND' if @query[:conditional_operator].blank? && @query[:query_filter].count > 1
@@ -113,15 +105,6 @@ module Dymos
         self
       end
 
-      def projection_expression(value)
-        @query[:projection_expression] = value
-        self
-      end
-
-      def expression_attribute_names(value)
-        @query[:expression_attribute_names] = value.deep_stringify_keys
-        self
-      end
     end
   end
 end

data/lib/dymos/query/scan.rb

@@ -1,6 +1,8 @@
 module Dymos
   module Query
     class Scan < Base
+      include Parameter::FilterExpression
+
       def command
         'scan'
       end
@@ -26,12 +28,9 @@ module Dymos
         self
       end
 
-      def add_filter(*value)
-        if value.count == 2
-          column, operator, value = value[0], :eq, value[1]
-        else
-          column, operator, value = value
-        end
+      def add_filter(*values)
+        column, operator, value = parse_condition(*values)
+
         @query[:scan_filter] ||= {}
         @query[:scan_filter].store(*_add_filter(column, operator, value))
         filter_operator 'AND' if @query[:conditional_operator].blank? && @query[:scan_filter].count > 1
@@ -39,11 +38,11 @@ module Dymos
       end
 
       def _add_filter(column, operator, value)
-        [column.to_s, {
-                      attribute_value_list: [*value],
-                      comparison_operator: operator.to_s.upcase
-                    }
-        ]
+        hash = {
+          comparison_operator: operator.to_s.upcase
+        }
+        hash[:attribute_value_list]=[*value] if value.present?
+        [column.to_s, hash]
       end
 
       def filter_operator(value)
@@ -73,26 +72,6 @@ module Dymos
         self
       end
 
-      def projection_expression(value)
-        @query[:projection_expression] = value
-        self
-      end
-
-      def filter_expression(value)
-        @query[:filter_expression] = value
-        self
-      end
-
-      def expression_attribute_names(value)
-        @query[:expression_attribute_names] = value.deep_stringify_keys
-        self
-      end
-
-      def expression_attribute_values(value)
-        @query[:expression_attribute_values] = value.deep_stringify_keys
-        self
-      end
-
     end
   end
 end

data/lib/dymos/query/update_item.rb

@@ -30,12 +30,8 @@ module Dymos
         self
       end
 
-      def add_attribute_updates(*value)
-        if value.count == 2
-          column, operator, value = value[0], :put, value[1]
-        else
-          column, operator, value = value
-        end
+      def add_attribute_updates(*values)
+        column, operator, value = parse_condition(*values)
         @query[:attribute_updates] ||= {}
         @query[:attribute_updates].store(*_attribute_updates(column, operator, value))
         self
@@ -54,12 +50,8 @@ module Dymos
         self
       end
 
-      def add_expected(*value)
-        if value.count == 2
-          column, operator, value = value[0], :eq, value[1]
-        else
-          column, operator, value = value
-        end
+      def add_expected(*values)
+        column, operator, value = parse_condition(*values)
         @query[:expected] ||= {}
         @query[:expected].store(*_add_expected(column, operator, value))
         self

data/lib/dymos/version.rb

@@ -1,3 +1,3 @@
 module Dymos
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/spec/lib/dymos/data.yml

@@ -103,6 +103,7 @@ Thread:
     Replies: 0
     Answered: 0
     Tags: [ "index", "primarykey", "table" ]
+    Option:
     LastPostDateTime:  "2012-01-03T00:40:57.165Z"
   -
     ForumName: "DynamoDB"
@@ -113,6 +114,7 @@ Thread:
     Replies: 0
     Answered: 0
     Tags: [ "index", "primarykey", "rangekey" ]
+    Option:
     LastPostDateTime:  "2012-01-03T00:40:57.165Z"
   -
     ForumName: "Amazon S3"
@@ -123,6 +125,7 @@ Thread:
     Replies: 0
     Answered: 0
     Tags: [ "largeobject", "multipart upload" ]
+    Option: "private"
     LastPostDateTime:  "2012-01-03T00:40:57.165Z"
 
 Reply:

data/spec/lib/dymos/model_spec.rb

@@ -7,7 +7,7 @@ describe Dymos::Model do
     end
     it "type:boolには初期値が必須" do
       expect { Class.new(Dymos::Model) do
-        field "hoge", :bool
+        field "hoge", :boolean
       end }.to raise_error
     end
   end
@@ -18,7 +18,7 @@ describe Dymos::Model do
     field :email, :string
     field :list, :string_set
     field :count, :integer
-    field :enable, :bool, default: false
+    field :enable, :boolean, default: false
 
     field :created_at, :time
     field :updated_at, :time
@@ -58,8 +58,8 @@ describe Dymos::Model do
     @client.put_item(table_name: 'dummy', item: {id: 'fuga', name: '次郎'})
     @client.put_item(table_name: 'dummy', item: {id: 'piyo', name: '三郎'})
     @client.put_item(table_name: 'dummy', item: {id: 'musashi', name: '巴'}) #削除用
-    @client.put_item(table_name: 'dummy', item: {id: 'enable_id', name: 'enable', enable: 1})
-    @client.put_item(table_name: 'dummy', item: {id: 'disable_id', name: 'disable', enable: 0})
+    @client.put_item(table_name: 'dummy', item: {id: 'enable_id', name: 'enable', enable: true})
+    @client.put_item(table_name: 'dummy', item: {id: 'disable_id', name: 'disable', enable: false})
 
     @client.delete_table(table_name: 'post') if @client.list_tables[:table_names].include?('post')
     @client.create_table(

data/spec/lib/dymos/query_spec.rb

@@ -32,6 +32,7 @@ describe 'query' do
     field :Views, :integer
     field :Answered, :string
     field :Tags, :array
+    field :Option, :string
     field :LastPostDateTime, :time
   end
   class ReplyModel < Dymos::Model
@@ -39,7 +40,7 @@ describe 'query' do
     field :Id, :string
     field :ReplyDateTime, :time
     field :Message, :string
-    field :ReplyDateTime, :string
+    field :PostedBy, :string
   end
 
   describe :find do
@@ -72,6 +73,62 @@ describe 'query' do
         where(Id: "DynamoDB#DynamoDB Thread 1", PostedBy: "User A").all
       expect(result.count).to eq(2)
     end
+
+    describe :filter_expression do
+      it :scan do
+        result =ThreadModel.expression("ForumName = :name").bind_values(name: "DynamoDB").all
+        expect(result.count).to eq(2)
+      end
+      it :query do
+        result =ThreadModel.where(ForumName: "DynamoDB").filter_expression("contains(#column, :number)")
+                  .bind_names(column: "Subject")
+                  .bind_values(number: "Thread 1").all
+        expect(result.count).to eq(1)
+      end
+    end
+
+    describe :conditions do
+      describe :time do
+        it :== do
+          time = Time.parse("2011-12-11T00:40:57.165Z")
+          result = ReplyModel.add_filter(:ReplyDateTime, :eq, time.iso8601(3)).all
+          expect(result.count).to eq(1)
+        end
+        it :> do
+          time = Time.parse("2011-12-11T00:40:57.165Z")
+          result = ReplyModel.add_filter(:ReplyDateTime, :gt, time.iso8601(3)).all
+          expect(result.count).to eq(4)
+        end
+        it :>= do
+          time = Time.parse("2011-12-11T00:40:57.165Z")
+          result = ReplyModel.add_filter(:ReplyDateTime, :ge, time.iso8601(3)).all
+          expect(result.count).to eq(5)
+        end
+        it :< do
+          time = Time.parse("2012-01-03T00:40:57.165Z")
+          result = ReplyModel.add_filter(:ReplyDateTime, :lt, time.iso8601(3)).all
+          expect(result.count).to eq(4)
+        end
+        it :<= do
+          time = Time.parse("2012-01-03T00:40:57.165Z")
+          result = ReplyModel.add_filter(:ReplyDateTime, :le, time.iso8601(3)).all
+          expect(result.count).to eq(5)
+        end
+        it :<= do
+          time = Time.parse("2012-01-03T00:40:57.165Z")
+          result = ReplyModel.add_filter(:ReplyDateTime, :le, time.iso8601(3)).all
+          expect(result.count).to eq(5)
+        end
+        it :null do
+          result = ThreadModel.add_filter(:Hoge, :null).all
+          expect(result.count).to eq(3)
+        end
+        it :not_null do
+          result = ThreadModel.add_filter(:Hoge, :not_null).all
+          expect(result.count).to eq(0)
+        end
+      end
+    end
   end
   it :one do
     result = ThreadModel.where(ForumName: "DynamoDB").desc.one
@@ -141,7 +198,7 @@ describe 'query' do
     describe :delete do
       it 'del' do
         model = TestModelSaveItem.find('piyo')
-        expect(model.add_expected(:param1,:eq,103).delete.class).to eq(TestModelSaveItem)
+        expect(model.add_expected(:param1, :eq, 103).delete.class).to eq(TestModelSaveItem)
         expect(TestModelSaveItem.find('piyo')).to eq(nil)
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dymos
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - hoshina85
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-14 00:00:00.000000000 Z
+date: 2014-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -148,6 +148,7 @@ files:
 - lib/dymos/query/delete_item.rb
 - lib/dymos/query/describe.rb
 - lib/dymos/query/get_item.rb
+- lib/dymos/query/parameter/filter_expression.rb
 - lib/dymos/query/put_item.rb
 - lib/dymos/query/query.rb
 - lib/dymos/query/scan.rb