active_hash 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 475fb352ab35cf436d135d74983e6ca7115c24a15d12681dd1176af36cea8cea
-  data.tar.gz: 98d31cd371ae7363e0c8e32ab7e7d87a3e2c74f1d4621456e17448be016a8c01
+  metadata.gz: 5a92e60195ef8ad5fbd50981978f78755d5f670ba04dd3b97604454e9c466e14
+  data.tar.gz: a00b0870924b1cc46e5f0fc63a75847bcd54532f4f6e8c9c0367c7058ec079e1
 SHA512:
-  metadata.gz: a9731e071b74c51753692d5e9d96144645cb314915ee8537666f1185fc23be109e3747c92bcbd68bcb429b9bf9564788694fb726d804ddb69354f0bcd93150a8
-  data.tar.gz: ce8d0eb87fea1909091dd01fc2f2afc20434f0fa22223777351880c6c8753fd4609d0784a001cfd1bfe194ed9a31d53bd24a49e867ece3b30545ffdec67b38d1
+  metadata.gz: 1419297eb2d3427cad33b04bf4a29c646b9852e89008df56269128635fabe55a16742a9c9f4a0de4cd8fd398bddfb1dcd36730f3fd63283ba92764c1f83260e4
+  data.tar.gz: a89ca9f078a9258d5c6f079505abffe438250444e2afa45f2f9d0934afa4ed29cbb06de211a6e392905887c5770724f873541a8f84e58253385dc93d00a35ef1

data/CHANGELOG

@@ -1,3 +1,8 @@
+2018-04-05 (v2.1.0)
+  - Allow to use ERB (embedded ruby) in yml files [#160](https://github.com/zilkey/active_hash/pull/160) Thanks, @UgoMare
+  - Add `ActiveHash::Base.polymorphic_name` [#162](https://github.com/zilkey/active_hash/pull/162)
+  - Fix to be able to use enum accessor constant with same name as top-level constant[#161](https://github.com/zilkey/active_hash/pull/161) Thanks, @yujideveloper
+
 2018-02-27 (v2.0.0)
   - Drop old Ruby and Rails support [#157](https://github.com/zilkey/active_hash/pull/157)
   - Don't generate instance accessors for class attributes [#136](https://github.com/zilkey/active_hash/pull/136) Thanks, @rainhead

data/README.md

@@ -389,6 +389,17 @@ Soda.length # => 1
 Soda.first.flavor # => sweet
 Soda.first.price # => 1.0
 ```
+
+### Using ERB ruby in YAML
+
+Embedded ruby can bu used in ActiveYaml using erb brackets `<% %>` and `<%= %>` to set the result of a ruby operation as a value in the yaml file.
+
+```
+- id: 1
+  email: <%= "user#{rand(100)}@email.com" %>
+  password: <%= ENV['USER_PASSWORD'] %>
+```
+
 ## ActiveJSON
 
 If you want to store your data in JSON files, just inherit from ActiveJSON and specify your path information:

data/active_hash.gemspec

@@ -44,6 +44,6 @@ Gem::Specification.new do |s|
     Dir.glob("lib/**/*")
   ].flatten
   s.test_files = s.files.grep(%r{^(test|spec|features)/})
-  s.add_runtime_dependency('activesupport', '>= 2.2.2')
-  s.required_ruby_version = '>= 1.9.3'
+  s.add_runtime_dependency('activesupport', '>= 5.0.0')
+  s.required_ruby_version = '>= 2.4.0'
 end

data/lib/active_hash/base.rb

@@ -397,6 +397,11 @@ module ActiveHash
         ActiveHash::Base
       end
 
+      # Needed for ActiveRecord polymorphic associations(rails/rails#32148)
+      def polymorphic_name
+        base_class.name
+      end
+
       def reload
         reset_record_index
         self.data = _data

data/lib/active_hash/version.rb

@@ -1,5 +1,5 @@
 module ActiveHash
   module Gem
-    VERSION = "2.0.0"
+    VERSION = "2.1.0"
   end
 end

data/lib/active_yaml/base.rb

@@ -19,7 +19,7 @@ module ActiveYaml
 
       private
       def load_path(path)
-        YAML.load_file(path)
+        YAML.load(ERB.new(File.read(path)).result)
       end
     end
   end

data/lib/enum/enum.rb

@@ -23,7 +23,7 @@ module ActiveHash
         if @enum_accessors.present?
           @records.each do |record|
             constant = constant_for(record, @enum_accessors)
-            remove_const(constant) if const_defined?(constant)
+            remove_const(constant) if const_defined?(constant, false)
           end
         end
         super
@@ -33,10 +33,10 @@ module ActiveHash
         constant = constant_for(record, @enum_accessors)
         return nil if constant.blank?
 
-        unless const_defined?(constant)
+        unless const_defined?(constant, false)
           const_set(constant, record)
         else
-          raise DuplicateEnumAccessor, "#{constant} already defined for #{self.class}" unless const_get(constant) == record
+          raise DuplicateEnumAccessor, "#{constant} already defined for #{self.class}" unless const_get(constant, false) == record
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_hash
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Jeff Dean
@@ -29,7 +29,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-27 00:00:00.000000000 Z
+date: 2018-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -37,14 +37,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 5.0.0
 description: Includes the ability to specify data using hashes, yml files or JSON
   files
 email: jeff@zilkey.com
@@ -79,7 +79,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="