frozen_record 0.14.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: aca3d3a4084fea57cbcbc396e95d35ee24750b44
-  data.tar.gz: 5fe3827d178da90300e05c49062e1c1259bc366d
+SHA256:
+  metadata.gz: ce0b59f2960394e86f2278a1c574680bfc27491bead98f9991ba70aa9a90766e
+  data.tar.gz: c194c8fa251cc4b9e6be6a41869ad383e4aa0ebd54021ddb36b2b285257dc347
 SHA512:
-  metadata.gz: 6afd96b57e571297ebd78bc218c0cfe8e06249be474231a50a3f573ad74f2ee8236bc289265362d67067769e7313acd7633ff721bf1349b868d23f917c94c2bc
-  data.tar.gz: cfd9d2c57b1238c8df69d311a738cc31d90138523b451f7cabc6bcf7a0c54f553740d47fbf10c92a9f80065e2661c9618d00f97db6975d259262dbcceb2bd84e
+  metadata.gz: 6bf7ce5df1f3a4c2dd67e4b391fd26bb3499ec572bf4de600bdf50728292959cef2330844d19e3deebec714183da7931802bb735fd5c2d0281541235f07fcb3d
+  data.tar.gz: 18b96a420a7f74e12c57362b856609b685e60923e4eb39c83d1d0623321f8dade128d53f6435008431589d22f218200c9d3c42a497ead3406013714208a09cdb

data/README.md

@@ -95,10 +95,12 @@ Country.
 
 ### Scopes
 
-While the `scope :symbol, lambda` syntax is not supported, the class methods way is:
+Basic `scope :symbol, lambda` syntax is now supported in addition to class method syntax.
 
 ```ruby
 class Country
+  scope :european, -> { where(continent: 'Europe' ) }
+
   def self.republics
     where(king: nil)
   end
@@ -108,7 +110,7 @@ class Country
   end
 end
 
-Country.republics.part_of_nato.order(id: :desc)
+Country.european.republics.part_of_nato.order(id: :desc)
 ```
 
 ### Supported query methods
@@ -181,7 +183,7 @@ class CountryTest < ActiveSupport::TestCase
   teardown do
     FrozenRecord::TestHelper.unload_fixtures
   end
-  
+
   test "countries have a valid name" do
   # ...
 ```

data/lib/frozen_record/base.rb

@@ -106,6 +106,13 @@ module FrozenRecord
         end
       end
 
+      def scope(name, body)
+        unless body.respond_to?(:call)
+          raise ArgumentError, "The scope body needs to be callable."
+        end
+        singleton_class.send(:define_method, name) { |*args| body.call(*args) }
+      end
+
       private
 
       def file_changed?

data/lib/frozen_record/scope.rb

@@ -122,8 +122,28 @@ module FrozenRecord
       array_delegable?(method_name) || @klass.respond_to?(method_name) || super
     end
 
+    def hash
+      comparable_attributes.hash
+    end
+
+    def ==(other)
+      self.class === other &&
+      comparable_attributes == other.comparable_attributes
+    end
+
     protected
 
+    def comparable_attributes
+      @comparable_attributes ||= {
+        klass: @klass,
+        where_values: @where_values.uniq.sort,
+        where_not_values: @where_not_values.uniq.sort,
+        order_values: @order_values.uniq,
+        limit: @limit,
+        offset: @offset,
+      }
+    end
+
     def scoping
       previous, @klass.current_scope = @klass.current_scope, self
       yield
@@ -136,6 +156,7 @@ module FrozenRecord
     end
 
     def clear_cache!
+      @comparable_attributes = nil
       @results = nil
       @matches = nil
       self
@@ -230,6 +251,7 @@ module FrozenRecord
     end
 
     private
+
     def compare_value(actual, requested)
       return actual == requested unless requested.is_a?(Array) || requested.is_a?(Range)
       requested.include?(actual)

data/lib/frozen_record/version.rb

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

data/spec/fixtures/countries.yml

@@ -8,6 +8,7 @@
   updated_at: 2014-02-24T19:08:06-05:00
   nato: true
   king: Elisabeth II
+  continent: North America
 
 - id: 2
   name: France
@@ -16,6 +17,9 @@
   population: 65.7
   founded_on: 486-01-01
   updated_at: 2014-02-12T19:02:03-02:00
+  nato: true
+  continent: Europe
+
 
 - id: 3
   name: Austria
@@ -24,3 +28,4 @@
   population: 8.462
   founded_on: 1156-01-01
   updated_at: 2014-02-12T19:02:03-02:00
+  continent: Europe

data/spec/frozen_record_spec.rb

@@ -71,6 +71,15 @@ describe FrozenRecord::Base do
 
   end
 
+  describe '.scope' do
+    it 'defines a scope method' do
+
+      Country.scope :north_american, -> { Country.where(continent: 'North America') }
+      expect(Country).to respond_to(:north_american)
+      expect(Country.north_american.first.name).to be == 'Canada'
+    end
+  end
+
   describe '#load_records' do
 
     it 'processes erb by default' do
@@ -124,6 +133,7 @@ describe FrozenRecord::Base do
         'updated_at' => Time.parse('2014-02-24T19:08:06-05:00'),
         'king' => 'Elisabeth II',
         'nato' => true,
+        'continent' => 'North America',
       }
     end
 

data/spec/scope_spec.rb

@@ -417,6 +417,23 @@ describe 'querying' do
 
   end
 
+  describe '#==' do
+    it 'returns true when two scopes share the same hashed attributes' do
+      scope_a = Country.republics.nato
+      scope_b = Country.republics.nato
+      expect(scope_a.object_id).not_to be == scope_b.object_id
+      expect(scope_a).to be == scope_b
+    end
+
+    it 'returns true when the same scope has be rechained' do
+      scope_a = Country.nato.republics.nato.republics
+      scope_b = Country.republics.nato
+      expect(scope_a.instance_variable_get(:@where_values)).to be == [[:nato, true ], [:king, nil ], [:nato, true], [:king, nil]]
+      expect(scope_b.instance_variable_get(:@where_values)).to be == [[:king, nil ], [:nato, true]]
+      expect(scope_a).to be == scope_b
+    end
+  end
+
   describe 'class methods delegation' do
 
     it 'can be called from a scope' do

data/spec/support/country.rb

@@ -4,6 +4,10 @@ class Country < FrozenRecord::Base
     where(king: nil)
   end
 
+  def self.nato
+    where(nato: true)
+  end
+
   def reverse_name
     name.reverse
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: frozen_record
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Jean Boussier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-02 00:00:00.000000000 Z
+date: 2019-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -146,8 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: ActiveRecord like interface to read only access and query static YAML files