super_sti 0.2.1 → 0.3.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 8b358a0cc85f0378b13d20b7a1fddb767b2f4c5e
+  data.tar.gz: e99e5cf78f3f343cbd2decb3455c95d8eec4dbba
+SHA512:
+  metadata.gz: b5aed786eba00111e00cc5575c4d96ecb36770ab0bb7480e070baf06ba526e917f91429390020c3733c4e0b03b0633e69945c79a0b79350bfc6e00d623a28657
+  data.tar.gz: a8560039dff9a4e8b982cc3f7ef4ec593aec7087b80ba68e54730cf7ae56c4170ef76d28279af2b62b16d2b14c7c9daadfd41b6d441593838787c2e1b1b3162c

data/.travis.yml

@@ -0,0 +1,7 @@
+nguage: ruby
+rvm:
+  - 1.9.3
+env:
+  - DB=sqlite
+script:
+  - RAILS_ENV=test bundle exec rspec

data/{README → README.md}

@@ -1,9 +1,9 @@
-Adds an add_extra_data method to ActiveRecord that invisibly includes an extra data table. Use with STI to keep your database clean. It removes the need to have lots of nullable columns.
+Adds an has_extra_data method to ActiveRecord that invisibly includes an extra data table. Use with STI to keep your database clean. It removes the need to have lots of nullable columns.
 
 Usage
 ---------
 Use in Rails 3 app. Add to bundler:
-gem "has_extra_data"
+gem 'super_sti', :git => "git://github.com/ihid/super_sti.git"
 
 Tests
 ---------
@@ -31,6 +31,7 @@ Usage:
     end
 
 Classes:
+
     class Account < ActiveRecord::Base
       before_create :set_initial_balance
   
@@ -76,4 +77,4 @@ Database Schema:
 
     create_table :banks do |t|
       t.string :name, :null => false
-    end
+    end

data/lib/super_sti/hook.rb

@@ -1,4 +1,7 @@
 module SuperSTI
+  
+  class DataMissingError < ::StandardError;end
+  
   module Hook
     
     ######
@@ -17,23 +20,29 @@ module SuperSTI
 
       table_name = options[:table_name] || "#{self.name.underscore.gsub("/", "_")}_data"
       klass = Class.new(ActiveRecord::Base) do
-        set_table_name(table_name)
+        self.table_name = table_name
       end
       klass.class_eval &block if block_given?
       self.const_set "Data", klass
   
       # Add a reference to a data object that gets created when this is created
-      has_one :data, :class_name => "#{self.name}::Data", :foreign_key => options[:foreign_key]
+      has_one :data, :class_name => "#{self.name}::Data", :foreign_key => options[:foreign_key], :readonly => false, :autosave => true, :dependent => :destroy
       before_create :get_data
       
       # A helper method which gets the existing data or builds a new object
       define_method :get_data do
-        data || build_data
+        return data if data
+        return build_data if new_record?
+        raise SuperSTI::DataMissingError
       end
       
       # Override respond_to? to check both this object and its data object.
       define_method "respond_to?" do |sym, include_private = false|
-        super(sym, include_private) || get_data.respond_to?(sym, include_private)
+        begin
+          super(sym, include_private) || get_data.respond_to?(sym, include_private)
+        rescue SuperSTI::DataMissingError
+          false
+        end
       end
       
       # Override method_missing to check both this object and it's data object for any methods or magic functionality.
@@ -41,8 +50,8 @@ module SuperSTI
       # some magic piping that will return a result and then try the data object.
       define_method :method_missing do |sym, *args|
         begin
-          super(sym, args)
-        rescue
+          super(sym, *args)
+        rescue NoMethodError
           get_data.send(sym, *args)
         end
       end

data/lib/super_sti/version.rb

@@ -1,3 +1,3 @@
 module SuperSTI
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

data/spec/spec_helper.rb

@@ -19,6 +19,12 @@ ActiveRecord::Base.logger
 ActiveRecord::Schema.define(:version => 1) do
   create_table :accounts do |t|
     t.float :balance
+    t.boolean :is_approved, :null => false
+    t.string :type, :null => false
+  end
+
+  create_table :basic_account_data do |t|
+    t.integer :basic_account_id, :null => false
   end
   
   create_table :bank_account_data do |t|
@@ -45,6 +51,14 @@ ActiveRecord::Schema.define(:version => 1) do
   create_table :unusual_foreign_key_data do |t|
     t.integer :unusual_foreign_key, :null => false
   end
+
+  create_table :scoped_accounts do |t|
+    t.boolean :is_live, :null => false
+  end
+
+  create_table :scoped_account_data do |t|
+    t.boolean :scoped_account_id, :null => false
+  end
 end
 
 require 'test_classes'

data/spec/super_sti_spec.rb

@@ -0,0 +1,102 @@
+require 'spec_helper'
+
+describe "Super STI models with has_extra_data models" do
+  
+  before :each do 
+    @bank = Bank.create!(:name => "My Bank")
+    @bank_account = BankAccount.new
+    @valid_bank_account_attributes = {:account_number => "12345678", :sort_code => "12 34 56", :bank => @bank}
+  end
+  
+  it "have the data method" do
+    @bank_account.should respond_to(:data)
+  end
+
+  it "can have variables set" do
+    @bank_account.account_number = "12345678"
+    @bank_account.sort_code = "12 34 56"
+    @bank_account.bank = @bank
+    @bank_account.save!
+    @bank_account.data.id.should_not == 0
+  end
+  
+  it "creates data with the test class" do
+    @bank_account.attributes = @valid_bank_account_attributes
+    @bank_account.save!
+    @bank_account.data.id.should_not == 0
+  end
+
+  it "can read attributes" do
+    @bank_account.attributes = @valid_bank_account_attributes
+    @bank_account.save!
+    @bank_account = BankAccount.find(@bank_account.id)
+    @bank_account.account_number.should == "12345678"
+  end
+  
+  it "can read associations" do
+    @bank_account.attributes = @valid_bank_account_attributes
+    @bank_account.save!
+    @bank_account = BankAccount.find(@bank_account.id)
+    @bank_account.bank.should == @bank
+  end
+  
+  it "can have a specifc foreign_key" do
+    obj = UnusualForeignKey.create!
+    obj.data.should_not be_nil
+  end
+  
+  it "can have any table name" do
+    obj = UnusualTableName.create!
+    obj.data.should_not be_nil
+  end
+  
+  it "does not break scoped" do
+    ba1 = BasicAccount.create!(:is_approved => true)
+    ba2 = BasicAccount.create!(:is_approved => false)
+    ba1.is_approved?.should == true
+    ba2.is_approved?.should == false
+    BasicAccount.approved.count.should == 1
+  end
+  
+  it "correctly gets parent id, not data id" do
+    ActiveRecord::Base.connection.execute("INSERT INTO basic_account_data('basic_account_id') VALUES (0)")
+    ba = BasicAccount.create!
+    ba.id.should_not == ba.data.id
+    
+    ba2 = BasicAccount.find(ba.id)
+    ba2.id.should == ba.id
+    ba2.data.id.should == ba.data.id
+    ba2.id.should_not == ba2.data.id
+    
+    ba3 = Account.find(ba.id)
+    ba3.id.should == ba.id
+    ba3.data.id.should == ba.data.id
+    ba3.id.should_not == ba3.data.id
+  end
+  
+  it "if extra data is deleted, it still loads but can't load extra data" do
+    ba = BankAccount.create!(@valid_bank_account_attributes)
+    ActiveRecord::Base.connection.execute("DELETE FROM bank_account_data where id = #{ba.data.id}")
+    
+    ba2 = BankAccount.find(ba.id)
+    ba2.id.should == ba.id
+    ba2.data.should be_nil 
+    lambda{ba2.bank_id}.should raise_error(SuperSTI::DataMissingError)
+  end
+  
+  it "saves data on updates" do
+    # Setup normal bank account
+    @bank_account.attributes = @valid_bank_account_attributes
+    @bank_account.save!
+    @bank_account.account_number.should == "12345678"
+    
+    # Update attribute
+    @bank_account.account_number = "87654321"
+    @bank_account.save!
+    
+    # Check the database has been updated
+    BankAccount.find(@bank_account.id).account_number.should == "87654321"
+  end
+  
+  
+end

data/spec/test_classes.rb

@@ -1,13 +1,20 @@
 class Account < ActiveRecord::Base
-  before_create :set_initial_balance
+  before_create :set_defaults
+  
+  scope :approved, where(:is_approved => true)
   
 private
-  def set_initial_balance
-    self.balance = 0
+  def set_defaults
+    self.balance = 0 unless balance
+    self.is_approved = 0 unless is_approved
     true
   end
 end
 
+class BasicAccount < Account
+  has_extra_data
+end
+
 class BankAccount < Account
   has_extra_data do
     belongs_to :bank

data/super_sti.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.summary     = %q{Ruby Rails - Add has_extra_data to SDI models with clean database tables.}
   s.description = %q{Adds an add_extra_data method to ActiveRecord that invisibly includes an extra data table. Means you can use STI but keep your database clean.}
 
-  s.add_dependency "rails"
+  s.add_dependency "rails", "~> 3.2.0"
   s.add_development_dependency "rspec-rails"
   
   s.rubyforge_project = "has_extra_data"

metadata

@@ -1,90 +1,89 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: super_sti
-version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.2.1
+version: !ruby/object:Gem::Version
+  version: 0.3.0
 platform: ruby
-authors: 
+authors:
 - Jeremy Walker
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-05-18 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-10-08 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rails
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec-rails
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.0
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-description: Adds an add_extra_data method to ActiveRecord that invisibly includes an extra data table. Means you can use STI but keep your database clean.
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Adds an add_extra_data method to ActiveRecord that invisibly includes
+  an extra data table. Means you can use STI but keep your database clean.
+email:
 - jez.walker@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
+- .travis.yml
 - Gemfile
-- README
+- README.md
 - Rakefile
 - lib/super_sti.rb
 - lib/super_sti/hook.rb
 - lib/super_sti/railtie.rb
 - lib/super_sti/version.rb
 - spec/spec_helper.rb
-- spec/super_sti.rb
+- spec/super_sti_spec.rb
 - spec/test_classes.rb
 - super_sti.gemspec
-homepage: ""
+homepage: ''
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: has_extra_data
-rubygems_version: 1.7.2
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby Rails - Add has_extra_data to SDI models with clean database tables.
-test_files: 
+test_files:
 - spec/spec_helper.rb
-- spec/super_sti.rb
+- spec/super_sti_spec.rb
 - spec/test_classes.rb

data/spec/super_sti.rb

@@ -1,53 +0,0 @@
-require 'spec_helper'
-
-describe "Super STI models with has_extra_data models" do
-  
-  before :each do 
-    @bank = Bank.create!(:name => "My Bank")
-    @bank_account = BankAccount.new
-    @valid_bank_account_attributes = {:account_number => "12345678", :sort_code => "12 34 56", :bank => @bank}
-  end
-  
-  it "have the data method" do
-    @bank_account.should respond_to(:data)
-  end
-
-  it "can have variables set" do
-    @bank_account.account_number = "12345678"
-    @bank_account.sort_code = "12 34 56"
-    @bank_account.bank = @bank
-    @bank_account.save!
-    @bank_account.data.id.should_not == 0
-  end
-  
-  it "creates data with the test class" do
-    @bank_account.attributes = @valid_bank_account_attributes
-    @bank_account.save!
-    @bank_account.data.id.should_not == 0
-  end
-
-  it "can read attributes" do
-    @bank_account.attributes = @valid_bank_account_attributes
-    @bank_account.save!
-    @bank_account = BankAccount.find(@bank_account.id)
-    @bank_account.account_number.should == "12345678"
-  end
-  
-  it "can read associations" do
-    @bank_account.attributes = @valid_bank_account_attributes
-    @bank_account.save!
-    @bank_account = BankAccount.find(@bank_account.id)
-    @bank_account.bank.should == @bank
-  end
-  
-  it "can have a specifc foreign_key" do
-    obj = UnusualForeignKey.create!
-    obj.data.should_not be_nil
-  end
-  
-  it "can have any table name" do
-    obj = UnusualTableName.create!
-    obj.data.should_not be_nil
-  end
-  
-end