mattly-exegesis 0.2.3 → 0.2.5

data/Rakefile

@@ -6,7 +6,7 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |s|
     s.name = "exegesis"
-    s.summary = "TODO"
+    s.summary = "A Document <> Object Mapper for CouchDB Documents"
     s.email = "matt@flowerpowered.com"
     s.homepage = "http://github.com/mattly/exegesis"
     s.description = "A Document <> Object Mapper for CouchDB Documents"

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
 :minor: 2
-:patch: 4
+:patch: 5

data/lib/exegesis/model.rb

@@ -1,6 +1,8 @@
 module Exegesis
   module Model
     
+    JSON_PRIMITIVES = [Array, String, Hash, Fixnum, Float]
+    
     def self.included base
       base.extend ClassMethods
       base.send :include, InstanceMethods
@@ -23,6 +25,7 @@ module Exegesis
             define_reference_writer attrib unless opts[:writer] == false
           elsif opts[:as]
             define_caster attrib, opts[:as]
+            define_caster_writer attrib, opts[:as] unless opts[:writer] == false
           else
             define_method(attrib) { @attributes[attrib] }
           end
@@ -33,10 +36,10 @@ module Exegesis
       # else retrieves the default
       def default hash=nil
         if hash
-          @default = {}
+          @default || default
           hash.each {|key, value| @default[key.to_s] = value }
         else
-          @default ||= {}
+          @default ||= superclass.respond_to?(:default) ? superclass.default.dup : {}
         end
       end
       
@@ -79,7 +82,20 @@ module Exegesis
           end
         end
       end
-
+      
+      def define_caster_writer attrib, as
+        define_writer(attrib) do |val|
+          @attributes[attrib] = if JSON_PRIMITIVES.include?(val.class)
+            if val.is_a?(Array)
+              val.map {|v| cast(as, v) }
+            else
+              cast(as, val)
+            end
+          else
+            val
+          end
+        end
+      end
     end
     
     module InstanceMethods
@@ -97,6 +113,7 @@ module Exegesis
       # update the attributes in the model using writers. If no writer is defined for a given
       # key it will raise NoMethodError
       def update_attributes hash={}
+        hash.delete('class')
         hash.each do |key, value| 
           self.send("#{key}=", value)
         end
@@ -126,7 +143,7 @@ module Exegesis
       
       def cast as, value
         return nil if value.nil?
-        return value unless [String, Hash, Fixnum, Float].include?(value.class)
+        return value unless JSON_PRIMITIVES.include?(value.class)
         klass = if as == :given && value.is_a?(Hash)
           Exegesis.constantize(value['class'])
         elsif as.is_a?(Class)
@@ -138,7 +155,7 @@ module Exegesis
         casted = if klass.nil?
           value # if no class, just return the value
         elsif klass == Time # Time is a special case; the ONLY special case.
-          Time.parse value
+          value.empty? ? nil : Time.parse(value)
         else
           klass.new value
         end

data/lib/monkeypatches/time.rb

@@ -1,6 +1,9 @@
 class Time
+  # returns the time, in UTC, in iso8601 format; see http://en.wikipedia.org/wiki/ISO_8601 for more details on this format
+  # One major advantage of this format over others is that it sorts lexigraphically, so if you want f.e. just stuff from 
+  # April 2009 you may specify '2009-04'..'2009-04Z' as your key
   def to_json_format
-    self.getutc.strftime("%Y/%m/%d %H:%M:%S +0000")
+    self.getutc.iso8601
   end
   
   def to_json(options = nil)

data/test/model_test.rb

@@ -143,6 +143,18 @@ describe Exegesis::Model do
               end
               expect { @obj.time.must_equal @time }
               expect { @obj.times.map{|time| time.localtime }.must_equal [@time, @time] }
+              expect { @obj['time'].must_equal @time }
+              expect { @obj['times'].must_equal [@time, @time] }
+            end
+            describe "from a blank string" do
+              before do
+                @obj.time = ''
+                @obj.times = ['', '']
+              end
+              expect { @obj.time.must_be_nil }
+              expect { @obj.times.map{|t| t }.must_equal [] }
+              expect { @obj['time'].must_be_nil }
+              expect { @obj['times'].must_equal [nil, nil] }
             end
           end
         end
@@ -283,7 +295,7 @@ describe Exegesis::Model do
       expect { @obj.read_only.must_equal 'bee' } 
     end
     
-    describe "update" do
+    describe "update_attributes" do
       describe "with a writer" do
         before do
           @obj.update_attributes(:foo => 'foo')
@@ -295,6 +307,14 @@ describe Exegesis::Model do
       describe "without a writer" do
         expect { lambda{@obj.update_attributes({:read_only => 'bee'})}.must_raise NoMethodError }
       end
+      
+      describe "with a 'class' key" do
+        before do
+          @obj.update_attributes('class' => 'Foo')
+        end
+        
+        expect { @obj['class'].must_equal 'ExposeTestModel' }
+      end
     end
   end
   

data/test/view_option_parsing_test.rb

@@ -0,0 +1,70 @@
+require File.join(File.dirname(__FILE__), 'test_helper.rb')
+
+class ViewOptionsParsingTestDatabase
+  include Exegesis::Database
+  
+  designs_directory "test/fixtures/designs"
+  
+  design :things do
+    view :by_name
+    docs :by_tag
+    hash :count, :view => :by_tag
+  end
+end
+
+describe "parsing query options" do
+  before { @db = reset_db('', ViewOptionsParsingTestDatabase) }
+  
+  describe "with a key as an initial arguemnt" do
+    expect { @db.things.parse_opts('foo').must_equal({:key => 'foo'}) }
+    expect { @db.things.parse_opts('foo', :include_docs => true).must_equal({:key => 'foo', :include_docs => true}) }
+    expect { @db.things.parse_opts('foo', {:stale => 'ok'}, {:include_docs => true}).must_equal({:key => 'foo', :stale => 'ok', :include_docs => true })}
+  end
+  
+  describe "without an implied key" do
+    expect { @db.things.parse_opts(:key => 'foo').must_equal({:key => 'foo'}) }
+    expect { @db.things.parse_opts({:key => 'foo'}, nil, {:stale => 'ok'}).must_equal({:key => 'foo', :stale => 'ok'}) }
+  end
+  
+  describe "when a keys option is empty" do
+    expect { @db.things.parse_opts(:keys => []).must_equal({}) }
+  end
+  
+  describe "for ranges" do
+    describe "when the key _is_ a range" do
+      before { @opts = @db.things.parse_opts(:key => 'bar'..'baz') }
+      expect { @opts.has_key?(:key).must_equal false }
+      expect { @opts[:startkey].must_equal 'bar' }
+      expect { @opts[:endkey].must_equal 'baz'}
+    end
+    
+    describe "when the key is an array that includes a range" do
+      before { @opts = @db.things.parse_opts(:key => ['published', '2009'..'2009/04']) }
+      expect { @opts.has_key?(:key).must_equal false }
+      expect { @opts[:startkey].must_equal ['published', '2009'] }
+      expect { @opts[:endkey].must_equal ['published', '2009/04'] }
+    end
+    
+    describe "for non inclusive ranges" do
+    end
+    describe "when descending:true is an option" do
+      describe "and first value is greater than the end value" do
+      end
+    end
+    describe "when the first value is greater than the end value" do
+    end
+    
+    describe "invalid option configurations" do
+      expect { lambda {@db.things.parse_opts(:startkey => 'foo')}.must_raise ArgumentError }
+    end
+  end
+  
+  describe "reducing" do
+    before { @parsing = lambda{|opts| @db.things.parse_opts(opts) } }
+    expect { @parsing.call(:group => 3).must_equal({:group_level => 3})}
+    expect { lambda{@parsing.call(:group => true, :reduce => false)}.must_raise ArgumentError }
+    expect { lambda{@parsing.call(:group => true, :include_docs => true)}.must_raise ArgumentError }
+    expect { lambda{@parsing.call(:group => 1, :reduce => false)}.must_raise ArgumentError }
+    expect { lambda{@parsing.call(:group => 1, :include_docs => true)}.must_raise ArgumentError }
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mattly-exegesis
 version: !ruby/object:Gem::Version 
-  version: 0.2.3
+  version: 0.2.5
 platform: ruby
 authors: 
 - Matt Lyon
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-16 00:00:00 -07:00
+date: 2009-05-03 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -62,6 +62,7 @@ files:
 - test/model_test.rb
 - test/server_test.rb
 - test/test_helper.rb
+- test/view_option_parsing_test.rb
 has_rdoc: true
 homepage: http://github.com/mattly/exegesis
 post_install_message: 
@@ -86,8 +87,8 @@ requirements: []
 rubyforge_project: 
 rubygems_version: 1.2.0
 signing_key: 
-specification_version: 2
-summary: TODO
+specification_version: 3
+summary: A Document <> Object Mapper for CouchDB Documents
 test_files: 
 - test/attachments_test.rb
 - test/database_test.rb
@@ -98,3 +99,4 @@ test_files:
 - test/model_test.rb
 - test/server_test.rb
 - test/test_helper.rb
+- test/view_option_parsing_test.rb