couchmodel 0.1.2 → 0.1.3

data/README.rdoc

@@ -38,6 +38,7 @@ To define a model, it's necessary to create a subclass of <tt>CouchModel::Base</
     key_accessor :name
     key_accessor :email
     key_accessor :language, :default => "en"
+    key_accessor :birthday, :type => :date
 
   end
 
@@ -52,7 +53,8 @@ manually by calling <tt>CouchModel::Configuration.setup_databases</tt> and
 
 The method <tt>key_accessor</tt> defined access methods to the given keys of the CouchDB document. It's also possible
 to use <tt>key_reader</tt> and <tt>key_writer</tt> here. If the <tt>:default</tt> option is passed, the key will get
-a default value assigned during initialization of the class.
+a default value assigned during initialization of the class. The <tt>:type</tt> option specifies the type of the
+attribute. Currently the types <tt>:integer</tt>, <tt>:string</tt>, <tt>:date</tt> and <tt>:time</tt> are supported.
 
 == Design documents
 

data/Rakefile

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

data/lib/couch_model/base/accessor.rb

@@ -1,3 +1,4 @@
+require 'time'
 
 module CouchModel
 
@@ -16,18 +17,20 @@ module CouchModel
 
         def key_reader(key, options = { })
           raise ArgumentError, "method #{key} is already defined" if method_defined?(:"#{key}")
-          set_default key, options[:default] if options.has_key?(:default)
-          define_method :"#{key}" do
-            @attributes[key.to_s]
-          end
+          default, type = options.values_at :default, :type
+          set_default key, default if default
+          send :"define_#{type || :string}_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}=")
-          set_default key, options[:default] if options.has_key?(:default)
-          define_method :"#{key}=" do |value|
-            @attributes[key.to_s] = value
-          end
+          default, type = options.values_at :default, :type
+          set_default key, default if default
+          send :"define_#{type || :string}_writer", key
+        rescue NoMethodError
+          raise ArgumentError, "type #{type} isn't supported"
         end
 
         def key_accessor(*arguments)
@@ -35,6 +38,56 @@ module CouchModel
           key_writer *arguments
         end
 
+        private
+
+        def define_integer_reader(name)
+          define_method :"#{name}" do
+            @attributes[name.to_s].to_i
+          end
+        end
+
+        def define_integer_writer(name)
+          define_method :"#{name}=" do |value|
+            @attributes[name.to_s] = value.to_i
+          end
+        end
+
+        def define_string_reader(name)
+          define_method :"#{name}" do
+            @attributes[name.to_s]
+          end
+        end
+
+        def define_string_writer(name)
+          define_method :"#{name}=" do |value|
+            @attributes[name.to_s] = value
+          end
+        end
+
+        def define_date_reader(name)
+          define_method :"#{name}" do
+            Date.parse @attributes[name.to_s]
+          end
+        end
+
+        def define_date_writer(name)
+          define_method :"#{name}=" do |value|
+            @attributes[name.to_s] = value.to_s
+          end
+        end
+
+        def define_time_reader(name)
+          define_method :"#{name}" do
+            Time.parse @attributes[name.to_s]
+          end
+        end
+
+        def define_time_writer(name)
+          define_method :"#{name}=" do |value|
+            @attributes[name.to_s] = value.strftime("%Y-%m-%d %H:%M:%S %z")
+          end
+        end
+
       end
 
     end

data/lib/couch_model/base/association.rb

@@ -39,7 +39,7 @@ module CouchModel
           define_method :"#{reader_name}" do
             klass = Object.const_get class_name
             klass.find self.send(key)
-          end          
+          end
         end
 
         def define_belongs_to_writer(writer_name, class_name, key)

data/spec/integration/associations_spec.rb

@@ -31,8 +31,8 @@ describe "integration" do
     end
 
     it "should use the selector" do
-      @user_one.memberships("yesterday").should include(@membership_one)
-      @user_one.memberships("today").should_not include(@membership_one)
+      @user_one.memberships(Time.parse("2010-07-07").strftime("%Y-%m-%d %H:%M:%S %z")).should include(@membership_one)
+      @user_one.memberships(Time.parse("2010-07-08").strftime("%Y-%m-%d %H:%M:%S %z")).should_not include(@membership_one)
     end
 
   end

data/spec/integration/models.rb

@@ -15,6 +15,7 @@ class User < CouchModel::Base
 
   key_accessor :username
   key_accessor :email, :default => "no email"
+  key_accessor :birthday, :type => :date
 
   has_many :memberships,
            :class_name  => "Membership",
@@ -27,15 +28,15 @@ class Membership < CouchModel::Base
 
   setup_database DATABASE
 
-  key_accessor :created_at
+  key_accessor :created_at, :type => :time
 
   belongs_to :user, :class_name => "User"
 
 end
 
 def create_users_and_memberships
-  @user_one = User.create :username => "user one"
-  @user_two = User.create :username => "user two"
-  @membership_one = Membership.create :created_at => "yesterday", :user => @user_one
-  @membership_two = Membership.create :created_at => "yesterday", :user => @user_two
+  @user_one = User.create :username => "user one", :birthday => Date.parse("2000-07-07")
+  @user_two = User.create :username => "user two", :birthday => Date.parse("2000-07-07")
+  @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/saved_model_spec.rb

@@ -50,12 +50,7 @@ describe "integration" do
   describe "all" do
 
     it "should include the saved user" do
-      begin
-        User.all.should include(@user_one)
-      rescue Object => error
-        puts error.backtrace
-        raise error
-      end
+      User.all.should include(@user_one)
       User.all.should include(@user_two)
     end
 
@@ -73,4 +68,14 @@ describe "integration" do
 
   end
 
+  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)
+    end
+
+  end
+
 end

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

@@ -8,6 +8,12 @@ class AccessorTestModel < CouchModel::Base
   key_reader   :test_one,   :default => "test default"
   key_writer   :test_two,   :default => "test default"
   key_accessor :test_three, :default => "test default"
+
+  key_accessor :test_integer, :type => :integer
+  key_accessor :test_string,  :type => :string
+  key_accessor :test_date,    :type => :date
+  key_accessor :test_time,    :type => :time
+
 end
 
 describe AccessorTestModel do
@@ -30,7 +36,33 @@ describe AccessorTestModel do
       @model.test_one.should == "test default"
     end
 
-    it "should raise an exception if the reader method is already defined" do
+    it "should raise an ArgumentError on unsupported type" do
+      lambda do
+        AccessorTestModel.key_reader :test, :type => :unsupported
+      end.should raise_error(ArgumentError)
+    end
+
+    it "should define readers for integer types" do
+      @model.test_integer = 3
+      @model.test_integer.should be_instance_of(Fixnum)
+    end
+
+    it "should define readers for string types" do
+      @model.test_string = "3"
+      @model.test_string.should be_instance_of(String)
+    end
+
+    it "should define readers for date types" do
+      @model.test_date = Date.today
+      @model.test_date.should be_instance_of(Date)
+    end
+
+    it "should define readers for time types" do
+      @model.test_time = Time.now
+      @model.test_time.should be_instance_of(Time)
+    end
+
+    it "should raise an ArgumentError if the reader method is already defined" do
       lambda do
         AccessorTestModel.key_reader :test_one
       end.should raise_error(ArgumentError)
@@ -52,6 +84,32 @@ describe AccessorTestModel do
       AccessorTestModel.defaults["test_two"].should == "test default"
     end
 
+    it "should raise an ArgumentError on unsupported type" do
+      lambda do
+        AccessorTestModel.key_writer :test, :type => :unsupported
+      end.should raise_error(ArgumentError)
+    end
+
+    it "should define writers for integer types" do
+      @model.test_integer = 3
+      @model.attributes["test_integer"].should == 3
+    end
+
+    it "should define writers for string types" do
+      @model.test_string = "3"
+      @model.attributes["test_string"].should == "3"
+    end
+
+    it "should define writers for date types" do
+      @model.test_date = Date.parse("2010-07-07")
+      @model.attributes["test_date"].should == "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"
+    end
+
     it "should raise an exception if the writer method is already defined" do
       lambda do
         AccessorTestModel.key_writer :test_two
@@ -76,4 +134,4 @@ describe AccessorTestModel do
 
   end
 
-end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Philipp Bruell
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-12 00:00:00 +02:00
+date: 2010-07-09 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency