active_record_batteries 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 627d133bd03a971733af4b6c13f785c7818fc091
-  data.tar.gz: da576d73fc56b2908ee439d57602f16190393d05
+SHA256:
+  metadata.gz: 159a2a4a4681bde175fe4f840828e8cccc02730a920dfacfc90357dfb46dea45
+  data.tar.gz: 2688b3784eb100bd085a441a7ff75f60f26856d8fe2196af511ed2b6f6c6e1bd
 SHA512:
-  metadata.gz: dd346dedc4c333d84854dbf6ba7c207d64ee1c33cd27f3c14f7ed1decba4e66c64a86f0931616f03e05d811ec49caaf33e6b2e61dde007d20867f7f8e5859300
-  data.tar.gz: a9d073f004d367713145512ef781600970b3b39f177e29fa6c199836d0f37cf4132efc3c76e32edd6ae8a2dc665fd56a6a2ac39126a7d29c1cd578ac71e87fd9
+  metadata.gz: 1b70cd34525c873fe0ea4b554445e8139dc21ee1f491077952b5168ba5f814308515d8a04b8b47442a1101c5dfb673227ec4853e80dabc3cb9f8c5f1980dd866
+  data.tar.gz: 8426aa0d792c5c5c9682f8768df908509d683fa6f6bb459acd7a62f4fc529c3965f449d86ba0fa17fcc9d70172d10a55697bb52b8b4df58676c9d037ef83f860

data/lib/active_record_batteries.rb

@@ -1,7 +1,5 @@
 module ActiveRecordBatteries
 end
 
-require 'active_record_batteries/engine'
 require 'active_record_batteries/version'
 require 'active_record_batteries/concerns'
-require 'active_record_batteries/loader'

data/lib/active_record_batteries/concerns/filterable.rb

@@ -16,7 +16,7 @@ module ActiveRecordBatteries
       end
 
       module ClassMethods
-        def filter_add(method_name, callable = nil)
+        def filter_by(method_name, callable = nil)
           scope(method_name, callable) if callable
           filters[method_name] = method_name
         end

data/lib/active_record_batteries/concerns/paginable.rb

@@ -5,11 +5,15 @@ module ActiveRecordBatteries
 
       included do
         # Default items per page
-        page_items 25
+        items_per_page 25
 
-        scope :paginate, lambda { |page, page_items = @page_items|
-          limit(page_items)
-            .offset(([page.to_i, 1].max - 1) * page_items)
+        klass = self
+
+        scope :paginate, lambda { |page, items_per_page = nil|
+          items_per_page ||= klass.instance_variable_get(:@items_per_page)
+
+          limit(items_per_page)
+            .offset(([page.to_i, 1].max - 1) * items_per_page)
             .extending do
 
             def current_page
@@ -42,13 +46,13 @@ module ActiveRecordBatteries
       end
 
       module ClassMethods
-        def page_items(items)
-          @page_items = items
+        def items_per_page(items)
+          @items_per_page = items
         end
 
-        def pages(page_items = @page_items)
+        def pages(items_per_page = @items_per_page)
           (all.except(:offset, :limit, :order, :includes)
-            .distinct(:id).count / page_items.to_f).ceil
+            .distinct(:id).count / items_per_page.to_f).ceil
         end
       end
     end

data/lib/active_record_batteries/version.rb

@@ -1,3 +1,3 @@
 module ActiveRecordBatteries
-  VERSION = "1.0.0"
+  VERSION = "2.0.0"
 end

data/spec/active_record_batteries_spec.rb

@@ -107,7 +107,7 @@ RSpec.describe ActiveRecordBatteries do
 
   context "Paginable" do
     it "should set items per page" do
-      expect(Author.page_items(2)).to eql(2)
+      expect(Author.items_per_page(2)).to eql(2)
     end
 
     it "should count pages" do
@@ -147,54 +147,14 @@ RSpec.describe ActiveRecordBatteries do
     end
   end
 
-  context "RelationshipScopes" do
-    before :all do
-      Author.create(name: "articleless")
-    end
-
-    # Scopes should be added
-    [ :with_articles, :include_articles, :and_articles,
-      :pload_articles, :eload_articles ].each do |method|
-      it "should respond to #{method}" do
-        expect(Author.respond_to?(method)).to be true
-      end
-    end
-
-    it "should not have articles preloaded" do
-      author = Author.first
-      expect(author.articles.loaded?).to be false
-    end
-
-    it "should have articles included" do
-      author = Author.include_articles.first
-
-      expect(author.articles.loaded?).to be true
-    end
-
-    it "should have articles preloaded" do
-      author = Author.pload_articles.first
-
-      expect(author.articles.loaded?).to be true
-    end
-
-    it "should have articles eager loaded" do
-      author = Author.eload_articles.first
-
-      expect(author.articles.loaded?).to be true
-    end
-
-    it "should join but not preload" do
-      author = Author.with_articles.first
-
-      expect(author.articles.loaded?).to be false
-    end
-
-    it "should inner join" do
-      expect(Author.and_articles.where(name: "articleless")).to be_empty
+  context "Sluggable" do
+    it "should have a slug" do
+      expect(Article.create(title: "Hello, world").slug).to eq("hello-world")
     end
 
-    it "should not inner join" do
-      expect(Author.pload_articles.where(name: "articleless")).not_to be_empty
+    it "should qualify slugs" do
+      expect { Article.create!(title: "Hello, world") }.to_not raise_error
+      expect { Article.create!(title: "Hello, world") }.to_not raise_error
     end
   end
 end

data/spec/spec_helper.rb

@@ -32,24 +32,27 @@ ActiveRecord::Schema.define do
 end
 
 class Author < ActiveRecord::Base
-  batteries! :sluggable, :paginable, :filterable, :relationship_scopes
+  include ActiveRecordBatteries::Concerns::Sluggable,
+          ActiveRecordBatteries::Concerns::Paginable,
+          ActiveRecordBatteries::Concerns::Filterable
 
   has_many :articles
 
-  filter_add :by_slug
-
-  relationship_scopes :articles
+  filter_by :by_slug
 end
 
 class Article < ActiveRecord::Base
-  batteries! :sluggable, :paginable, :filterable, :relationship_scopes, :deletable
+  include ActiveRecordBatteries::Concerns::Sluggable,
+          ActiveRecordBatteries::Concerns::Paginable,
+          ActiveRecordBatteries::Concerns::Filterable,
+          ActiveRecordBatteries::Concerns::Deletable
 
   belongs_to :author
 
   slug_base_column :title
 
-  filter_add :by_slug
-  filter_add :by_title, ->(title) { where(title: title) }
+  filter_by :by_slug
+  filter_by :by_title, ->(title) { where(title: title) }
 
-  page_items 5
+  items_per_page 5
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record_batteries
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Francisco Soto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-28 00:00:00.000000000 Z
+date: 2019-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.1
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.1
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.10
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.10
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
 description: Several small active record modules to empower models in a simple way.
 email:
-- ebobby@gmail.com
+- ebobby@ebobby.org
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -66,12 +66,8 @@ files:
 - lib/active_record_batteries/concerns/deletable.rb
 - lib/active_record_batteries/concerns/filterable.rb
 - lib/active_record_batteries/concerns/paginable.rb
-- lib/active_record_batteries/concerns/relationship_scopes.rb
 - lib/active_record_batteries/concerns/sluggable.rb
-- lib/active_record_batteries/engine.rb
-- lib/active_record_batteries/loader.rb
 - lib/active_record_batteries/version.rb
-- lib/tasks/active_record_batteries_tasks.rake
 - spec/active_record_batteries_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/ebobby/active_record_batteries
@@ -93,8 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: ActiveRecord with Batteries. Extensions to make life easier.

data/lib/active_record_batteries/concerns/relationship_scopes.rb

@@ -1,24 +0,0 @@
-module ActiveRecordBatteries
-  module Concerns
-    module RelationshipScopes
-      extend ActiveSupport::Concern
-
-      module ClassMethods
-        def relationship_scopes(relationship, suffix = nil)
-          suffix ||= relationship
-
-          with_scope_name    = "with_#{ suffix }".to_sym
-          include_scope_name = "include_#{ suffix }".to_sym
-
-          scope with_scope_name,              -> { joins(relationship) }
-          scope include_scope_name,           -> { includes(relationship) }
-          scope "and_#{ suffix }".to_sym,     -> { send(with_scope_name).send(include_scope_name) }
-          scope "pload_#{ suffix }".to_sym,   -> { preload(relationship) }
-          scope "eload_#{ suffix }".to_sym,   -> { eager_load(relationship) }
-
-          nil
-        end
-      end
-    end
-  end
-end

data/lib/active_record_batteries/engine.rb

@@ -1,5 +0,0 @@
-module ActiveRecordBatteries
-  class Engine < ::Rails::Engine
-    isolate_namespace ActiveRecordBatteries
-  end
-end

data/lib/active_record_batteries/loader.rb

@@ -1,19 +0,0 @@
-module ActiveRecordBatteries
-  module Loader
-    extend ActiveSupport::Concern
-
-    module ClassMethods
-      def batteries! (*modules)
-        modules = modules.is_a?(Array) ? modules : [ modules ]
-
-        modules.each.map{|i| i.to_s.camelize }.each do |mod|
-          include ActiveRecordBatteries::Concerns.const_get(mod)
-        end
-
-        nil
-      end
-    end
-
-    ActiveRecord::Base.send(:include, self)
-  end
-end

data/lib/tasks/active_record_batteries_tasks.rake

@@ -1,4 +0,0 @@
-# desc "Explaining what the task does"
-# task :active_record_batteries do
-#   # Task goes here
-# end