swift 1.2.0 → 1.2.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 18c278ce050ba2e983c44f446ec275b3cb9fb867
+  data.tar.gz: 55ad66f690b578a47bf9446611cb044c10a1f4f2
+SHA512:
+  metadata.gz: 6514b0f039f53ceb35dfc1db5b91eb4b14a5e48d820302aba581262bd8fecccaf7da3eb97c3abf261f1698b919da5b4271f8d2e95fc10afccb6005aba7e6a529
+  data.tar.gz: c849a24b4b450f6cdf6c37031271115d06626180e07b4b9ae6e897a2e7821f01c163fcb1a73cb5dbad3feb1d40f9f64a3138e2a8fa5eb02d2b15dd9c9ed8cace

data/Rakefile

@@ -1,22 +1,5 @@
 require 'rake'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name        = 'swift'
-    gem.summary     = %q{A rational rudimentary database abstraction.}
-    gem.description = %q{A rational rudimentary database abstraction.}
-    gem.email       = %w{shane.hanna@gmail.com deepfryed@gmail.com}
-    gem.homepage    = 'http://github.com/shanna/swift'
-    gem.authors     = ["Shane Hanna", "Bharanee 'Barney' Rathna"]
-    gem.files.reject!{|f| f =~ %r{\.gitignore|examples|benchmarks|memory|gems/.*|Gemfile}}
-
-    gem.add_development_dependency 'minitest', '>= 1.7.0'
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
+require 'date'
 
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
@@ -29,5 +12,45 @@ task :default => :test
 
 require 'yard'
 YARD::Rake::YardocTask.new do |yard|
-  yard.files = Dir["lib/**/*.rb"].reject {|file| %r{eventmachine|synchrony}.match(file)}
+  yard.files = Dir["lib/**/*.rb"].reject{|file| %r{eventmachine|synchrony}.match(file)}
+end
+
+require_relative 'lib/swift/version'
+$gemspec = Gem::Specification.new do |s|
+  s.name                  = 'swift'
+  s.version               = Swift::VERSION
+  s.authors               = ['Shane Hanna', %q{Bharanee 'Barney' Rathna}]
+  s.date                  = Date.today
+  s.description           = 'A rational rudimentary database abstraction.'
+  s.summary               = 'A rational rudimentary database abstraction.'
+  s.email                 = ['shane.hanna@gmail.com', 'deepfryed@gmail.com']
+  s.licenses              = %w{MIT}
+  s.homepage              = 'http://github.com/shanna/swift'
+  s.require_paths         = %w{lib}
+  s.required_ruby_version = '>= 1.9.2'
+
+  s.files            = `git ls-files`.split("\n").reject{|f| f =~ %r{\.gitignore|examples|benchmarks|memory|gems/.*|Gemfile}}
+  s.test_files       = `git ls-files -- test/*`.split("\n")
+  s.extra_rdoc_files = %w{LICENSE README.md}
+
+  # testing
+  s.add_development_dependency 'minitest', '>= 1.7.0'
+
+  # swift drivers
+  s.add_development_dependency 'swift-db-sqlite3'
+  s.add_development_dependency 'swift-db-postgres'
+  s.add_development_dependency 'swift-db-mysql'
+
+  # async
+  s.add_development_dependency 'eventmachine'
+  s.add_development_dependency 'em-synchrony'
+
+  # rake
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'yard'
+end
+
+desc 'Generate gemspec'
+task :gemspec do
+  File.open('%s.gemspec' % $gemspec.name, 'w') {|fh| fh.write($gemspec.to_ruby)}
 end

data/lib/swift.rb

@@ -5,6 +5,7 @@ require_relative 'swift/attribute'
 require_relative 'swift/header'
 require_relative 'swift/record'
 require_relative 'swift/type'
+require_relative 'swift/version'
 
 # A rational rudimentary object relational mapper.
 #

data/lib/swift/attribute.rb

@@ -23,7 +23,7 @@ module Swift
     def initialize record, name, options = {}
       @name    = name
       @default = options.fetch(:default, nil)
-      @field   = options.fetch(:field,   name)
+      @field   = options.fetch(:field,   name).to_sym
       @key     = options.fetch(:key,     false)
       @serial  = options.fetch(:serial,  false)
       define_record_methods(record)

data/swift.gemspec

@@ -1,83 +1,55 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+# stub: swift 1.2.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "swift"
-  s.version = "1.2.0"
+  s.version = "1.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib"]
   s.authors = ["Shane Hanna", "Bharanee 'Barney' Rathna"]
-  s.date = "2013-03-10"
+  s.date = "2014-09-12"
   s.description = "A rational rudimentary database abstraction."
   s.email = ["shane.hanna@gmail.com", "deepfryed@gmail.com"]
-  s.extra_rdoc_files = [
-    "LICENSE",
-    "README.md"
-  ]
-  s.files = [
-    "API.rdoc",
-    "LICENSE",
-    "README.md",
-    "Rakefile",
-    "VERSION",
-    "lib/swift.rb",
-    "lib/swift/adapter.rb",
-    "lib/swift/adapter/em/mysql.rb",
-    "lib/swift/adapter/em/postgres.rb",
-    "lib/swift/adapter/eventmachine.rb",
-    "lib/swift/adapter/mysql.rb",
-    "lib/swift/adapter/postgres.rb",
-    "lib/swift/adapter/sql.rb",
-    "lib/swift/adapter/sqlite3.rb",
-    "lib/swift/adapter/synchrony.rb",
-    "lib/swift/adapter/synchrony/mysql.rb",
-    "lib/swift/adapter/synchrony/postgres.rb",
-    "lib/swift/attribute.rb",
-    "lib/swift/fiber_connection_pool.rb",
-    "lib/swift/header.rb",
-    "lib/swift/identity_map.rb",
-    "lib/swift/migrations.rb",
-    "lib/swift/record.rb",
-    "lib/swift/result.rb",
-    "lib/swift/statement.rb",
-    "lib/swift/type.rb",
-    "lib/swift/validations.rb",
-    "swift.gemspec",
-    "test/helper.rb",
-    "test/house-explode.jpg",
-    "test/minitest_teardown_hack.rb",
-    "test/test_adapter.rb",
-    "test/test_async.rb",
-    "test/test_datetime_parser.rb",
-    "test/test_encoding.rb",
-    "test/test_error.rb",
-    "test/test_identity_map.rb",
-    "test/test_io.rb",
-    "test/test_record.rb",
-    "test/test_swift.rb",
-    "test/test_synchrony.rb",
-    "test/test_timestamps.rb",
-    "test/test_transactions.rb",
-    "test/test_types.rb",
-    "test/test_validations.rb"
-  ]
+  s.extra_rdoc_files = ["LICENSE", "README.md"]
+  s.files = ["API.rdoc", "LICENSE", "README.md", "Rakefile", "lib/swift.rb", "lib/swift/adapter.rb", "lib/swift/adapter/em/mysql.rb", "lib/swift/adapter/em/postgres.rb", "lib/swift/adapter/eventmachine.rb", "lib/swift/adapter/mysql.rb", "lib/swift/adapter/postgres.rb", "lib/swift/adapter/sql.rb", "lib/swift/adapter/sqlite3.rb", "lib/swift/adapter/synchrony.rb", "lib/swift/adapter/synchrony/mysql.rb", "lib/swift/adapter/synchrony/postgres.rb", "lib/swift/attribute.rb", "lib/swift/fiber_connection_pool.rb", "lib/swift/header.rb", "lib/swift/identity_map.rb", "lib/swift/migrations.rb", "lib/swift/record.rb", "lib/swift/result.rb", "lib/swift/statement.rb", "lib/swift/type.rb", "lib/swift/validations.rb", "swift.gemspec", "test/helper.rb", "test/house-explode.jpg", "test/test_adapter.rb", "test/test_async.rb", "test/test_datetime_parser.rb", "test/test_encoding.rb", "test/test_error.rb", "test/test_identity_map.rb", "test/test_io.rb", "test/test_record.rb", "test/test_swift.rb", "test/test_synchrony.rb", "test/test_timestamps.rb", "test/test_transactions.rb", "test/test_types.rb", "test/test_validations.rb"]
   s.homepage = "http://github.com/shanna/swift"
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.24"
+  s.licenses = ["MIT"]
+  s.required_ruby_version = Gem::Requirement.new(">= 1.9.2")
+  s.rubygems_version = "2.2.0"
   s.summary = "A rational rudimentary database abstraction."
+  s.test_files = ["test/helper.rb", "test/house-explode.jpg", "test/test_adapter.rb", "test/test_async.rb", "test/test_datetime_parser.rb", "test/test_encoding.rb", "test/test_error.rb", "test/test_identity_map.rb", "test/test_io.rb", "test/test_record.rb", "test/test_swift.rb", "test/test_synchrony.rb", "test/test_timestamps.rb", "test/test_transactions.rb", "test/test_types.rb", "test/test_validations.rb"]
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<minitest>, [">= 1.7.0"])
+      s.add_development_dependency(%q<swift-db-sqlite3>, [">= 0"])
+      s.add_development_dependency(%q<swift-db-postgres>, [">= 0"])
+      s.add_development_dependency(%q<swift-db-mysql>, [">= 0"])
+      s.add_development_dependency(%q<eventmachine>, [">= 0"])
+      s.add_development_dependency(%q<em-synchrony>, [">= 0"])
+      s.add_development_dependency(%q<rake>, [">= 0"])
+      s.add_development_dependency(%q<yard>, [">= 0"])
     else
       s.add_dependency(%q<minitest>, [">= 1.7.0"])
+      s.add_dependency(%q<swift-db-sqlite3>, [">= 0"])
+      s.add_dependency(%q<swift-db-postgres>, [">= 0"])
+      s.add_dependency(%q<swift-db-mysql>, [">= 0"])
+      s.add_dependency(%q<eventmachine>, [">= 0"])
+      s.add_dependency(%q<em-synchrony>, [">= 0"])
+      s.add_dependency(%q<rake>, [">= 0"])
+      s.add_dependency(%q<yard>, [">= 0"])
     end
   else
     s.add_dependency(%q<minitest>, [">= 1.7.0"])
+    s.add_dependency(%q<swift-db-sqlite3>, [">= 0"])
+    s.add_dependency(%q<swift-db-postgres>, [">= 0"])
+    s.add_dependency(%q<swift-db-mysql>, [">= 0"])
+    s.add_dependency(%q<eventmachine>, [">= 0"])
+    s.add_dependency(%q<em-synchrony>, [">= 0"])
+    s.add_dependency(%q<rake>, [">= 0"])
+    s.add_dependency(%q<yard>, [">= 0"])
   end
 end
-

data/test/helper.rb

@@ -2,10 +2,9 @@ $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'test'))
 
 require 'bundler/setup'
-
 require 'etc'
 require 'minitest/autorun'
-require 'minitest_teardown_hack'
+
 require 'swift'
 require 'swift/adapter/mysql'
 require 'swift/adapter/postgres'

data/test/test_record.rb

@@ -58,6 +58,25 @@ describe 'record' do
   end
 
   supported_by Swift::Adapter::Postgres, Swift::Adapter::Mysql, Swift::Adapter::Sqlite3 do
+    describe 'field name customization' do
+      before do
+        @user = Class.new(Swift::Record) do
+          store     :users
+          attribute :id,   Swift::Type::Integer, serial: true, key: true, field: 'field_id'
+          attribute :name, Swift::Type::String, field: 'field_name'
+        end
+
+        Swift.db.migrate! @user
+      end
+
+      it 'should fetch and create by fields correctly' do
+        @user.create(name: 'dave')
+        user = @user.execute("select * from #{@user} limit 1").first
+        assert_equal 'dave', user.name
+        assert_equal 1, user.id
+      end
+    end
+
     describe 'adapter operations' do
       before do
         Swift.db.migrate! @user

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: swift
 version: !ruby/object:Gem::Version
-  version: 1.2.0
-  prerelease: 
+  version: 1.2.1
 platform: ruby
 authors:
 - Shane Hanna
@@ -10,24 +9,120 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-10 00:00:00.000000000 Z
+date: 2014-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.7.0
-    none: false
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.7.0
-    none: false
-  name: minitest
+- !ruby/object:Gem::Dependency
+  name: swift-db-sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: swift-db-postgres
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: swift-db-mysql
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: eventmachine
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: em-synchrony
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A rational rudimentary database abstraction.
 email:
 - shane.hanna@gmail.com
@@ -42,7 +137,6 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- VERSION
 - lib/swift.rb
 - lib/swift/adapter.rb
 - lib/swift/adapter/em/mysql.rb
@@ -68,7 +162,6 @@ files:
 - swift.gemspec
 - test/helper.rb
 - test/house-explode.jpg
-- test/minitest_teardown_hack.rb
 - test/test_adapter.rb
 - test/test_async.rb
 - test/test_datetime_parser.rb
@@ -84,30 +177,44 @@ files:
 - test/test_types.rb
 - test/test_validations.rb
 homepage: http://github.com/shanna/swift
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      hash: -4534175981099401006
-      version: '0'
-      segments:
-      - 0
-  none: false
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A rational rudimentary database abstraction.
-test_files: []
+test_files:
+- test/helper.rb
+- test/house-explode.jpg
+- test/test_adapter.rb
+- test/test_async.rb
+- test/test_datetime_parser.rb
+- test/test_encoding.rb
+- test/test_error.rb
+- test/test_identity_map.rb
+- test/test_io.rb
+- test/test_record.rb
+- test/test_swift.rb
+- test/test_synchrony.rb
+- test/test_timestamps.rb
+- test/test_transactions.rb
+- test/test_types.rb
+- test/test_validations.rb
+has_rdoc: 

data/VERSION

@@ -1 +0,0 @@
-1.2.0

data/test/minitest_teardown_hack.rb

@@ -1,20 +0,0 @@
-# TODO remove this once the patch gets applied to stock ruby 1.9
-class MiniTest::Spec < MiniTest::Unit::TestCase
-
-  def self.define_inheritable_method name, &block # :nodoc:
-    super_method = self.superclass.instance_method name
-
-    case name
-      when :teardown
-        define_method(name) do
-          instance_eval(&block)
-          super_method.bind(self).call if super_method
-        end
-      else
-        define_method(name) do
-          super_method.bind(self).call if super_method
-          instance_eval(&block)
-        end
-    end
-  end
-end