zdzolton-cambric 0.7.0 → 0.7.1

data/README.rdoc

@@ -104,7 +104,7 @@ by the application.
 
 * Install gems:
 
-  $ sudo gem install jchris-couchrest zdzolton-cambric
+  $ sudo gem install mattetti-couchrest zdzolton-cambric
 
 * Configure Rails:
   * create a config/initializers/cambric.rb file as follows:

data/VERSION

@@ -1 +1 @@
-0.7.0
+0.7.1

data/cambric.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cambric}
-  s.version = "0.7.0"
+  s.version = "0.7.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Zachary Zolton", "Geoff Buesing"]
-  s.date = %q{2009-08-27}
+  s.date = %q{2009-09-01}
   s.email = %q{zachary.zolton@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -29,6 +29,11 @@ Gem::Specification.new do |s|
      "spec/cambric/cambric_spec.rb",
      "spec/cambric/configurator_spec.rb",
      "spec/cambric/test_helpers_spec.rb",
+     "spec/fixtures/twitter-clone-modified/tweets/views/by_follower_and_created_at/map.js",
+     "spec/fixtures/twitter-clone-modified/users/views/bad/map.js",
+     "spec/fixtures/twitter-clone-modified/users/views/bad/reduce.js",
+     "spec/fixtures/twitter-clone-modified/users/views/followers/map.js",
+     "spec/fixtures/twitter-clone-modified/users/views/followers/reduce.js",
      "spec/fixtures/twitter-clone/tweets/views/by_follower_and_created_at/map.js",
      "spec/fixtures/twitter-clone/users/views/bad/map.js",
      "spec/fixtures/twitter-clone/users/views/bad/reduce.js",

data/lib/cambric.rb

@@ -46,12 +46,12 @@ module Cambric
     @databases.each_pair{ |name,db| db.server.create_db db.name rescue nil }
   end
   
-  def self.[](database)
-    @databases[database.to_sym]
+  def self.[](database_name)
+    @databases[database_name.to_sym]
   end
   
-  def self.push_design_docs
-    @databases.keys.each{ |db_sym| push_design_doc_for db_sym.to_s }
+  def self.push_design_docs ddoc_name=nil
+    @databases.keys.each{ |db_sym| push_design_doc_for db_sym, ddoc_name }
   end
   
   def self.prepare_databases
@@ -63,14 +63,32 @@ module Cambric
     create_databases!
     push_design_docs
   end
-   
+  
+  def self.prime_view_changes_in_temp
+    ddoc_name = "#{@design_doc_name}-temp"
+    push_design_docs ddoc_name
+    @databases.keys.map do |db_name|
+      Thread.new{ prime_views_for @databases[db_name], ddoc_name }
+    end.each{ |t| t.join }
+  end
+  
 private
 
-  def self.push_design_doc_for database
+  def self.prime_views_for database, ddoc_name=nil
+    ddoc = database.get "_design/#{ddoc_name}"
+    view_name, view_def = ddoc['views'].first
+    opts = { :limit => 1 }
+    opts[:reduce] = false if view_def['reduce']
+    view_url = "#{database.root}/_design/#{ddoc_name}/_view/#{view_name}"
+    %x[curl --silent '#{CouchRest.paramify_url view_url, opts}']
+  end
+
+  def self.push_design_doc_for database_name, ddoc_name=nil
+    database = database_name.to_s
     design_doc_path = File.join @db_dir, database
     if File.exist?(design_doc_path)
       fm = FileManager.new self[database].name, self[database].host
-      fm.push_app design_doc_path, @design_doc_name
+      fm.push_app design_doc_path, ddoc_name || @design_doc_name
     end
   end
     

data/spec/cambric/cambric_spec.rb

@@ -131,6 +131,28 @@ describe Cambric do
       design_doc = Cambric[:tweets].get("_design/twitter-clone")
       design_doc['views']['by_follower_and_created_at'].should_not be_nil
     end
+  
+    describe "after priming modified views in a temp design doc" do
+      before :all do
+        Cambric[:tweets].save_doc :message => 'ohai!',
+                                  :author => 'zach',
+                                  :followers => %w(trevor geoff),
+                                  :created_at => '2009/09/01T12:51:42Z'
+        reconfigure_twitter_clone_to_modified_code
+        Cambric.prime_view_changes_in_temp
+      end
+      
+      it "should be able to hit new views on temp design doc" do
+        db = CouchRest.database('http://127.0.0.1:5984/tweets-testing')
+        result = db.view 'twitter-clone-temp/by_follower_and_created_at', :limit => 1
+        result['rows'].first['key'].should be_a(String)
+      end
+      
+      it "should be able to hit old views on original design doc" do
+        result = Cambric[:tweets].view :by_follower_and_created_at, :limit => 1
+        result['rows'].first['key'].should be_an(Array)
+      end
+    end
   end
   
   describe "when the design doc already exists" do

data/spec/fixtures/twitter-clone-modified/tweets/views/by_follower_and_created_at/map.js

@@ -0,0 +1,7 @@
+function(doc) {
+  var outdoc = { message: doc.message, author: doc.author };
+  doc.followers.push(doc.author);
+  doc.followers.forEach(function(f) {
+      emit('TESTING', outdoc);
+  });
+};

data/spec/fixtures/twitter-clone-modified/users/views/bad/map.js

@@ -0,0 +1,7 @@
+function(doc) {
+  // This should be returned:
+  emit(4, 5);
+  
+  // This should not:
+  emit(doc['some_non_existant_property'].length, null);
+}

data/spec/fixtures/twitter-clone-modified/users/views/bad/reduce.js

@@ -0,0 +1,4 @@
+function(key, values) {
+  // This should throw an error:
+  return values[0]['some_non_existant_property'].length;
+}

data/spec/fixtures/twitter-clone-modified/users/views/followers/map.js

@@ -0,0 +1,6 @@
+function(doc) {
+  // FYI: This example assumes we're using usernames as the doc ID.
+  doc['following'].forEach(function(user) {
+    emit(user, doc['_id']);
+  });
+}

data/spec/fixtures/twitter-clone-modified/users/views/followers/reduce.js

@@ -0,0 +1,7 @@
+function(keys, values, rereduce) {
+  if (rereduce) {
+    return sum(values);
+  } else {
+    return values.length;
+  }
+}

data/spec/spec_helper.rb

@@ -34,6 +34,15 @@ def configure_twitter_clone
   end
 end
 
+def reconfigure_twitter_clone_to_modified_code
+  Cambric.configure do |config|
+    config.design_doc_name = 'twitter-clone'
+    config.db_dir = 'spec/fixtures/twitter-clone-modified'
+    config.environment = 'test'
+    config.databases = TWITTER_CLONE_DATABASES
+  end
+end
+
 def delete_twitter_clone_databases
   %w(users tweets).each{ |db| Cambric[db].delete! rescue nil }
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: zdzolton-cambric
 version: !ruby/object:Gem::Version 
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors: 
 - Zachary Zolton
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-27 00:00:00 -07:00
+date: 2009-09-01 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -49,6 +49,11 @@ files:
 - spec/cambric/cambric_spec.rb
 - spec/cambric/configurator_spec.rb
 - spec/cambric/test_helpers_spec.rb
+- spec/fixtures/twitter-clone-modified/tweets/views/by_follower_and_created_at/map.js
+- spec/fixtures/twitter-clone-modified/users/views/bad/map.js
+- spec/fixtures/twitter-clone-modified/users/views/bad/reduce.js
+- spec/fixtures/twitter-clone-modified/users/views/followers/map.js
+- spec/fixtures/twitter-clone-modified/users/views/followers/reduce.js
 - spec/fixtures/twitter-clone/tweets/views/by_follower_and_created_at/map.js
 - spec/fixtures/twitter-clone/users/views/bad/map.js
 - spec/fixtures/twitter-clone/users/views/bad/reduce.js
@@ -58,7 +63,6 @@ files:
 - spec/spec_helper.rb
 has_rdoc: false
 homepage: http://github.com/zdzolton/cambric
-licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -79,7 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 3
 summary: Opinionated management and usage of CouchDB from your Ruby apps.