frozen_record 0.13.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2caf0ce8ea29240d70604b68d7e1edeaa8b331c
-  data.tar.gz: 4ccec1e2b69e9a882d48cbbad9df73c9732b5fae
+  metadata.gz: aca3d3a4084fea57cbcbc396e95d35ee24750b44
+  data.tar.gz: 5fe3827d178da90300e05c49062e1c1259bc366d
 SHA512:
-  metadata.gz: 62e573bedb84600e916de3784e764eeb9400555c8f11118dc27787ef7f642f15e927a6e304e96e118eb8c1f3317c57613c1bd395fc6330d2b59ad36d014c653c
-  data.tar.gz: c225c4584ee248a86cd88e5f888618745d6275fdd27582a47fbedf405095d521c16a7d8484c6866b1c4ce2e618d921a772b0d45335253f4b50d3bc4c1a2d385a
+  metadata.gz: 6afd96b57e571297ebd78bc218c0cfe8e06249be474231a50a3f573ad74f2ee8236bc289265362d67067769e7313acd7633ff721bf1349b868d23f917c94c2bc
+  data.tar.gz: cfd9d2c57b1238c8df69d311a738cc31d90138523b451f7cabc6bcf7a0c54f553740d47fbf10c92a9f80065e2661c9618d00f97db6975d259262dbcceb2bd84e

data/lib/frozen_record/base.rb

@@ -15,19 +15,28 @@ module FrozenRecord
     end
 
     FIND_BY_PATTERN = /\Afind_by_(\w+)(!?)/
-    FALSY_VALUES = [false, nil, 0, ''].to_set
+    FALSY_VALUES = [false, nil, 0, -''].to_set
 
     class_attribute :base_path
 
     class_attribute :primary_key
-    self.primary_key = :id
+
+    class << self
+      alias_method :original_primary_key=, :primary_key=
+
+      def primary_key=(primary_key)
+        self.original_primary_key = -primary_key.to_s
+      end
+    end
+
+    self.primary_key = 'id'
 
     class_attribute :backend
     self.backend = FrozenRecord::Backends::Yaml
 
     class_attribute :auto_reloading
 
-    attribute_method_suffix '?'
+    attribute_method_suffix -'?'
 
     class ThreadSafeStorage
 
@@ -72,7 +81,7 @@ module FrozenRecord
       end
 
       def respond_to_missing?(name, *)
-        if name =~ FIND_BY_PATTERN
+        if name.to_s =~ FIND_BY_PATTERN
           load_records # ensure attribute methods are defined
           return true if $1.split('_and_').all? { |attr| instance_method_already_implemented?(attr) }
         end
@@ -93,10 +102,7 @@ module FrozenRecord
         @records ||= begin
           records = backend.load(file_path)
           define_attribute_methods(list_attributes(records))
-          records.map do |attributes|
-            attributes.symbolize_keys!
-            new(attributes)
-          end.freeze
+          records.map(&method(:new)).freeze
         end
       end
 
@@ -113,14 +119,14 @@ module FrozenRecord
       end
 
       def method_missing(name, *args)
-        if name =~ FIND_BY_PATTERN
+        if name.to_s =~ FIND_BY_PATTERN
           return dynamic_match($1, args, $2.present?)
         end
         super
       end
 
       def dynamic_match(expression, values, bang)
-        results = where(expression.split('_and_').zip(values))
+        results = where(expression.split('_and_'.freeze).zip(values))
         bang ? results.first! : results.first
       end
 
@@ -128,7 +134,7 @@ module FrozenRecord
         attributes = Set.new
         records.each do |record|
           record.keys.each do |key|
-            attributes.add(key.to_sym)
+            attributes.add(key.to_s)
           end
         end
         attributes.to_a
@@ -137,20 +143,19 @@ module FrozenRecord
     end
 
     def initialize(attrs = {})
-      @attributes = attrs
+      @attributes = attrs.stringify_keys.freeze
     end
 
     def attributes
-      # We have to return a hash with string keys for backward compatibity reasons
-      @attributes.stringify_keys
+      @attributes.dup
     end
 
     def id
-      self[primary_key]
+      self[primary_key.to_s]
     end
 
     def [](attr)
-      @attributes[attr.to_sym]
+      @attributes[attr.to_s]
     end
     alias_method :attribute, :[]
 
@@ -169,8 +174,7 @@ module FrozenRecord
     private
 
     def attribute?(attribute_name)
-      value = self[attribute_name]
-      FALSY_VALUES.exclude?(value) && value.present?
+      FALSY_VALUES.exclude?(self[attribute_name]) && self[attribute_name].present?
     end
 
   end

data/lib/frozen_record/scope.rb

@@ -62,7 +62,7 @@ module FrozenRecord
     def pluck(*attributes)
       case attributes.length
       when 1
-        to_a.map(&attributes.first)
+        to_a.map(&attributes.first.to_sym)
       when 0
         raise NotImplementedError, '`.pluck` without arguments is not supported yet'
       else

data/lib/frozen_record/version.rb

@@ -1,3 +1,3 @@
 module FrozenRecord
-  VERSION = '0.13.0'
+  VERSION = '0.14.0'
 end

data/spec/frozen_record_spec.rb

@@ -13,6 +13,24 @@ describe FrozenRecord::Base do
 
   end
 
+  describe '.primary_key' do
+
+    around do |example|
+      previous_primary_key = Country.primary_key
+      begin
+        example.run
+      ensure
+        Country.primary_key = previous_primary_key
+      end
+    end
+
+    it 'is coerced to string' do
+      Country.primary_key = :foobar
+      expect(Country.primary_key).to be == 'foobar'
+    end
+
+  end
+
   describe '.auto_reloading' do
 
     context 'when enabled' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: frozen_record
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.0
 platform: ruby
 authors:
 - Jean Boussier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-26 00:00:00.000000000 Z
+date: 2019-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel