frozen_record 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fdb7686678220892ee4d076e0dd12678eb3b5bb6
-  data.tar.gz: 1cb91679f2c40a42ff635b3ae92a28169641b4f8
+  metadata.gz: 275b29fe63b81841f976203d89605b9a9a5c6289
+  data.tar.gz: 4243044175796dec9f623da8e9e1a589eef85994
 SHA512:
-  metadata.gz: a01bb54dc54ca88f5acb7b85c4739002e6e7918345f55f7bd45cd4f97350e1d721c9497f981b909ec57ae217353a881f4c01c36e8f66921353dfc099fa60d760
-  data.tar.gz: de01bdbbb0c09f3d8720711a540c7a7686ba2c7f55d64ddd39296f9e3ba8501da3f84b81259f22b26f30f2fe840e75c80e2610788abe39f98d1634a129cdeafa
+  metadata.gz: f4de4b60e0cee0988b3aaae4fab620958e034d2d22057cf7d4c896b3ec879295c0d3340576e9a388cd6b5e77d3bf581ed08eb3542cc6d51a5a0ad5cd79a254c7
+  data.tar.gz: 531c13fa6479eabbc5662910ff92173851cb06949a51e781523379ac6089cfb2b1c0cce8b0e1b1b861c45ada84ac8ab88b31472f222b375832edc41fd700d14a

data/lib/frozen_record/base.rb

@@ -62,18 +62,23 @@ module FrozenRecord
 
       def respond_to_missing?(name, *)
         if name.to_s =~ FIND_BY_PATTERN
-          return true if $1.split('_and_').all? { |attr| public_method_defined?(attr) }
+          load_records # ensure attribute methods are defined
+          return true if $1.split('_and_').all? { |attr| instance_method_already_implemented?(attr) }
         end
       end
 
       def load_records
-        @records = nil if auto_reloading && file_changed?
+        if auto_reloading && file_changed?
+          @records = nil
+          undefine_attribute_methods
+        end
+
         @records ||= begin
           yml_erb_data = File.read(file_path)
           yml_data = ERB.new(yml_erb_data).result
 
           records = YAML.load(yml_data) || []
-          define_attributes!(list_attributes(records))
+          define_attribute_methods(list_attributes(records))
           records.map(&method(:new)).freeze
         end
       end
@@ -109,13 +114,7 @@ module FrozenRecord
             attributes.add(key.to_s)
           end
         end
-        attributes
-      end
-
-      def define_attributes!(attributes)
-        attributes.each do |attr|
-          define_attribute_method(attr)
-        end
+        attributes.to_a
       end
 
     end

data/lib/frozen_record/scope.rb

@@ -118,8 +118,8 @@ module FrozenRecord
       spawn.offset!(amount)
     end
 
-    def respond_to_missing(method_name, *)
-      array_delegable?(method_name) || super
+    def respond_to_missing?(method_name, *)
+      array_delegable?(method_name) || @klass.respond_to?(method_name) || super
     end
 
     protected

data/lib/frozen_record/version.rb

@@ -1,3 +1,3 @@
 module FrozenRecord
-  VERSION = '0.7.0'
+  VERSION = '0.7.1'
 end

data/spec/scope_spec.rb

@@ -145,12 +145,22 @@ describe 'querying' do
       expect(country).to be_nil
     end
 
+    it 'can be used on a scope' do
+      country = Country.republics.find_by_name_and_density('France', 116)
+      expect(country.name).to be == 'France'
+
+      country = Country.republics.find_by_name('Canada')
+      expect(country).to be_nil
+    end
+
     it 'hook into respond_to?' do
       expect(Country).to respond_to :find_by_name_and_density
+      expect(Country.republics).to respond_to :find_by_name_and_density
     end
 
     it 'do not respond to unknown attributes' do
       expect(Country).to_not respond_to :find_by_name_and_unknown_attribute
+      expect(Country.republics).to_not respond_to :find_by_name_and_unknown_attribute
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: frozen_record
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Jean Boussier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-06 00:00:00.000000000 Z
+date: 2016-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel