dynamoid 0.1.1 → 0.1.2

data/spec/dynamoid/indexes_spec.rb

@@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe "Dynamoid::Indexes" do
   
-  before do
+  before(:all) do
     User.create_indexes
   end
 
@@ -22,40 +22,32 @@ describe "Dynamoid::Indexes" do
     User.index_table_name([:email, :name]).should == 'dynamoid_tests_index_user_emails_and_names'
   end
   
-  it 'creates a key name for a table index' do
-    User.index_key_name([:email, :name]).should == 'user_emails_and_names'
-  end
-  
-  it 'creates a table after an index is created' do
-    User.send(:index, :password)
-    
-    User.table_exists?(User.index_table_name([:password])).should be_true
-  end
-  
   it 'assembles a hashed value for the key of an index' do
     @user = User.create(:name => 'Josh', :email => 'josh@joshsymonds.com')
     
-    @user.key_for_index([:email, :name]).should == (Digest::SHA2.new << 'Josh' << 'josh@joshsymonds.com').to_s
+    @user.key_for_index([:email, :name]).should == "Josh.josh@joshsymonds.com"
   end
   
   it 'saves indexes to their tables' do
     @user = User.create(:name => 'Josh')
     
-    Dynamoid::Adapter.get_item("dynamoid_tests_index_user_names", @user.key_for_index([:name])).should == {@user.class.index_key_name([:name]).to_sym => @user.key_for_index([:name]), :ids => Set[@user.id]}
+    Dynamoid::Adapter.read("dynamoid_tests_index_user_names", @user.key_for_index([:name]))[:id].should == @user.key_for_index([:name])
+    Dynamoid::Adapter.read("dynamoid_tests_index_user_names", @user.key_for_index([:name]))[:ids].should == Set[@user.id]
   end
   
   it 'saves multiple indexes with the same value as an array' do
     @user1 = User.create(:name => 'Josh')
     @user2 = User.create(:name => 'Josh')
     
-    Dynamoid::Adapter.get_item("dynamoid_tests_index_user_names", @user1.key_for_index([:name])).should == {@user1.class.index_key_name([:name]).to_sym => @user1.key_for_index([:name]), :ids => Set[@user2.id, @user1.id]}
+    Dynamoid::Adapter.read("dynamoid_tests_index_user_names", @user1.key_for_index([:name]))[:id].should == @user1.key_for_index([:name])
+    Dynamoid::Adapter.read("dynamoid_tests_index_user_names", @user1.key_for_index([:name]))[:ids].should == Set[@user2.id, @user1.id]
   end
   
   it 'deletes indexes when the object is destroyed' do
     @user = User.create(:name => 'Josh')
     @user.destroy
     
-    Dynamoid::Adapter.get_item("dynamoid_tests_index_user_names", @user.key_for_index([:name])).should == {@user.class.index_key_name([:name]).to_sym => @user.key_for_index([:name]), :ids => Set.new}
+    Dynamoid::Adapter.read("dynamoid_tests_index_user_names", @user.key_for_index([:name]))[:id].should == @user.key_for_index([:name])
   end
     
 end

data/spec/dynamoid/persistence_spec.rb

@@ -3,6 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 describe "Dynamoid::Persistence" do
   
   before do
+    Random.stubs(:rand).with(Dynamoid::Config.partition_size).returns(0)
     @address = Address.new
   end
   
@@ -27,18 +28,17 @@ describe "Dynamoid::Persistence" do
     end
   end
   
-  
   it 'assigns itself an id on save' do
     @address.save
     
-    Dynamoid::Adapter.get_item("dynamoid_tests_addresses", @address.id)[:id].should == @address.id
+    Dynamoid::Adapter.read("dynamoid_tests_addresses", @address.id)[:id].should == @address.id
   end
   
   it 'assigns itself an id on save only if it does not have one' do
     @address.id = 'test123'
     @address.save
     
-    Dynamoid::Adapter.get_item("dynamoid_tests_addresses", 'test123').should_not be_empty
+    Dynamoid::Adapter.read("dynamoid_tests_addresses", 'test123').should_not be_empty
   end
   
   it 'has a table name' do
@@ -56,7 +56,37 @@ describe "Dynamoid::Persistence" do
     @user = User.create(:name => 'Josh')
     @user.destroy
     
-    Dynamoid::Adapter.get_item("dynamoid_tests_users", @user.id).should be_nil
+    Dynamoid::Adapter.read("dynamoid_tests_users", @user.id).should be_nil
+  end
+  
+  it 'keeps string attributes as strings' do
+    @user = User.new(:name => 'Josh')
+    @user.send(:dump)[:name].should == 'Josh'
+  end
+  
+  it 'dumps datetime attributes' do
+    @user = User.create(:name => 'Josh')
+    @user.send(:dump)[:name].should == 'Josh'
+  end
+  
+  it 'dumps integer attributes' do
+    @subscription = Subscription.create(:length => 10)
+    @subscription.send(:dump)[:length].should == 10
+  end
+  
+  it 'dumps set attributes' do
+    @subscription = Subscription.create(:length => 10)
+    @magazine = @subscription.magazine.create
+    
+    @subscription.send(:dump)[:magazine_ids].should == Set[@magazine.id]
+  end
+  
+  it 'loads attributes from a hash' do
+    @time = DateTime.now
+    @hash = {:name => 'Josh', :created_at => @time.to_f}
+    
+    User.undump(@hash)[:name].should == 'Josh'
+    User.undump(@hash)[:created_at].to_f == @time.to_f
   end
 
 end

data/spec/spec_helper.rb

@@ -41,11 +41,11 @@ RSpec.configure do |config|
       end      
     end
     
-    #config.after(:suite) do
-    #  Dynamoid::Adapter.list_tables.each do |table|
-    #    Dynamoid::Adapter.delete_table(table) if table =~ /^#{Dynamoid::Config.namespace}/
-    #  end
-    #end
+    config.after(:suite) do
+      Dynamoid::Adapter.list_tables.each do |table|
+        Dynamoid::Adapter.delete_table(table) if table =~ /^#{Dynamoid::Config.namespace}/
+      end
+    end
   else
     config.before(:each) do
       Dynamoid::Adapter.reset_data

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynamoid
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-27 00:00:00.000000000 Z
+date: 2012-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70174244757120 !ruby/object:Gem::Requirement
+  requirement: &70138865789600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70174244757120
+  version_requirements: *70138865789600
 - !ruby/object:Gem::Dependency
   name: tzinfo
-  requirement: &70174244756560 !ruby/object:Gem::Requirement
+  requirement: &70138865788440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70174244756560
+  version_requirements: *70138865788440
 - !ruby/object:Gem::Dependency
   name: aws-sdk
-  requirement: &70174244755620 !ruby/object:Gem::Requirement
+  requirement: &70138865787560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70174244755620
+  version_requirements: *70138865787560
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70174244754780 !ruby/object:Gem::Requirement
+  requirement: &70138865787060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70174244754780
+  version_requirements: *70138865787060
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70174244770280 !ruby/object:Gem::Requirement
+  requirement: &70138865786540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70174244770280
+  version_requirements: *70138865786540
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70174244769680 !ruby/object:Gem::Requirement
+  requirement: &70138865785960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70174244769680
+  version_requirements: *70138865785960
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70174244769120 !ruby/object:Gem::Requirement
+  requirement: &70138865785300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70174244769120
+  version_requirements: *70138865785300
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70174244768580 !ruby/object:Gem::Requirement
+  requirement: &70138865807640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70174244768580
+  version_requirements: *70138865807640
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70174244768080 !ruby/object:Gem::Requirement
+  requirement: &70138865806900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70174244768080
+  version_requirements: *70138865806900
 description: Dynamoid is an ORM for Amazon's DynamoDB that supports offline development,
   associations, querying, and everything else you'd expect from an ActiveRecord-style
   replacement.
@@ -139,7 +139,6 @@ files:
 - lib/dynamoid/associations/has_and_belongs_to_many.rb
 - lib/dynamoid/associations/has_many.rb
 - lib/dynamoid/associations/has_one.rb
-- lib/dynamoid/attributes.rb
 - lib/dynamoid/components.rb
 - lib/dynamoid/config.rb
 - lib/dynamoid/config/options.rb
@@ -151,7 +150,6 @@ files:
 - lib/dynamoid/finders.rb
 - lib/dynamoid/indexes.rb
 - lib/dynamoid/persistence.rb
-- lib/dynamoid/relations.rb
 - spec/app/models/address.rb
 - spec/app/models/magazine.rb
 - spec/app/models/sponsor.rb
@@ -166,7 +164,6 @@ files:
 - spec/dynamoid/associations/has_many_spec.rb
 - spec/dynamoid/associations/has_one_spec.rb
 - spec/dynamoid/associations_spec.rb
-- spec/dynamoid/attributes_spec.rb
 - spec/dynamoid/config_spec.rb
 - spec/dynamoid/criteria/chain_spec.rb
 - spec/dynamoid/criteria_spec.rb
@@ -175,7 +172,6 @@ files:
 - spec/dynamoid/finders_spec.rb
 - spec/dynamoid/indexes_spec.rb
 - spec/dynamoid/persistence_spec.rb
-- spec/dynamoid/relations_spec.rb
 - spec/dynamoid_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/Veraticus/Dynamoid
@@ -193,7 +189,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -456596935797833583
+      hash: 2498222871702438577
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/dynamoid/attributes.rb

@@ -1,37 +0,0 @@
-# encoding: utf-8
-module Dynamoid #:nodoc:
-
-  module Attributes
-    extend ActiveSupport::Concern
-    
-    attr_accessor :attributes
-    alias :raw_attributes :attributes
-      
-    def write_attribute(name, value)
-      attributes[name.to_sym] = value
-    end
-    alias :[]= :write_attribute
-    
-    def read_attribute(name)
-      attributes[name.to_sym]
-    end
-    alias :[] :read_attribute
-    
-    def update_attributes(attributes)
-      self.attributes = self.attributes.merge(attributes)
-      save
-    end
-    
-    def update_attribute(attribute, value)
-      self.attributes[attribute] = value
-      save
-    end
-    
-    module ClassMethods
-      def attributes
-        [self.fields + [:id]].flatten.uniq
-      end
-    end
-  end
-  
-end

data/lib/dynamoid/relations.rb

@@ -1,21 +0,0 @@
-require 'digest/sha2'
-
-# encoding: utf-8
-module Dynamoid #:nodoc:
-
-  # Associate a document with another object: belongs_to, has_many, and has_and_belongs_to_many
-  module Relations
-    extend ActiveSupport::Concern
-
-    included do
-      class_attribute :indexes
-      
-      self.indexes = []
-    end
-    
-    module ClassMethods
-
-    end
-  end
-  
-end

data/spec/dynamoid/attributes_spec.rb

@@ -1,46 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-
-describe "Dynamoid::Attributes" do
-
-  before do
-    @address = Address.create
-    @original_id = @address.id
-  end
-
-  it 'should write an attribute correctly' do
-    @address.write_attribute(:city, 'Chicago')
-  end
-  
-  it 'should write an attribute with the alias' do
-    @address[:city] = 'Chicago'
-  end
-  
-  it 'should read a written attribute' do
-    @address.write_attribute(:city, 'Chicago')
-    @address.read_attribute(:city).should == 'Chicago'
-  end
-  
-  it 'should read a written attribute with the alias' do
-    @address.write_attribute(:city, 'Chicago')
-    @address[:city].should == 'Chicago'
-  end
-  
-  it 'should update all attributes' do
-    @address.expects(:save).once.returns(true)
-    @address.update_attributes(:city => 'Chicago')
-    @address[:city].should == 'Chicago'
-    @address.id.should == @original_id
-  end
-  
-  it 'should update one attribute' do
-    @address.expects(:save).once.returns(true)
-    @address.update_attribute(:city, 'Chicago')
-    @address[:city].should == 'Chicago'
-    @address.id.should == @original_id
-  end
-  
-  it 'returns all attributes' do
-    Address.attributes.should == [:id, :city]
-  end
-
-end

data/spec/dynamoid/relations_spec.rb

@@ -1,6 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-
-describe "Dynamoid::Relations" do
-
-  
-end