model-builder 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 826210a322d5f3d0672b28072c023478179b0e37
-  data.tar.gz: 78cef455bc1a4a059c275e876746ef0301a2ca47
+  metadata.gz: 43d4553c2249d1ed6c3191c3177246b5cb3afb1e
+  data.tar.gz: e55a8406071a5161677595830d4aa6030721bbc1
 SHA512:
-  metadata.gz: 6b3b985ca816f10018e23cebbfcfd257f6f3e40dbf254ab9f8550c8ae7c21cc6ca5af5e3a95b131cae50b6b53f382e928a811ed381e6d355d9b0d1c4117e16da
-  data.tar.gz: c9a5efb7833fdecfd932c9f9bd6fe372226e0edb03ce7f1036292cd2c7be71e768d4d3757e69ab56928a9f70c61e33d77b32153451fb5b409a9b8d1d10baf2d5
+  metadata.gz: 61b3c213aead2ae4b7ed17ac861e04ff06cf55a403beba99eefb1233e8a42331c1f9b32632f4f79796137021f79d5a6f5fff6fadaa8d2d0bb3460d05b9ad9c75
+  data.tar.gz: ac98d9910802a38209c7078a90f821a338cb37144fb6bddf855e4d0a15053d4b60bb6cab5adbece32f0df835c7e74c256cc66b0a5b4e3c6af91d624d84019c38

data/.gitignore

@@ -3,6 +3,7 @@
 *.sqlite3
 log/*
 tmp/*
+rdoc/*
 *~
 *.lock
 *.DS_Store

data/README.rdoc

@@ -2,11 +2,11 @@
 
 Build active record models on the fly.
 
-Handy when using TDD to develop a reusable component, that is not strictly related to the business intelligence of a project (and should not reference it).
+Handy when following TDD to develop a reusable component, that isn't strictly related to a project business intelligence (therefore should not reference it).
 
 == Scenario
 
-Consider this case of code duplication:
+Take a look at this case of code duplication:
 
     class User < ActiveRecord::Base
       def map_all_names
@@ -20,7 +20,7 @@ Consider this case of code duplication:
       end
     end
 
-We can easily improve this through an abstraction:
+That can be easily improved through an abstraction:
 
     class User < ActiveRecord::Base
       include NameUtils
@@ -38,12 +38,12 @@ We can easily improve this through an abstraction:
       end
     end
 
-Nice. Now we have a reusable abstraction, that could even fit in a gem to be applied at another projects.
+Nice. Now we've a reusable abstraction, that could even fit into a gem to be applied at another projects.
 
-But thinking about the gem context, we will not be able to use user or topic models at our tests.
+But thinking about a gem context, we will not be able to use User or Topic models at our tests.
 They belong to our business intelligence. So, how to test it?
 
-Here comes the necessity of don't rely on our business intelligence at abstractions tests.
+Here is the need of don't rely our business intelligence during abstraction tests.
 
 == Solution
 
@@ -57,4 +57,12 @@ Now your 'MappableName' model is able to receive NameUtils tests:
 
     MappableName.map_all_names
 
-See the full test example here[https://github.com/r4z3c/model-builder/blob/master/spec/examples/name_utils_spec.rb].
+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.1.0
+
+- Improving support to namespaced classes/models. Now the builder accepts:
+
+    ModelBuilder.build 'Namespaced::Models' ...

data/lib/model_builder/class_builder.rb

@@ -3,21 +3,38 @@ module ModelBuilder
 
     @@dynamic_classes ||= {}
 
-    def self.build(name, opts={})
-      return Object.const_get name if Object.const_defined? name
+    def self.build(class_full_name, opts={})
+      namespace = namespace_from_class_full_name class_full_name
+      class_name = class_name_from_class_full_name class_full_name
+      return namespace.const_get class_name if namespace.const_defined? class_name
 
       klass = get_class_from_options opts
-      mod = get_module_from_options opts
+      namespace.const_set class_name, klass
 
-      mod.const_set name, klass
-
-      add_class mod, klass
+      add_class namespace, klass
       include_modules klass, opts[:includes]
       create_accessors klass, opts[:accessors]
 
       klass
     end
 
+    def self.namespace_from_class_full_name(class_full_name)
+      namespace_name = class_namespace_name(class_full_name)
+      namespace_name.blank? ? Object : const_get(namespace_name)
+    end
+
+    def self.class_namespace_name(class_full_name)
+      class_full_name_parts(class_full_name)[0...-1].join '::'
+    end
+
+    def self.class_full_name_parts(class_full_name)
+      class_full_name.split('::')
+    end
+
+    def self.class_name_from_class_full_name(class_full_name)
+      class_full_name_parts(class_full_name).last
+    end
+
     def self.get_class_from_options(opts)
       superclass = get_superclass_from_options opts
       superclass.nil? ? Class.new : Class.new(superclass)
@@ -28,10 +45,6 @@ module ModelBuilder
       superclass.is_a?(String) ? superclass.constantize : superclass
     end
 
-    def self.get_module_from_options(opts)
-      opts[:module] || Object
-    end
-
     def self.add_class(mod, klass)
       @@dynamic_classes[mod] = klass
     end

data/lib/model_builder/version.rb

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

data/lib/model_builder.rb

@@ -4,14 +4,14 @@ module ModelBuilder
 
   @@dynamic_models ||= []
 
-  def self.build(name, opts={})
+  def self.build(class_full_name, opts={})
     opts.reverse_merge! get_default_options
 
-    already_exists = Object.const_defined? name
-    klass = ClassBuilder.build name, opts
+    already_exists = Object.const_defined? class_full_name
+    klass = ClassBuilder.build class_full_name, opts
 
     unless already_exists
-      create_table klass, opts
+      create_table class_full_name, opts
       define_validations klass, opts[:validates]
     end
 
@@ -25,16 +25,12 @@ module ModelBuilder
     }
   end
 
-  def self.create_table(klass, opts)
-    ActiveRecord::Migration.create_table(table_name_for(klass)) do |migration|
+  def self.create_table(class_full_name, opts)
+    ActiveRecord::Migration.create_table(class_full_name.tableize) do |migration|
       create_attributes(migration, opts[:attributes])
     end
 
-    @@dynamic_models << klass
-  end
-
-  def self.table_name_for(klass)
-    klass.to_s.tableize
+    @@dynamic_models << class_full_name
   end
 
   def self.create_attributes(migration, attributes={})
@@ -70,8 +66,8 @@ module ModelBuilder
     @@dynamic_models
   end
 
-  def self.drop_table(klass)
-    ActiveRecord::Migration.drop_table(table_name_for(klass))
+  def self.drop_table(class_full_name)
+    ActiveRecord::Migration.drop_table(class_full_name.tableize)
   end
 
 end

data/spec/lib/model_builder/class_builder_spec.rb

@@ -24,12 +24,7 @@ describe ModelBuilder::ClassBuilder do
     it { expect(builder.dynamic_classes.values).to include constant }
 
     context 'module validations' do
-      let(:options) {{
-        module: ModelBuilder,
-        superclass: Array,
-        includes: [Spec::Support::DummyModule],
-        accessors: %w(a1 a2)
-      }}
+      let(:name) { 'ModelBuilder::ClassBuilderTest' }
 
       it { is_expected.to eq ModelBuilder.const_get(name) }
     end

data/spec/lib/model_builder_spec.rb

@@ -36,7 +36,13 @@ describe ModelBuilder do
     subject { @build_result }
 
     it { is_expected.to eq constant }
-    it { expect(builder.dynamic_models).to include constant }
+    it { expect(builder.dynamic_models).to include name }
+
+    context 'module validations' do
+      let(:name) { 'ModelBuilder::TestModel' }
+
+      it { is_expected.to eq ModelBuilder.const_get(name) }
+    end
 
     context 'options validations' do
 

metadata

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