natural_key 0.2.0 → 0.2.1

data/Manifest

@@ -6,22 +6,6 @@ VERSION.yml
 lib/natural_key.rb
 lib/natural_key/base.rb
 natural_key.gemspec
-pkg/natural_key-0.1.0.gem
-pkg/natural_key-0.1.0.tar.gz
-pkg/natural_key-0.1.0/CHANGELOG
-pkg/natural_key-0.1.0/Manifest
-pkg/natural_key-0.1.0/README.rdoc
-pkg/natural_key-0.1.0/Rakefile
-pkg/natural_key-0.1.0/VERSION.yml
-pkg/natural_key-0.1.0/lib/natural_key.rb
-pkg/natural_key-0.1.0/lib/natural_key/base.rb
-pkg/natural_key-0.1.0/natural_key.gemspec
-pkg/natural_key-0.1.0/test/database.yml
-pkg/natural_key-0.1.0/test/fixtures/schema.rb
-pkg/natural_key-0.1.0/test/lib/activerecord_test_case.rb
-pkg/natural_key-0.1.0/test/lib/activerecord_test_connector.rb
-pkg/natural_key-0.1.0/test/test_helper.rb
-pkg/natural_key-0.1.0/test/test_natural_key.rb
 test/database.yml
 test/fixtures/schema.rb
 test/lib/activerecord_test_case.rb

data/VERSION.yml

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

data/lib/natural_key/base.rb

@@ -1,4 +1,4 @@
-require 'activerecord'
+require 'active_record'
 
 module ActiveRecord
   class Base

data/natural_key.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{natural_key}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sharad Jain"]
-  s.date = %q{2009-10-30}
+  s.date = %q{2010-02-26}
   s.description = %q{ActiveRecord.create_or_update based on a user-defined natural-key}
   s.email = %q{shaanjain@gmail.com}
   s.extra_rdoc_files = ["CHANGELOG", "README.rdoc", "lib/natural_key.rb", "lib/natural_key/base.rb"]
-  s.files = ["CHANGELOG", "Manifest", "README.rdoc", "Rakefile", "VERSION.yml", "lib/natural_key.rb", "lib/natural_key/base.rb", "natural_key.gemspec", "pkg/natural_key-0.1.0.gem", "pkg/natural_key-0.1.0.tar.gz", "pkg/natural_key-0.1.0/CHANGELOG", "pkg/natural_key-0.1.0/Manifest", "pkg/natural_key-0.1.0/README.rdoc", "pkg/natural_key-0.1.0/Rakefile", "pkg/natural_key-0.1.0/VERSION.yml", "pkg/natural_key-0.1.0/lib/natural_key.rb", "pkg/natural_key-0.1.0/lib/natural_key/base.rb", "pkg/natural_key-0.1.0/natural_key.gemspec", "pkg/natural_key-0.1.0/test/database.yml", "pkg/natural_key-0.1.0/test/fixtures/schema.rb", "pkg/natural_key-0.1.0/test/lib/activerecord_test_case.rb", "pkg/natural_key-0.1.0/test/lib/activerecord_test_connector.rb", "pkg/natural_key-0.1.0/test/test_helper.rb", "pkg/natural_key-0.1.0/test/test_natural_key.rb", "test/database.yml", "test/fixtures/schema.rb", "test/lib/activerecord_test_case.rb", "test/lib/activerecord_test_connector.rb", "test/test_helper.rb", "test/test_natural_key.rb"]
+  s.files = ["CHANGELOG", "Manifest", "README.rdoc", "Rakefile", "VERSION.yml", "lib/natural_key.rb", "lib/natural_key/base.rb", "natural_key.gemspec", "test/database.yml", "test/fixtures/schema.rb", "test/lib/activerecord_test_case.rb", "test/lib/activerecord_test_connector.rb", "test/test_helper.rb", "test/test_natural_key.rb"]
   s.homepage = %q{http://github.com/sjain/natural_key}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Natural_key", "--main", "README.rdoc"]
   s.require_paths = ["lib"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: natural_key
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Sharad Jain
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-30 00:00:00 -05:00
+date: 2010-02-26 00:00:00 -06:00
 default_executable: 
 dependencies: []
 
@@ -33,22 +33,6 @@ files:
 - lib/natural_key.rb
 - lib/natural_key/base.rb
 - natural_key.gemspec
-- pkg/natural_key-0.1.0.gem
-- pkg/natural_key-0.1.0.tar.gz
-- pkg/natural_key-0.1.0/CHANGELOG
-- pkg/natural_key-0.1.0/Manifest
-- pkg/natural_key-0.1.0/README.rdoc
-- pkg/natural_key-0.1.0/Rakefile
-- pkg/natural_key-0.1.0/VERSION.yml
-- pkg/natural_key-0.1.0/lib/natural_key.rb
-- pkg/natural_key-0.1.0/lib/natural_key/base.rb
-- pkg/natural_key-0.1.0/natural_key.gemspec
-- pkg/natural_key-0.1.0/test/database.yml
-- pkg/natural_key-0.1.0/test/fixtures/schema.rb
-- pkg/natural_key-0.1.0/test/lib/activerecord_test_case.rb
-- pkg/natural_key-0.1.0/test/lib/activerecord_test_connector.rb
-- pkg/natural_key-0.1.0/test/test_helper.rb
-- pkg/natural_key-0.1.0/test/test_natural_key.rb
 - test/database.yml
 - test/fixtures/schema.rb
 - test/lib/activerecord_test_case.rb

data/pkg/natural_key-0.1.0/CHANGELOG

@@ -1,8 +0,0 @@
-== 0.1.0 2009-01-07
-* fixed to accept hash with string keys in addition to symbols
-* cleaned up unnecessary files
-* using Echoe instead of newgem for gem generation
-* github updated
-
-== 0.0.1 2009-01-07
-* initial release

data/pkg/natural_key-0.1.0/Manifest

@@ -1,30 +0,0 @@
-CHANGELOG
-Manifest
-README.rdoc
-Rakefile
-VERSION.yml
-lib/natural_key.rb
-lib/natural_key/base.rb
-natural_key.gemspec
-pkg/natural_key-0.1.0.gem
-pkg/natural_key-0.1.0.tar.gz
-pkg/natural_key-0.1.0/CHANGELOG
-pkg/natural_key-0.1.0/Manifest
-pkg/natural_key-0.1.0/README.rdoc
-pkg/natural_key-0.1.0/Rakefile
-pkg/natural_key-0.1.0/VERSION.yml
-pkg/natural_key-0.1.0/lib/natural_key.rb
-pkg/natural_key-0.1.0/lib/natural_key/base.rb
-pkg/natural_key-0.1.0/natural_key.gemspec
-pkg/natural_key-0.1.0/test/database.yml
-pkg/natural_key-0.1.0/test/fixtures/schema.rb
-pkg/natural_key-0.1.0/test/lib/activerecord_test_case.rb
-pkg/natural_key-0.1.0/test/lib/activerecord_test_connector.rb
-pkg/natural_key-0.1.0/test/test_helper.rb
-pkg/natural_key-0.1.0/test/test_natural_key.rb
-test/database.yml
-test/fixtures/schema.rb
-test/lib/activerecord_test_case.rb
-test/lib/activerecord_test_connector.rb
-test/test_helper.rb
-test/test_natural_key.rb

data/pkg/natural_key-0.1.0/README.rdoc

@@ -1,52 +0,0 @@
-= natural_key
-
-* http://www.pathf.com
-
-== DESCRIPTION:
-
-This gem adds create_or_update functionality to ActiveRecord based on a user-defined natural-key.
-
-== SYNOPSIS:
-
-Define natural key for your model as follows:
-
-  #
-  # Table users(first_name varchar, last_name varchar, age integer, address string, salary integer)
-  #
-  class User < ActiveRecord::Base
-    natural_key :first_name, :last_name
-  end
-
-With this in place, a method 'create_or_update_by_natural_key' can be used to invoke create/update.
-
-  User.create_or_update_by_natural_key(:first_name => 'John', :last_name => "Smith", :age => 25, :address => "New York")
-
-== INSTALL:
-
-  gem sources -a http://gems.github.com
-  gem install sjain-natural_key
-
-== LICENSE:
-
-(The MIT License)
-
-Copyright (c) 2009 Pathfinder Associates, LLC.
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-'Software'), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/pkg/natural_key-0.1.0/Rakefile

@@ -1,15 +0,0 @@
-require 'rubygems'
-require 'rake'
-require 'echoe'
-require 'lib/natural_key'
-
-Echoe.new('natural_key', NaturalKey::VERSION) do |p|
-  p.description = "ActiveRecord.create_or_update based on a user-defined natural-key"
-  p.url = "http://github.com/sjain/natural_key"
-  p.author = "Sharad Jain"
-  p.email = "shaanjain@gmail.com"
-  p.ignore_pattern = ["tmp/*", "script/*", "nbproject/**/*"]
-  p.development_dependencies = []
-end
-
-Dir["#{File.dirname(__FILE__)}/tasks/*.rake"].sort.each { |ext| load ext }

data/pkg/natural_key-0.1.0/VERSION.yml

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

data/pkg/natural_key-0.1.0/lib/natural_key/base.rb

@@ -1,33 +0,0 @@
-require 'activerecord'
-
-module ActiveRecord
-  class Base
-    class_inheritable_accessor :key_attributes
-    class << self
-      def natural_key(*key_attributes)
-        # TODO validate the supplied key_attributes are subset of all attributes
-        # TODO key_attributes should default to primary_key/surrogate_key (:id)
-        # TODO if natural_key is composed of non-primary-key, then it should not contain primary_key
-        raise "natural key attributes cannot be empty" if key_attributes.empty?
-        self.key_attributes = key_attributes
-      end
-      # can't use method "create_or_update" since there is already a private method with that name
-      # in ActiveRecord::Base
-      # TODO The following method should only be made available when natural_key is called with proper
-      # attributes. (hint: use class_eval?)
-      def create_or_update_by_natural_key(options)
-        options.symbolize_keys!
-        #TODO options should contain all key_attributes, and their values should be non-nil
-        key_options = options.reject { |k,v| !key_attributes.include?(k) }
-        raise "key_options cannot be empty" if key_options.empty?
-        record = find(:first, :conditions => key_options)
-        if(record.nil?)
-          record = create(options)
-        else
-          record.update_attributes!(options)
-        end
-        record
-      end
-    end
-  end
-end

data/pkg/natural_key-0.1.0/lib/natural_key.rb

@@ -1,9 +0,0 @@
-$:.unshift(File.dirname(__FILE__)) unless
-  $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
-
-module NaturalKey
-  version = YAML.load_file(File.dirname(__FILE__) + "/../VERSION.yml")
-  VERSION = "#{version[:major]}.#{version[:minor]}.#{version[:patch]}"
-end
-
-require 'natural_key/base'

data/pkg/natural_key-0.1.0/natural_key.gemspec

@@ -1,32 +0,0 @@
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{natural_key}
-  s.version = "0.1.0"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Sharad Jain"]
-  s.date = %q{2009-08-08}
-  s.description = %q{ActiveRecord.create_or_update based on a user-defined natural-key}
-  s.email = %q{shaanjain@gmail.com}
-  s.extra_rdoc_files = ["CHANGELOG", "README.rdoc", "lib/natural_key/base.rb", "lib/natural_key.rb"]
-  s.files = ["CHANGELOG", "Rakefile", "README.rdoc", "Manifest", "lib/natural_key/base.rb", "lib/natural_key.rb", "test/fixtures/schema.rb", "test/test_helper.rb", "test/database.yml", "test/test_natural_key.rb", "test/lib/activerecord_test_connector.rb", "test/lib/activerecord_test_case.rb", "VERSION.yml", "natural_key.gemspec"]
-  s.has_rdoc = true
-  s.homepage = %q{http://github.com/sjain/natural_key}
-  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Natural_key", "--main", "README.rdoc"]
-  s.require_paths = ["lib"]
-  s.rubyforge_project = %q{natural_key}
-  s.rubygems_version = %q{1.3.1}
-  s.summary = %q{ActiveRecord.create_or_update based on a user-defined natural-key}
-  s.test_files = ["test/test_helper.rb", "test/test_natural_key.rb"]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 2
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-    else
-    end
-  else
-  end
-end

data/pkg/natural_key-0.1.0/test/database.yml

@@ -1,23 +0,0 @@
-mysql:
-  adapter: mysql
-  username: arnk
-  password: arnk
-  encoding: utf8
-  database: ar_natural_key_test
-  host: 127.0.0.1
-
-sqlite3:
-  database: ":memory:"
-  adapter: sqlite3
-  timeout: 500
-
-sqlite2:
-  database: ":memory:"
-  adapter: sqlite2
-
-postgres:
-  adapter: postgresql
-  username: postgres
-  password: postgres
-  database: arnk_test
-  min_messages: warning

data/pkg/natural_key-0.1.0/test/fixtures/schema.rb

@@ -1,9 +0,0 @@
-ActiveRecord::Schema.define do
-  create_table :users, :force => true do |t|
-    t.string :first_name
-    t.string :last_name
-    t.integer :age
-    t.string :address
-    t.integer :salary, :default => 70000
-  end
-end

data/pkg/natural_key-0.1.0/test/lib/activerecord_test_case.rb

@@ -1,34 +0,0 @@
-require 'lib/activerecord_test_connector'
-
-class ActiveRecordTestCase < ActiveRecord::TestCase
-  include ActiveRecord::TestFixtures
-
-  # Set our fixture path
-  if ActiveRecordTestConnector.able_to_connect
-    self.fixture_path = File.join(File.dirname(__FILE__), '..', 'fixtures')
-    self.use_transactional_fixtures = true
-  end
-
-  def self.fixtures(*args)
-    super if ActiveRecordTestConnector.connected
-  end
-
-  def run(*args)
-    super if ActiveRecordTestConnector.connected
-  end
-
-  protected
-
-  def assert_queries(num = 1)
-    $query_count = 0
-    yield
-  ensure
-    assert_equal num, $query_count, "#{$query_count} instead of #{num} queries were executed."
-  end
-
-  def assert_no_queries(&block)
-    assert_queries(0, &block)
-  end
-end
-
-ActiveRecordTestConnector.setup

data/pkg/natural_key-0.1.0/test/lib/activerecord_test_connector.rb

@@ -1,76 +0,0 @@
-require 'rubygems'
-require 'active_record'
-require 'active_record/version'
-require 'active_record/fixtures'
-
-class ActiveRecordTestConnector
-  cattr_accessor :able_to_connect
-  cattr_accessor :connected
-
-  FIXTURES_PATH = File.join(File.dirname(__FILE__), '..', 'fixtures')
-
-  # Set our defaults
-  self.connected = false
-  self.able_to_connect = true
-
-  def self.setup
-    unless self.connected || !self.able_to_connect
-      setup_connection
-      load_schema
-      add_load_path FIXTURES_PATH
-      self.connected = true
-    end
-  rescue Exception => e  # errors from ActiveRecord setup
-    $stderr.puts "\nSkipping ActiveRecord tests: #{e}\n\n"
-    self.able_to_connect = false
-  end
-
-  private
-  
-  def self.add_load_path(path)
-    dep = defined?(ActiveSupport::Dependencies) ? ActiveSupport::Dependencies : ::Dependencies
-    dep.load_paths.unshift path
-  end
-
-  def self.setup_connection
-    db = ENV['DB'].blank?? 'sqlite3' : ENV['DB']
-    
-    configurations = YAML.load_file(File.join(File.dirname(__FILE__), '..', 'database.yml'))
-    raise "no configuration for '#{db}'" unless configurations.key? db
-    configuration = configurations[db]
-    
-    ActiveRecord::Base.logger = Logger.new(STDOUT) if $0 == 'irb'
-    puts "using #{configuration['adapter']} adapter" unless ENV['DB'].blank?
-    
-    gem 'sqlite3-ruby' if 'sqlite3' == db
-    
-    ActiveRecord::Base.establish_connection(configuration)
-    ActiveRecord::Base.configurations = { db => configuration }
-    prepare ActiveRecord::Base.connection
-
-    unless Object.const_defined?(:QUOTED_TYPE)
-      Object.send :const_set, :QUOTED_TYPE, ActiveRecord::Base.connection.quote_column_name('type')
-    end
-  end
-
-  def self.load_schema
-    ActiveRecord::Base.silence do
-      ActiveRecord::Migration.verbose = false
-      load File.join(FIXTURES_PATH, 'schema.rb')
-    end
-  end
-
-  def self.prepare(conn)
-    class << conn
-      IGNORED_SQL = [/^PRAGMA/, /^SELECT currval/, /^SELECT CAST/, /^SELECT @@IDENTITY/, /^SELECT @@ROWCOUNT/, /^SHOW FIELDS /]
-
-      def execute_with_counting(sql, name = nil, &block)
-        $query_count ||= 0
-        $query_count  += 1 unless IGNORED_SQL.any? { |r| sql =~ r }
-        execute_without_counting(sql, name, &block)
-      end
-
-      alias_method_chain :execute, :counting
-    end
-  end
-end

data/pkg/natural_key-0.1.0/test/test_helper.rb

@@ -1,14 +0,0 @@
-require 'stringio'
-require 'test/unit'
-require 'lib/activerecord_test_case'
-require File.dirname(__FILE__) + '/../lib/natural_key'
-
-# gem install redgreen for colored test output
-#begin require 'redgreen'; rescue LoadError; end
-
-# The following is not required since we use active-record gem installed on the system
-#require 'boot' unless defined?(ActiveRecord)
-
-class Test::Unit::TestCase
-# any test helper methods can go here
-end

data/pkg/natural_key-0.1.0/test/test_natural_key.rb

@@ -1,33 +0,0 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
-
-class User < ActiveRecord::Base
-  natural_key :first_name, :last_name
-end
-
-class TestNaturalKey < ActiveRecordTestCase
-  def test_create_by_natural_key
-    created_record = User.create(:first_name => 'John', :last_name => "Smith", :age => 21, :address => "Chicago")
-    updated_record = User.create_or_update_by_natural_key(:first_name => 'Different', :last_name => "Smith", :age => 25, :address => "New York")
-    assert_not_equal(created_record.id, updated_record.id)
-    assert_equal(25, updated_record.age)
-    assert_equal("New York", updated_record.address)
-  end
-  def test_update_by_natural_key
-    created_record = User.create(:first_name => 'John', :last_name => "Smith", :age => 21, :address => "Chicago")
-    updated_record = User.create_or_update_by_natural_key(:first_name => 'John', :last_name => "Smith", :age => 25, :address => "New York")
-    assert_equal(created_record.id, updated_record.id)
-    assert_equal(25, updated_record.age)
-    assert_equal("New York", updated_record.address)
-  end
-  def test_update_by_natural_key_when_keys_are_strings_instead_of_symbols
-    User.create(:first_name => 'Mary', :last_name => "Beth", :age => 21, :address => "Chicago")
-    john_smith = User.create(:first_name => 'John', :last_name => "Smith", :age => 21, :address => "Chicago")
-    updated_record = User.create_or_update_by_natural_key('first_name' => 'John',
-      'last_name' => "Smith",
-      'age' => 25,
-      'address' => "New York")
-    assert_equal(john_smith.id, updated_record.id)
-    assert_equal(25, updated_record.age)
-    assert_equal("New York", updated_record.address)
-  end
-end