sheety 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38ade06e385c46a2d91faacf730d0448f6d4dd33
-  data.tar.gz: 5dfc347ed4b5b4c757c6ed207f3fa1d61c70abd4
+  metadata.gz: 0bcb4c0f7b6b0dcf39e89cc9e816cb48ece43ae2
+  data.tar.gz: c3b3a6c2f573a421a2f87a24818bca447186373d
 SHA512:
-  metadata.gz: ed078b4cf16624b2870f2d5d78ddea2ac3ea863641a3be6942db5434ce2d9b55598758a9da7383c75f10104b29286acd1c4ebf45a485351f2f00fc7055959219
-  data.tar.gz: 9da2690ecc23258d77af3d2c179bca1bf5cf9dd8bfe35704482dc245d7061f62338b74ff1df0723386f4326c065e0fea88c7e8fe0bbd6d2bf66ad7a2c4a42f83
+  metadata.gz: ef9ccea18022a4e0ffa7f6d60941dbeb3d31898a1def8ccdf421879523ef984c3dd528668a7761fad8e25f5cfe0471f85a57c1301b8c75e463563e1faf26d87a
+  data.tar.gz: 36aebc88802a69d9d3d7edda08af38ee137ab77d957829a7212061b5edcc96dc61bf0fc1d1fd7aa405032982c1a101e9dc7f6869585305043d266a29c68f73f0

data/lib/sheety/api.rb

@@ -6,6 +6,12 @@ require_relative 'spreadsheet'
 
 module Sheety
 
+  class SheetyError < StandardError
+  end
+
+  class SheetyFetchError < SheetyError
+  end
+
   private
 
   class Api
@@ -14,7 +20,7 @@ module Sheety
     URI_LIST = 'https://spreadsheets.google.com/feeds/spreadsheets/private/full'
     URI_AUTH = 'https://www.googleapis.com/oauth2/v3/token'
 
-    def link(key) # for compat with ChildBearing
+    def link(key) # for compatibility with Sheety::Children
       return key
     end
 
@@ -39,34 +45,82 @@ module Sheety
       return (@access_token ? self : nil)
     end
 
+    # block so you can have the max retries set only for a small amount of code
+    def with_max_retries(num, &block)
+      raise ArgumentError.new, "Must pass a block!" unless block_given?
+
+      previous_max = @max_retries
+      @max_retries = num.to_i
+      yield
+      @max_retries = previous_max
+    end
+
+    attr_accessor :max_read_retries
+
+    def with_max_read_retries(num)
+      if block_given?
+        previous_max = @max_read_retries
+        @max_read_retries = num.to_i
+        yield
+        @max_read_retries = previous_max
+      else
+        @max_read_retries = num.to_i
+      end
+    end
+    alias_method :set_max_read_retries, :with_max_read_retries
+
     def get_feed(uri)
+      tries = 0
       begin
         return parse_response(HTTParty.get(uri, headers: get_headers))
       rescue
+        if tries < [@max_retries, @max_read_retries].max
+          tries += 1
+          retry
+        end
+
         return nil
       end
     end
 
     def post_feed(uri, data)
+      tries = 0
       begin
         return parse_response(HTTParty.post(uri, body: data, headers: post_headers))
       rescue
+        if tries < @max_retries
+          tries += 1
+          retry
+        end
+
         return nil
       end
     end
 
     def put_feed(uri, data)
+      tries = 0
       begin
         return parse_response(HTTParty.put(uri, body: data, headers: put_headers))
       rescue
+        if tries < @max_retries
+          tries += 1
+          retry
+        end
+
         return nil
       end
     end
 
     def delete_feed(uri)
+      tries = 0
       begin
         return parse_response(HTTParty.delete(uri, headers: delete_headers))
       rescue
+        if tries < @max_retries
+          tries += 1
+          retry
+        end
+
         return nil
       end
     end
@@ -108,8 +162,10 @@ module Sheety
       @client.authorization= :google_app_default
       @auth = @client.authorization
       @auth.scope = 'https://spreadsheets.google.com/feeds'
+      @max_retries = 0
+      @max_read_retries = 0
 
       return self
     end
   end
-end
+end

data/lib/sheety/children.rb

@@ -27,10 +27,16 @@ module Sheety::Children
   end
 
   module ClassMethods
+    # Defines a child relationship with the given name
+    # symbol (required): the name of the child
+    # options (required): a hash of options
+    #   - klass (required): the class to use for the child instances
+    #   - link (required): the url to fetch the children from
+    #   -
     def atom_children(symbol, options)
 
       if options.blank?
-        raise ArgumentError.new("blank options #{options} are not valid options for bear_children")
+        raise ArgumentError.new("blank options #{options} are not valid options for atom_children")
       end
 
       if options[:klass].blank? || options[:klass].class != Class
@@ -42,11 +48,11 @@ module Sheety::Children
       end
 
       unless method_defined?(:link)
-        raise TypeError.new("#{self} must respond to :link to bear_children")
+        raise TypeError.new("#{self} must respond to :link to use atom_children")
       end
 
       if options[:merge_links] && method_defined?(:add_links) == false
-        raise TypeError.new("#{self} must respond to :add_links to bear_children with mrege_links=true")
+        raise TypeError.new("#{self} must respond to :add_links in atom_children with merge_links=true")
       end
 
       plural = symbol.to_s
@@ -62,14 +68,20 @@ module Sheety::Children
       except_any_method = :"#{plural}_except_any"
       find_first_method = :"find_#{singular}"
 
+      # Defines a method that instantiates a new child
       define_method(new_method) do |entry=nil|
         options[:klass].new(self, entry)
       end
 
+      # Defines a method that fetches children from Google
       define_method(get_method) do |force_refetch=false|
         if instance_variable_get(inst_var_sym).nil? || force_refetch
           list = Sheety::Api.inst.get_feed(link(options[:link])) # sort of a cyclic dependency, suboptimal
 
+          if list.nil?
+            raise Sheety::SheetyFetchError.new, "Fetching #{plural} failed!"
+          end
+
           # TODO: Create a ListFeed Object so the links we get here don't need to be worried about collisions on link ids
           add_links(list['link']) if !list['link'].blank? && options[:merge_links]
 
@@ -83,28 +95,45 @@ module Sheety::Children
         return instance_variable_get(inst_var_sym)
       end
 
-      define_method(enum_method) do |constraints, method|
-        return method(get_method).call().send(method) do |item|
+      # Defines a helper-method that will iterate over children checking that each item passes all constraints given
+      define_method(enum_method) do |constraints, enumeration_method|
+        children = method(get_method).()
+
+        if children.nil?
+          return []
+        end
+
+        return children.send(enumeration_method) do |item|
           constraints.all? do |constraint|
             _passes_constraint(_get_i_val(item, constraint[0], options[:accessor]), constraint[1])
           end
         end
       end
 
+      # Defines a method that selects the children who adhere to all constraints given
       define_method(where_method) do |constraints|
         return method(enum_method).call(constraints, :find_all)
       end
 
+      # Defines a method that selects the first child that passes all constraints given
       define_method(find_first_method) do |constraints|
         return method(enum_method).call(constraints, :detect)
       end
 
+      # Defines a method that selects those children who fail to meet all constraint given
       define_method(except_method) do |constraints|
         return method(enum_method).call(constraints, :reject)
       end
 
+      # Defines a method that selects those children who fail to meet at least one constraint given
       define_method(except_any_method) do |constraints|
-        return method(get_method).call().reject do |item|
+        children = method(get_method).()
+
+        if children.nil?
+          return []
+        end
+
+        return children.reject do |item|
           constraints.any? do |constraint|
             _passes_constraint(_get_i_val(item, constraint[0], options[:accessor]), constraint[1])
           end
@@ -112,4 +141,4 @@ module Sheety::Children
       end
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sheety
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Blake Israel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-04 00:00:00.000000000 Z
+date: 2017-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xml-simple
@@ -92,7 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A Google Spreadsheets Gem