lib/core_ext/string.rb spec/unit/string_spec.rb @@ -1,11 +1,11 @@ class Time def to_json(*a) - self.strftime("%Y/%m/%d %H:%M:%S %z") + strftime("%Y/%m/%d %H:%M:%S %z") end -end - -class Time - def self.json_create(*o) - parse(*o) + + def self.parse string + return nil if string.nil? + d = DateTime.parse(string).new_offset + self.utc(d.year, d.month, d.day, d.hour, d.min, d.sec) end end lib/core_ext/time.rb @@ -1,4 +1,3 @@ -require 'active_support' require 'couchrest' require 'json' require 'json/add/core' @@ -15,6 +14,7 @@ end require File.dirname(__FILE__) + '/core_ext/object' require File.dirname(__FILE__) + '/core_ext/time' +require File.dirname(__FILE__) + '/core_ext/string' require File.dirname(__FILE__) + '/couch_potato/persistence' require File.dirname(__FILE__) + '/couch_potato/active_record/compatibility' lib/couch_potato.rb @@ -11,7 +11,7 @@ module CouchPotato module Persistence class ValidationsFailedError < ::Exception; end - class UnsavedRecordError < ::Exception; end + class UnsavedDocumentError < ::Exception; end def self.included(base) base.send :extend, ClassMethods @@ -59,7 +59,7 @@ module CouchPotato end def reload - raise(UnsavedRecordError.new) unless _id + raise(UnsavedDocumentError.new) unless _id json = self.class.db.get _id self.class.properties.each do |property| property.build self, json @@ -74,10 +74,6 @@ module CouchPotato _id end - # def [](name) - # self.send name - # end - def ==(other) other.class == self.class && self.to_json == other.to_json end lib/couch_potato/persistence.rb @@ -50,7 +50,7 @@ module CouchPotato end def item_class_name - @name.to_s.singularize.camelcase + @name.to_s.camelize end end lib/couch_potato/persistence/belongs_to_property.rb @@ -11,20 +11,31 @@ module CouchPotato def view(name, options) map_function = options[:map] || map_function(options[:key], options[:properties]) basic_view_options = options[:properties] || options[:map] ? {} : {:include_docs => true} - (class << self; self; end).instance_eval do + self.class.instance_eval do define_method name do |view_options = {}| rows = ViewQuery.new(self.name.underscore, name, map_function).query_view!(basic_view_options.merge(view_options)) - rows['rows'].map{|row| self.new(row['doc'] || row['value'].merge(:_id => row['id']))} + rows['rows'].map{|row| + self.json_create(row['doc'] || row['value'].merge(:_id => row['id'])) + } end end end def map_function(key, properties) "function(doc) { - emit(doc.#{key}, #{properties_for_map(properties)}); + emit(#{formatted_key(key)}, #{properties_for_map(properties)}); }" end + def formatted_key(key) + if key.is_a? Array + '[' + key.map{|attribute| formatted_key(attribute)}.join(', ') + ']' + else + "doc['#{key}']" + end + + end + def properties_for_map(properties) if properties.nil? 'null' lib/couch_potato/persistence/custom_view.rb @@ -37,8 +37,8 @@ module CouchPotato instance = self.new instance.created_at = Time.parse(json['created_at']) instance.updated_at = Time.parse(json['updated_at']) - instance._id = json['_id'] - instance._rev = json['_rev'] + instance._id = json[:_id] || json['_id'] + instance._rev = json[:_rev] || json['_rev'] properties.each do |property| property.build(instance, json) end lib/couch_potato/persistence/json.rb @@ -38,7 +38,7 @@ module CouchPotato end def build(object, json) - object.send "#{name}=", json.stringify_keys[name.to_s] + object.send "#{name}=", json[name.to_s] || json[name.to_sym] end def dirty?(object) lib/couch_potato/persistence/simple_property.rb @@ -2,6 +2,6 @@ require File.dirname(__FILE__) + '/../lib/couch_potato' -CouchPotato::Config.database_name = YAML::load(File.read(RAILS_ROOT + '/config/couchdb.yml'))[RAILS_ENV] +CouchPotato::Config.database_name = YAML::load(File.read(Rails.root.to_s + '/config/couchdb.yml'))[RAILS_ENV] RAILS_DEFAULT_LOGGER.info "** couch_potato: initialized from #{__FILE__}" rails/init.rb @@ -8,6 +8,7 @@ class Build view :timeline, :key => :time view :minimal_timeline, :key => :time, :properties => [:state] + view :key_array_timeline, :key => [:time, :state] view :custom_timeline, :map => "function(doc) { emit(doc._id, {state: 'custom_' + doc.state}); }" end @@ -18,7 +19,7 @@ describe 'view' do end it "should return instances of the class" do - Build.db.save_doc({:state => 'success', :time => '2008-01-01'}) + Build.create!(:state => 'success', :time => '2008-01-01') Build.timeline.map(&:class).should == [Build] end @@ -48,9 +49,11 @@ describe 'view' do describe "no properties defined" do it "should assign all properties to the objects by default" do - Build.db.save_doc({:state => 'success', :time => '2008-01-01'}) - Build.timeline.first.state.should == 'success' - Build.timeline.first.time.should == '2008-01-01' + id = Build.db.save_doc({:state => 'success', :time => '2008-01-01'})['id'] + result = Build.timeline.first + result.state.should == 'success' + result.time.should == '2008-01-01' + result._id.should == id end end @@ -71,4 +74,11 @@ describe 'view' do end end + describe "with array as key" do + it "should create a map function with the composite key" do + CouchPotato::Persistence::ViewQuery.should_receive(:new).with(anything, anything, string_matching(/emit\(\[doc\['time'\], doc\['state'\]\]/)).and_return(stub('view query').as_null_object) + Build.key_array_timeline + end + end + end \ No newline at end of file spec/custom_view_spec.rb @@ -21,4 +21,10 @@ def recreate_db CouchPotato::Persistence.Db.delete! rescue nil CouchPotato::Persistence.Server.create_db CouchPotato::Config.database_name end -recreate_db \ No newline at end of file +recreate_db + +Spec::Matchers.create :string_matching do |regex| + match do |string| + string =~ regex + end +end spec/spec_helper.rb e0fedeb9dd61393be704755cffa3bdece1642b01 Alexander Lang alex@upstream-berlin.com http://github.com/langalex/couch_potato/commit/0f5423210c4949b41fa10c1ecc118e2b1b078804 0f5423210c4949b41fa10c1ecc118e2b1b078804 2009-03-28T16:25:26-07:00 2009-03-28T16:25:26-07:00 removed activesupport dependency, custom views now support arrays as keys 318a0c857947230efdf83c4739b23d4552aae6ba Alexander Lang alex@upstream-berlin.com