couch_potato 0.2.26 → 0.2.27

data/CHANGES.md

@@ -1,7 +1,13 @@
 ## Changes
 
-### master
+### 0.2.27
+* workaround for Rails apps using bundler: database name was not initialized from couchdb.yml (langalex)
+
+### 0.2.26
 * added to_s(:json) to Date and Time to be able to get properly formatted dates/times for searching with dates/times (langalex)
+* all times are now stored as UTC (langalex)
+* added support for Float attributes (arbovm)
+
 
 ### 0.2.25
 * automatic view updates: when you change the definition of a view couch potato will now update the design document in the database (langalex)

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
-:build: 
-:minor: 2
-:patch: 26
 :major: 0
+:minor: 2
+:patch: 27
+:build: 

data/lib/couch_potato/persistence/type_caster.rb

@@ -25,6 +25,8 @@ module CouchPotato
         if type && !value.instance_of?(type)
           if type == Fixnum
             value.to_s.scan(/\d/).join.to_i unless value.blank?
+          elsif type == Float
+            value.to_s.scan(/\d+\.?\d*/).join.to_f unless value.blank?
           else
             type.json_create value unless value.blank?
           end

data/lib/couch_potato.rb

@@ -7,28 +7,30 @@ require 'ostruct'
 
 JSON.create_id = 'ruby_class'
 
-module CouchPotato
-  Config = Struct.new(:database_name, :validation_framework).new
-  Config.validation_framework = :validatable # default to the validatable gem for validations
-
-  # Returns a database instance which you can then use to create objects and query views. You have to set the CouchPotato::Config.database_name before this works.
-  def self.database
-    @@__database ||= Database.new(self.couchrest_database)
-  end
+unless defined?(CouchPotato)
+  module CouchPotato
+    Config = Struct.new(:database_name, :validation_framework).new
+    Config.validation_framework = :validatable # default to the validatable gem for validations
+
+    # Returns a database instance which you can then use to create objects and query views. You have to set the CouchPotato::Config.database_name before this works.
+    def self.database
+      @@__database ||= Database.new(self.couchrest_database)
+    end
 
-  # Returns the underlying CouchRest database object if you want low level access to your CouchDB. You have to set the CouchPotato::Config.database_name before this works.
-  def self.couchrest_database
-    @@__couchrest_database ||= CouchRest.database(full_url_to_database)
-  end
+    # Returns the underlying CouchRest database object if you want low level access to your CouchDB. You have to set the CouchPotato::Config.database_name before this works.
+    def self.couchrest_database
+      @@__couchrest_database ||= CouchRest.database(full_url_to_database)
+    end
 
-  private
+    private
 
-  def self.full_url_to_database
-    raise('No Database configured. Set CouchPotato::Config.database_name') unless CouchPotato::Config.database_name
-    if CouchPotato::Config.database_name.match(%r{https?://})
-      CouchPotato::Config.database_name
-    else
-      "http://127.0.0.1:5984/#{CouchPotato::Config.database_name}"
+    def self.full_url_to_database
+      raise('No Database configured. Set CouchPotato::Config.database_name') unless CouchPotato::Config.database_name
+      if CouchPotato::Config.database_name.match(%r{https?://})
+        CouchPotato::Config.database_name
+      else
+        "http://127.0.0.1:5984/#{CouchPotato::Config.database_name}"
+      end
     end
   end
 end

data/spec/unit/attributes_spec.rb

@@ -4,6 +4,7 @@ class Plant
   include CouchPotato::Persistence
   property :leaf_count
   property :typed_leaf_count, :type => Fixnum
+  property :typed_leaf_size,  :type => Float
 end
 
 describe "attributes" do
@@ -19,7 +20,7 @@ describe "attributes" do
   describe "attributes" do
     it "should return the attributes" do
       plant = Plant.new(:leaf_count => 1)
-      plant.attributes.should == {:leaf_count => 1, :created_at => nil, :updated_at => nil, :typed_leaf_count => nil}
+      plant.attributes.should == {:leaf_count => 1, :created_at => nil, :updated_at => nil, :typed_leaf_count => nil, :typed_leaf_size => nil}
     end
   end
   
@@ -46,12 +47,13 @@ describe "attributes" do
   end
 
   describe 'typed attributes' do
-    describe "fixnum" do
-      before(:each) do
-        @plant = Plant.new
-      end
-      
-      it "should convert a string into a finum" do
+    
+    before(:each) do
+      @plant = Plant.new
+    end
+    
+    describe "fixnum" do  
+      it "should convert a string into a fixnum" do
         @plant.typed_leaf_count = '4'
         @plant.typed_leaf_count.should == 4
       end
@@ -81,6 +83,43 @@ describe "attributes" do
         @plant.typed_leaf_count.should be_nil
       end
     end
+    
+    describe "float" do  
+      it "should convert a number in a string with a decimal place" do
+        @plant.typed_leaf_size = '0.5001'
+        @plant.typed_leaf_size.should == 0.5001
+      end
+
+      it "should convert a number in a string without a decimal place" do
+        @plant.typed_leaf_size = '5'
+        @plant.typed_leaf_size.should == 5.0
+      end
+
+      it "should leave a float as it is" do
+        @plant.typed_leaf_size = 0.5
+        @plant.typed_leaf_size.should == 0.5
+      end
+      
+      it "should leave nil as is" do
+        @plant.typed_leaf_size = nil
+        @plant.typed_leaf_size.should be_nil
+      end
+      
+      it "should set the attributes to zero if a string given" do
+        @plant.typed_leaf_size = 'x'
+        @plant.typed_leaf_size.should == 0
+      end
+      
+      it "should parse numbers out of a string" do
+        @plant.typed_leaf_size = 'x00.123'
+        @plant.typed_leaf_size.should == 0.123
+      end
+      
+      it "should set the attributes to nil if given a blank string" do
+        @plant.typed_leaf_size = ''
+        @plant.typed_leaf_size.should be_nil
+      end
+    end
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: couch_potato
 version: !ruby/object:Gem::Version 
-  version: 0.2.26
+  version: 0.2.27
 platform: ruby
 authors: 
 - Alexander Lang
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-17 00:00:00 +01:00
+date: 2010-03-05 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency