bookie_accounting 1.1.3 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ef00d4082140ad111a21da87cba98e1254fabcf
-  data.tar.gz: 1acbe70668d35255e0ce408346b6f74f756d1bea
+  metadata.gz: f140628ce83250fabffabda656f8f66a73cb89dc
+  data.tar.gz: b0c4ed64a1adbd44986df8856eb9c01a2aa52b61
 SHA512:
-  metadata.gz: 12cecbc1171f0b9fa7b063beff8650d9f2c46c3b9de4218478ae3f83782772e0e9b9070a6ae49502adbe77808c16828a9a7b376442717a9c37827d32890057b7
-  data.tar.gz: 022f7c9c45cf8ce896ea09e2a6d1221515f92e2c9ccf5b940b3edda30c543a0042dea03d15b771cbde78b939f2f3e1c6e1fa5a64e02dd20ac361da012e5b94a5
+  metadata.gz: ca2c83c5150357c4cef54d129670c9ef93f530c4ec4846f333de7ea79b19a9cf88a377a69e1895459a40bffa1f254a26bab55a2684cb69e13301df3ee710ab88
+  data.tar.gz: 1ebafa8e77bf140b8942289b53bab7d9a6345250f2e2888c8ecceb417181f7eee7f6975d09bd5ce7744af940320f27ec8c3c39f55d826521a17377e484b5964c

data/Gemfile

@@ -5,5 +5,6 @@ gemspec
 gem 'bundler', :group => :development
 gem 'mocha', :group => :development
 gem 'rspec', :group => :development
+gem 'simplecov', :group => :development
 gem 'sqlite3', :group => :development
 

data/lib/bookie/database.rb

@@ -87,7 +87,7 @@ module Bookie
       def self.by_group_name(group_name)
         group = Group.find_by_name(group_name)
         return joins(:user).where('users.group_id = ?', group.id) if group
-        where('1=0')
+        self.none
       end
       
       ##
@@ -118,7 +118,7 @@ module Bookie
       #Finds all jobs whose running intervals overlap the given time range
       def self.by_time_range_inclusive(time_range)
         if time_range.empty?
-          where('1=0')
+          self.none
         elsif time_range.exclude_end?
           where('? <= jobs.end_time AND jobs.start_time < ?', time_range.first, time_range.last)
         else
@@ -292,7 +292,7 @@ module Bookie
       def self.by_group_name(name)
         group = Group.find_by_name(name)
         return by_group(group) if group
-        where('1=0')
+        self.none
       end
       
       ##
@@ -499,7 +499,7 @@ module Bookie
     #A group of users
     class Group < ActiveRecord::Base
       has_many :users
-      
+
       ##
       #Finds a group by name, creating it if it doesn't exist
       #
@@ -528,6 +528,16 @@ module Bookie
       def self.by_name(name)
         where('users.name = ?', name)
       end
+
+      def self.by_group(group)
+        return where('users.group_id = ?', group.id)
+      end
+
+      def self.by_group_name(name)
+        group = Group.find_by_name(name)
+        return by_group(group) if group
+        self.none
+      end
       
       ##
       #Finds a user by name and group, creating it if it doesn't exist
@@ -589,7 +599,7 @@ module Bookie
       #To do: unit test.
       def self.by_time_range_inclusive(time_range)
         if time_range.empty?
-          where('1=0')
+          self.none
         elsif time_range.exclude_end?
           where('(? <= systems.end_time OR systems.end_time IS NULL) AND systems.start_time < ?', time_range.first, time_range.last)
         else

data/lib/bookie/version.rb

@@ -1,4 +1,4 @@
 module Bookie
   #The library version
-  VERSION = "1.1.3"
+  VERSION = "1.2.3"
 end

data/spec/database_spec.rb

@@ -424,6 +424,7 @@ describe Bookie::Database do
         sums.each do |sum|
           sum.user.group.name.should eql 'admin'
         end
+        Bookie::Database::JobSummary.by_group_name('fake_group').count.should eql 0
       end
       
       it "correctly filters by system" do
@@ -693,6 +694,16 @@ describe Bookie::Database do
         user.name.should eql 'test'
       end
     end
+
+    it "correctly filters by group" do
+      Bookie::Database::User.by_group(Bookie::Database::Group.find_by_name('admin')).count.should eql 2
+      Bookie::Database::User.by_group(Bookie::Database::Group.find_by_name('root')).count.should eql 1
+    end
+
+    it "correctly filters by group name" do
+      Bookie::Database::User.by_group_name('admin').count.should eql 2
+      Bookie::Database::User.by_group_name('fake_group').count.should eql 0
+    end
     
     describe "#find_or_create" do
       before(:each) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bookie_accounting
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.2.3
 platform: ruby
 authors:
 - Ben Merritt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-06 00:00:00.000000000 Z
+date: 2013-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord