active_mocker 1.1.10 → 1.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7bb54273c96a7bc0bd3734d3193ec1993f6a6336
-  data.tar.gz: abf486f0dc2c983059a4a2a82eac5061b333430a
+  metadata.gz: 461b70e002570b08fb40fd4f3bbfeeedaac59672
+  data.tar.gz: c1a570d233029b13813e61ba849b388edc417183
 SHA512:
-  metadata.gz: 36401322a2d363a592d8c3cfa6fc7b322765103680b02a0e14e2391bfa0dc70deca69cf247d2ff2cd673c12dd01d119996d69711599af8e555996f41ca0c3859
-  data.tar.gz: 17c97729cfe75f2a46ec1bb97f4a751e67a9dd8b12bc8462922f2b549d87a273cf135c20ae22d2b325de67e308c039ea6da97b278fe16b8423a545b1bf6c7d5a
+  metadata.gz: 80063db1732dec862301ce306b77a63b8097cb27f1b23d07d9c11ad25532b31c24f17ba5054410ec50b6fbd0677684bc91337a206b2045bf56cf981183efd171
+  data.tar.gz: d336a09d187f76d1eec2fc3220cd277e5da941649bd378ad14e253b2be826b95f1ff5a317c0fce1edf1a17bd5b6c8ae80e8adff41b9232a14cd42745e56599b1

data/lib/active_mocker/active_record/schema.rb

@@ -18,23 +18,24 @@ module ActiveMocker
       end
 
       def self.add_to_cache(table)
-        @@tables_cache ||= []
-        @@tables_cache << table unless table.nil?
+        @tables_cache ||= []
+        @tables_cache << table unless table.nil?
       end
 
       def self.search_cache(table_name)
-        @@tables_cache ||= []
-        @@tables_cache.find do |h|
+        @tables_cache ||= []
+        @tables_cache.find do |h|
           h.name == table_name
         end
       end
 
       def self.clear_cache
-        @@tables_cache = []
+        @tables_cache = []
       end
 
       def self.search(table_name)
         @table_search = table_name
+        search_cache(table_name)
       end
 
     end

data/lib/active_mocker/schema_reader.rb

@@ -13,7 +13,7 @@ module ActiveMocker
     def search(model_name)
       @model_name = model_name
       @table = search_schema_file
-      @table.fields.unshift Field.new('id', :integer, {})
+      @table
       @table
     end
 
@@ -23,16 +23,13 @@ module ActiveMocker
       model_name
     end
 
-    def not_found
-      raise "#{table_name} table not found." if @schema_result.nil?
-    end
-
     def search_schema_file
       ActiveMocker::ActiveRecord::Schema.clear_cache if clear_cache
-      ActiveMocker::ActiveRecord::Schema.search(table_name)
-      @schema_result = eval_file
-      not_found
-      @schema_result
+      search_result = ActiveMocker::ActiveRecord::Schema.search(table_name)
+      return search_result if search_result
+      schema_result = eval_file
+      raise "#{table_name} table not found." if schema_result.nil?
+      schema_result
     end
 
     def eval_file

data/lib/active_mocker/table.rb

@@ -7,6 +7,7 @@ module ActiveMocker
     def initialize(name, fields=[])
       @name   = name
       @fields = fields
+      fields.unshift Field.new('id', :integer, {})
     end
 
     def to_h

data/lib/active_mocker/version.rb

@@ -1,3 +1,3 @@
 module ActiveMocker
-  VERSION = "1.1.10"
+  VERSION = "1.1.11"
 end

data/spec/lib/active_mocker/schema_reader_spec.rb

@@ -57,7 +57,7 @@ describe ActiveMocker::SchemaReader do
 
   context 'inject string_reader as file_reader' do
 
-    let(:subject){described_class.new({schema_file:nil, file_reader: example_schema})}
+    let(:subject){described_class.new({schema_file:nil, file_reader: example_schema, clear_cache: true})}
 
     let(:search){subject.search('people')}
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_mocker
 version: !ruby/object:Gem::Version
-  version: 1.1.10
+  version: 1.1.11
 platform: ruby
 authors:
 - Dustin Zeisler