model-builder 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2583711abc52652aa9cc69ef15f9562a291c7a2
-  data.tar.gz: 65e5037c934f0b60e7e739fa7d84b345e36d3c49
+  metadata.gz: ace51db947f2b525e1d80a6fa90b71e6a3115adc
+  data.tar.gz: c1cb1febe8be2491f961bba40059f86c72bc8f82
 SHA512:
-  metadata.gz: 7aa46d725a9c5eafd7b17ae90915faa58a1cac85079201953a404fb96d01497f3a7a4ebf2e18708769ab4c22655d832cf495172daccfd4cad296ab2dd9d964c0
-  data.tar.gz: 29d785d220246d6bb8eaa67552f9091d4214554112363fd6174df42d1527033055d5858fd1c5c4a61ca7ec4e42bf0454edce4de7ea706b157fa2710679d3b427
+  metadata.gz: 9280f72f29461438d2ee0411f0a3411b0ade28b9057a56ff620995366366f02f4525341558af750ec5a3f935cba0a792a233724c5c07510ce2b9813497e47d99
+  data.tar.gz: 5b0d1755b6742ac1f38b6b12576053d88a8293ab09bc0b15f092b35af3250c354a102d0b9e4d62c4d4684a77b9ee42152d078e97a4bb3e506ed0d747a4f6d6dd

data/README.rdoc

@@ -2,7 +2,7 @@
 
 Build active record models on the fly.
 
-Handy when following TDD to develop a reusable component, that isn't strictly related to a project business intelligence (therefore should not reference it).
+Handy when following TDD to develop a reusable component, that isn't strictly related to a project business layer (therefore should not reference it).
 
 == Scenario
 
@@ -57,14 +57,37 @@ Now your 'MappableName' model is able to receive NameUtils tests:
 
     MappableName.map_all_names
 
+And, in order to clean database:
+
+    # Add this to your spec_helper.rb or rails_helper.rb
+
+    RSpec.configure do |config|
+      config.after(:suite) do
+        ModelBuilder.clean
+      end
+    end
+
 See full test examples here[https://github.com/r4z3c/model-builder/blob/master/spec/examples/name_utils_spec.rb] and here[https://github.com/r4z3c/model-builder/blob/master/spec/lib/model_builder_spec.rb].
 
 == Changelog
 
+=== 2.2.1
+
+- Bug fixes and improvements for creating/dropping tables
+- Bug fixes and improvements for cleaning strategy: now you have to call 'clean' method at 'after :suite' instead of 'before :all'
+
+    # Add this to your spec_helper.rb or rails_helper.rb
+
+    RSpec.configure do |config|
+      config.after(:suite) do
+        ModelBuilder.clean
+      end
+    end
+
 === 2.2.0
 
 - Bug fixes and improvements for creating/dropping tables
-- Bug fixes and improvements for cleaning strategy: now you should call 'clean' methods in 'before :all' instead of 'before :each'
+- Bug fixes and improvements for cleaning strategy: now you have to 'clean' method at 'before :all' instead of 'before :each'
 
 === 2.1.0
 

data/lib/model_builder/version.rb

@@ -1,3 +1,3 @@
 module ModelBuilder
-  VERSION = '2.2.0'
+  VERSION = '2.2.1'
 end

data/lib/model_builder.rb

@@ -2,6 +2,8 @@ Dir["#{File.dirname(__FILE__)}/**/*.rb"].each {|file| require file }
 
 module ModelBuilder
 
+  TABLE_PREFIX = "model_builder/"
+
   @@dynamic_models ||= []
 
   def self.build(class_full_name, opts={})
@@ -11,6 +13,7 @@ module ModelBuilder
 
     unless table_already_exists class_full_name
       create_table class_full_name, opts
+      define_table_name klass, class_full_name
       define_validations klass, opts[:validates]
     end
 
@@ -25,11 +28,24 @@ module ModelBuilder
   end
 
   def self.table_already_exists(class_full_name)
-    ActiveRecord::Base.connection.tables.include? table_name_for(class_full_name)
+    relevant_database_tables.include? table_name_for(class_full_name)
+  end
+
+  def self.relevant_database_tables
+    database_tables.select {|table| table.starts_with? TABLE_PREFIX }
+  end
+
+  def self.database_tables
+    database_connection.tables
+  end
+
+  def self.database_connection
+    ActiveRecord::Base.connection
   end
 
   def self.table_name_for(class_full_name)
-    class_full_name.tableize.gsub(/\//,'_')
+    table_name = class_full_name.tableize.gsub(/\//,'_')
+    "#{TABLE_PREFIX}#{table_name}"
   end
 
   def self.create_table(class_full_name, opts)
@@ -57,6 +73,10 @@ module ModelBuilder
     migration.send(type, key, opts)
   end
 
+  def self.define_table_name(klass, class_full_name)
+    klass.table_name = table_name_for(class_full_name)
+  end
+
   def self.define_validations(klass, validations)
     return if validations.nil? or !validations.kind_of?(Array) or validations.empty?
     validations = [validations] unless validations.first.kind_of? Array
@@ -64,7 +84,7 @@ module ModelBuilder
   end
 
   def self.clean
-    dynamic_models.map {|c| drop_table c }
+    relevant_database_tables.map {|table| drop_table table }
     @@dynamic_models = []
   end
 
@@ -72,8 +92,8 @@ module ModelBuilder
     @@dynamic_models
   end
 
-  def self.drop_table(class_full_name)
-    ActiveRecord::Migration.drop_table(table_name_for(class_full_name))
+  def self.drop_table(table)
+    ActiveRecord::Migration.drop_table(table)
   end
 
 end

data/spec/lib/model_builder_spec.rb

@@ -2,8 +2,6 @@ require 'spec_helper'
 require 'support/database_connection'
 require 'support/dummy_module'
 
-Spec::Support::DatabaseConnection.establish_sqlite_connection
-
 describe ModelBuilder do
 
   let(:builder) { ModelBuilder }
@@ -29,8 +27,6 @@ describe ModelBuilder do
 
   before { @build_result = builder.build name, options }
 
-  after(:all) { ModelBuilder.clean }
-
   describe '.build' do
 
     subject { @build_result }

data/spec/spec_helper.rb

@@ -1,6 +1,15 @@
 require 'active_record'
 require 'simplecov'
+require 'support/database_connection'
 
 SimpleCov.start
 
-require(File.expand_path '.','lib/model_builder')
+require 'model_builder'
+
+Spec::Support::DatabaseConnection.establish_sqlite_connection
+
+RSpec.configure do |config|
+  config.after(:suite) do
+    ModelBuilder.clean
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: model-builder
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - r4z3c
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-16 00:00:00.000000000 Z
+date: 2016-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler