built_in_data 1.1.0 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b28022b96a300e723ae2377d8322e285298f2b79
-  data.tar.gz: 6d006c9c8cb191997c23f7395e95c0b3a3cf7918
+SHA256:
+  metadata.gz: 9394bd2479dccf207f906c6ca48653287a621c5d6522306b770e556fce552d56
+  data.tar.gz: 9e1d7d9e4ef5706036452492f31bdd1061b79d8fc048c8cd891a1c68bb9f1793
 SHA512:
-  metadata.gz: 5537320180706f97934bad8e6a16bca311bfe7d5e8e092a3d4e08228639af911a8778dfcce949698fcc56adb51c99c48466135e66f16820bbe433ca62d7d2ec4
-  data.tar.gz: d2fbcb5b365937c789614121107acc97f2684fe7e9aa56aeb1739a051690bdb30a385fd62302e48310f0db70c85f7bdb26053feacb5ba8cce327eecc0ac4377f
+  metadata.gz: 638ce6c855a13e1254ff71a0e3fe5888d7c4c8996d70277e58ea2636f470dabde48922bca6aa60c6459487d0604329a4f8d9d49c266732c2dcd192281f49e874
+  data.tar.gz: 6d737a730d0b4a63b7393babcb4de49fdff07e0b1a556bd07d436769c97d3d8c6bf05ee9befea440798a580ad19a2f291f32f9c05529cae747b6e65ed972006a

data/Rakefile

@@ -1,32 +1,10 @@
-begin
-  require 'bundler/setup'
-rescue LoadError
-  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
-end
-
-require 'rdoc/task'
-
-RDoc::Task.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'BuiltInData'
-  rdoc.options << '--line-numbers'
-  rdoc.rdoc_files.include('README.rdoc')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
-
-
-
-Bundler::GemHelper.install_tasks
-
-require 'rake/testtask'
+require "bundler/gem_tasks"
+require "rake/testtask"
 
 Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = false
+  t.libs << "test"
+  t.libs << "lib"
+  t.test_files = FileList["test/**/*_test.rb"]
 end
 
-
 task default: :test

data/lib/built_in_data/version.rb

@@ -1,3 +1,3 @@
 module BuiltInData
-  VERSION = "1.1.0"
+  VERSION = "1.1.4"
 end

data/lib/built_in_data.rb

@@ -3,7 +3,7 @@ module BuiltInData
 
   included do
     # all built in data objects should have a built_in_key, model objects without a key will not be modified or removed
-    validates_uniqueness_of :built_in_key, :allow_nil => true
+    validates_uniqueness_of :built_in_key, allow_nil: true, case_sensitive: false
 
     scope :built_in, -> { where "#{table_name}.built_in_key IS NOT NULL" }
   end
@@ -29,6 +29,11 @@ module BuiltInData
       built_in_object_ids[key]
     end
 
+    def delete_all
+      @built_in_object_ids = nil
+      super
+    end
+
     private
 
     def prepare_objects_hash(hash)
@@ -36,10 +41,14 @@ module BuiltInData
     end
 
     def load_yaml_data
-      # allow a standard key to be used for doing defaults in YAML
-      YAML.load(read_and_erb_process_yaml_file).except('DEFAULTS')
+      # allow a standard key to be used for defaults in YAML files
+      YAML.safe_load(
+        read_and_erb_process_yaml_file,
+        permitted_classes:  [Date],
+        aliases:            true
+      ).except('DEFAULTS')
     end
-    
+
     def read_and_erb_process_yaml_file
       ERB.new(File.read(Rails.root.join('db', 'built_in_data', "#{table_name}.yml"))).result
     end
@@ -50,7 +59,7 @@ module BuiltInData
         object.save!
       end
     end
-    
+
     # memoized hash of built in object ids
     def built_in_object_ids
       @built_in_object_ids ||= Hash.new do |hash, key|
@@ -58,7 +67,7 @@ module BuiltInData
       end
     end
   end
-  
+
   def built_in?
     !built_in_key.blank?
   end

data/test/built_in_data_test.rb

@@ -87,6 +87,13 @@ class BuiltInDataTest < ActiveSupport::TestCase
     load_hash_data
     assert_equal NationalPark.where(name: 'Yellowstone National Park').first.id, NationalPark.built_in_object_id(:test)
   end
+  
+  test 'should clear built_in_object_ids cache when delete_all is called' do
+    NationalPark.instance_variable_set('@built_in_object_ids', 'testing')
+    
+    NationalPark.delete_all
+    assert_nil NationalPark.instance_variable_get('@built_in_object_ids')
+  end
 
   private
 

data/test/dummy/app/assets/config/manifest.js

@@ -0,0 +1,4 @@
+
+//= link_tree ../images
+//= link_directory ../javascripts .js
+//= link_directory ../stylesheets .css

data/test/dummy/config/application.rb

@@ -20,4 +20,3 @@ module Dummy
     # config.i18n.default_locale = :de
   end
 end
-