couchup 0.0.8 → 0.0.9

data/lib/couchup.rb

@@ -14,6 +14,7 @@ Couchup::Commands.constants.each do |c|
         instance.run(*args)
       rescue 
         puts $!.inspect
+        puts $!.backtrace
       end
     end"
 end

data/lib/couchup/commands/create.rb

@@ -13,27 +13,28 @@ module Couchup
       
       def create_view(name)
         raise "Please set your EDITOR env variable before using view" if ENV['EDITOR'].nil? 
-        view = View.new(name)  
+        view = ::Couchup::View.new(name)  
         file = Tempfile.new(name.gsub("/", "_"))
         tmp_file_path = file.path
         file.write("------BEGIN Map-------\n")
-        file.write(view.map) if view.map?
-        file.write("------END------\n\n")
+        file.write( view.map? ? view.map : ::Couchup::View::MAP_TEMPLATE)
+        file.write("\n------END------\n")
         
-        file.write("------BEGIN Reduce(Remove the function if you don't want a reduce)-------\n")
-        file.write(view.reduce) if view.reduce?
-        file.write("------END------\n")
+        file.write("\n------BEGIN Reduce(Remove the function if you don't want a reduce)-------\n")
+        file.write(view.reduce? ? view.reduce: ::Couchup::View::REDUCE_TEMPLATE )
+        file.write("\n------END------\n")
+        file.write("\nDelete Everything to do nothing.\n")
         file.close
         
         `#{ENV['EDITOR']} #{tmp_file_path}`
         contents = File.open(tmp_file_path).read
-        ::Couchup::View.create(name, contents)
+        ::Couchup::View.create(name, contents) unless contents.blank?
         file.close
         file.unlink
       end
       
       def self.describe
-        "Creates a new database and switches to the database"
+        "Creates a new database and switches to the database if using create :database, :foo or a new view if using create :view,'Rider/by_number'"
       end
     end
   end

data/lib/couchup/extensions/nil_class.rb

@@ -0,0 +1,5 @@
+class NilClass
+  def blank?
+    true
+  end
+end

data/lib/couchup/extensions/string.rb

@@ -1,6 +1,6 @@
 class String
   def blank?
-    nil || empty?
+    nil || strip.empty?
   end
   
   def constantize

data/lib/couchup/version.rb

@@ -1,3 +1,3 @@
 module Couchup
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/lib/couchup/view.rb

@@ -1,25 +1,65 @@
 module Couchup
   class View
+    MAP_TEMPLATE = "function(doc){\n}\n"
+    REDUCE_TEMPLATE = ""
     
     def initialize(name)
       @design, @name = name.split "/"
-      design, name = name.split "/"
       begin
-        doc = Couchup.database.get("_design/#{design}")
+        @doc = Couchup.database.get("_design/#{@design}")
       rescue
-        # handle creation of new design doc.
+        puts "Design #{@design} not found creating a new one"
+        @doc = {"_id" => "_design/#{@design}", :language => 'javascript', :views => {}}
+        save
+        @doc = Couchup.database.get("_design/#{@design}")
       end
     end
+    
+    def save
+      Couchup.database.save_doc(@doc)  
+    end
+    
+    def map
+      @doc["views"][@name]["map"]
+    end
+    
+    def map=(fun)
+      if map?
+        @doc["views"][@name]["map"] = fun 
+      else
+        @doc["views"][@name] = {:map => fun}
+      end
+    end
+
+    def reduce
+      @doc["views"][@name]["reduce"]
+    end
 
+    def reduce=(fun)
+      if reduce?
+        @doc["views"][@name]["reduce"] = fun
+      else
+        @doc["views"][@name] ={:reduce => fun}
+      end
+    end
+
+    def map?
+      @doc["views"][@name] && !@doc["views"][@name]["map"].blank?
+    end
+
+    def reduce?
+      @doc["views"][@name] && !@doc["views"][@name]["reduce"].blank?
+    end
+    
+    
     def self.create(name, file_contents)
-      v = doc["views"][name]
+      v = new(name)
+      
       map, reduce = parse(file_contents)
-
-      puts "View Exists overwriting." unless v.nil? 
-      v = (doc["views"][name]= {})  if v.nil? 
-      v["map"] = map
-      v["reduce"] = reduce unless reduce.blank?
-      Couchup.database.save_doc(doc)
+      v.map = map
+      v.reduce = reduce unless reduce.blank?
+      puts v.inspect
+      v.save
     end
     
     def self.parse(file_contents)

metadata

@@ -2,7 +2,7 @@
 name: couchup
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors: 
 - V Sreekanth
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-25 00:00:00 +05:30
+date: 2011-02-26 00:00:00 +05:30
 default_executable: ey
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -135,6 +135,7 @@ files:
 - lib/couchup/commands/view.rb
 - lib/couchup/couchup.rb
 - lib/couchup/extensions/array.rb
+- lib/couchup/extensions/nil_class.rb
 - lib/couchup/extensions/string.rb
 - lib/couchup/extensions/symbol.rb
 - lib/couchup/mapreduce.rb