static-record 1.0.0.pre.4 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b60c1fa4bbb64488ee835ee71ca5b98a2d4ac0ec
-  data.tar.gz: bbc16fa804ca8c6e53ad8af528b0e24951ee701d
+  metadata.gz: 5b162063f35ae54889eb3667e905da0e9ded7006
+  data.tar.gz: 47cb368f415b140fd8a1edfb0d0871ee557028d1
 SHA512:
-  metadata.gz: 3422bf6fc4b9119a593a109414741e53f8b97b1a93a9fac9a3ca57df30dc7b2f41b72526e02489648d54d6d2f8ffc76db81229290ca127b810f7d618d8736d28
-  data.tar.gz: a97badf91f4997632dc5e3b1e0485cd7a41356af27f85b8dc7cc8986deded9d616d9ea7ba060dd6b220d72d3b5b728e2072f218ebd74c37f10b4fe546a923fc0
+  metadata.gz: 2818d1563d8abb371273626a852150de43df729fd2aa8db28229b56f060115ed43e98a381e7df716c8a832c25fb23357807ea69fabf47f2741c20615d485c000
+  data.tar.gz: df9d29e83a7d6ba39386710e17857790355667c85c04be06e9b0be4bea8dd8084d13fcd1ab6e4115de1e9e55c9c36ca3c460849af01fcf657c3a1282b245b20d

data/README.rdoc

@@ -146,12 +146,8 @@ If you have any question or doubt regarding StaticRecord which you cannot find t
 
 If you find a bug please add an issue on GitHub or fork the project and send a pull request.
 
-== Development
+== Future
 
-As StaticRecord is in active development and a full list of feature is already scheduled, I won't be accepting any feature-oriented pull requests before the 1.0.0 release (hopefully before mi-January).
-
-Here is what will be available soon:
 - Better documentation
-- Support for Date, Datetime and Foreign keys
-- Joins
 - Generators
+- Allow StaticRecord to reference other static records and add possibility to query over relations (joins)

data/lib/static_record/concerns/query_building_concern.rb

@@ -22,8 +22,6 @@ module StaticRecord
     end
 
     def sql_order
-      return '' unless @primary_key
-
       ord_sql = ''
       @order_by.each do |ord|
         ord_sql += ord_sql.empty? ? ' ORDER BY' : ', '

data/lib/static_record/migrations/has_static_record.rb

@@ -18,19 +18,20 @@ module StaticRecord
 
       def define_setter(table_name, options)
         define_method("#{table_name}=") do |static_record|
-          unless static_record.class.pkey
-            err = "No primary key has been defined for #{static_record.class}"
-            raise NoPrimaryKey, err
-          end
-
           table = __method__.to_s.delete('=')
           options[:class_name] ||= table.camelize
           superklass = static_record.class.superclass
+
           unless superklass.to_s == options[:class_name]
-            err = "Record must be an instance of #{options[:class_name]}"
+            err = "Record must be an instance of #{options[:class_name]}, got #{superklass}"
             raise ClassError, err
           end
 
+          unless superklass.pkey
+            err = "No primary key has been defined for #{superklass.class}"
+            raise NoPrimaryKey, err
+          end
+
           send(:"#{table}_static_record_type=", static_record.class.name)
         end
       end

data/lib/static_record/models/predicates.rb

@@ -67,14 +67,20 @@ module StaticRecord
     end
 
     def first(amount = 1)
-      @order_by << { :"#{@primary_key}" => :asc } if @order_by.empty?
+      @order_by << { :"#{@primary_key}" => :asc } if @primary_key && @order_by.empty?
       take(amount)
     end
 
     def last(amount = 1)
-      @order_by << { :"#{@primary_key}" => :desc } if @order_by.empty?
-      res = take(amount)
-      res.reverse! if res.is_a?(Array)
+      if !@primary_key && @order_by.empty?
+        cnt = self.class.new(self, store: @store, primary_key: @primary_key).no_sql.send(:count)
+        @sql_offset = [cnt - amount, 0].max
+        res = take(amount)
+      else
+        @order_by << { :"#{@primary_key}" => :desc } if @order_by.empty?
+        res = take(amount)
+        res.reverse! if res.is_a?(Array)
+      end
       res
     end
 
@@ -107,6 +113,11 @@ module StaticRecord
       self
     end
 
+    def no_sql
+      @only_sql = false
+      self
+    end
+
     def to_a
       exec_request
     end

data/lib/static_record/version.rb

@@ -1,3 +1,3 @@
 module StaticRecord
-  VERSION = '1.0.0.pre.4'.freeze
+  VERSION = '1.0.0'.freeze
 end

data/spec/models/relation_spec.rb

@@ -85,6 +85,11 @@ RSpec.describe StaticRecord::Relation, :type => :model do
         expect(Article.last.class).to eql(ArticleTwo)
         expect(Article.see_sql_of.last).to eql("SELECT * FROM articles ORDER BY articles.name DESC LIMIT 1")
       end
+
+      it 'returns use default sort when no primary key has been defined' do
+        expect(Role.last.class).to eql(RoleTwo)
+        expect(Role.see_sql_of.last).to eql("SELECT * FROM roles LIMIT 1 OFFSET #{Role.all.count - 1}")
+      end
     end
 
     context 'with a parameter' do
@@ -92,6 +97,11 @@ RSpec.describe StaticRecord::Relation, :type => :model do
         expect(Article.last(2).map(&:class)).to eql([ArticleThree, ArticleTwo])
         expect(Article.see_sql_of.last(2)).to eql("SELECT * FROM articles ORDER BY articles.name DESC LIMIT 2")
       end
+
+      it 'returns up to specified number of records from the end when no primary key is set' do
+        expect(Role.last(2).map(&:class)).to eql([RoleOne, RoleTwo])
+        expect(Role.see_sql_of.last(2)).to eql("SELECT * FROM roles LIMIT 2 OFFSET #{Role.all.count - 2}")
+      end
     end
   end
 

data/spec/test_app/app/models/roles/role_one.rb

@@ -1,4 +1,4 @@
-class RoleOne < Article
+class RoleOne < Role
   attribute :name, 'Role One'
   attribute :description, 'This is a description'
 end

data/spec/test_app/app/models/roles/role_two.rb

@@ -0,0 +1,4 @@
+class RoleTwo < Role
+  attribute :name, 'Role Two'
+  attribute :description, 'This is another description'
+end

data/spec/test_app/spec/has_static_record_spec.rb

@@ -15,8 +15,13 @@ RSpec.describe StaticRecord::HasStaticRecord, :type => :module do
     expect(t.article.name).to eql(article.name)
   end
 
+  it 'must assign correct instance' do
+    expect { Test.new.article = Article.last }.not_to raise_error
+    expect { Test.new.article = Role.last }.to raise_error(StaticRecord::ClassError)
+  end
+
   it 'cannot add getter to ActiveRecord if no primary key is set' do
     Test.has_static_record :role
-    expect { Test.new.role = Role.last }.to raise_error
+    expect { Test.new.role = Role.last }.to raise_error(StaticRecord::NoPrimaryKey)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: static-record
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.4
+  version: 1.0.0
 platform: ruby
 authors:
 - Hugo Chevalier
@@ -173,6 +173,7 @@ files:
 - spec/test_app/app/models/articles/article_two.rb
 - spec/test_app/app/models/role.rb
 - spec/test_app/app/models/roles/role_one.rb
+- spec/test_app/app/models/roles/role_two.rb
 - spec/test_app/app/models/test.rb
 - spec/test_app/config/application.rb
 - spec/test_app/config/boot.rb
@@ -209,9 +210,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.8
@@ -235,6 +236,7 @@ test_files:
 - spec/test_app/app/models/articles/article_two.rb
 - spec/test_app/app/models/role.rb
 - spec/test_app/app/models/roles/role_one.rb
+- spec/test_app/app/models/roles/role_two.rb
 - spec/test_app/app/models/test.rb
 - spec/test_app/config/application.rb
 - spec/test_app/config/boot.rb