simply_stored 0.3.4 → 0.3.5

data/lib/simply_stored.rb

@@ -4,7 +4,7 @@ require File.expand_path(File.dirname(__FILE__) + '/simply_stored/storage')
 require File.expand_path(File.dirname(__FILE__) + '/simply_stored/class_methods_base')
 
 module SimplyStored
-  VERSION = '0.3.4'
+  VERSION = '0.3.5'
   class Error < RuntimeError; end
   class RecordNotFound < RuntimeError; end
-end
+end

data/lib/simply_stored/couch/validations.rb

@@ -62,7 +62,9 @@ module SimplyStored
       
       def validates_uniqueness_of(*args)
         args.each do |name|
-          view "by_#{name}", :key => name
+          if not respond_to?("by_#{name}")
+            view "by_#{name}", :key => name
+          end
         end
         
         add_validations(args, ValidatesUniquenessOf)
@@ -71,4 +73,4 @@ module SimplyStored
   end
 end
 
-  
+  

data/test/fixtures/couch.rb

@@ -87,6 +87,14 @@ class UniqueUser
   validates_uniqueness_of :name
 end
 
+class UniqueUserWithAView
+  include SimplyStored::Couch
+  
+  view :by_name, :key => :email
+  property :name
+  validates_uniqueness_of :name
+end
+
 class CountMe
   include SimplyStored::Couch
   
@@ -199,4 +207,4 @@ class Servant
   include SimplyStored::Couch
   
   belongs_to :master
-end
+end

data/test/simply_stored_couch_test.rb

@@ -1238,6 +1238,15 @@ class CouchTest < Test::Unit::TestCase
           user = UniqueUser.create(:name => "Host Master")
           assert_equal "Name is already taken", user.errors.on(:name)
         end
+        
+        should 'create a view to check with' do
+          assert UniqueUser.respond_to?(:by_name)
+          assert_equal :name, UniqueUser.by_name.send(:options)[:key]
+        end
+
+        should 'not overwrite the view when a custom one already exists' do
+          assert_equal :email, UniqueUserWithAView.by_name.send(:options)[:key]
+        end
       end
     end
     

data/test/test_helper.rb

@@ -4,7 +4,8 @@ require 'shoulda'
 require 'mocha'
 require 'active_support'
 require 'active_support/testing/assertions'
-
+$:.unshift(File.expand_path(File.dirname(__FILE__) + "/../lib"))
+puts File.expand_path(File.dirname(__FILE__) + "/lib")
 require 'simply_stored/couch'
 require 'simply_stored/simpledb'
 

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: simply_stored
 version: !ruby/object:Gem::Version 
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 3
-  - 4
-  version: 0.3.4
+  - 5
+  version: 0.3.5
 platform: ruby
 authors: 
 - Mathias Meyer, Jonathan Weiss
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-17 00:00:00 +02:00
+date: 2010-07-15 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rest-client
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 1
         - 4
@@ -35,9 +38,11 @@ dependencies:
   name: couch_potato
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 9
         segments: 
         - 0
         - 2
@@ -49,9 +54,11 @@ dependencies:
   name: activesupport
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -61,9 +68,11 @@ dependencies:
   name: mattmatt-validatable
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -102,6 +111,109 @@ files:
 - lib/simply_stored/simpledb/storag.rb
 - lib/simply_stored/simpledb/validations.rb
 - lib/simply_stored/storage.rb
+- test/custom_views_test.rb
+- test/fixtures/couch.rb
+- test/fixtures/simpledb/item.rb
+- test/fixtures/simpledb/item_daddy.rb
+- test/fixtures/simpledb/log_item.rb
+- test/fixtures/simpledb/namespace_bar.rb
+- test/fixtures/simpledb/namespace_foo.rb
+- test/fixtures/simpledb/protected_item.rb
+- test/simply_stored_couch_test.rb
+- test/simply_stored_simpledb_test.rb
+- test/test_helper.rb
+- test/vendor/dhaka-2.2.1/lib/dhaka/dot/dot.rb
+- test/vendor/dhaka-2.2.1/lib/dhaka/evaluator/evaluator.rb
+- test/vendor/dhaka-2.2.1/lib/dhaka/grammar/closure_hash.rb
+- test/vendor/dhaka-2.2.1/lib/dhaka/grammar/grammar.rb
+- test/vendor/dhaka-2.2.1/lib/dhaka/grammar/grammar_symbol.rb
+- test/vendor/dhaka-2.2.1/lib/dhaka/grammar/precedence.rb
+- test/vendor/dhaka-2.2.1/lib/dhaka/grammar/production.rb
+- test/vendor/dhaka-2.2.1/lib/dhaka/lexer/accept_actions.rb
+- test/vendor/dhaka-2.2.1/lib/dhaka/lexer/alphabet.rb
+- test/vendor/dhaka-2.2.1/lib/dhaka/lexer/compiled_lexer.rb
+- test/vendor/dhaka-2.2.1/lib/dhaka/lexer/dfa.rb
+- test/vendor/dhaka-2.2.1/lib/dhaka/lexer/lexeme.rb
+- test/vendor/dhaka-2.2.1/lib/dhaka/lexer/lexer.rb
+- test/vendor/dhaka-2.2.1/lib/dhaka/lexer/lexer_run.rb
+- test/vendor/dhaka-2.2.1/lib/dhaka/lexer/regex_grammar.rb
+- test/vendor/dhaka-2.2.1/lib/dhaka/lexer/regex_parser.rb
+- test/vendor/dhaka-2.2.1/lib/dhaka/lexer/regex_tokenizer.rb
+- test/vendor/dhaka-2.2.1/lib/dhaka/lexer/specification.rb
+- test/vendor/dhaka-2.2.1/lib/dhaka/lexer/state.rb
+- test/vendor/dhaka-2.2.1/lib/dhaka/lexer/state_machine.rb
+- test/vendor/dhaka-2.2.1/lib/dhaka/parser/action.rb
+- test/vendor/dhaka-2.2.1/lib/dhaka/parser/channel.rb
+- test/vendor/dhaka-2.2.1/lib/dhaka/parser/compiled_parser.rb
+- test/vendor/dhaka-2.2.1/lib/dhaka/parser/conflict.rb
+- test/vendor/dhaka-2.2.1/lib/dhaka/parser/item.rb
+- test/vendor/dhaka-2.2.1/lib/dhaka/parser/parse_result.rb
+- test/vendor/dhaka-2.2.1/lib/dhaka/parser/parse_tree.rb
+- test/vendor/dhaka-2.2.1/lib/dhaka/parser/parser.rb
+- test/vendor/dhaka-2.2.1/lib/dhaka/parser/parser_methods.rb
+- test/vendor/dhaka-2.2.1/lib/dhaka/parser/parser_run.rb
+- test/vendor/dhaka-2.2.1/lib/dhaka/parser/parser_state.rb
+- test/vendor/dhaka-2.2.1/lib/dhaka/parser/token.rb
+- test/vendor/dhaka-2.2.1/lib/dhaka/runtime.rb
+- test/vendor/dhaka-2.2.1/lib/dhaka/tokenizer/tokenizer.rb
+- test/vendor/dhaka-2.2.1/lib/dhaka.rb
+- test/vendor/dhaka-2.2.1/test/all_tests.rb
+- test/vendor/dhaka-2.2.1/test/arithmetic/arithmetic_evaluator.rb
+- test/vendor/dhaka-2.2.1/test/arithmetic/arithmetic_evaluator_test.rb
+- test/vendor/dhaka-2.2.1/test/arithmetic/arithmetic_grammar.rb
+- test/vendor/dhaka-2.2.1/test/arithmetic/arithmetic_grammar_test.rb
+- test/vendor/dhaka-2.2.1/test/arithmetic/arithmetic_test_methods.rb
+- test/vendor/dhaka-2.2.1/test/arithmetic/arithmetic_tokenizer.rb
+- test/vendor/dhaka-2.2.1/test/arithmetic/arithmetic_tokenizer_test.rb
+- test/vendor/dhaka-2.2.1/test/arithmetic_precedence/arithmetic_precedence_evaluator.rb
+- test/vendor/dhaka-2.2.1/test/arithmetic_precedence/arithmetic_precedence_grammar.rb
+- test/vendor/dhaka-2.2.1/test/arithmetic_precedence/arithmetic_precedence_grammar_test.rb
+- test/vendor/dhaka-2.2.1/test/arithmetic_precedence/arithmetic_precedence_lexer_specification.rb
+- test/vendor/dhaka-2.2.1/test/arithmetic_precedence/arithmetic_precedence_parser_test.rb
+- test/vendor/dhaka-2.2.1/test/brackets/bracket_grammar.rb
+- test/vendor/dhaka-2.2.1/test/brackets/bracket_tokenizer.rb
+- test/vendor/dhaka-2.2.1/test/brackets/brackets_test.rb
+- test/vendor/dhaka-2.2.1/test/chittagong/chittagong_driver.rb
+- test/vendor/dhaka-2.2.1/test/chittagong/chittagong_driver_test.rb
+- test/vendor/dhaka-2.2.1/test/chittagong/chittagong_evaluator.rb
+- test/vendor/dhaka-2.2.1/test/chittagong/chittagong_evaluator_test.rb
+- test/vendor/dhaka-2.2.1/test/chittagong/chittagong_grammar.rb
+- test/vendor/dhaka-2.2.1/test/chittagong/chittagong_lexer.rb
+- test/vendor/dhaka-2.2.1/test/chittagong/chittagong_lexer_specification.rb
+- test/vendor/dhaka-2.2.1/test/chittagong/chittagong_lexer_test.rb
+- test/vendor/dhaka-2.2.1/test/chittagong/chittagong_parser.rb
+- test/vendor/dhaka-2.2.1/test/chittagong/chittagong_parser_test.rb
+- test/vendor/dhaka-2.2.1/test/chittagong/chittagong_test.rb
+- test/vendor/dhaka-2.2.1/test/core/another_lalr_but_not_slr_grammar.rb
+- test/vendor/dhaka-2.2.1/test/core/compiled_parser_test.rb
+- test/vendor/dhaka-2.2.1/test/core/dfa_test.rb
+- test/vendor/dhaka-2.2.1/test/core/evaluator_test.rb
+- test/vendor/dhaka-2.2.1/test/core/grammar_test.rb
+- test/vendor/dhaka-2.2.1/test/core/lalr_but_not_slr_grammar.rb
+- test/vendor/dhaka-2.2.1/test/core/lexer_test.rb
+- test/vendor/dhaka-2.2.1/test/core/malformed_grammar.rb
+- test/vendor/dhaka-2.2.1/test/core/malformed_grammar_test.rb
+- test/vendor/dhaka-2.2.1/test/core/nullable_grammar.rb
+- test/vendor/dhaka-2.2.1/test/core/parse_result_test.rb
+- test/vendor/dhaka-2.2.1/test/core/parser_state_test.rb
+- test/vendor/dhaka-2.2.1/test/core/parser_test.rb
+- test/vendor/dhaka-2.2.1/test/core/precedence_grammar.rb
+- test/vendor/dhaka-2.2.1/test/core/precedence_grammar_test.rb
+- test/vendor/dhaka-2.2.1/test/core/rr_conflict_grammar.rb
+- test/vendor/dhaka-2.2.1/test/core/simple_grammar.rb
+- test/vendor/dhaka-2.2.1/test/core/sr_conflict_grammar.rb
+- test/vendor/dhaka-2.2.1/test/dhaka_test_helper.rb
+- test/vendor/dhaka-2.2.1/test/fake_logger.rb
+- test/vendor/simplerdb-0.2/lib/simplerdb/client_exception.rb
+- test/vendor/simplerdb-0.2/lib/simplerdb/db.rb
+- test/vendor/simplerdb-0.2/lib/simplerdb/query_language.rb
+- test/vendor/simplerdb-0.2/lib/simplerdb/server.rb
+- test/vendor/simplerdb-0.2/lib/simplerdb/servlet.rb
+- test/vendor/simplerdb-0.2/lib/simplerdb.rb
+- test/vendor/simplerdb-0.2/test/functional_test.rb
+- test/vendor/simplerdb-0.2/test/query_evaluator_test.rb
+- test/vendor/simplerdb-0.2/test/query_parser_test.rb
+- test/vendor/simplerdb-0.2/test/simplerdb_test.rb
 has_rdoc: true
 homepage: http://github.com/peritor/simply_stored
 licenses: []
@@ -112,23 +224,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Convenience layer for CouchDB and SimpleDB