active_mocker 1.1.9 → 1.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9940d5208df11f3cc98ab2172753293c4e6e480
-  data.tar.gz: 37c61f9c1cf275c9807f0de8b2f3c0bbdceedc30
+  metadata.gz: 7bb54273c96a7bc0bd3734d3193ec1993f6a6336
+  data.tar.gz: abf486f0dc2c983059a4a2a82eac5061b333430a
 SHA512:
-  metadata.gz: c49ea8b615fb04c03e59a75415dba2f906c262917785f8e1c8f5c6a49228425e2959f1c8d23c5819c5a3847c4380753b5b3bf6327528005237bcd1678b183820
-  data.tar.gz: 540acf96d88c6df5c474e8b69c40d92d3b6d4d4b691a87a71a55f558bf13b60da3ebb6d8e71c2ca48001c883569b317d5479923c32bde557bcef687f86c0cdb7
+  metadata.gz: 36401322a2d363a592d8c3cfa6fc7b322765103680b02a0e14e2391bfa0dc70deca69cf247d2ff2cd673c12dd01d119996d69711599af8e555996f41ca0c3859
+  data.tar.gz: 17c97729cfe75f2a46ec1bb97f4a751e67a9dd8b12bc8462922f2b549d87a273cf135c20ae22d2b325de67e308c039ea6da97b278fe16b8423a545b1bf6c7d5a

data/README.md

@@ -51,17 +51,14 @@ Or install it yourself as:
     require 'active_mocker'
 
     ActiveMocker.configure do |config|
-    # Required Options
+      # Required Options
       config.schema_file = "#{APP_ROOT}/db/schema.rb"
       config.model_dir   = "#{APP_ROOT}/app/models"
-    # Additional Options
-      config.active_hash_as_base = false #default
+      # Additional Options
       config.schema_attributes   = true  #default
-      config.model_relationships = true  #default
-      config.model_methods       = true  #default
-      config.mass_assignment     = true  #default
-     # Logging
-      config.log_level = Logger::WARN    #default
+      config.model_attributes    = true  #default
+      # Logging
+      config.log_level = Logger::WARN       #default
     end
 
     ActiveMocker.mock('Person')
@@ -149,59 +146,28 @@ Or install it yourself as:
     end
       => NameError: undefined method `bar' for class `PersonMock'
 
-### Enable ActiveHash support
-ActiveHash is a simple base class that allows you to use a ruby hash as a readonly datasource for an ActiveRecord-like model.
-  [zilkey/active_hash](https://github.com/zilkey/active_hash)
-
-
-    ActiveMocker.configure do |config|
-      config.active_hash_as_base = true
-    end
-
-    ActiveMocker.mock('Person').superclass
-      => ActiveHash::Base
-
-    dustin = PersonMock.create(first_name: 'Dustin')
-      => #<PersonMock @attributes={:first_name=>"Dustin" :id=>1}>
-
-    PersonMock.all
-      => [#<PersonMock: @attributes={:first_name=>"Dustin", :id=>1}>]
-
-     dustin.last_name = 'Zeisler'
-       => "Zeisler"
-
-     dustin.save
-       => true
-
-### Additional ActiveHash extensions for matching ActiveRecord
-
-
-#### #update method
-
-    person = PersonMock.create(first_name: 'Justin')
-    person.update(first_name: 'Dustin')
-
-    person.first_name
-        => 'Dustin'
-
-
-#### ::destroy_all
-
-    PersonMock.create
-    PersonMock.count
-        => 1
-
-    PersonMock.destroy_all
-    PersonMock.count
-        => 0
-
-
-#### ::find_by
-
-    person = PersonMock.create(first_name: 'Dustin')
-    PersonMock.find_by(first_name: 'Dustin') == person
-      => true
-
+### ActiveRecord supported methods
+**class methods**
+  * new
+  * create
+  * column_names
+  * find
+  * find_by
+  * find_by!
+  * find_or_create_by
+  * find_or_initialize_by
+  * where - (only supports hash input)
+  * delete_all/destroy_all
+  * all
+  * count
+  * first/last
+
+**instance methods**
+  * attributes
+  * update
+  * save
+  * write_attribute - (private)
+  * read_attribute  - (private)
 
 ### Known Limitations
 

data/active_mocker.gemspec

@@ -20,14 +20,14 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.0.0'
 
-  spec.add_runtime_dependency "activesupport", "~>4.0"
+  spec.add_runtime_dependency "activerecord", "~>4.1"
+  spec.add_runtime_dependency "activesupport", "~>4.1"
   spec.add_runtime_dependency "active_hash", "~>1.3"
 
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake", "~>10.1"
   spec.add_development_dependency "rspec", "~>2.14"
   spec.add_development_dependency "i18n", "~>0.6"
-  spec.add_development_dependency "activerecord", "~>4.0"
   spec.add_development_dependency "sqlite3", "~>1.3"
 
   # if ENV['DEBUG'] == '1'

data/lib/active_hash/find_by.rb

@@ -1,6 +1,7 @@
 module ActiveHash
 
   module ARApi
+    require 'active_record/errors'
 
     module FindBy
 
@@ -8,6 +9,12 @@ module ActiveHash
         send(:where, options).first
       end
 
+      def find_by!(options={})
+        result = find_by(options)
+        raise ActiveRecord::RecordNotFound if result.blank?
+        result
+      end
+
     end
 
   end

data/lib/active_mocker/base.rb

@@ -5,21 +5,19 @@ module ActiveMocker
     @@_self = self
     def_delegators :@@_self,
                    :mass_assignment,
-                   :model_relationships,
                    :schema_attributes,
-                   :model_methods,
-                   :active_hash_as_base,
+                   :model_attributes,
                    :model_dir,
                    :schema_file,
                    :model_file_reader,
-                   :schema_file_reader
+                   :schema_file_reader,
+                   :clear_cache
 
     attr_reader :model_name, :klass
 
     def initialize(model_name)
       @model_name = model_name
-      plain_mock_class       unless active_hash_as_base
-      active_hash_mock_class if active_hash_as_base
+      active_hash_mock_class
     end
 
     def self.configure(&block)
@@ -40,10 +38,11 @@ module ActiveMocker
     end
 
     def table_definition
+      return @table_definition unless @table_definition.nil?
       table_name = model_name.tableize
-      table = SchemaReader.new({schema_file: schema_file, file_reader: schema_file_reader}).search(table_name)
+      table = SchemaReader.new({schema_file: schema_file, file_reader: schema_file_reader, clear_cache: clear_cache}).search(table_name)
       raise "#{table_name} table not found." if table.nil?
-      return table
+      @table_definition = table
     end
 
     def active_hash_mock_class
@@ -57,25 +56,12 @@ module ActiveMocker
       add_relationships_methods
       add_column_names_method
       add_method_mock_of
-      if model_methods
+      if model_attributes
         add_class_methods
         add_instance_methods
       end
     end
 
-    def plain_mock_class
-      fill_templates
-      add_method_mock_of
-      if model_methods
-        add_class_methods
-        add_instance_methods
-      end
-      add_table_attributes     if schema_attributes
-      add_relationships_methods        if model_relationships
-      add_column_names_method  if schema_attributes
-      create_initializer       if mass_assignment
-    end
-
     def create_initializer
       klass = create_klass
       klass.class_eval <<-'eos', __FILE__, __LINE__+1
@@ -120,39 +106,18 @@ module ActiveMocker
       end
     end
 
-    def add_table_attributes
-      klass = create_klass
-      table_definition.column_names.each do |m|
-
-        klass.send(:schema_attributes_template)[m] = nil
-        begin
-          klass.class_eval <<-eos, __FILE__, __LINE__+1
-            def #{m}
-              read_attribute(#{m.inspect})
-            end
-
-            def #{m}=(value)
-              write_attribute(#{m.inspect}, value)
-            end
-          eos
-        rescue SyntaxError
-          Logger_.debug "ActiveMocker :: Can't create accessor methods for #{m}.\n #{caller}"
-        end
-      end
-    end
-
     def add_relationships_methods
       klass = create_klass
       model_definition.relationships.each do |m|
         klass.send(:schema_attributes_template)[m] = nil
         begin
           klass.class_eval <<-eos, __FILE__, __LINE__+1
-            def #{m}
-              read_attribute(#{m.inspect})
+             def #{m}
+              read_association(#{m.inspect})
             end
 
             def #{m}=(value)
-              write_attribute(#{m.inspect}, value)
+              write_association(#{m.inspect}, value)
             end
           eos
         rescue SyntaxError
@@ -216,11 +181,10 @@ module ActiveMocker
 
     def const_class
       remove_const(mock_class_name) if class_exists? mock_class_name
-      klass = Object.const_set(mock_class_name ,Class.new(::ActiveHash::Base)) if active_hash_as_base
-      klass.send(:include, ActiveHash::ARApi) if active_hash_as_base
-      klass = Object.const_set(mock_class_name ,Class.new()) unless active_hash_as_base
+      klass = Object.const_set(mock_class_name, Class.new(::ActiveHash::Base))
+      klass.send(:include, ActiveHash::ARApi)
+      klass.send(:prepend, ModelInstanceMethods) # is a private method for ruby 2.0.0
       klass.extend ModelClassMethods
-      klass.send(:include, ModelInstanceMethods) # is a private method for ruby 2.0.0
       klass
     end
 
@@ -247,15 +211,57 @@ module ActiveMocker
       model_instance_methods[method] = block
     end
 
+    def inspect
+      inspection =  self.class.column_names.map { |name|
+                         "#{name}: #{attribute_for_inspect(name)}"
+                     }.compact.join(", ")
+
+      "#<#{self.class} #{inspection}>"
+    end
+
+    def attribute_for_inspect(attr_name)
+      value = self.attributes[attr_name]
+      if value.is_a?(String) && value.length > 50
+        "#{value[0, 50]}...".inspect
+      elsif value.is_a?(Date) || value.is_a?(Time)
+        %("#{value.to_s(:db)}")
+      elsif value.is_a?(Array) && value.size > 10
+        inspected = value.first(10).inspect
+        %(#{inspected[0...-1]}, ...])
+      else
+        value.inspect
+      end
+    end
+
+    def hash
+      attributes.hash
+    end
+
+     def ==(obj)
+      hash == obj.attributes.hash
+    end
+
+    private
+
     def read_attribute(attr)
-      schema_attributes[attr]
+      attributes[attr]
     end
 
     def write_attribute(attr, value)
-      schema_attributes[attr] = value
+      attributes[attr] = value
     end
 
-    private
+    def read_association(attr)
+      @associations[attr]
+    end
+
+    def write_association(attr, value)
+      @associations[attr] = value
+    end
+
+    def attribute_to_string
+      attributes.map {|k, v| "#{k.to_s}: #{v.inspect}"}.join(', ')
+    end
 
     def delegate_to_model_instance(method, *args)
       self.class.send(:delegate_to_model_instance, method, *args)

data/lib/active_mocker/config.rb

@@ -5,45 +5,57 @@ module ActiveMocker
 
     attr_accessor :schema_file,
                   :model_dir,
-                  :active_hash_as_base,
                   :schema_attributes,
-                  :model_relationships,
-                  :model_methods,
-                  :mass_assignment,
+                  :model_attributes,
                   :schema_file_reader,
-                  :model_file_reader
+                  :model_file_reader,
+                  :clear_cache
 
     def config
       @@first_load ||= reload_default
       yield self
       check_required_settings
+      require_active_hash
     end
 
     def reload_default
+      @log_level           = Logger::WARN
       @schema_file         = nil
       @model_dir           = nil
-      @active_hash_as_base = false
       @schema_attributes   = true
-      @model_relationships = true
-      @model_methods       = true
-      @mass_assignment     = true
-      @log_level           = Logger::WARN
+      @model_attributes    = true
+      @clear_cache         = false
+      @schema_file_reader  = nil
+      @model_file_reader   = nil
     end
 
     def check_required_settings
-      raise 'schema_file must be specified'if schema_file.nil?
-      raise 'model_dir must be specified'if model_dir.nil?
+      raise 'schema_file must be specified' if schema_file.nil?
+      raise 'model_dir must be specified'   if model_dir.nil?
+    end
+
+    def require_active_hash
+      require 'active_hash'  if schema_attributes
     end
 
     def log_level=(level)
       Logger_.level = level
     end
 
-    def active_hash_as_base=(bool)
-      if bool
-        require 'active_hash'
-      end
-      @active_hash_as_base = bool
+    def active_hash_as_base=(arg)
+      Logger_.warn('Deprecation Warning: config option `active_hash_as_base` is now model_attributes')
+    end
+
+    def model_relationships=(arg)
+      Logger_.warn('Deprecation Warning: config option `model_relationships` is now model_attributes')
+    end
+
+    def model_methods=(arg)
+      Logger_.warn('Deprecation Warning: config option `model_methods` is now model_attributes')
+    end
+
+    def mass_assignment=(arg)
+      Logger_.warn('Deprecation Warning: config option `mass_assignment` is now model_attributes')
     end
 
   end

data/lib/active_mocker/schema_reader.rb

@@ -2,11 +2,12 @@ module ActiveMocker
 
   class SchemaReader
 
-    attr_reader :model_name, :schema_file, :file_reader, :table
+    attr_reader :model_name, :schema_file, :file_reader, :table, :clear_cache
 
     def initialize(options={})
       @file_reader = options[:file_reader] ||= FileReader
       @schema_file = options[:schema_file]
+      @clear_cache = options[:clear_cache]
     end
 
     def search(model_name)
@@ -27,6 +28,7 @@ module ActiveMocker
     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

data/lib/active_mocker/version.rb

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

data/spec/lib/active_mocker/base_spec.rb

@@ -28,11 +28,9 @@ describe ActiveMocker::Base do
       config.schema_file_reader = schema_file
       config.model_file_reader  = model_file
       # Additional Options
-      #config.active_hash_as_base = false #default
-      #config.schema_attributes   = true  #default
-      #config.model_relationships = true  #default
-      #config.model_methods       = true  #default
-      #config.mass_assignment     = true  #default
+      config.schema_attributes   = true  #default
+      config.model_attributes    = true  #default
+      config.clear_cache         = true  #default
       # Logging
       config.log_level = Logger::WARN       #default
     end
@@ -43,10 +41,6 @@ describe ActiveMocker::Base do
     ActiveMocker.mock('Person')
   }
 
-  after(:each) do
-    ActiveMocker::Base.reload_default
-  end
-
     let(:model_file){
       StringReader.new <<-eos
         class Person < ActiveRecord::Base
@@ -79,24 +73,6 @@ describe ActiveMocker::Base do
 
   end
 
-  describe '#read_attribute' do
-
-    it 'will access attributes' do
-      mock_class.new.read_attribute("800_number")
-    end
-
-  end
-
-  describe '#write_attribute' do
-
-    it 'will access attributes' do
-      person = mock_class.new
-      person.write_attribute("800_number", 100)
-      expect(person.read_attribute("800_number")).to eq 100
-    end
-
-  end
-
   describe 'mass_assignment' do
 
     it "can pass any or all attributes from schema in initializer" do
@@ -319,18 +295,7 @@ describe ActiveMocker::Base do
 
   end
 
-  context 'option active_hash_as_base' do
-
-    describe 'true' do
-
-      before(:each) do
-
-        ActiveMocker::Base.configure do |config|
-          config.active_hash_as_base = true
-        end
-
-      end
-      require 'active_hash'
+  context 'active_hash' do
 
       let(:model_file){
         StringReader.new <<-eos
@@ -374,20 +339,6 @@ describe ActiveMocker::Base do
         expect{mock_class.new.bar}.to raise_error '#bar is not Implemented for Class: PersonMock'
       end
 
-    end
-
-    describe 'option active_hash_ext' do
-
-      before(:each) do
-
-        ActiveMocker::Base.configure do |config|
-          config.active_hash_as_base = true
-        end
-
-      end
-
-      require 'active_hash'
-
       let(:model_file){
         StringReader.new <<-eos
         class Person < ActiveRecord::Base
@@ -404,10 +355,13 @@ describe ActiveMocker::Base do
 
         person = mock_class.create(first_name: 'Justin')
 
+        expect(PersonMock.first.first_name).to eq 'Justin'
         person.update(first_name: 'Dustin')
+        expect(PersonMock.first.first_name).to eq 'Dustin'
 
         expect(person.first_name).to eq 'Dustin'
 
+
       end
 
       it '::destroy_all' do
@@ -434,6 +388,14 @@ describe ActiveMocker::Base do
         expect(mock_class.count).to eq 1
       end
 
+      it '::find_or_create_by with update' do
+        mock_class.create(first_name: 'dustin')
+        person = mock_class.find_or_create_by(first_name: 'dustin')
+        person.update(last_name: 'Zeisler')
+        expect(mock_class.first.attributes).to eq person.attributes
+        expect(mock_class.count).to eq 1
+      end
+
       it '::find_or_initialize_by' do
         person = mock_class.find_or_initialize_by(first_name: 'dustin')
         expect(person.persisted?).to eq false
@@ -446,17 +408,6 @@ describe ActiveMocker::Base do
         mock_class.delete_all
       end
 
-    end
-
-    describe 'false' do
-      let(:base_options){{active_hash_as_base: false}}
-
-      it 'has object as supper class' do
-        expect(mock_class.superclass.name).to eq 'Object'
-
-      end
-
-    end
 
   end
 

metadata

@@ -1,29 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: active_mocker
 version: !ruby/object:Gem::Version
-  version: 1.1.9
+  version: 1.1.10
 platform: ruby
 authors:
 - Dustin Zeisler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-12 00:00:00.000000000 Z
+date: 2014-04-21 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: active_hash
   requirement: !ruby/object:Gem::Requirement
@@ -94,20 +108,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
-- !ruby/object:Gem::Dependency
-  name: activerecord
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement