engrade 1.1.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b4230d6c99403ccd3399d10d1da3d451515a29c
-  data.tar.gz: a273179b5105e6b7db1debf9994cc836f111b67b
+  metadata.gz: 0c1ec0680d76ecf417ed7e627b4aea6afadc3aa8
+  data.tar.gz: 1e466ce74f85fc3ce665fa8dc13ab5bc404bde64
 SHA512:
-  metadata.gz: b0ff51ce42711db0fbdfb880cfdb44952d78c121f10725252f2bb4228826cb738e8beb6a6b0139ab5eb3e15ff79242cc062215008c12dfd5e534d5dce4c48440
-  data.tar.gz: a89fcc7983eb26d809f30a25bfe15236469a016306bcc88d9d4d183f9a770fe9583709d60084baa8c17a1825412467f8e21d7a5dfe3c88c08146e75520d34ebc
+  metadata.gz: a8d97b4a9ac7cb391c01660c66f0167079a6a1ab4c5a093f4c7e47f98db9a1b0fffd63e4ba8061ddde857258b7bea253b5db8b7e400c0ab0be48c84f98385962
+  data.tar.gz: fd9ad6b5653f6a2f71cb19acf3561e357ab47183ab9c72afc61de12ae0ede050c71f0f4eceae8c4f3ae68af730554525fdbd4614ba8dda3149efe8716ed778df

data/lib/engrade.rb

@@ -77,7 +77,7 @@ module Engrade
   # can be filtered by calling with the :only or :except and :type (3=active, 2=archived, 
   # 1=trashed) option.
   def self.classes(options={})
-    filter teacher_classes, options
+    filter_classes teacher_classes, options
   end
 
 
@@ -87,7 +87,7 @@ module Engrade
   # assignments can be filtered by calling with the additional :only or :except
   # option
   def self.assignments(classes, options={})
-    filter all_assignments(classes), options
+    filter_assignments all_assignments(classes), options
   end
 
 
@@ -109,12 +109,17 @@ module Engrade
   # HELPER METHODS #
   ##################
 
-  def self.filter(array=[], options={})
-    var = :name if array.first.instance_of? Classroom
-    var = :title if array.first.instance_of? Assignment
-    array.select! { |item| item.send(var).match options[:only]} if options[:only]
-    array.reject! { |item| item.send(var).match options[:except]} if options[:except]
-    array.select! { |item| item.folder == options[:type] } if options[:type]
+  def self.filter_classes(array=[], options={})
+    array.select! { |cl| cl.name.match options[:only]} if options[:only]
+    array.reject! { |cl| cl.name.match options[:except]} if options[:except]
+    array.select! { |cl| cl.folder == options[:type] } if options[:type]
+    array.select! { |cl| cl.syr == options[:syr] } if options[:syr]
+    array
+  end
+
+  def self.filter_assignments(array=[], options={})
+    array.select! { |assn| assn.title.match options[:only]} if options[:only]
+    array.reject! { |assn| assn.title.match options[:except]} if options[:except]
     array
   end
 

data/lib/engrade/version.rb

@@ -1,3 +1,3 @@
 module Engrade
-    VERSION = "1.1.2"
+    VERSION = "1.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: engrade
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - Zachary Thompson