oldie_rails_models 0.3.8 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f3dc34f895b5e9d7ebfb8fe5cddc672ab3b89601
-  data.tar.gz: 039d2056d7e07692f79f222d996bc4a117a6a226
+  metadata.gz: 7f27871005caba3cd3cab92b7b6e5b3dbcb8f232
+  data.tar.gz: cc54ebe40de89debb8f1e3735947bb68302ba1f5
 SHA512:
-  metadata.gz: 8119972886002feaad67d0fb345634d1e4b5c04023ecb909418e3ad5fa89cd829635b55efc2cdb3209e8ba36d02f96c013ee9ae3118e424f3abdadfd721276a0
-  data.tar.gz: 9ddf897c59e455c1592e482175b2eaf3b550e527a5c3ae8f216247d646809f49344392c54d8356ef72291f1b7c860e86909adac04f0541722be33d1e33da5330
+  metadata.gz: 93adb42a127f0e78f6b7bcfc4fbb90b037bd2660cfa295ce8bb6ab1fd20aae4a2f6b9e3e5f6b91bb69292936d1cc67aaa6e4690d04f5f8d815ec65fcdafc8ab9
+  data.tar.gz: 89b672bb2f63feb8fe50b51b93290aeddfe00e89384f5c3beddef1cb48375eaf4df0b34b0239f83636f120770914629726091d55b4648d5a03b5e29919f16da2

data/lib/oldie_rails_models/model.rb

@@ -39,33 +39,6 @@ module OldieRailsModels
       parent_scoped(h, self)
     end
 
-    def parent_scoped(h, parent)
-      h.inject(parent) do |s, (key, value)|
-        case key
-        when :conditions
-          s.where(value)
-        when :select
-          s.select(value)
-        when :order
-          s.order(value)
-        when :joins
-          s.joins(value)
-        when :limit
-          s.limit(value)
-        when :includes
-          s.includes(value)
-        when :offset
-          s.offset(value)
-        when :group
-          s.group(value)
-        when :having
-          s.having(value)
-        when :finder_sql
-          s.find_by_sql(value)
-        end
-      end
-    end
-
     def validate_on_create(*args)
       validate *add_parameter(args, { on: :create })
     end
@@ -98,7 +71,17 @@ module OldieRailsModels
       case opts
         when Hash
           finders = {}
-          [:conditions, :order, :joins, :limit, :include, :offset, :group, :having, :finder_sql].each do |k|
+          [
+            :conditions,
+            :order,
+            :joins,
+            :limit,
+            :include,
+            :offset,
+            :group,
+            :having,
+            :finder_sql
+          ].each do |k|
             if opts[k]
               finders[k] = opts[k]
               opts.delete(k)
@@ -120,6 +103,36 @@ module OldieRailsModels
       end
     end
 
+
+    def parent_scoped(h, parent)
+      h.inject(parent) do |s, (key, value)|
+        case key
+        when :conditions
+          s.where(value)
+        when :select
+          s.select(value)
+        when :order
+          s.order(value)
+        when :joins
+          s.joins(value)
+        when :limit
+          s.limit(value)
+        when :includes
+          s.includes(value)
+        when :offset
+          s.offset(value)
+        when :group
+          s.group(value)
+        when :having
+          s.having(value)
+        when :finder_sql
+          s.find_by_sql(value)
+        when :count
+          s.where(value).count
+        end
+      end
+    end
+
   end
 end
 

data/lib/oldie_rails_models/version.rb

@@ -1,3 +1,3 @@
 module OldieRailsModels
-  VERSION = "0.3.8"
+  VERSION = "0.3.9"
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: oldie_rails_models
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.3.9
 platform: ruby
 authors:
 - Alex Dubovskoy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-14 00:00:00.000000000 Z
+date: 2014-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Basic support of Rails 2 models in Rails 4.
@@ -31,13 +31,13 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/oldie_rails_models/version.rb
-- lib/oldie_rails_models/model.rb
-- lib/oldie_rails_models/mailer.rb
-- lib/oldie_rails_models.rb
 - MIT-LICENSE
-- Rakefile
 - README.rdoc
+- Rakefile
+- lib/oldie_rails_models.rb
+- lib/oldie_rails_models/mailer.rb
+- lib/oldie_rails_models/model.rb
+- lib/oldie_rails_models/version.rb
 homepage: https://github.com/dubadub/oldie_rails_models
 licenses: []
 metadata: {}
@@ -47,19 +47,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Basic support of Rails 2 models in Rails 4.
 test_files: []
-has_rdoc: