yourub 1.0.7 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 494ed6a9104fae3170ddc50558721f98bc42f36f
-  data.tar.gz: b2c160e3bf7410d175328205b2550e69e20001f3
+  metadata.gz: b2aa1059c797a786fea83046d74f8bd6751f954d
+  data.tar.gz: 7906cfcc12e3fd7e7cd82c2290f00a855c3ef8cd
 SHA512:
-  metadata.gz: 4353aefef6f549703e09bbef10387008993e3844d744528005201239e117d5f01048c7f7bdd5b343e36b5527631091df35ba9ac16b0ed3f8437199259c8d3a91
-  data.tar.gz: 9473dddeb12fef8f2a3d100ebd6b4dadf3fbec1c72d1db2ba5fe090fe88acbf2843d408739f29c771b91bb462b5cf38d404818b0ec7a57dab6640396ec919f82
+  metadata.gz: 3cb8c2d1c2c2ebce6e81bd0d8bcf832f0ac7365d3543e445bd3ced8c2e5049a24840e03d83684bd47725a466d277df596cd4b635c752ad1eb0747d85b5ef3f58
+  data.tar.gz: 4533693deb7dd813670d8ec362f44e66e985f41c6233c58798b2d14b977194f9ae59112ce0b67ef9984f0305c541c67c1713346eb01bc854694882df1112e42a

data/README.md

@@ -49,7 +49,7 @@ test:
 
 `:category` String, example `comedy`
 
-`:count_filters` Hash, example `{views: ">= 100"}` or `{views: "== 600"}`
+`:count_filter` Hash, example `{views: ">= 100"}` or `{views: "== 600"}`
 
 `:max_results` Integer, between 1 and 50
 

data/config/yourub.yml

@@ -13,4 +13,4 @@ production:
   <<: *yourub_defaults
 
 test:
-  <<: *yourub_defaults
+  <<: *yourub_defaults

data/lib/yourub/client.rb

@@ -7,6 +7,7 @@ module Yourub
     def initialize()
       @extended_info = false
       @categories, @videos = [], []
+      @count_filter = {}
       @api_options= {
         :part            => 'snippet',
         :type            => 'video',
@@ -97,7 +98,7 @@ module Yourub
     def retrieve_videos
       consume_criteria do |criteria|
         req = search_list_request(criteria)
-        if @extended_info || @criteria[:count_filter]
+        if @extended_info || Yourub::CountFilter.filter
           get_details_and_store req
         else
           videos = Yourub::Reader.parse_videos(req)
@@ -175,7 +176,7 @@ module Yourub
 
     def add_video_to_search_result(entry)
       video = @extended_info ? entry : Yourub::Reader.parse_entry(entry)
-      if Yourub::CountFilter.accept?(entry, @criteria[:count_filter])
+      if Yourub::CountFilter.accept?(entry)
         @videos.push(video)
       end
     end

data/lib/yourub/count_filter.rb

@@ -7,8 +7,7 @@ module Yourub
       VIEWS_COUNT_NUMBER = /\d*\z/
       ARITHMETIC_OPERATOR = /\A<(?!=)|>(?!=)|<=|>=|==|!=/
 
-      def accept?(entry, filter)
-        @filter = filter
+      def accept?(entry)
         return true if @filter.nil?
         validate_filter
         apply_filter(entry)

data/lib/yourub/validator.rb

@@ -22,6 +22,7 @@ module Yourub
         countries_to_array
         add_default_country_if_category_is_present
         validate_countries
+        set_filter_count_options
 
         @criteria
       end
@@ -66,7 +67,14 @@ module Yourub
         end
       end
 
+      def set_filter_count_options
+        if @criteria.has_key? :count_filter
+          Yourub::CountFilter.filter = @criteria.delete(:count_filter)
+        end
+      end
+
       def valid_category(categories, selected_category)
+        #if selected_category == 'all' return categories
         categories = categories.select {|k| k.has_value?(selected_category.downcase)}
         if categories.first.nil?
           raise ArgumentError.new(
@@ -109,7 +117,7 @@ module Yourub
         raise ArgumentError.new(
           'max 50 videos pro categories or country'
         ) unless(
-          @criteria[:max_results].to_i < 50 || @criteria[:max_results].to_i == 0
+          @criteria[:max_results].to_i < 51 || @criteria[:max_results].to_i == 0
         )
       end
 

data/lib/yourub/version.rb

@@ -1,6 +1,6 @@
 module Yourub
   MAJOR = 1
   MINOR = 0
-  PATCH = 7
+  PATCH = 8
   VERSION = [MAJOR, MINOR, PATCH].compact.join('.')
 end

data/spec/count_filter_spec.rb

@@ -16,22 +16,21 @@ describe Yourub::CountFilter do
     }
   }
 
+  let(:subject) { Yourub::CountFilter.accept?(video) }
+
   it "accept the video if satisfy the condition" do
-    filter = {views: ">= 100"}
-    res = Yourub::CountFilter.accept?(video, filter)
-    expect(res).to be_true
+    Yourub::CountFilter.filter = {views: ">= 100"}
+    expect(subject).to be_true
   end
 
   it "accept the video if filter is nil" do
-    filter = nil
-    res = Yourub::CountFilter.accept?(video, filter)
-    expect(res).to be_true
+    Yourub::CountFilter.filter = nil
+    expect(subject).to be_true
   end
 
   it "not accept the video if it does not satisfy the condition" do
-    filter = {views: "<= 100"}
-    res = Yourub::CountFilter.accept?(video, filter)
-    expect(res).to be_false
+    Yourub::CountFilter.filter = {views: "<= 100"}
+    expect(subject).to be_false
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yourub
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
 platform: ruby
 authors:
 - Davide Prati
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-25 00:00:00.000000000 Z
+date: 2014-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-api-client