Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@ group :development do
gem "redcarpet", '1.17.2'
gem 'github-markup'
gem 'pry'
gem 'fake_dynamo', '~>0.1.3'
gem 'fake_dynamo', '>=0.2'
gem "mocha", '0.10.0'
end
93 changes: 64 additions & 29 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,66 +1,101 @@
GEM
remote: https://rubygems.org/
specs:
activemodel (3.2.13)
activesupport (= 3.2.13)
builder (~> 3.0.0)
activesupport (3.2.13)
i18n (= 0.6.1)
multi_json (~> 1.0)
aws-sdk (1.10.0)
activemodel (4.0.0)
activesupport (= 4.0.0)
builder (~> 3.1.0)
activesupport (4.0.0)
i18n (~> 0.6, >= 0.6.4)
minitest (~> 4.2)
multi_json (~> 1.3)
thread_safe (~> 0.1)
tzinfo (~> 0.3.37)
addressable (2.3.5)
atomic (1.1.13)
aws-sdk (1.15.0)
json (~> 1.4)
nokogiri (>= 1.4.4)
nokogiri (< 1.6.0)
uuidtools (~> 2.1)
builder (3.0.4)
builder (3.1.4)
coderay (1.0.9)
diff-lcs (1.2.4)
fake_dynamo (0.1.3)
fake_dynamo (0.2.4)
activesupport
json
sinatra
git (1.2.5)
faraday (0.8.8)
multipart-post (~> 1.2.0)
git (1.2.6)
github-markup (0.7.5)
i18n (0.6.1)
jeweler (1.8.4)
github_api (0.10.1)
addressable
faraday (~> 0.8.1)
hashie (>= 1.2)
multi_json (~> 1.4)
nokogiri (~> 1.5.2)
oauth2
hashie (2.0.5)
highline (1.6.19)
httpauth (0.2.0)
i18n (0.6.5)
jeweler (1.8.7)
builder
bundler (~> 1.0)
git (>= 1.2.5)
github_api (= 0.10.1)
highline (>= 1.6.15)
nokogiri (= 1.5.10)
rake
rdoc
json (1.8.0)
jwt (0.1.8)
multi_json (>= 1.5)
metaclass (0.0.1)
method_source (0.8.1)
method_source (0.8.2)
minitest (4.7.5)
mocha (0.10.0)
metaclass (~> 0.0.1)
multi_json (1.7.3)
nokogiri (1.5.9)
multi_json (1.7.9)
multi_xml (0.5.5)
multipart-post (1.2.0)
nokogiri (1.5.10)
oauth2 (0.9.2)
faraday (~> 0.8)
httpauth (~> 0.2)
jwt (~> 0.1.4)
multi_json (~> 1.0)
multi_xml (~> 0.5)
rack (~> 1.2)
pry (0.9.12.2)
coderay (~> 1.0.5)
method_source (~> 0.8)
slop (~> 3.4)
rack (1.5.2)
rack-protection (1.5.0)
rack
rake (10.0.4)
rake (10.1.0)
rdoc (4.0.1)
json (~> 1.4)
redcarpet (1.17.2)
rspec (2.13.0)
rspec-core (~> 2.13.0)
rspec-expectations (~> 2.13.0)
rspec-mocks (~> 2.13.0)
rspec-core (2.13.1)
rspec-expectations (2.13.0)
rspec (2.14.1)
rspec-core (~> 2.14.0)
rspec-expectations (~> 2.14.0)
rspec-mocks (~> 2.14.0)
rspec-core (2.14.5)
rspec-expectations (2.14.2)
diff-lcs (>= 1.1.3, < 2.0)
rspec-mocks (2.13.1)
sinatra (1.4.2)
rack (~> 1.5, >= 1.5.2)
rspec-mocks (2.14.3)
sinatra (1.4.3)
rack (~> 1.4)
rack-protection (~> 1.4)
tilt (~> 1.3, >= 1.3.4)
slop (3.4.5)
slop (3.4.6)
thread_safe (0.1.2)
atomic
tilt (1.4.1)
tzinfo (0.3.37)
uuidtools (2.1.4)
yard (0.8.6.1)
yard (0.8.7)

PLATFORMS
ruby
Expand All @@ -69,7 +104,7 @@ DEPENDENCIES
activemodel
aws-sdk
bundler
fake_dynamo (~> 0.1.3)
fake_dynamo (>= 0.2)
github-markup
jeweler
mocha (= 0.10.0)
Expand Down
4 changes: 2 additions & 2 deletions lib/dynamoid/adapter.rb
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ def get_original_id_and_partition id
#
# @since 0.2.0
def result_for_partition(results, table_name)
table = Dynamoid::Adapter::AwsSdk.get_table(table_name)
table = @adapter.get_table(table_name)

if table.range_key
range_key_name = table.range_key.name.to_sym
Expand Down Expand Up @@ -243,7 +243,7 @@ def query(table_name, opts = {})

unless Dynamoid::Config.partitioning?
#no paritioning? just pass to the standard query method
Dynamoid::Adapter::AwsSdk.query(table_name, opts)
@adapter.query(table_name, opts)
else
#get all the hash_values that could be possible
ids = id_with_partitions(opts[:hash_value])
Expand Down
Loading