frozen_record 0.20.1 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c98f13b693b4c7bceae48a308722c3681a678033855f40995a10fd82c0faee8
-  data.tar.gz: ff4ef784946b6fc9f067caf8e26d50433c3c396716ead1c953dd324528861ab2
+  metadata.gz: b998592ed0453f220a0679b3ee2aea49d1d5381a3a7c4d6e9286434e6e3b6c27
+  data.tar.gz: 3f430857f5b5626951360d2c28402c58b5751cb1ef2805f139558d600b7e1e1c
 SHA512:
-  metadata.gz: e25090babf81d5ffa18a26acecf5af68d3424866b848508838ded880196d2178f994ce586be9bee8d63db71b3c84159ed2b4fac2c7e90f26414b9fbff4c69598
-  data.tar.gz: 384749f211db239a1d3964c16d5c23d4af4261ee052d6c0fa16f15f0d6a0ce5710df898b1f4e290c9cfa77c553d214668ab383ca33b09fbb82a03266db7a0324
+  metadata.gz: cbc8307030df2b393d69499c7be236ef62349ad6f74b7fc9de914260748fd0919e293204b30ba31e377acf157acb90e9371d4ed50a77da955f60222694f74892
+  data.tar.gz: f211b9298137e71e098e841658341f0cceb3dd902f7974a5a9a7c2233173bd1016037832ba744f8966beb9045fa9c93068365ad5d9b7d64f9b68631e1b840ca1

data/.github/workflows/main.yml

@@ -0,0 +1,29 @@
+name: CI
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby: [ '2.5', '2.6', '2.7', '3.0' ]
+    name: Ruby ${{ matrix.ruby }} tests
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+      - uses: actions/cache@v2
+        with:
+          path: vendor/bundle
+          key: ${{ runner.os }}-${{ matrix.ruby }}-gems-${{ hashFiles('Gemfile', 'frozen_record.gemspec') }}
+          restore-keys: |
+            ${{ runner.os }}-${{ matrix.ruby }}-gems-
+      - name: Bundle install
+        run: |
+          gem install bundler
+          bundle install --jobs 4 --retry 3 --path=vendor/bundle
+      - name: Run tests
+        run: bundle exec rake

data/frozen_record.gemspec

@@ -22,7 +22,6 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'activemodel'
   spec.add_runtime_dependency 'dedup'
 
-  spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'pry'

data/lib/frozen_record.rb

@@ -1,30 +1,5 @@
 # frozen_string_literal: true
 
-require 'yaml'
-require 'set'
-require 'active_support/all'
-require 'active_model'
-
-require 'dedup'
-
-require 'frozen_record/version'
-require 'frozen_record/scope'
-require 'frozen_record/index'
-require 'frozen_record/base'
-require 'frozen_record/compact'
-
-module FrozenRecord
-  RecordNotFound = Class.new(StandardError)
-
-  class << self
-    attr_accessor :deprecated_yaml_erb_backend
-
-    def eager_load!
-      Base.descendants.each(&:eager_load!)
-    end
-  end
-
-  self.deprecated_yaml_erb_backend = true
-end
-
+require 'frozen_record/minimal'
+require 'frozen_record/serialization'
 require 'frozen_record/railtie' if defined?(Rails)

data/lib/frozen_record/backends/empty.json

@@ -0,0 +1 @@
+true

data/lib/frozen_record/backends/json.rb

@@ -9,9 +9,26 @@ module FrozenRecord
         "#{model_name.underscore.pluralize}.json"
       end
 
-      def load(file_path)
-        json_data = File.read(file_path)
-        JSON.parse(json_data) || []
+      if JSON.respond_to?(:load_file)
+        supports_freeze = begin
+          JSON.load_file(File.expand_path('../empty.json', __FILE__), freeze: true)
+        rescue ArgumentError
+          false
+        end
+
+        if supports_freeze
+          def load(file_path)
+            JSON.load_file(file_path, freeze: true) || Dedup::EMPTY_ARRAY
+          end
+        else
+          def load(file_path)
+            Dedup.deep_intern!(JSON.load_file(file_path) || Dedup::EMPTY_ARRAY)
+          end
+        end
+      else
+        def load(file_path)
+          Dedup.deep_intern!(JSON.parse(File.read(file_path)) || Dedup::EMPTY_ARRAY)
+        end
       end
     end
   end

data/lib/frozen_record/backends/yaml.rb

@@ -34,15 +34,41 @@ module FrozenRecord
             end
           end
 
-          YAML.load(yml_data) || []
+          load_string(yml_data)
         else
           if file_path.end_with?('.erb')
-            YAML.load(ERB.new(File.read(file_path)).result) || []
+            load_string(ERB.new(File.read(file_path)).result)
           else
-            YAML.load_file(file_path) || []
+            load_file(file_path)
           end
         end
       end
+
+      private
+
+      supports_freeze = begin
+        YAML.load_file(File.expand_path('../empty.json', __FILE__), freeze: true)
+      rescue ArgumentError
+        false
+      end
+
+      if supports_freeze
+        def load_file(path)
+          YAML.load_file(path, freeze: true) || Dedup::EMPTY_ARRAY
+        end
+
+        def load_string(yaml)
+          YAML.load(yaml, freeze: true) || Dedup::EMPTY_ARRAY
+        end
+      else
+        def load_file(path)
+          Dedup.deep_intern!(YAML.load_file(path) || Dedup::EMPTY_ARRAY)
+        end
+
+        def load_string(yaml)
+          Dedup.deep_intern!(YAML.load(yaml) || Dedup::EMPTY_ARRAY)
+        end
+      end
     end
   end
 end

data/lib/frozen_record/base.rb

@@ -1,9 +1,7 @@
 # frozen_string_literal: true
 
-require 'set'
 require 'active_support/descendants_tracker'
 require 'frozen_record/backends'
-require 'objspace'
 
 module FrozenRecord
   class Base
@@ -11,11 +9,6 @@ module FrozenRecord
     extend ActiveModel::Naming
     include ActiveModel::Conversion
     include ActiveModel::AttributeMethods
-    include ActiveModel::Serializers::JSON
-
-    if defined? ActiveModel::Serializers::Xml
-      include ActiveModel::Serializers::Xml
-    end
 
     FIND_BY_PATTERN = /\Afind_by_(\w+)(!?)/
     FALSY_VALUES = [false, nil, 0, -''].to_set
@@ -52,7 +45,7 @@ module FrozenRecord
       alias_method :set_default_attributes, :default_attributes=
       private :set_default_attributes
       def default_attributes=(default_attributes)
-        set_default_attributes(Dedup.deep_intern!(default_attributes.stringify_keys))
+        set_default_attributes(Dedup.deep_intern!(default_attributes.transform_keys(&:to_s)))
       end
 
       alias_method :set_primary_key, :primary_key=
@@ -146,8 +139,9 @@ module FrozenRecord
 
         @records ||= begin
           records = backend.load(file_path)
-          records.each { |r| assign_defaults!(r) }
-          records = Dedup.deep_intern!(records)
+          if default_attributes
+            records = records.map { |r| assign_defaults!(r.dup).freeze }.freeze
+          end
           @attributes = list_attributes(records).freeze
           define_attribute_methods(@attributes.to_a)
           records = records.map { |r| load(r) }.freeze
@@ -164,7 +158,7 @@ module FrozenRecord
       private :load
 
       def new(attrs = {})
-        load(assign_defaults!(attrs.stringify_keys))
+        load(assign_defaults!(attrs.transform_keys(&:to_s)))
       end
 
       private

data/lib/frozen_record/compact.rb

@@ -13,8 +13,9 @@ module FrozenRecord
 
         @records ||= begin
           records = backend.load(file_path)
-          records.each { |r| assign_defaults!(r) }
-          records = Dedup.deep_intern!(records)
+          if default_attributes
+            records = records.map { |r| assign_defaults!(r.dup).freeze }.freeze
+          end
           @attributes = list_attributes(records).freeze
           build_attributes_cache
           define_attribute_methods(@attributes.to_a)

data/lib/frozen_record/minimal.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'yaml'
+require 'set'
+require 'active_model'
+
+require 'dedup'
+
+require 'frozen_record/version'
+require 'frozen_record/scope'
+require 'frozen_record/index'
+require 'frozen_record/base'
+require 'frozen_record/compact'
+
+module FrozenRecord
+  RecordNotFound = Class.new(StandardError)
+
+  class << self
+    attr_accessor :deprecated_yaml_erb_backend
+
+    def eager_load!
+      Base.descendants.each(&:eager_load!)
+    end
+  end
+
+  self.deprecated_yaml_erb_backend = true
+end

data/lib/frozen_record/serialization.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require 'frozen_record/base'
+
+module FrozenRecord
+  class Base
+    include ActiveModel::Serializers::JSON
+
+    if defined? ActiveModel::Serializers::Xml
+      include ActiveModel::Serializers::Xml
+    end
+  end
+end

data/lib/frozen_record/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FrozenRecord
-  VERSION = '0.20.1'
+  VERSION = '0.21.0'
 end

data/spec/spec_helper.rb

@@ -10,6 +10,7 @@ SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
 ]
 SimpleCov.start
 
+require 'objspace'
 require 'frozen_record'
 require 'frozen_record/test_helper'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: frozen_record
 version: !ruby/object:Gem::Version
-  version: 0.20.1
+  version: 0.21.0
 platform: ruby
 authors:
 - Jean Boussier
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-19 00:00:00.000000000 Z
+date: 2021-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -38,20 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -115,9 +101,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/main.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -128,13 +114,16 @@ files:
 - frozen_record.gemspec
 - lib/frozen_record.rb
 - lib/frozen_record/backends.rb
+- lib/frozen_record/backends/empty.json
 - lib/frozen_record/backends/json.rb
 - lib/frozen_record/backends/yaml.rb
 - lib/frozen_record/base.rb
 - lib/frozen_record/compact.rb
 - lib/frozen_record/index.rb
+- lib/frozen_record/minimal.rb
 - lib/frozen_record/railtie.rb
 - lib/frozen_record/scope.rb
+- lib/frozen_record/serialization.rb
 - lib/frozen_record/test_helper.rb
 - lib/frozen_record/version.rb
 - spec/fixtures/animals.json
@@ -168,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: ActiveRecord like interface to read only access and query static YAML files

data/.travis.yml

@@ -1,5 +0,0 @@
-sudo: false
-rvm:
-  - '2.5'
-  - '2.6'
-  - '2.7'