model-builder 1.1.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 755f69f2759cbef81f648647073101f1e832d18e
-  data.tar.gz: 918e0c1720b2a2349e1430d39bb1be546cbde95d
+  metadata.gz: 826210a322d5f3d0672b28072c023478179b0e37
+  data.tar.gz: 78cef455bc1a4a059c275e876746ef0301a2ca47
 SHA512:
-  metadata.gz: c55813b933ad427308bc20e31b61b0ce6a9146795df9ec7908c89e8cc5bed85de58759828d22e22dca5fd1cf57bd8549a3808ce4dc3b5d8b115bed75ad2f9a31
-  data.tar.gz: 47c71a7ef9a882b0cee79ce1d7ba4484c0d486cc08c37f8d7da8de0b2c84dac8972c9f09ebf32a55651f44aef9e34f96d674547d4b779e301701ba1ae7e9f218
+  metadata.gz: 6b3b985ca816f10018e23cebbfcfd257f6f3e40dbf254ab9f8550c8ae7c21cc6ca5af5e3a95b131cae50b6b53f382e928a811ed381e6d355d9b0d1c4117e16da
+  data.tar.gz: c9a5efb7833fdecfd932c9f9bd6fe372226e0edb03ce7f1036292cd2c7be71e768d4d3757e69ab56928a9f70c61e33d77b32153451fb5b409a9b8d1d10baf2d5

data/lib/model_builder/class_builder.rb

@@ -1,15 +1,17 @@
 module ModelBuilder
   module ClassBuilder
 
-    @@dynamic_classes ||= []
+    @@dynamic_classes ||= {}
 
     def self.build(name, opts={})
       return Object.const_get name if Object.const_defined? name
 
       klass = get_class_from_options opts
-      Object.const_set name, klass
+      mod = get_module_from_options opts
 
-      add_class klass
+      mod.const_set name, klass
+
+      add_class mod, klass
       include_modules klass, opts[:includes]
       create_accessors klass, opts[:accessors]
 
@@ -26,8 +28,12 @@ module ModelBuilder
       superclass.is_a?(String) ? superclass.constantize : superclass
     end
 
-    def self.add_class(klass)
-      @@dynamic_classes << klass
+    def self.get_module_from_options(opts)
+      opts[:module] || Object
+    end
+
+    def self.add_class(mod, klass)
+      @@dynamic_classes[mod] = klass
     end
 
     def self.include_modules(klass, modules)
@@ -50,11 +56,11 @@ module ModelBuilder
     end
 
     def self.clean
-      list.map {|c| Object.send :remove_const, c.to_s }
-      @@dynamic_classes = []
+      dynamic_classes.each_pair { |mod, klass| mod.send :remove_const, klass.to_s.gsub(/^.*::/, '') }
+      @@dynamic_classes = {}
     end
 
-    def self.list
+    def self.dynamic_classes
       @@dynamic_classes
     end
 

data/lib/model_builder/version.rb

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

data/lib/model_builder.rb

@@ -61,12 +61,12 @@ module ModelBuilder
   end
 
   def self.clean
-    list.map {|c| drop_table c }
+    dynamic_models.map {|c| drop_table c }
     @@dynamic_models = []
     ClassBuilder.clean
   end
 
-  def self.list
+  def self.dynamic_models
     @@dynamic_models
   end
 

data/spec/lib/model_builder/class_builder_spec.rb

@@ -5,8 +5,12 @@ describe ModelBuilder::ClassBuilder do
 
   let(:builder) { ModelBuilder::ClassBuilder }
   let(:name) { 'ClassBuilderTest' }
-  let(:options) { { superclass: Array, includes: [Spec::Support::DummyModule], accessors: %w(a1 a2) } }
   let(:constant) { Object.const_get name }
+  let(:options) {{
+    superclass: Array,
+    includes: [Spec::Support::DummyModule],
+    accessors: %w(a1 a2)
+  }}
 
   before { @build_result = builder.build name, options }
 
@@ -17,7 +21,18 @@ describe ModelBuilder::ClassBuilder do
     subject { @build_result }
 
     it { is_expected.to eq constant }
-    it { expect(builder.list).to include constant }
+    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)
+      }}
+
+      it { is_expected.to eq ModelBuilder.const_get(name) }
+    end
 
     context 'includes validations' do
 
@@ -52,7 +67,7 @@ describe ModelBuilder::ClassBuilder do
       before { builder.clean }
 
       it { expect{constant}.to raise_error(NameError, "uninitialized constant #{name}") }
-      it { expect(builder.list.empty?).to be true }
+      it { expect(builder.dynamic_classes.empty?).to be true }
 
     end
 

data/spec/lib/model_builder_spec.rb

@@ -36,7 +36,7 @@ describe ModelBuilder do
     subject { @build_result }
 
     it { is_expected.to eq constant }
-    it { expect(builder.list).to include constant }
+    it { expect(builder.dynamic_models).to include constant }
 
     context 'options validations' do
 
@@ -87,7 +87,7 @@ describe ModelBuilder do
 
       before { builder.clean }
       it { expect{constant}.to raise_error(NameError, "uninitialized constant #{name}") }
-      it { expect(builder.list.empty?).to be true }
+      it { expect(builder.dynamic_models.empty?).to be true }
 
     end
 

metadata

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