dymos 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a14520d556c3eb1c8f019feca759dc4a8c0bf530
-  data.tar.gz: b3d32561a640e4c08611a6df6aa62afe6e7e3f8f
+  metadata.gz: 5ba92ec5ad7a14cc2a8a2290558dc84803396a74
+  data.tar.gz: bf890a934267cfe7aee6aa06408f9fc3412c7ada
 SHA512:
-  metadata.gz: 3715cc421b3f4453ecfd1e88b1bcb544faf74bf522498bcf77a8f53b2b1119b3563cad5d508a228497ffa2c13d1a0b78f2006783fa6b18de8fd1238fc8403bf6
-  data.tar.gz: 1a5ffcbe966d215d3c40605068414ded37b5a692d094ad99d71c9d01c12432f602df60029e59c09c9b13787c53ca4352742db6ebb6358b438893ab56ce3a1664
+  metadata.gz: a376e42a0ade618cec85b5606bc7f15d71551a5fa70f9645c5f99bc41a6b2c274d1ee12c40bbf68cb6086729d915cee7fd5f71e7793225d050b9635255f7dbe9
+  data.tar.gz: 6da39b940196b74d02df13df03cbd1567b28792dece6139483cf0d241b6363464fb1525c76c6c3b984f9c35ed8ec2b009e19c77f4a3a2d18eed7da492af41edf

data/lib/dymos/model.rb

@@ -6,7 +6,7 @@ module Dymos
     include ActiveModel::Model
     include ActiveModel::Dirty
     include ActiveModel::Callbacks
-    include Dymos::Persistence
+    include ::Dymos::Persistence
     attr_accessor :metadata, :last_execute_query
 
     define_model_callbacks :save
@@ -21,9 +21,9 @@ 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)
+        methods ||= ::Dymos::Query::Query.instance_methods(false)+
+          ::Dymos::Query::GetItem.instance_methods(false)+
+          ::Dymos::Query::Scan.instance_methods(false)
         if methods.include? name
           @query||={}
           @query[name]=args
@@ -35,9 +35,9 @@ 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)
+      methods ||= ::Dymos::Query::UpdateItem.instance_methods(false)+
+        ::Dymos::Query::PutItem.instance_methods(false)+
+        ::Dymos::Query::DeleteItem.instance_methods(false)
       if methods.include? name
         @query||={}
         @query[name]=args
@@ -122,15 +122,15 @@ module Dymos
     end
 
     def self.all
-      if @query.present? && @query.keys & [:conditions, :add_condition, :where]
-        builder = Dymos::Query::Query.new.name(table_name)
-        @query.each do |k, v|
-          builder.send k, *v
-        end
-        @query={}
+      if @query.present? && (@query.keys & [:conditions, :add_condition, :where]).present?
+        builder = ::Dymos::Query::Query.new.name(table_name)
       else
-        builder = Dymos::Query::Scan.new.name(table_name)
+        builder = ::Dymos::Query::Scan.new.name(table_name)
       end
+      @query.each do |k, v|
+        builder.send k, *v
+      end if @query.present?
+      @query={}
       _execute(builder)
     end
 
@@ -145,13 +145,13 @@ module Dymos
       keys[indexes.first[:attribute_name].to_sym] = key1
       keys[indexes.last[:attribute_name].to_sym] = key2 if indexes.size > 1
 
-      builder = Dymos::Query::GetItem.new.name(table_name).key(keys)
+      builder = ::Dymos::Query::GetItem.new.name(table_name).key(keys)
       _execute(builder)
     end
     def self._execute(builder)
       query = builder.build
+      response = ::Dymos::Client.new.command builder.command, query
       @last_execute_query = {command: builder.command, query: query}
-      response = Dymos::Client.new.command builder.command, query
       to_model(class_name, response)
     end
 
@@ -164,8 +164,8 @@ module Dymos
     end
 
     def self.describe
-      builder=Dymos::Query::Describe.new.name(table_name)
-      Dymos::Client.new.command :describe_table, builder.build
+      builder=::Dymos::Query::Describe.new.name(table_name)
+      ::Dymos::Client.new.command :describe_table, builder.build
     end
 
     def indexes

data/lib/dymos/persistence.rb

@@ -29,7 +29,7 @@ module Dymos
 
     def save!(*)
       run_callbacks :save do
-        _put || raise(Dymos::RecordNotSaved)
+        _put || raise(::Dymos::RecordNotSaved)
       end
     end
 
@@ -43,14 +43,14 @@ module Dymos
 
     def update!(*)
       run_callbacks :save do
-        _update || raise(Dymos::RecordNotSaved)
+        _update || raise(::Dymos::RecordNotSaved)
       end
     end
 
     def delete
 
       if persisted?
-        builder = Dymos::Query::DeleteItem.new
+        builder = ::Dymos::Query::DeleteItem.new
 
         builder.name(self.table_name).key(indexes).return_values(:all_old)
 
@@ -61,7 +61,7 @@ module Dymos
 
         query = builder.build
         @last_execute_query = {command: builder.command, query: query}
-        Dymos::Client.new.command builder.command, query
+        ::Dymos::Client.new.command builder.command, query
       end
       @destroyed = true
       freeze
@@ -72,7 +72,7 @@ module Dymos
     def _put
       send :created_at=, Time.new.iso8601 if respond_to? :created_at if @new_record
       send :updated_at=, Time.new.iso8601 if respond_to? :updated_at
-      builder = Dymos::Query::PutItem.new
+      builder = ::Dymos::Query::PutItem.new
       builder.name(self.table_name).item(attributes).return_values(:all_old)
 
       @query.each do |k, v|
@@ -85,7 +85,7 @@ module Dymos
 
     def _update
       send :updated_at=, Time.new.iso8601 if respond_to? :updated_at
-      builder = Dymos::Query::UpdateItem.new
+      builder = ::Dymos::Query::UpdateItem.new
 
       builder.name(self.table_name).key(indexes).return_values(:all_old)
 
@@ -116,8 +116,8 @@ module Dymos
     def _execute(builder)
       query = builder.build
       @last_execute_query = {command: builder.command, query: query}
-      response = Dymos::Client.new.command builder.command, query
-      fail raise(Dymos::RecordNotSaved) if response.nil?
+      response = ::Dymos::Client.new.command builder.command, query
+      fail raise(::Dymos::RecordNotSaved) if response.nil?
       changes_applied
       @new_record = false
       response.present?

data/lib/dymos/query/base.rb

@@ -15,7 +15,7 @@ module Dymos
       end
 
       def build(value={})
-        value = Dymos::Config.default[command.to_sym].merge value
+        value = ::Dymos::Config.default[command.to_sym].merge value
         @query.merge value
       end
     end

data/lib/dymos/version.rb

@@ -1,3 +1,3 @@
 module Dymos
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/spec/lib/dymos/model_spec.rb

@@ -246,6 +246,10 @@ describe Dymos::Model do
         users = DummyUser.all
         expect(users.size).to eq(7)
       end
+      it :limit do
+        users = DummyUser.limit(2).all
+        expect(users.size).to eq(2)
+      end
     end
 
     describe :find do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dymos
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - hoshina85