swift 0.8.1 → 0.9.0

data/API.rdoc

@@ -16,15 +16,15 @@ Public API minus the optional stuff like Pool, IdentityMap, Migrations etc.
       #all         #=> Result
       #begin       #=> Adapter
       #commit
-      #create      #=> Scheme
-      #destroy     #=> Result
+      #create      #=> Scheme or Result
+      #destroy     #=> Scheme or Result
       #execute     #=> Result
       #first       #=> Scheme
       #get         #=> Scheme
       #prepare     #=> Statement
       #rollback
       #transaction #=> Adapter
-      #update      #=> Result
+      #update      #=> Scheme or Result
       #reconnect
       #delete      #=> Result
 
@@ -50,7 +50,7 @@ Public API minus the optional stuff like Pool, IdentityMap, Migrations etc.
     Scheme
       .all       #=> Result
       .attribute #=> Type
-      .create    #=> Scheme
+      .create    #=> Scheme or Result
       .first     #=> Scheme
       .get       #=> Scheme
       .header    #=> Header
@@ -58,9 +58,9 @@ Public API minus the optional stuff like Pool, IdentityMap, Migrations etc.
       .new       #=> Scheme
       .scheme    #=> Alias for self.class
       .store     #=> Symbol
-      #destroy   #=> Result
+      #destroy   #=> Scheme or Result
       #tuple     #=> Hash
-      #update    #=> Result
+      #update    #=> Scheme or Result
 
     # Enumerable collection of Types for Scheme
     Header

data/VERSION

@@ -1 +1 @@
-0.8.1
+0.9.0

data/ext/result.cc

@@ -158,7 +158,7 @@ VALUE typecast_timestamp(const char *data, uint64_t len, const char *zone) {
         lastmatch++;
       }
       subsec[idx] = 0;
-      usec        = atoll(subsec);
+      usec        = round(atoll(subsec) * (1000000 / pow(10, idx)));
   }
 
   tm.tm_year  -= 1900;

data/lib/swift/adapter.rb

@@ -25,8 +25,8 @@ module Swift
     #--
     # NOTE: Not significantly shorter than Scheme.db.first(User, 'id = ?', 12)
     def get scheme, keys
-      relation = scheme.new(keys)
-      prepare_get(scheme).execute(*relation.tuple.values_at(*scheme.header.keys)).first
+      resource = scheme.new(keys)
+      prepare_get(scheme).execute(*resource.tuple.values_at(*scheme.header.keys)).first
     end
 
     # Select one or more.
@@ -73,32 +73,58 @@ module Swift
       prepare(scheme, "select * from #{scheme.store} #{where} limit 1").execute(*binds, &block).first
     end
 
+    # Delete one or more.
+    #
+    # The SQL condition form of Swift::Adapter.destroy.
+    #
+    # @example All.
+    #   Swift.db.delete(User)
+    # @example All with conditions and binds.
+    #   Swift.db.delete(User, ':name = ? and :age > ?', 'Apple Arthurton', 32)
+    #
+    # @param  [Swift::Scheme] scheme     Concrete scheme subclass
+    # @param  [String]        conditions Optional SQL 'where' fragment.
+    # @param  [Object, ...]   *binds     Optional bind values that accompany conditions SQL fragment.
+    # @return [Swift::Result]
+    def delete scheme, conditions = '', *binds
+      sql =  "delete from #{scheme.store}"
+      sql += " where #{exchange_names(scheme, conditions)}" unless conditions.empty?
+      execute(sql, *binds)
+    end
+
     # Create one or more.
     #
     # @example Scheme.
     #   user = User.new(name: 'Apply Arthurton', age: 32)
     #   Swift.db.create(User, user)
+    #   #=> Swift::Scheme
     # @example Coerce hash to scheme.
     #   Swif.db.create(User, name: 'Apple Arthurton', age: 32)
-    # @example Multiple relations.
+    #   #=> Swift::Scheme
+    # @example Multiple resources.
     #   apple = User.new(name: 'Apple Arthurton', age: 32)
     #   benny = User.new(name: 'Benny Arthurton', age: 30)
-    #   Swift.db.create(User, apple, benny)
-    # @example Coerce multiple relations.
-    #   Swift.db.create(User, {name: 'Apple Arthurton', age: 32}, {name: 'Benny Arthurton', age: 30})
+    #   Swift.db.create(User, [apple, benny])
+    #   #=> Array<Swift::Scheme>
+    # @example Coerce multiple resources.
+    #   Swift.db.create(User, [{name: 'Apple Arthurton', age: 32}, {name: 'Benny Arthurton', age: 30}])
+    #   #=> Array<Swift::Scheme>
     #
-    # @param  [Swift::Scheme]       scheme     Concrete scheme subclass to load.
-    # @param  [Swift::Scheme, Hash> *relations Scheme or tuple hash. Hashes will be coerced into scheme via Swift::Scheme#new
-    # @return [Array<Swift::Scheme>]
+    # @param  [Swift::Scheme]                                   scheme    Concrete scheme subclass to load.
+    # @param  [Swift::Scheme, Hash, Array<Swift::Scheme, Hash>] resources The resources to be saved.
+    # @return [Swift::Scheme, Array<Swift::Scheme>]
+    # @note   Hashes will be coerced into a Swift::Scheme resource via Swift::Scheme#new
+    # @note   Passing a scalar will result in a scalar.
     # @see    Swift::Scheme.create
-    def create scheme, *relations
+    def create scheme, resources
       statement = prepare_create(scheme)
-      relations.map do |relation|
-        relation = scheme.new(relation) unless relation.kind_of?(scheme)
-        result   = statement.execute(*relation.tuple.values_at(*scheme.header.insertable))
-        relation.tuple[scheme.header.serial] = result.insert_id if scheme.header.serial
-        relation
+      result    = [resources].flatten.map do |resource|
+        resource = scheme.new(resource) unless resource.kind_of?(scheme)
+        result   = statement.execute(*resource.tuple.values_at(*scheme.header.insertable))
+        resource.tuple[scheme.header.serial] = result.insert_id if scheme.header.serial
+        resource
       end
+      resources.kind_of?(Enumerable) ? result : result.first
     end
 
     # Update one or more.
@@ -107,32 +133,43 @@ module Swift
     #   user      = Swift.db.create(User, name: 'Apply Arthurton', age: 32)
     #   user.name = 'Arthur Appleton'
     #   Swift.db.update(User, user)
+    #   #=> Swift::Scheme
     # @example Coerce hash to scheme.
     #   user      = Swift.db.create(User, name: 'Apply Arthurton', age: 32)
     #   user.name = 'Arthur Appleton'
     #   Swif.db.update(User, user.tuple)
-    # @example Multiple relations.
+    #   #=> Swift::Scheme
+    # @example Multiple resources.
     #   apple = Swift.db.create(User, name: 'Apple Arthurton', age: 32)
     #   benny = Swift.db.create(User, name: 'Benny Arthurton', age: 30)
-    #   Swift.db.update(User, apple, benny)
-    # @example Coerce multiple relations.
+    #   Swift.db.update(User, [apple, benny])
+    #   #=> Array<Swift::Scheme>
+    # @example Coerce multiple resources.
     #   apple = Swift.db.create(User, name: 'Apple Arthurton', age: 32)
     #   benny = Swift.db.create(User, name: 'Benny Arthurton', age: 30)
-    #   Swift.db.update(User, apple.tuple, benny.tuple)
+    #   Swift.db.update(User, [apple.tuple, benny.tuple])
+    #   #=> Array<Swift::Scheme>
     #
-    # @param  [Swift::Scheme]       scheme     Concrete scheme subclass to load.
-    # @param  [Swift::Scheme, Hash> *relations Scheme or tuple hash. Hashes will be coerced into scheme via Swift::Scheme#new
-    # @return [Array<Swift::Scheme>]
+    # @param  [Swift::Scheme]                                   scheme    Concrete scheme subclass to load.
+    # @param  [Swift::Scheme, Hash, Array<Swift::Scheme, Hash>] resources The resources to be updated.
+    # @return [Swift::Scheme, Swift::Result<Swift::Scheme>]
+    # @note   Hashes will be coerced into a Swift::Scheme resource via Swift::Scheme#new
+    # @note   Passing a scalar will result in a scalar.
     # @see    Swift::Scheme#update
-    def update scheme, *relations
+    def update scheme, resources
       statement = prepare_update(scheme)
-      relations.map do |relation|
-        relation = scheme.new(relation) unless relation.kind_of?(scheme)
-        keys     = relation.tuple.values_at(*scheme.header.keys)
-        raise ArgumentError, "relation has incomplete key : #{relation.inspect}" unless keys.select(&:nil?).empty?
-        statement.execute(*relation.tuple.values_at(*scheme.header.updatable), *keys)
-        relation
+      result    = [resources].flatten.map do |resource|
+        resource = scheme.new(resource) unless resource.kind_of?(scheme)
+        keys     = resource.tuple.values_at(*scheme.header.keys)
+
+        # TODO: Name the key field(s) missing.
+        raise ArgumentError, "#{scheme} resource has incomplete key: #{resource.inspect}" \
+          unless keys.select(&:nil?).empty?
+
+        statement.execute(*resource.tuple.values_at(*scheme.header.updatable), *keys)
+        resource
       end
+      resources.kind_of?(Enumerable) ? result : result.first
     end
 
     # Destroy one or more.
@@ -145,49 +182,40 @@ module Swift
     #   user      = Swift.db.create(User, name: 'Apply Arthurton', age: 32)
     #   user.name = 'Arthur Appleton'
     #   Swif.db.destroy(User, user.tuple)
-    # @example Multiple relations.
+    # @example Multiple resources.
     #   apple = Swift.db.create(User, name: 'Apple Arthurton', age: 32)
     #   benny = Swift.db.create(User, name: 'Benny Arthurton', age: 30)
-    #   Swift.db.destroy(User, apple, benny)
-    # @example Coerce multiple relations.
+    #   Swift.db.destroy(User, [apple, benny])
+    # @example Coerce multiple resources.
     #   apple = Swift.db.create(User, name: 'Apple Arthurton', age: 32)
     #   benny = Swift.db.create(User, name: 'Benny Arthurton', age: 30)
-    #   Swift.db.destroy(User, apple.tuple, benny.tuple)
+    #   Swift.db.destroy(User, [apple.tuple, benny.tuple])
     #
-    # @param  [Swift::Scheme]       scheme     Concrete scheme subclass to load.
-    # @param  [Swift::Scheme, Hash] *relations Scheme or tuple hash. Hashes will be coerced into scheme via Swift::Scheme#new
+    # @param  [Swift::Scheme]                                   scheme    Concrete scheme subclass to load.
+    # @param  [Swift::Scheme, Hash, Array<Swift::Scheme, Hash>] resources The resources to be destroyed.
+    # @return [Swift::Scheme, Array<Swift::Scheme>]
+    # @note   Hashes will be coerced into a Swift::Scheme resource via Swift::Scheme#new
+    # @note   Passing a scalar will result in a scalar.
     # @see    Swift::Scheme#destroy
-    def destroy scheme, *relations
+    def destroy scheme, resources
       statement = prepare_destroy(scheme)
-      relations.map do |relation|
-        relation = scheme.new(relation) unless relation.kind_of?(scheme)
-        keys     = relation.tuple.values_at(*scheme.header.keys)
-        raise ArgumentError, "relation has incomplete key : #{relation.inspect}" unless keys.select(&:nil?).empty?
+      result    = [resources].flatten.map do |resource|
+        resource = scheme.new(resource) unless resource.kind_of?(scheme)
+        keys     = resource.tuple.values_at(*scheme.header.keys)
+
+        # TODO: Name the key field(s) missing.
+        raise ArgumentError, "#{scheme} resource has incomplete key: #{resource.inspect}" \
+          unless keys.select(&:nil?).empty?
+
         if result = statement.execute(*keys)
-          relation.freeze
+          resource.freeze
         end
         result
       end
+      resources.kind_of?(Enumerable) ? result : result.first
     end
 
 
-    # Delete one or more rows
-    #
-    # @example All.
-    #   Swift.db.delete(User)
-    # @example All with conditions and binds.
-    #   Swift.db.delete(User, ':name = ? and :age > ?', 'Apple Arthurton', 32)
-    #
-    # @param  [Swift::Scheme] scheme     Concrete scheme subclass
-    # @param  [String]        conditions Optional SQL 'where' fragment.
-    # @param  [Object, ...]   *binds     Optional bind values that accompany conditions SQL fragment.
-    # @return [Swift::Result]
-    def delete scheme, conditions = '', *binds
-      sql =  "delete from #{scheme.store}"
-      sql += " where #{exchange_names(scheme, conditions)}" unless conditions.empty?
-      execute(sql, *binds)
-    end
-
     def migrate! scheme
       keys   =  scheme.header.keys
       fields =  scheme.header.map{|p| field_definition(p)}.join(', ')

data/lib/swift/scheme.rb

@@ -1,6 +1,6 @@
 module Swift
 
-  # A relation (instance) definition.
+  # A resource (instance) definition.
   #
   # @example A user scheme.
   #   class User < Swift::Scheme
@@ -10,8 +10,6 @@ module Swift
   #     attribute :email,      Swift::Type::String
   #     attribute :updated_at, Swift::Type::Time
   #   end # User
-  #
-  # @todo Tuple should be renamed tuples (plural?)
   class Scheme
     attr_accessor :tuple
     alias_method :scheme, :class
@@ -22,7 +20,7 @@ module Swift
     #     email:      'apple@arthurton.local',
     #     updated_at: Time.now
     #   )
-    # @param [Hash] options Create relation and set attributes. <tt>{name: value}</tt>
+    # @param [Hash] options Create resource and set attributes. <tt>{name: value}</tt>
     def initialize options = {}
       @tuple = scheme.header.new_tuple
       options.each{|k, v| send(:"#{k}=", v)}
@@ -49,8 +47,8 @@ module Swift
     #     updated_at: Time.now
     #   )
     #   apple.destroy
-    def destroy
-      Swift.db.destroy(scheme, self)
+    def destroy resources = self
+      Swift.db.destroy(scheme, resources)
     end
 
     class << self
@@ -62,6 +60,7 @@ module Swift
       def inherited klass
         klass.header = Header.new
         klass.header.push(*header) if header
+        klass.store store          if store
         Swift.schema.push(klass)   if klass.name
       end
 
@@ -96,9 +95,9 @@ module Swift
       #     updated_at: Time.now
       #   )
       #
-      # @param [Hash] options Create with attributes. <tt>{name: value}</tt>
-      def create options = {}
-        Swift.db.create(self, options)
+      # @param [Hash, Array<Hash>] options Create with attributes. <tt>{name: value}</tt>
+      def create resources = {}
+        Swift.db.create(self, resources)
       end
 
       # Select by id(s).

data/swift.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{swift}
-  s.version = "0.8.1"
+  s.version = "0.9.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Shane Hanna", "Bharanee 'Barney' Rathna"]
-  s.date = %q{2011-01-19}
+  s.date = %q{2011-02-10}
   s.description = %q{A rational rudimentary database abstraction.}
   s.email = ["shane.hanna@gmail.com", "deepfryed@gmail.com"]
   s.extensions = ["ext/extconf.rb"]

data/test/test_scheme.rb

@@ -78,7 +78,7 @@ describe 'scheme' do
       end
 
       it 'adapter should delete only relevant rows given condition & scheme' do
-        Swift.db.create(@user, {name: 'dave'}, {name: 'mike'})
+        Swift.db.create(@user, [{name: 'dave'}, {name: 'mike'}])
         assert_equal 2, @user.all.rows
 
         Swift.db.delete @user, ':name = ?', 'dave'

data/test/test_types.rb

@@ -26,7 +26,7 @@ describe 'Adapter' do
 
       it 'query result is typecast correctly' do
         dt   = '2010-01-01 23:22:21'
-        bind = [ 1, 'jim', 32, 178.71, true, false, '2010-01-02', "#{dt}.012345+11:00" ]
+        bind = [ 1, 'jim', 32, 178.71, true, false, '2010-01-02', "#{dt}.065+11:00" ]
         @db.execute %q{insert into users values(?, ?, ?, ?, ?, ?, ?, ?)}, *bind
 
         result = @db.prepare(%q{select * from users limit 1}).execute.first
@@ -40,7 +40,7 @@ describe 'Adapter' do
         assert_kind_of Time,       result[:updated]
 
         assert_equal   dt,         result[:updated].strftime('%F %T')
-        assert_equal   12345,      result[:updated].usec unless @db.kind_of?(Swift::DB::Mysql)
+        assert_equal   65000,      result[:updated].usec unless @db.kind_of?(Swift::DB::Mysql)
       end
     end
   end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 8
-  - 1
-  version: 0.8.1
+  - 9
+  - 0
+  version: 0.9.0
 platform: ruby
 authors: 
 - Shane Hanna
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-19 00:00:00 +11:00
+date: 2011-02-10 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency