couchmodel 0.1.4 → 0.1.5

data/Rakefile

@@ -9,8 +9,8 @@ task :default => :spec
 
 specification = Gem::Specification.new do |specification|
   specification.name              = "couchmodel"
-  specification.version           = "0.1.4"
-  specification.date              = "2010-07-12"
+  specification.version           = "0.1.5"
+  specification.date              = "2010-07-15"
 
   specification.authors           = [ "Philipp Bruell" ]
   specification.email             = "b.phifty@gmail.com"

data/lib/couch_model/active_model.rb

@@ -78,6 +78,21 @@ module CouchModel
       @changed_attributes = { }
     end
 
+    def merge_multiparameter_attributes(attributes)
+      result = attributes.stringify_keys
+      self.class.key_definitions.each do |key, definition|
+        case definition[:type]
+          when :date
+            parameters = attributes.values_at(*(1..3).map{ |index| "#{key}(#{index}i)" }).map(&:to_i)
+            result[key] = Date.civil *parameters rescue nil unless result[key].is_a?(Date)
+          when :time
+            parameters = attributes.values_at(*(1..6).map{ |index| "#{key}(#{index}i)" }).map(&:to_i)
+            result[key] = Time.mktime *parameters rescue nil unless result[key].is_a?(Time)
+        end
+      end
+      result
+    end
+
     class << self
 
       alias key_accessor_without_dirty key_accessor

data/lib/couch_model/base.rb

@@ -31,12 +31,13 @@ module CouchModel
       @attributes = { Configuration::CLASS_KEY => klass.to_s }
       self.attributes = attributes
 
-      klass.defaults.each do |key, value|
-        @attributes[key] = value unless @attributes.has_key?(key)
-      end      
+      klass.key_definitions.each do |key, definition|
+        @attributes[key] = definition[:default] if definition.has_key?(:default) && !@attributes.has_key?(key)
+      end
     end
 
     def attributes=(attributes)
+      attributes = merge_multiparameter_attributes attributes
       attributes.each { |key, value| self.send :"#{key}=", value if self.respond_to?(:"#{key}=") }
     end
 
@@ -96,7 +97,7 @@ module CouchModel
     private
 
     def rev=(value)
-      @attributes["_rev"] = value      
+      @attributes["_rev"] = value
     end
 
     def load_response(response)
@@ -130,15 +131,6 @@ module CouchModel
       raise error
     end
 
-    def self.set_default(key, value)
-      @defaults ||= { }
-      @defaults[key.to_s] = value
-    end
-
-    def self.defaults
-      @defaults || { }
-    end    
-
     def self.create(*arguments)
       model = new *arguments
       model.save ? model : nil
@@ -152,4 +144,4 @@ module CouchModel
 
   end
 
-end
+end

data/lib/couch_model/base/accessor.rb

@@ -15,20 +15,22 @@ module CouchModel
 
       module ClassMethods
 
+        attr_reader :key_definitions
+
         def key_reader(key, options = { })
           raise ArgumentError, "method #{key} is already defined" if method_defined?(:"#{key}")
-          default, type = options.values_at :default, :type
-          set_default key, default if default
-          send :"define_#{type || :string}_reader", key
+          set_key_definition key, options
+          type = options[:type] || :string
+          send :"define_#{type}_reader", key
         rescue NoMethodError
           raise ArgumentError, "type #{type} isn't supported"
         end
 
         def key_writer(key, options = { })
           raise ArgumentError, "method #{key}= is already defined" if method_defined?(:"#{key}=")
-          default, type = options.values_at :default, :type
-          set_default key, default if default
-          send :"define_#{type || :string}_writer", key
+          set_key_definition key, options
+          type = options[:type] || :string
+          send :"define_#{type}_writer", key
         rescue NoMethodError
           raise ArgumentError, "type #{type} isn't supported"
         end
@@ -40,6 +42,11 @@ module CouchModel
 
         private
 
+        def set_key_definition(key, definition)
+          @key_definitions ||= { }
+          @key_definitions[key.to_s] = definition
+        end
+
         def define_integer_reader(name)
           define_method :"#{name}" do
             @attributes[name.to_s].to_i
@@ -86,7 +93,7 @@ module CouchModel
 
         def define_time_writer(name)
           define_method :"#{name}=" do |value|
-            @attributes[name.to_s] = value ? value.strftime("%Y-%m-%d %H:%M:%S %z") : nil
+            @attributes[name.to_s] = value.is_a?(Time) ? value.strftime("%Y-%m-%d %H:%M:%S %z") : value
           end
         end
 

data/spec/integration/models.rb

@@ -14,8 +14,9 @@ class User < CouchModel::Base
   setup_database DATABASE
 
   key_accessor :username
-  key_accessor :email, :default => "no email"
+  key_accessor :email,    :default => "no email"
   key_accessor :birthday, :type => :date
+  key_accessor :lunch,    :type => :time
 
   has_many :memberships,
            :class_name  => "Membership",
@@ -35,8 +36,24 @@ class Membership < CouchModel::Base
 end
 
 def create_users_and_memberships
-  @user_one = User.create :username => "user one", :birthday => Date.parse("2000-07-07")
-  @user_two = User.create :username => "user two", :birthday => nil
-  @membership_one = Membership.create :created_at => Time.parse("2010-07-07"), :user => @user_one
-  @membership_two = Membership.create :created_at => Time.parse("2010-07-07"), :user => @user_two
+  @user_one = User.create :username => "user one",
+                          :birthday => Date.parse("2000-07-07"),
+                          :lunch    => Time.parse("2010/10/21 12:13:14")
+
+  @user_two = User.create :username => "user two",
+                          "birthday(1i)" => "2010",
+                          "birthday(2i)" => "2",
+                          "birthday(3i)" => "20",
+                          "lunch(1i)" => "2010",
+                          "lunch(2i)" => "10",
+                          "lunch(3i)" => "21",
+                          "lunch(4i)" => "12",
+                          "lunch(5i)" => "13",
+                          "lunch(6i)" => "14"
+
+  @membership_one = Membership.create :created_at => Time.parse("2010-07-07"),
+                                      :user => @user_one
+
+  @membership_two = Membership.create :created_at => Time.parse("2010-07-07"),
+                                      :user => @user_two
 end

data/spec/integration/new_model_spec.rb

@@ -6,7 +6,16 @@ describe "integration" do
   use_real_transport!
 
   before :each do
-    @user = User.new :username => "user"
+    @user = User.new "username" => "user",
+                     "birthday(1i)" => "2010",
+                     "birthday(2i)" => "3",
+                     "birthday(3i)" => "15",
+                     "lunch(1i)" => "2010",
+                     "lunch(2i)" => "10",
+                     "lunch(3i)" => "21",
+                     "lunch(4i)" => "12",
+                     "lunch(5i)" => "13",
+                     "lunch(6i)" => "14"
   end
 
   describe "setup" do
@@ -29,6 +38,22 @@ describe "integration" do
 
   end
 
+  describe "birthday" do
+
+    it "should return the correct date" do
+      @user.birthday.should == Date.parse("2010/03/15")
+    end
+
+  end
+
+  describe "lunch" do
+
+    it "should return the correct time" do
+      @user.lunch.should == Time.parse("2010/10/21 12:13:14")
+    end
+    
+  end
+
   describe "save" do
 
     it "should create the model" do

data/spec/integration/saved_model_spec.rb

@@ -70,11 +70,24 @@ describe "integration" do
 
   describe "birthday" do
 
-    it "should return a time" do
-      @user_one.birthday.should be_instance_of(Date)
-      user = User.find @user_one.id
-      user.birthday.should be_instance_of(Date)
-      @user_two.birthday.should be_nil
+    it "should return the correct date" do
+      @user_one.reload
+      @user_one.birthday.should == Date.parse("2000/07/07")
+
+      @user_two.reload
+      @user_two.birthday.should == Date.parse("2010/02/20")
+    end
+
+  end
+
+  describe "lunch" do
+
+    it "should return the correct time" do
+      @user_one.reload
+      @user_one.lunch.should == Time.parse("2010/10/21 12:13:14")
+
+      @user_two.reload
+      @user_two.lunch.should == Time.parse("2010/10/21 12:13:14")
     end
 
   end

data/spec/lib/couch_model/active_model_spec.rb

@@ -7,6 +7,8 @@ class ActiveTestModel < CouchModel::Base
 
   key_accessor :name
   key_accessor :email
+  key_accessor :date, :type => :date
+  key_accessor :time, :type => :time
 
   validates_presence_of :name
 
@@ -125,6 +127,31 @@ describe ActiveTestModel do
 
   end
 
+  describe "attributes=" do
+
+    it "should convert multiple date parameters into one date field" do
+      @model.attributes = {
+        "date(1i)" => "2010",
+        "date(2i)" => "3",
+        "date(3i)" => "15"
+      }
+      @model.date.should == Date.parse("2010/03/15")
+    end
+
+    it "should convert multiple time parameters into one time field" do
+      @model.attributes = {
+        "time(1i)" => "2010",
+        "time(2i)" => "3",
+        "time(3i)" => "15",
+        "time(4i)" => "10",
+        "time(5i)" => "11",
+        "time(6i)" => "12"
+      }
+      @model.time.should == Time.parse("2010/03/15 10:11:12")
+    end
+    
+  end
+
   describe "save" do
 
     before :each do

data/spec/lib/couch_model/base/accessor_spec.rb

@@ -81,7 +81,7 @@ describe AccessorTestModel do
     end
 
     it "should set a default value" do
-      AccessorTestModel.defaults["test_two"].should == "test default"
+      AccessorTestModel.key_definitions["test_two"].should == { :default => "test default" }
     end
 
     it "should raise an ArgumentError on unsupported type" do
@@ -103,11 +103,19 @@ describe AccessorTestModel do
     it "should define writers for date types" do
       @model.test_date = Date.parse("2010-07-07")
       @model.attributes["test_date"].should == "2010-07-07"
+
+      @model.test_date = "2010-07-07"
+      @model.attributes["test_date"].should == "2010-07-07"
+      @model.test_date.should == Date.parse("2010-07-07")
     end
 
     it "should define writers for time types" do
       @model.test_time = Time.parse("2010-07-07 10:10:10")
       @model.attributes["test_time"].should == "2010-07-07 10:10:10 +0200"
+
+      @model.test_time = "2010-07-07 10:10:10"
+      @model.attributes["test_time"].should == "2010-07-07 10:10:10"
+      @model.test_time.should == Time.parse("2010-07-07 10:10:10")
     end
 
     it "should raise an exception if the writer method is already defined" do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Philipp Bruell
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-12 00:00:00 +02:00
+date: 2010-07-15 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency