dynamoid 0.0.2 → 0.0.3

data/Dynamoid.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "dynamoid"
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Josh Symonds"]
@@ -62,6 +62,7 @@ Gem::Specification.new do |s|
     "spec/dynamoid/associations/has_one_spec.rb",
     "spec/dynamoid/associations_spec.rb",
     "spec/dynamoid/attributes_spec.rb",
+    "spec/dynamoid/config_spec.rb",
     "spec/dynamoid/document_spec.rb",
     "spec/dynamoid/fields_spec.rb",
     "spec/dynamoid/finders_spec.rb",

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/lib/dynamoid.rb

@@ -24,9 +24,13 @@ module Dynamoid
   extend self
   
   def configure
-    block_given? ? yield(Config) : Config
+    block_given? ? yield(Dynamoid::Config) : Dynamoid::Config
     Dynamoid::Adapter.reconnect!
   end
   alias :config :configure
   
+  def logger
+    Dynamoid::Config.logger
+  end
+  
 end

data/lib/dynamoid/adapter.rb

@@ -16,7 +16,12 @@ module Dynamoid #:nodoc:
     end
     
     def method_missing(method, *args)
-      return @adapter.send(method, *args) if @adapter.respond_to?(method)
+      if @adapter.respond_to?(method)
+        start = Time.now
+        result = @adapter.send(method, *args)
+        Dynamoid.logger.info "((#{((Time.now - start) * 1000.0).round(2)} ms) #{method.to_s.split('_').collect(&:upcase).join(' ')}#{ " - #{args.join(',')}" unless args.empty? }"
+        return result
+      end
       super
     end
   end

data/lib/dynamoid/associations.rb

@@ -44,7 +44,9 @@ module Dynamoid #:nodoc:
           @associations[name] ||= Dynamoid::Associations.const_get(type.to_s.camelcase).new(self, name, options)
         end
         define_method("#{name}=".to_sym) do |objects|
-          self.send(name) << objects
+          @associations ||= {}
+          @associations[name] ||= Dynamoid::Associations.const_get(type.to_s.camelcase).new(self, name, options)
+          @associations[name].setter(objects)
         end
       end
     end

data/lib/dynamoid/associations/association.rb

@@ -38,6 +38,12 @@ module Dynamoid #:nodoc:
         object
       end
       
+      def setter(object)
+        source.update_attribute(source_attribute, Array(object).collect(&:id))
+        Array(object).collect{|o| self.send(:associate_target, o)} if target_association
+        object
+      end
+      
       def create(attributes = {})
         object = target_class.create(attributes)
         self << object

data/lib/dynamoid/associations/has_and_belongs_to_many.rb

@@ -26,7 +26,7 @@ module Dynamoid #:nodoc:
       
       def disassociate_target(object)
         ids = object.send(target_attribute) || Set.new
-        source.update_attribute(source_attribute, ids - Array(source.id))
+        object.update_attribute(target_attribute, ids - Array(source.id))
       end
     end
   end

data/lib/dynamoid/config.rb

@@ -10,10 +10,28 @@ module Dynamoid #:nodoc
     include ActiveModel::Observing
 
     option :adapter, :default => 'local'
-    option :namespace, :default => 'dynamoid'
+    option :namespace, :default => defined?(Rails) ? "dynamoid_#{Rails.application.class.parent_name}_#{Rails.env}" : "dynamoid"
+    option :logger, :default => defined?(Rails)
     option :access_key
     option :secret_key
     option :warn_on_scan, :default => true
+    
+    def default_logger
+      defined?(Rails) && Rails.respond_to?(:logger) ? Rails.logger : ::Logger.new($stdout)
+    end
+
+    def logger
+      @logger ||= default_logger
+    end
+    
+    def logger=(logger)
+      case logger
+      when false, nil then @logger = nil
+      when true then @logger = default_logger
+      else
+        @logger = logger if logger.respond_to?(:info)
+      end
+    end
 
   end
 end

data/lib/dynamoid/config/options.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# Shamelessly stolen from Mongoid!
 module Dynamoid #:nodoc
   module Config
 
@@ -11,8 +11,6 @@ module Dynamoid #:nodoc
       #   options.defaults
       #
       # @return [ Hash ] The default options.
-      #
-      # @since 2.3.0
       def defaults
         @defaults ||= {}
       end
@@ -26,8 +24,6 @@ module Dynamoid #:nodoc
       # @param [ Hash ] options Extras for the option.
       #
       # @option options [ Object ] :default The default value.
-      #
-      # @since 2.0.0.rc.1
       def option(name, options = {})
         defaults[name] = settings[name] = options[:default]
 
@@ -43,6 +39,10 @@ module Dynamoid #:nodoc
           def #{name}?
             #{name}
           end
+          
+          def reset_#{name}
+            settings[#{name.inspect}] = defaults[#{name.inspect}]
+          end
         RUBY
       end
 
@@ -52,8 +52,6 @@ module Dynamoid #:nodoc
       #   config.reset
       #
       # @return [ Hash ] The defaults.
-      #
-      # @since 2.3.0
       def reset
         settings.replace(defaults)
       end
@@ -64,8 +62,6 @@ module Dynamoid #:nodoc
       #   options.settings
       #
       # @return [ Hash ] The setting options.
-      #
-      # @since 2.3.0
       def settings
         @settings ||= {}
       end

data/lib/dynamoid/finders.rb

@@ -41,8 +41,8 @@ module Dynamoid #:nodoc:
             end
           else
             if Dynamoid::Config.warn_on_scan
-              puts 'Queries without an index are forced to use scan and are generally much slower than indexed queries!'
-              puts "You can index this query by adding this to #{self.to_s.downcase}.rb: index [#{attributes.sort.collect{|attr| ":#{attr}"}.join(', ')}]"
+              Dynamoid.logger.warn 'Queries without an index are forced to use scan and are generally much slower than indexed queries!'
+              Dynamoid.logger.warn "You can index this query by adding this to #{self.to_s.downcase}.rb: index [#{attributes.sort.collect{|attr| ":#{attr}"}.join(', ')}]"
             end
             scan_hash = {}
             attributes.each_with_index {|attr, index| scan_hash[attr.to_sym] = args[index]}

data/spec/dynamoid/associations/association_spec.rb

@@ -67,5 +67,16 @@ describe "Dynamoid::Associations::Association" do
     @subscription.should_not respond_to :sponsors_ids
     @subscription.should_not respond_to :sponsor_ids
   end
+  
+  it 'deletes all items from the association' do
+    @magazine.subscriptions << Subscription.create
+    @magazine.subscriptions << Subscription.create
+    @magazine.subscriptions << Subscription.create
+    
+    @magazine.subscriptions.size.should == 3
+    
+    @magazine.subscriptions = nil
+    @magazine.subscriptions.size.should == 0
+  end
 
 end

data/spec/dynamoid/associations/has_and_belongs_to_many_spec.rb

@@ -26,5 +26,15 @@ describe "Dynamoid::Associations::HasAndBelongsToMany" do
     
     @user.subscriptions.size.should == 1
     @user.subscriptions.should include @subscription
+    @subscription.users.size.should == 1
+    @subscription.users.should include @user
+  end
+  
+  it 'disassociates has_and_belongs_to_many automatically' do
+    @user = @subscription.users.create
+    
+    @subscription.users.delete(@user)
+    @subscription.users.size.should == 0
+    @user.subscriptions.size.should == 0
   end
 end

data/spec/dynamoid/config_spec.rb

@@ -0,0 +1,27 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe "Dynamoid::Config" do
+  
+  before(:each) do
+    Dynamoid::Config.reset_namespace
+  end
+  
+  after(:each) do
+    Dynamoid.config {|config| config.namespace = 'dynamoid_tests'}
+  end
+
+  it 'returns a namespace for non-Rails apps' do
+    Dynamoid::Config.namespace.should == 'dynamoid'
+  end
+  
+  it 'returns a namespace for Rails apps' do
+    class Rails; end
+    Rails.stubs(:application => stubs(:class => stubs(:parent_name => 'TestApp')))
+    Rails.stubs(:env => 'development')
+    Dynamoid::Config.send(:option, :namespace, :default => defined?(Rails) ? "dynamoid_#{Rails.application.class.parent_name}_#{Rails.env}" : "dynamoid")
+    
+    # TODO Make this return what we actually expect
+    Dynamoid::Config.namespace.should == "dynamoid_Mocha_development"
+  end
+  
+end

data/spec/spec_helper.rb

@@ -19,6 +19,8 @@ Dynamoid.configure do |config|
   config.warn_on_scan = false
 end
 
+Dynamoid.logger.level = Logger::FATAL
+
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynamoid
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70308512101780 !ruby/object:Gem::Requirement
+  requirement: &70135836907680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70308512101780
+  version_requirements: *70135836907680
 - !ruby/object:Gem::Dependency
   name: tzinfo
-  requirement: &70308512117280 !ruby/object:Gem::Requirement
+  requirement: &70135836906980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70308512117280
+  version_requirements: *70135836906980
 - !ruby/object:Gem::Dependency
   name: aws-sdk
-  requirement: &70308512115100 !ruby/object:Gem::Requirement
+  requirement: &70135836906300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70308512115100
+  version_requirements: *70135836906300
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70308512112760 !ruby/object:Gem::Requirement
+  requirement: &70135836905060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70308512112760
+  version_requirements: *70135836905060
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70308511927640 !ruby/object:Gem::Requirement
+  requirement: &70135836904480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70308511927640
+  version_requirements: *70135836904480
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70308511926580 !ruby/object:Gem::Requirement
+  requirement: &70135836903920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70308511926580
+  version_requirements: *70135836903920
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70308511926080 !ruby/object:Gem::Requirement
+  requirement: &70135836072500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70308511926080
+  version_requirements: *70135836072500
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70308511925480 !ruby/object:Gem::Requirement
+  requirement: &70135836071700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70308511925480
+  version_requirements: *70135836071700
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70308511924800 !ruby/object:Gem::Requirement
+  requirement: &70135836071100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70308511924800
+  version_requirements: *70135836071100
 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.
@@ -165,6 +165,7 @@ files:
 - spec/dynamoid/associations/has_one_spec.rb
 - spec/dynamoid/associations_spec.rb
 - spec/dynamoid/attributes_spec.rb
+- spec/dynamoid/config_spec.rb
 - spec/dynamoid/document_spec.rb
 - spec/dynamoid/fields_spec.rb
 - spec/dynamoid/finders_spec.rb
@@ -188,7 +189,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2111085687923262415
+      hash: -1286880132188396224
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: