model-builder 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 43d4553c2249d1ed6c3191c3177246b5cb3afb1e
-  data.tar.gz: e55a8406071a5161677595830d4aa6030721bbc1
+  metadata.gz: c2583711abc52652aa9cc69ef15f9562a291c7a2
+  data.tar.gz: 65e5037c934f0b60e7e739fa7d84b345e36d3c49
 SHA512:
-  metadata.gz: 61b3c213aead2ae4b7ed17ac861e04ff06cf55a403beba99eefb1233e8a42331c1f9b32632f4f79796137021f79d5a6f5fff6fadaa8d2d0bb3460d05b9ad9c75
-  data.tar.gz: ac98d9910802a38209c7078a90f821a338cb37144fb6bddf855e4d0a15053d4b60bb6cab5adbece32f0df835c7e74c256cc66b0a5b4e3c6af91d624d84019c38
+  metadata.gz: 7aa46d725a9c5eafd7b17ae90915faa58a1cac85079201953a404fb96d01497f3a7a4ebf2e18708769ab4c22655d832cf495172daccfd4cad296ab2dd9d964c0
+  data.tar.gz: 29d785d220246d6bb8eaa67552f9091d4214554112363fd6174df42d1527033055d5858fd1c5c4a61ca7ec4e42bf0454edce4de7ea706b157fa2710679d3b427

data/.gitignore

@@ -4,6 +4,7 @@
 log/*
 tmp/*
 rdoc/*
+doc/*
 *~
 *.lock
 *.DS_Store

data/README.rdoc

@@ -61,6 +61,11 @@ See full test examples here[https://github.com/r4z3c/model-builder/blob/master/s
 
 == Changelog
 
+=== 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'
+
 === 2.1.0
 
 - Improving support to namespaced classes/models. Now the builder accepts:

data/lib/model_builder/class_builder.rb

@@ -69,7 +69,11 @@ module ModelBuilder
     end
 
     def self.clean
-      dynamic_classes.each_pair { |mod, klass| mod.send :remove_const, klass.to_s.gsub(/^.*::/, '') }
+      dynamic_classes.each_pair do |mod, klass|
+        class_name = klass.to_s.gsub(/^.*::/, '')
+        return if !Object.const_defined?(mod.to_s) or !mod.const_defined?(class_name)
+        mod.send :remove_const, class_name
+      end
       @@dynamic_classes = {}
     end
 

data/lib/model_builder/version.rb

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

data/lib/model_builder.rb

@@ -7,10 +7,9 @@ module ModelBuilder
   def self.build(class_full_name, opts={})
     opts.reverse_merge! get_default_options
 
-    already_exists = Object.const_defined? class_full_name
     klass = ClassBuilder.build class_full_name, opts
 
-    unless already_exists
+    unless table_already_exists class_full_name
       create_table class_full_name, opts
       define_validations klass, opts[:validates]
     end
@@ -25,8 +24,16 @@ module ModelBuilder
     }
   end
 
+  def self.table_already_exists(class_full_name)
+    ActiveRecord::Base.connection.tables.include? table_name_for(class_full_name)
+  end
+
+  def self.table_name_for(class_full_name)
+    class_full_name.tableize.gsub(/\//,'_')
+  end
+
   def self.create_table(class_full_name, opts)
-    ActiveRecord::Migration.create_table(class_full_name.tableize) do |migration|
+    ActiveRecord::Migration.create_table(table_name_for(class_full_name)) do |migration|
       create_attributes(migration, opts[:attributes])
     end
 
@@ -59,7 +66,6 @@ module ModelBuilder
   def self.clean
     dynamic_models.map {|c| drop_table c }
     @@dynamic_models = []
-    ClassBuilder.clean
   end
 
   def self.dynamic_models
@@ -67,7 +73,7 @@ module ModelBuilder
   end
 
   def self.drop_table(class_full_name)
-    ActiveRecord::Migration.drop_table(class_full_name.tableize)
+    ActiveRecord::Migration.drop_table(table_name_for(class_full_name))
   end
 
 end

data/spec/examples/name_utils_spec.rb

@@ -18,7 +18,7 @@ describe NameUtils do
     populate_mappable_names_table
   end
 
-  after { ModelBuilder.clean }
+  after(:all) { ModelBuilder.clean }
 
   subject { MappableName.map_all_names }
 

data/spec/lib/model_builder/class_builder_spec.rb

@@ -14,7 +14,7 @@ describe ModelBuilder::ClassBuilder do
 
   before { @build_result = builder.build name, options }
 
-  after { ModelBuilder::ClassBuilder.clean }
+  after(:all) { ModelBuilder::ClassBuilder.clean }
 
   describe '.build' do
 

data/spec/lib/model_builder_spec.rb

@@ -29,7 +29,7 @@ describe ModelBuilder do
 
   before { @build_result = builder.build name, options }
 
-  after { ModelBuilder.clean }
+  after(:all) { ModelBuilder.clean }
 
   describe '.build' do
 
@@ -89,14 +89,6 @@ describe ModelBuilder do
 
     it { expect(constant.all.count).to eq 0 }
 
-    context 'after build' do
-
-      before { builder.clean }
-      it { expect{constant}.to raise_error(NameError, "uninitialized constant #{name}") }
-      it { expect(builder.dynamic_models.empty?).to be true }
-
-    end
-
   end
 
 end

metadata

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